Merge pull request #2076 from TechnologyEnhancedLearning/Develop/Fixes/TD-1877_Allow_supervisor_to_export_a_summary_of_a_learner_progress_to_Excel

TD-1877 Allowed supervisor to export a summary of a learner's progres…

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SupervisorService.cs

@@ -554,7 +554,7 @@ FROM    CandidateAssessmentSupervisorVerifications AS casv
                  (SELECT COUNT(*) AS Expr1
                     FROM   SelfAssessmentResultSupervisorVerifications AS sarsv
                     WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (Superceded = 0)) AS ResultsVerificationRequests,
-                    ca.NonReportable
+                    ca.NonReportable,ca.DelegateUserID
                     FROM   CandidateAssessmentSupervisors AS cas INNER JOIN
                          CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
                            SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID INNER JOIN

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -347,6 +347,8 @@ public IActionResult ReviewDelegateSelfAssessment(int supervisorDelegateId, int
                 CompetencyGroups = competencies.GroupBy(competency => competency.CompetencyGroup),
                 IsSupervisorResultsReviewed = delegateSelfAssessment.IsSupervisorResultsReviewed,
                 SearchViewModel = searchModel,
+                CandidateAssessmentId = candidateAssessmentId,
+                ExportToExcelHide = delegateSelfAssessment.SupervisorRoleTitle.Contains("Assessor")
             };
 
             var flags = frameworkService.GetSelectedCompetencyFlagsByCompetecyIds(reviewedCompetencies.Select(c => c.Id).ToArray());
@@ -1299,9 +1301,19 @@ private int IsSupervisorDelegateExistAndActive(int adminId, string delegateEmail
                 {
                     return 0;
                 }
-
             }
             return existingId;
         }
+
+        public IActionResult ExportCandidateAssessment(int candidateAssessmentId, string delegateName, string selfAssessmentName,int delegateUserID)
+        {
+            var content = candidateAssessmentDownloadFileService.GetCandidateAssessmentDownloadFileForCentre(candidateAssessmentId, delegateUserID, true);
+            var fileName = $"{selfAssessmentName.Substring(0,29)}-{delegateName}-{clockUtility.UtcNow:yyyy-MM-dd}.xlsx";
+            return File(
+                content,
+                FileHelper.GetContentTypeFromFileName(fileName),
+                fileName
+            );
+        }
     }
 }

DigitalLearningSolutions.Web/Controllers/SupervisorController/SupervisorController.cs

@@ -2,6 +2,8 @@
 {
     using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.DataServices.UserDataService;
+    using DigitalLearningSolutions.Data.Services;
+    using DigitalLearningSolutions.Data.Utilities;
     using DigitalLearningSolutions.Web.Helpers;
     using DigitalLearningSolutions.Web.Services;
     using GDS.MultiPageFormData;
@@ -26,6 +28,8 @@ public partial class SupervisorController : Controller
         private readonly IUserService userService;
         private readonly IEmailGenerationService emailGenerationService;
         private readonly IEmailService emailService;
+        private readonly ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService;
+        private readonly IClockUtility clockUtility;
 
         public SupervisorController(
            ISupervisorService supervisorService,
@@ -43,9 +47,11 @@ public SupervisorController(
            IRegistrationService registrationService,
            ICentresDataService centresDataService,
            IUserService userService,
-            IEmailGenerationService emailGenerationService,
-            IEmailService emailService
-            )
+           IEmailGenerationService emailGenerationService,
+           IEmailService emailService,
+           ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService,
+           IClockUtility clockUtility
+           )
         {
             this.supervisorService = supervisorService;
             this.frameworkNotificationService = frameworkNotificationService;
@@ -60,6 +66,8 @@ IEmailService emailService
             this.userService = userService;
             this.emailGenerationService = emailGenerationService;
             this.emailService = emailService;
+            this.candidateAssessmentDownloadFileService = candidateAssessmentDownloadFileService;
+            this.clockUtility = clockUtility;
         }
 
         private int GetCentreId()

DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss

@@ -248,3 +248,6 @@ h1.truncate-overflow::after {
     inline-size: 305px;
   }
 }
+.float-right{
+    float:right;
+}

DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs

@@ -19,5 +19,7 @@ public string VocabPlural(string vocabulary)
         {
             return FrameworkVocabularyHelper.VocabularyPlural(vocabulary);
         }
+        public int CandidateAssessmentId { get; set; }
+        public bool ExportToExcelHide { get; set; }
     }
 }

DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml

@@ -82,6 +82,18 @@
         </div>
     </div>
     <div class="nhsuk-grid-column-one-third">
+        @if (!Model.ExportToExcelHide)
+        {
+            <a class="nhsuk-button nhsuk-button--secondary float-right"
+             asp-route-candidateAssessmentId="@Model.CandidateAssessmentId"
+             asp-route-selfAssessmentName="@Model.DelegateSelfAssessment.RoleName"
+             asp-route-delegateUserID="@Model.DelegateSelfAssessment.DelegateUserID"
+             asp-route-delegateName="@Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName"
+             asp-action="ExportCandidateAssessment"
+             role="button">
+                Export to Excel
+            </a>
+        }
         @if (Model.DelegateSelfAssessment.SignOffRequested > 0)
         {
             <a role="button" asp-action="SignOffProfileAssessment" asp-route-candidateAssessmentId="@Model.DelegateSelfAssessment.ID" asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID" class="nhsuk-button">Sign-off self assessment</a>