Skip to content

TD-3542 Console '500' error is seeing on the 'My staff' screen when clicked 'Supervise' link for 'Version_2_Data_Professions framework' assessment #3123

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 3 commits into from
Feb 25, 2025
Merged

TD-3542 Console '500' error is seeing on the 'My staff' screen when clicked 'Supervise' link for 'Version_2_Data_Professions framework' assessment #3123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ef6456
TD-3542 Console '500' error is seeing on the 'My staff' screen when c…
sherif-olaboye Feb 12, 2025
b492564
Merge remote-tracking branch 'origin/DLS-Release-v1.1.2' into Develop…
sherif-olaboye Feb 24, 2025
bf29c8c
TD-3542 putting the validations in the viewmodels
sherif-olaboye Feb 24, 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
6 changes: 3 additions & 3 deletions DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,16 +1061,16 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele

var sessionEnrolOnRoleProfile = new SessionEnrolOnRoleProfile()
{
SelfAssessmentID = supervisorRoles.FirstOrDefault().SelfAssessmentID,
SelfAssessmentSupervisorRoleId = supervisorRoles.FirstOrDefault().ID
SelfAssessmentID = supervisorRoles.FirstOrDefault() != null ? supervisorRoles.FirstOrDefault().SelfAssessmentID : selfAssessmentId,
SelfAssessmentSupervisorRoleId = supervisorRoles.FirstOrDefault() != null ? supervisorRoles.FirstOrDefault().ID : 0
};

multiPageFormService.SetMultiPageFormData(
sessionEnrolOnRoleProfile,
MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment,
TempData
);
var supervisorRoleName = supervisorRoles.FirstOrDefault().RoleName;
var supervisorRoleName = supervisorRoles.FirstOrDefault() != null ? supervisorRoles.FirstOrDefault().RoleName : "";
var model = new EnrolDelegateSummaryViewModel
{
RoleProfile = roleProfile,
Expand Down
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ public class EnrolDelegateSummaryViewModel
public string SupervisorRoleName { get; set; }
public int SupervisorRoleCount { get; set; }
public bool AllowSupervisorRoleSelection { get; set; }
public bool HasSupervisorRoles => !string.IsNullOrWhiteSpace(SupervisorRoleName);
}
}
11 changes: 10 additions & 1 deletion DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,15 @@
<partial name="Shared/_StaffDetails" model="Model.Item1.SupervisorDelegateDetail" />
</div>
</details>
<h2>Supervision Summary</h2>
@if (!Model.Item1.HasSupervisorRoles)
{
<p>No supervisor roles have been configured for this self assessment.</p>
}
else
{


<h2>Supervision Summary</h2>
<dl class="nhsuk-summary-list">

<div class="nhsuk-summary-list__row">
Expand Down Expand Up @@ -115,3 +123,4 @@
Cancel
</a>
</div>
}
Loading