diff --git a/DigitalLearningSolutions.Data/Models/MultiPageFormData/AddNewCentreCourse/AddNewCentreCourseTempData.cs b/DigitalLearningSolutions.Data/Models/MultiPageFormData/AddNewCentreCourse/AddNewCentreCourseTempData.cs index 717d1d0f3e..4fd6350d2b 100644 --- a/DigitalLearningSolutions.Data/Models/MultiPageFormData/AddNewCentreCourse/AddNewCentreCourseTempData.cs +++ b/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? SectionContentData { get; set; } - + public bool EditCourseContent { get; set; } public void SetApplicationAndResetModels(ApplicationDetails application) { if (Application == application) diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs index f24d243c53..d047e1a744 100644 --- a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs +++ b/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
()); // When - var result = controller.SetCourseContent(); + var result = controller.SetCourseContent(false); // Then result.Should().BeRedirectToActionResult().WithActionName("Summary"); diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs index 015a232f1c..775e52ecdb 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs @@ -365,7 +365,7 @@ 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")] @@ -373,7 +373,7 @@ public IActionResult SetCourseOptions(EditCourseOptionsFormData model) typeof(RedirectMissingMultiPageFormData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddNewCourse) } )] - public IActionResult SetCourseContent() + public IActionResult SetCourseContent(bool editCourseContent) { var data = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewCourse, TempData).GetAwaiter().GetResult(); @@ -381,6 +381,8 @@ public IActionResult SetCourseContent() { 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(); } - 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() - ) - ); + data!.SectionContentData!.Add( + new SectionContentTempData( + model.Tutorials != null + ? model.Tutorials.Select(GetCourseTutorialData) + : new List() + ) + ); multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData); return RedirectToNextSectionOrSummary( diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/_CourseContentSummary.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/_CourseContentSummary.cshtml index 31031f3363..ab5298108e 100644 --- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/_CourseContentSummary.cshtml +++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/_CourseContentSummary.cshtml @@ -26,7 +26,8 @@
@if (!Model.NoContent) { - + Change course content }