Merge pull request #2441 from TechnologyEnhancedLearning/Develop/Fixes/TD-3032-renamingassessmentsonLearningPortal

TD-3032 Following right format in naming the export file

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -98,7 +98,8 @@ FROM SelfAssessmentSupervisorRoles AS SelfAssessmentSupervisorRoles_1
                             'Supervisor') AS SignOffRoleName,
                         SA.SignOffRequestorStatement,
                         SA.ManageSupervisorsDescription,
-                        CA.NonReportable
+                        CA.NonReportable,
+					 U.FirstName +' '+ U.LastName AS DelegateName
                     FROM CandidateAssessments CA
                     JOIN SelfAssessments SA
                         ON CA.SelfAssessmentID = SA.ID
@@ -110,6 +111,8 @@ INNER JOIN CompetencyGroups AS CG
                             ON SAS.CompetencyGroupID = CG.ID AND SAS.SelfAssessmentID = @selfAssessmentId
                     LEFT OUTER JOIN CandidateAssessmentOptionalCompetencies AS CAOC
                             ON CA.ID = CAOC.CandidateAssessmentID AND C.ID = CAOC.CompetencyID AND CG.ID = CAOC.CompetencyGroupID
+                    INNER JOIN Users AS U 
+							ON U.ID = CA.DelegateUserID 
                     WHERE CA.DelegateUserID = @delegateUserId AND CA.SelfAssessmentID = @selfAssessmentId AND CA.RemovedDate IS NULL
                         AND CA.CompletedDate IS NULL AND ((SAS.Optional = 0) OR (CAOC.IncludedInSelfAssessment = 1))
                     GROUP BY
@@ -120,7 +123,8 @@ GROUP BY
                         CA.ID, CA.UserBookmark, CA.UnprocessedUpdates,
                         CA.LaunchCount, CA.SubmittedDate, SA.LinearNavigation, SA.UseDescriptionExpanders,
                         SA.ManageOptionalCompetenciesPrompt, SA.SupervisorSelfAssessmentReview, SA.SupervisorResultsReview,
-                        SA.ReviewerCommentsLabel,SA.EnforceRoleRequirementsForSignOff, SA.ManageSupervisorsDescription,CA.NonReportable",
+                        SA.ReviewerCommentsLabel,SA.EnforceRoleRequirementsForSignOff, SA.ManageSupervisorsDescription,CA.NonReportable,
+                        U.FirstName , U.LastName",
                 new { delegateUserId, selfAssessmentId }
             );
         }

DigitalLearningSolutions.Data/Models/SelfAssessments/CurrentSelfAssessment.cs

@@ -22,5 +22,6 @@ public class CurrentSelfAssessment : SelfAssessment
         public bool NonReportable { get; set; }
         public int? SupervisorCount { get; set; }
         public bool IsSameCentre { get; set; }
+        public string? DelegateName { get; set; }
     }
 }

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -1536,11 +1536,11 @@ public IActionResult SignOffHistory(int selfAssessmentId, string vocabulary)
             };
             return View("SelfAssessments/SignOffHistory", model);
         }
-        public IActionResult ExportCandidateAssessment(int candidateAssessmentId, string vocabulary,string candidateAssessmentName)
+        public IActionResult ExportCandidateAssessment(int candidateAssessmentId,string candidateAssessmentName, string delegateName)
         {
             var content = candidateAssessmentDownloadFileService.GetCandidateAssessmentDownloadFileForCentre(candidateAssessmentId, User.GetUserIdKnownNotNull(), true);
-            var fileName = $"{((candidateAssessmentName.Length > 30) ? candidateAssessmentName.Substring(0, 30) : candidateAssessmentName)} {vocabulary} Assessment Export {clockUtility.UtcNow:yyyy-MM-dd}.xlsx";
-            return File(
+            var fileName = $"{((candidateAssessmentName.Length > 30) ? candidateAssessmentName.Substring(0, 30) : candidateAssessmentName)} - {delegateName} - {clockUtility.UtcNow:yyyy-MM-dd}.xlsx";
+             return File(
                 content,
                 FileHelper.GetContentTypeFromFileName(fileName),
                 fileName

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

@@ -24,7 +24,7 @@
   <a class="nhsuk-button nhsuk-button--secondary"
      asp-route-candidateAssessmentId="@Model.SelfAssessment.CandidateAssessmentId"
      asp-route-candidateAssessmentName="@Model.SelfAssessment.Name"
-     asp-route-vocabulary="@Model.VocabPlural()"
+       asp-route-delegateName="@Model.SelfAssessment.DelegateName"
      asp-action="ExportCandidateAssessment"
      role="button">
     Export to Excel