Fixes following merge conflict problems.

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -785,8 +785,8 @@ public IActionResult EnrolSetCompetencyAssessment(int supervisorDelegateId, int
                 return View("EnrolDelegateOnProfileAssessment", model);
             }
 
-            if (sessionEnrolOnRoleProfile.SelfAssessmentID != selfAssessmentID)
-                sessionEnrolOnRoleProfile = new SessionEnrolOnRoleProfile();
+            if (sessionEnrolOnCompetencyAssessment.SelfAssessmentID != selfAssessmentID)
+                sessionEnrolOnCompetencyAssessment = new SessionEnrolOnCompetencyAssessment();
 
             sessionEnrolOnCompetencyAssessment.SelfAssessmentID = selfAssessmentID;
             multiPageFormService.SetMultiPageFormData(
@@ -811,15 +811,14 @@ public IActionResult EnrolSetCompetencyAssessment(int supervisorDelegateId, int
         [Route("/Supervisor/Staff/{supervisorDelegateId}/ProfileAssessment/Enrol/Confirm")]
         public IActionResult ConfirmRetiringSelfAssessment(int supervisorDelegateId)
         {
-            var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData<SessionEnrolOnRoleProfile>(
+            var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData<SessionEnrolOnCompetencyAssessment>(
                    MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment,
                    TempData
                    ).GetAwaiter().GetResult();
 
             var retirementDate = selfAssessmentService.GetSelfAssessmentById((int)sessionEnrolOnRoleProfile.SelfAssessmentID).RetirementDate;
             if (!CheckRetirementDate((retirementDate)))
             {
-                var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData<SessionEnrolOnCompetencyAssessment>(
                 return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });
             }
             var model = new RetiringSelfAssessmentViewModel()
@@ -836,7 +835,7 @@ public IActionResult ConfirmRetiringSelfAssessment(int supervisorDelegateId)
         [Route("/Supervisor/Staff/{supervisorDelegateId}/ProfileAssessment/Enrol/Confirm")]
         public IActionResult ConfirmRetiringSelfAssessment(RetiringSelfAssessmentViewModel retiringSelfAssessment)
         {
-            var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData<SessionEnrolOnRoleProfile>(
+            var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData<SessionEnrolOnCompetencyAssessment>(
                     MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment,
                     TempData
                     ).GetAwaiter().GetResult();
@@ -881,8 +880,8 @@ public IActionResult EnrolDelegateCompleteBy(int supervisorDelegateId, int? day,
                 TempData
             );
 
-            var retirementDate = selfAssessmentService.GetSelfAssessmentById((int)sessionEnrolOnRoleProfile.SelfAssessmentID).RetirementDate;
-            if (CheckRetirementDate(retirementDate) && !sessionEnrolOnRoleProfile.ActionConfirmed)
+            var retirementDate = selfAssessmentService.GetSelfAssessmentById((int)sessionEnrolOnCompetencyAssessment.SelfAssessmentID).RetirementDate;
+            if (CheckRetirementDate(retirementDate) && !sessionEnrolOnCompetencyAssessment.ActionConfirmed)
             {
                 return RedirectToAction("ConfirmRetiringSelfAssessment", "Supervisor", new { supervisorDelegateId });
             }
@@ -893,10 +892,8 @@ public IActionResult EnrolDelegateCompleteBy(int supervisorDelegateId, int? day,
             {
                 SupervisorDelegateDetail = supervisorDelegate,
                 CompetencyAssessment = competencyAssessment,
-                CompleteByDate = sessionEnrolOnCompetencyAssessment.CompleteByDate
-                RoleProfile = roleProfile,
-                CompleteByDate = sessionEnrolOnRoleProfile.CompleteByDate,
-                ActionConfirmed = sessionEnrolOnRoleProfile.ActionConfirmed
+                CompleteByDate = sessionEnrolOnCompetencyAssessment.CompleteByDate,
+                ActionConfirmed = sessionEnrolOnCompetencyAssessment.ActionConfirmed
             };
             if (day != null && month != null && year != null)
             {
@@ -918,6 +915,7 @@ public IActionResult EnrolDelegateSetCompleteBy(int supervisorDelegateId, int da
             {
                 var validationResult = OldDateValidator.ValidateDate(day, month, year);
                 if (!validationResult.DateValid)
+                {
                     return RedirectToAction("EnrolDelegateCompleteBy", new { supervisorDelegateId, day, month, year });
                 }
                 else
@@ -931,11 +929,11 @@ public IActionResult EnrolDelegateSetCompleteBy(int supervisorDelegateId, int da
                     );
                 }
 
-                sessionEnrolOnRoleProfile.CompleteByDate = new DateTime(year, month, day);
+                sessionEnrolOnCompetencyAssessment.CompleteByDate = new DateTime(year, month, day);
             }
             else
             {
-                sessionEnrolOnRoleProfile.CompleteByDate = null;
+                sessionEnrolOnCompetencyAssessment.CompleteByDate = null;
             }
 
             var supervisorRoles =
@@ -1048,8 +1046,8 @@ public IActionResult EnrolDelegateSummary(int supervisorDelegateId)
                 TempData
             );
 
-            var retirementDate = selfAssessmentService.GetSelfAssessmentById((int)sessionEnrolOnRoleProfile.SelfAssessmentID).RetirementDate;
-            if (CheckRetirementDate(retirementDate) && !sessionEnrolOnRoleProfile.ActionConfirmed)
+            var retirementDate = selfAssessmentService.GetSelfAssessmentById((int)sessionEnrolOnCompetencyAssessment.SelfAssessmentID).RetirementDate;
+            if (CheckRetirementDate(retirementDate) && !sessionEnrolOnCompetencyAssessment.ActionConfirmed)
             {
                 return RedirectToAction("ConfirmRetiringSelfAssessment", "Supervisor", new { supervisorDelegateId });
             }
@@ -1081,7 +1079,7 @@ public IActionResult EnrolDelegateSummary(int supervisorDelegateId)
             ViewBag.completeByMonth = TempData["completeByMonth"];
             ViewBag.completeByYear = TempData["completeByYear"];
             ViewBag.navigatedFrom = TempData["navigatedFrom"];
-            ViewBag.actionConfirmed = sessionEnrolOnRoleProfile.ActionConfirmed;
+            ViewBag.actionConfirmed = sessionEnrolOnCompetencyAssessment.ActionConfirmed;
             return View("EnrolDelegateSummary", model);
         }
 
@@ -1605,7 +1603,6 @@ private static string RenderRazorViewToString(Controller controller, string view
                 return sw.GetStringBuilder().ToString();
             }
         }
-
         private bool CheckRetirementDate(DateTime? date)
         {
             if (date == null)

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

@@ -37,7 +37,7 @@ public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook
             var newCompetencyIds = competencyRows.Select(row => row.ID ?? 0).ToList();
             var existingIds = frameworkService.GetFrameworkCompetencyOrder(frameworkId, newCompetencyIds);
             var existingGroups = frameworkService
-                .GetFrameworkCompetencyGroups(frameworkId).Where(x => x.FrameworkCompetencies.Any()).ToList()
+                .GetFrameworkCompetencyGroups(frameworkId, null).Where(x => x.FrameworkCompetencies.Any()).ToList()
                 .Select(row => row.Name)
                 .Distinct()
                 .ToList();