Merge branch 'DLS-Release-v1.1.1' into UAT

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -537,16 +537,16 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
             if (candidateAssessmentId > 1 && supervisorDelegateId == 0)
             {
                 connection.Execute(
-                        @"UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic
+                        @"UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic, EnrolledByAdminId = @enrolledByAdminId
                   WHERE ID = @candidateAssessmentId",
-                        new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic }
+                        new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic, enrolledByAdminId }
                     );
             }
             if (candidateAssessmentId > 1 && supervisorDelegateId != 0)
             {
                 string sqlQuery = $@"
                 BEGIN TRANSACTION
-                UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic
+                UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic, EnrolledByAdminId = @enrolledByAdminId
                   WHERE ID = @candidateAssessmentId
 
                 UPDATE CandidateAssessmentSupervisors SET Removed = NULL
@@ -556,7 +556,7 @@ BEGIN TRANSACTION
                 COMMIT TRANSACTION";
 
                 connection.Execute(sqlQuery
-                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic, supervisorDelegateId });
+                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic, supervisorDelegateId, enrolledByAdminId });
             }
 
             if (supervisorId > 0)

DigitalLearningSolutions.Data/Models/MultiPageFormData/AddNewCentreCourse/AddNewCentreCourseTempData.cs

@@ -17,7 +17,7 @@ public AddNewCentreCourseTempData()
         public CourseOptionsTempData? CourseOptionsData { get; set; }
         public CourseContentTempData? CourseContentData { get; set; }
         public List<SectionContentTempData>? SectionContentData { get; set; }
-
+        public bool EditCourseContent { get; set; }
         public void SetApplicationAndResetModels(ApplicationDetails application)
         {
             if (Application == application)

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs

@@ -416,7 +416,7 @@ public void SetCourseContent_get_redirects_to_summary_if_application_has_no_sect
             ).Returns(new List<Section>());
 
             // When
-            var result = controller.SetCourseContent();
+            var result = controller.SetCourseContent(false);
 
             // Then
             result.Should().BeRedirectToActionResult().WithActionName("Summary");

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs

@@ -365,22 +365,24 @@ public IActionResult SetCourseOptions(EditCourseOptionsFormData model)
             data!.CourseOptionsData = model.ToCourseOptionsTempData();
             multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData);
 
-            return RedirectToAction("SetCourseContent");
+            return RedirectToAction("SetCourseContent", false);
         }
 
         [HttpGet("AddCourse/SetCourseContent")]
         [TypeFilter(
             typeof(RedirectMissingMultiPageFormData),
             Arguments = new object[] { nameof(MultiPageFormDataFeature.AddNewCourse) }
         )]
-        public IActionResult SetCourseContent()
+        public IActionResult SetCourseContent(bool editCourseContent)
         {
             var data = multiPageFormService.GetMultiPageFormData<AddNewCentreCourseTempData>(MultiPageFormDataFeature.AddNewCourse, TempData).GetAwaiter().GetResult();
 
             if (!sectionService.GetSectionsThatHaveTutorialsForApplication(data!.Application!.ApplicationId).Any())
             {
                 return RedirectToAction("Summary");
             }
+            data.EditCourseContent = editCourseContent;
+            multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData);
 
             var model = data!.CourseContentData != null
                 ? new SetCourseContentViewModel(data.CourseContentData)
@@ -457,7 +459,7 @@ public IActionResult SetSectionContent(int sectionIndex)
             }
 
             var showDiagnostic = data.Application!.DiagAssess;
-            if (data.SectionContentData != null && data.SectionContentData.Count >=3 )
+            if (data.EditCourseContent)
             {
                 var tutorial = GetTutorialsFromSectionContentData(data.SectionContentData, tutorials);
                 var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorial);
@@ -649,20 +651,19 @@ private IActionResult SaveSectionAndRedirect(SetSectionContentViewModel model)
             {
                 data.SectionContentData = new List<SectionContentTempData>();
             }
-            if (data.SectionContentData != null && data.SectionContentData.Count >= 3)
+            if (data.EditCourseContent)
             {
                 return RedirectToNextSectionOrSummary(
                model.Index,
-               new SetCourseContentViewModel(data.CourseContentData!)
-           );
+               new SetCourseContentViewModel(data.CourseContentData!));
             }
-                data!.SectionContentData!.Add(
-                new SectionContentTempData(
-                    model.Tutorials != null
-                        ? model.Tutorials.Select(GetCourseTutorialData)
-                        : new List<CourseTutorialTempData>()
-                )
-            );
+            data!.SectionContentData!.Add(
+            new SectionContentTempData(
+                model.Tutorials != null
+                    ? model.Tutorials.Select(GetCourseTutorialData)
+                    : new List<CourseTutorialTempData>()
+            )
+        );
             multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData);
 
             return RedirectToNextSectionOrSummary(

DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/_CourseContentSummary.cshtml

@@ -26,7 +26,8 @@
   <dd class="nhsuk-summary-list__actions">
     @if (!Model.NoContent)
     {
-      <a asp-action="SetCourseContent">
+      <a asp-action="SetCourseContent"
+               asp-route-EditCourseContent="true">
         Change<span class="nhsuk-u-visually-hidden"> course content</span>
       </a>
     }