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

Author: rshrirohit

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

@@ -460,17 +460,15 @@ public IActionResult SetSectionContent(int sectionIndex)
             }
 
             var showDiagnostic = data.Application!.DiagAssess;
-            if (data.EditCourseContent)
+            var tutorial = GetTutorialsFromSectionContentData(data.SectionContentData, tutorials);
+            if (tutorial.Count() == 0)
             {
-                var tutorial = GetTutorialsFromSectionContentData(data.SectionContentData, tutorials);
-                var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorial);
-                return View("AddNewCentreCourse/SetSectionContent", model);
-            }
-            else
-            {
-                var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorials);
-                return View("AddNewCentreCourse/SetSectionContent", model);
+                var models = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorials);
+                return View("AddNewCentreCourse/SetSectionContent", models);
             }
+            var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorial);
+            return View("AddNewCentreCourse/SetSectionContent", model);
+
 
         }
 
@@ -501,6 +499,21 @@ string action
         public IActionResult Summary()
         {
             var data = multiPageFormService.GetMultiPageFormData<AddNewCentreCourseTempData>(MultiPageFormDataFeature.AddNewCourse, TempData).GetAwaiter().GetResult();
+            var updatedSections = new List<SectionContentTempData>();
+            foreach (var item in data.CourseContentData.SelectedSectionIds)
+            {
+                var tutorialsForSection = tutorialService.GetTutorialsForSection(item).ToList();
+
+                var matchingSections = data.SectionContentData
+                    .Where(section => section.Tutorials.Any(t => tutorialsForSection.Any(tf => tf.TutorialId == t.TutorialId)))
+                    .ToList();
+
+                updatedSections.AddRange(matchingSections);
+            }
+
+            updatedSections = updatedSections.Distinct().ToList();
+            data.SectionContentData = updatedSections;
+            multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData);
 
             var model = new SummaryViewModel(data!);
 
@@ -664,11 +677,11 @@ private IActionResult SaveSectionAndRedirect(SetSectionContentViewModel model)
                 }
             }
             if (sectionsToRemove.Count > 0)
-            { 
-            foreach (var section in sectionsToRemove)
             {
-                data.SectionContentData.Remove(section);
-            }
+                foreach (var section in sectionsToRemove)
+                {
+                    data.SectionContentData.Remove(section);
+                }
             }
             data!.SectionContentData!.Add(
             new SectionContentTempData(

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

@@ -3,34 +3,37 @@
 @model SetSectionContentViewModel
 
 @{
-  ViewData["Title"] = "Set section content";
-  var backLinkRouteData = new Dictionary<string, string> { { "index", Model.Index.ToString() } };
+    ViewData["Title"] = "Set section content";
+    var sectionIndex = Model.Index == 0 ? Model.Index : Model.Index - 1;
+    var backLinkRouteData = new Dictionary<string, string> { { "index", Model.Index.ToString() } };
 }
 
 <div class="nhsuk-grid-row">
-  <div class="nhsuk-grid-column-full">
-    <h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
+    <div class="nhsuk-grid-column-full">
+        <h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
 
-    <vc:field-name-value-display display-name="Section" field-value="@Model.SectionName" />
+        <vc:field-name-value-display display-name="Section" field-value="@Model.SectionName" />
 
-    <form method="post" novalidate asp-action="SetSectionContent">
-      <input type="hidden" asp-for="Index" />
+        <form method="post" novalidate asp-action="SetSectionContent">
+            <input type="hidden" asp-for="Index" />
 
-      <partial name="../CourseContent/_EditSectionContentFormInputs" model="Model" />
+            <partial name="../CourseContent/_EditSectionContentFormInputs" model="Model" />
 
-      <button name="action" class="nhsuk-button" type="submit" value="@CourseSetupController.SaveAction">Next</button>
-    </form>
-    @if (Model.Index == 0)
-    {
-      <vc:back-link asp-controller="CourseSetup" asp-action="SetCourseContent" link-text="Go back" />
-    }
-    else
-    {
-      <vc:back-link asp-controller="CourseSetup" asp-action="SetSectionContent" asp-all-route-data="@backLinkRouteData" link-text="Go back" />
-    }
-  </div>
+            <button name="action" class="nhsuk-button" type="submit" value="@CourseSetupController.SaveAction">Next</button>
+        </form>
+        @if (Model.Index == 0)
+        {
+            <vc:back-link asp-controller="CourseSetup" asp-action="SetCourseContent" link-text="Go back" />
+        }
+        else
+        {
+            <a asp-controller="CourseSetup" asp-action="SetSectionContent" asp-route-sectionIndex="@sectionIndex">
+                &lt; Go back
+            </a>
+        }
+    </div>
 </div>
 
 @section scripts {
-  <script src="@Url.Content("~/js/trackingSystem/editCourseContent.js")" asp-append-version="true"></script>
+    <script src="@Url.Content("~/js/trackingSystem/editCourseContent.js")" asp-append-version="true"></script>
 }