Skip to content

TD-5290- Issue on 'Course set up' screen when selected All course content first time and changed to few of them clicking 'change link' #3098

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

Closed
wants to merge 2 commits into from
Closed

TD-5290- Issue on 'Course set up' screen when selected All course content first time and changed to few of them clicking 'change link' #3098

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
482aef5
TD-5290- SectionContentData is updated in edit mode according to exis…
Auldrin-Possa Jan 31, 2025
13f128e
TD-5290- Tutorials null check added
Auldrin-Possa Jan 31, 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
51 changes: 49 additions & 2 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 @@ -381,7 +381,10 @@ public IActionResult SetCourseContent(bool editCourseContent)
{
return RedirectToAction("Summary");
}
data.EditCourseContent = editCourseContent;

if (!data.EditCourseContent)
data.EditCourseContent = editCourseContent;

multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData);

var model = data!.CourseContentData != null
Expand Down Expand Up @@ -426,6 +429,23 @@ public IActionResult SetCourseContent(SetCourseContentViewModel model)
}

data.CourseContentData = model.ToDataCourseContentTempData();

//*** When user changes section using change link or back button, update data.SectionContentData accordingly ***//
var newSectionContentData = new List<SectionContentTempData?>();
foreach (var secId in model.SelectedSectionIds)
{
var tutorials = tutorialService.GetTutorialsForSection(secId).ToArray();
var sectionContentTempData = new SectionContentTempData(tutorials);
sectionContentTempData.Tutorials = sectionContentTempData.Tutorials.ToList();

newSectionContentData!.Add(sectionContentTempData);
}
if (data!.SectionContentData != null)
{
data.SectionContentData = data.SectionContentData
.Where(nArray => newSectionContentData.Any(sArray => sArray.Tutorials.FirstOrDefault().TutorialId.Equals(nArray.Tutorials.FirstOrDefault().TutorialId))).ToList();
}

multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData);

return RedirectToAction(model.IncludeAllSections ? "Summary" : "SetSectionContent");
Expand Down Expand Up @@ -462,6 +482,8 @@ public IActionResult SetSectionContent(int sectionIndex)
if (data.EditCourseContent)
{
var tutorial = GetTutorialsFromSectionContentData(data.SectionContentData, tutorials);
if (tutorial.Count() == 0) // if newly added section in edit mode
tutorial = tutorials;
var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorial);
return View("AddNewCentreCourse/SetSectionContent", model);
}
Expand Down Expand Up @@ -651,8 +673,33 @@ private IActionResult SaveSectionAndRedirect(SetSectionContentViewModel model)
{
data.SectionContentData = new List<SectionContentTempData>();
}
if (data.EditCourseContent)

bool tutorialExist = false;
if (model.Tutorials != null)
{
var tutorialId = model.Tutorials.Select(x => x.TutorialId).FirstOrDefault();
tutorialExist = data.SectionContentData!.SelectMany(x => x.Tutorials).Select(y => y.TutorialId).Contains(tutorialId);
}

if (data.EditCourseContent && tutorialExist) // Edit only for existing sections else add
{
if (model.Tutorials != null)
{
data.SectionContentData!
.SelectMany(x => x.Tutorials)
.Join(model!.Tutorials,
sectTut => sectTut.TutorialId,
modTut => modTut.TutorialId,
(sectTut, modTut) =>
{
sectTut.DiagnosticEnabled = modTut.DiagnosticEnabled;
sectTut.LearningEnabled = modTut.LearningEnabled;
return sectTut;
})
.ToList();

multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData);
}
return RedirectToNextSectionOrSummary(
model.Index,
new SetCourseContentViewModel(data.CourseContentData!));
Expand Down
Loading