Merge pull request #2740 from TechnologyEnhancedLearning/Develop/Fix/TD-4320-Supervisor-emails-on-ManageSupervisors-list

TD-4320-Supervisor emails should be shown on 'Manage Supervisors' list/ 'Quick add'

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs

@@ -269,7 +269,7 @@ public IEnumerable<Competency> GetResultSupervisorVerifications(int selfAssessme
             const string supervisorFields = @"
                 LAR.EmailSent,
                 LAR.Requested AS SupervisorVerificationRequested,
-                COALESCE(au.Forename + ' ' + au.Surname + (CASE WHEN au.Active = 1 THEN '' ELSE ' (Inactive)' END), sd.SupervisorEmail) AS SupervisorName,
+                au.Forename + ' ' + au.Surname + (CASE WHEN au.Active = 1 THEN '' ELSE ' (Inactive)' END) + ' (' + sd.SupervisorEmail + ')' AS SupervisorName,
                 au.CentreName,
                 SelfAssessmentResultSupervisorVerificationId AS SupervisorVerificationId,
                 CandidateAssessmentSupervisorID";

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ManageSupervisors.cshtml

@@ -61,8 +61,9 @@
                 <tr role="row" class="nhsuk-table__row">
                     <td class="nhsuk-table__cell">
                         <span class="nhsuk-table-responsive__heading">Name/role </span>
-                        @supervisor.SupervisorName, @supervisor.RoleName
-
+                        <span class="text-wrap word-break">
+                            @supervisor.SupervisorName (@supervisor.SupervisorEmail), @supervisor.RoleName
+                        </span>
                     </td>
                     <td class="nhsuk-table__cell">
                         <span class="nhsuk-table-responsive__heading">Centre </span>
@@ -110,7 +111,9 @@ else
                 <tr role="row" class="nhsuk-table__row">
                     <td class="nhsuk-table__cell">
                         <span class="nhsuk-table-responsive__heading">Name/role </span>
-                        @supervisor.SupervisorName, @supervisor.RoleName
+                        <span class="text-wrap word-break">
+                            @supervisor.SupervisorName (@supervisor.SupervisorEmail), @supervisor.RoleName
+                        </span>
                     </td>
                     <td class="nhsuk-table__cell">
                         <span class="nhsuk-table-responsive__heading">Centre </span>

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ReviewConfirmationRequests.cshtml

@@ -77,8 +77,10 @@
                         </td>
                         <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
                             <span class="nhsuk-table-responsive__heading">Request </span>
-                            @competency.SupervisorName (@competency.CentreName)<br />
-                            @competency.SupervisorVerificationRequested?.ToString("dd/MM/yyyy")<br />
+                            <span class="text-wrap word-break">
+                                @competency.SupervisorName @competency.CentreName<br />
+                                @competency.SupervisorVerificationRequested?.ToString("dd/MM/yyyy")<br />
+                            </span>
                             <div class="nhsuk-u-one-half-tablet" style="white-space: nowrap;">
                                 <div class="nhsuk-grid-row nhsuk-u-padding-0">
                                     @if (competency.EmailSent.HasValue && clockUtility.UtcNow.Subtract(competency.EmailSent.Value) > TimeSpan.FromHours(1))