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

Author: sherif-olaboye

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -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,

DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml

@@ -47,7 +47,15 @@
             <partial name="Shared/_StaffDetails" model="Model.Item1.SupervisorDelegateDetail" />
         </div>
     </details>
-    <h2>Supervision Summary</h2>
+@if (string.IsNullOrWhiteSpace(Model.Item1.SupervisorRoleName))
+{
+    <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">
@@ -115,3 +123,4 @@
         Cancel
     </a>
 </div>
+}