Skip to content

TD-4340 Issue with the 'Course content' change link when creating a course from 'Course set up' screen #3060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 23, 2025
Merged

TD-4340 Issue with the 'Course content' change link when creating a course from 'Course set up' screen #3060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f899dd
TD-4340 Issue with the 'Course content' change link when creating a c…
sherif-olaboye Jan 13, 2025
99482e1
TD-4340 Issue with the 'Course content' change link when creating a c…
sherif-olaboye Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...gSolutions.Data/Models/MultiPageFormData/AddNewCentreCourse/AddNewCentreCourseTempData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...gSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
27 changes: 14 additions & 13 deletions DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion ...ions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/_CourseContentSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
}
Expand Down
Loading