Merge branch 'Release-DLS-2023.23' into Develop/Features/TD-1565-ImplementationOfCompleteByEditLink

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/DataServices/SelfAssessmentDataService/DCSAReportDataService.cs

@@ -8,8 +8,8 @@
 
     public interface IDCSAReportDataService
     {
-        IEnumerable<DCSADelegateCompletionStatus> GetDelegateCompletionStatusForCentre(int centreId);
-        IEnumerable<DCSAOutcomeSummary> GetOutcomeSummaryForCentre(int centreId);
+        IEnumerable<DCSADelegateCompletionStatus> GetDelegateCompletionStatus();
+        IEnumerable<DCSAOutcomeSummary> GetOutcomeSummary();
     }
     public partial class DCSAReportDataService : IDCSAReportDataService
     {
@@ -21,7 +21,7 @@ public DCSAReportDataService(IDbConnection connection, ILogger<SelfAssessmentDat
             this.connection = connection;
             this.logger = logger;
         }
-        public IEnumerable<DCSAOutcomeSummary> GetOutcomeSummaryForCentre(int centreId)
+        public IEnumerable<DCSAOutcomeSummary> GetOutcomeSummary()
         {
             return connection.Query<DCSAOutcomeSummary>(
                 @"SELECT DATEPART(month, caa.StartedDate) AS EnrolledMonth, DATEPART(yyyy, caa.StartedDate) AS EnrolledYear, jg.JobGroupName AS JobGroup, ca.Answer1 AS CentreField1, ca.Answer2 AS CentreField2, ca.Answer3 AS CentreField3, CASE WHEN (caa.SubmittedDate IS NOT NULL) 
@@ -107,24 +107,20 @@ FROM    SelfAssessmentResults AS sar INNER JOIN
                 FROM   Candidates AS ca INNER JOIN
                              CandidateAssessments AS caa ON ca.UserID = caa.DelegateUserID AND ca.CentreID = caa.CentreID INNER JOIN Users AS u ON caa.DelegateUserID = u.ID INNER JOIN
                              JobGroups AS jg ON u.JobGroupID = jg.JobGroupID
-                WHERE (ca.Active = 1) AND (ca.CentreID = @centreId) AND (caa.SelfAssessmentID = 1)
-                ORDER BY EnrolledYear DESC, EnrolledMonth DESC, JobGroup, CentreField1, CentreField2, CentreField3, Status",
-                new { centreId }
-            );
+                WHERE (ca.Active = 1) AND (caa.SelfAssessmentID = 1)
+                ORDER BY EnrolledYear DESC, EnrolledMonth DESC, JobGroup, CentreField1, CentreField2, CentreField3, Status");
         }
 
-        public IEnumerable<DCSADelegateCompletionStatus> GetDelegateCompletionStatusForCentre(int centreId)
+        public IEnumerable<DCSADelegateCompletionStatus> GetDelegateCompletionStatus()
         {
             return connection.Query<DCSADelegateCompletionStatus>(
                 @"SELECT DATEPART(month, caa.StartedDate) AS EnrolledMonth, DATEPART(yyyy, caa.StartedDate) AS EnrolledYear, ca.FirstName, ca.LastName, ca.EmailAddress AS Email, ca.Answer1 AS CentreField1, ca.Answer2 AS CentreField2, ca.Answer3 AS CentreField3, CASE WHEN (caa.SubmittedDate IS NOT NULL) 
                              THEN 'Submitted' WHEN (caa.UserBookmark LIKE N'/LearningPortal/SelfAssessment/1/Review' AND caa.SubmittedDate IS NULL) THEN 'Reviewing' ELSE 'Incomplete' END AS Status
                 FROM   Candidates AS ca INNER JOIN
                              CandidateAssessments AS caa ON ca.UserID = caa.DelegateUserID AND ca.CentreID = caa.CentreID INNER JOIN
                              JobGroups AS jg ON ca.JobGroupID = jg.JobGroupID
-                WHERE (ca.Active = 1) AND (ca.CentreID = @centreId) AND  caa.NonReportable = 0
-                ORDER BY EnrolledYear DESC, EnrolledMonth DESC, ca.LastName, ca.FirstName",
-                new { centreId }
-            );
+                WHERE (ca.Active = 1) AND (caa.SelfAssessmentID = 1) AND  caa.NonReportable = 0
+                ORDER BY EnrolledYear DESC, EnrolledMonth DESC, ca.LastName, ca.FirstName");
         }
     }
 }

DigitalLearningSolutions.Data/Models/SelfAssessments/CurrentSelfAssessment.cs

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

DigitalLearningSolutions.Data/Models/Support/RequestAttachment.cs

@@ -10,6 +10,7 @@ public class RequestAttachment
     {
         public string? Id { get; set; }
         public string? FileName { get; set; }
+        public double? SizeMb { get; set; }
         public string? OriginalFileName { get; set; }
         public string? FullFileName { get; set; }
         public byte[] Content { 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/Controllers/Support/RequestSupportTicketController.cs

@@ -170,10 +170,10 @@ public IActionResult SetAttachment(DlsSubApplication dlsSubApplication, RequestA
                 MultiPageFormDataFeature.AddCustomWebForm("RequestSupportTicketCWF"),
                 TempData
             ).GetAwaiter().GetResult(); ;
-
+            requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
             if (requestAttachmentmodel.ImageFiles == null)
             {
-                requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
+                //requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
                 ModelState.AddModelError("ImageFiles", "Please select at least one image");
                 return View("RequestAttachment", requestAttachmentmodel);
             }
@@ -184,13 +184,13 @@ public IActionResult SetAttachment(DlsSubApplication dlsSubApplication, RequestA
             (bool? fileExtension, bool? fileSize) = validateUploadedImages(requestAttachmentmodel);
             if (fileExtension == true)
             {
-                requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
+                //requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
                 ModelState.AddModelError("FileExtensionError", "File must be in valid image formats jpg, jpeg, png, bmp or mp4 video format");
                 return View("RequestAttachment", requestAttachmentmodel);
             }
             if (fileSize == true)
             {
-                requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
+                //requestAttachmentmodel.RequestAttachment = data.RequestAttachment;
                 ModelState.AddModelError("FileSizeError", "Maximum allowed file size is 20MB");
                 return View("RequestAttachment", requestAttachmentmodel);
             }
@@ -202,7 +202,8 @@ public IActionResult SetAttachment(DlsSubApplication dlsSubApplication, RequestA
                 {
                     OriginalFileName = item.FileName,
                     FileName = fileName,
-                    FullFileName = uploadDir + fileName
+                    FullFileName = uploadDir + fileName,
+                    SizeMb = Convert.ToDouble(item.Length.ToSize(FileSizeCalc.SizeUnits.MB))
                 };
                 RequestAttachmentList.Add(RequestAttachment);
             }
@@ -370,6 +371,13 @@ private string UploadFile(IFormFile file)
         private (bool, bool) validateUploadedImages(RequestAttachmentViewModel requestAttachmentmodel)
         {
             var totalFileSize = 0.00;
+            if (requestAttachmentmodel.RequestAttachment != null)
+            {
+                foreach (var item in requestAttachmentmodel.RequestAttachment)
+                {
+                    totalFileSize = totalFileSize + item.SizeMb??0;
+                }
+            }
             foreach (var item in requestAttachmentmodel.ImageFiles)
             {
                 var extension = Path.GetExtension(item.FileName);
@@ -380,10 +388,11 @@ private string UploadFile(IFormFile file)
                 }
                 var fileSize = Convert.ToDouble(item.Length.ToSize(FileSizeCalc.SizeUnits.MB));
                 totalFileSize = totalFileSize + fileSize;
-                if (fileSize > requestAttachmentmodel.SizeLimit || totalFileSize > requestAttachmentmodel.SizeLimit)
-                {
-                    requestAttachmentmodel.FileSizeFlag = true;
-                }
+
+            }
+            if (totalFileSize > requestAttachmentmodel.SizeLimit)
+            {
+                requestAttachmentmodel.FileSizeFlag = true;
             }
             return (requestAttachmentmodel.FileExtensionFlag ?? false, requestAttachmentmodel.FileSizeFlag ?? false);
         }

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs

@@ -42,8 +42,8 @@ public IActionResult Index()
         public IActionResult DownloadDigitalCapabilityToExcel()
         {
             var centreId = User.GetCentreIdKnownNotNull();
-            var dataFile = selfAssessmentReportService.GetDigitalCapabilityExcelExportForCentre(centreId);
-            var fileName = $"DLS DSAT Report - Centre {centreId} - downloaded {clockUtility.UtcToday:yyyy-MM-dd}.xlsx";
+            var dataFile = selfAssessmentReportService.GetDigitalCapabilityExcelExport();
+            var fileName = $"DLS DSAT Report - downloaded {clockUtility.UtcToday:yyyy-MM-dd}.xlsx";
             return File(
                 dataFile,
                 FileHelper.GetContentTypeFromFileName(fileName),

DigitalLearningSolutions.Web/Services/SelfAssessmentReportService.cs

@@ -11,7 +11,7 @@
 
     public interface ISelfAssessmentReportService
     {
-        byte[] GetDigitalCapabilityExcelExportForCentre(int centreId);
+        byte[] GetDigitalCapabilityExcelExport();
         byte[] GetSelfAssessmentExcelExportForCentre(int centreId, int selfAssessmentId);
         IEnumerable<SelfAssessmentSelect> GetSelfAssessmentsForReportList(int centreId, int? categoryId);
     }
@@ -34,10 +34,10 @@ private static void AddSheetToWorkbook(IXLWorkbook workbook, string sheetName, I
             table.Theme = XLTableTheme.TableStyleLight9;
             sheet.Columns().AdjustToContents();
         }
-        public byte[] GetDigitalCapabilityExcelExportForCentre(int centreId)
+        public byte[] GetDigitalCapabilityExcelExport()
         {
-            var delegateCompletionStatus = dcsaReportDataService.GetDelegateCompletionStatusForCentre(centreId);
-            var outcomeSummary = dcsaReportDataService.GetOutcomeSummaryForCentre(centreId);
+            var delegateCompletionStatus = dcsaReportDataService.GetDelegateCompletionStatus();
+            var outcomeSummary = dcsaReportDataService.GetOutcomeSummary();
             var summary = delegateCompletionStatus.Select(
                 x => new
                 {

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

DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestAttachment.cshtml

@@ -34,7 +34,7 @@
                         </legend>
                         <div class="nhsuk-form-group">
                             <label class="nhsuk-label" for="ImageFiles">
-                                If you have any screenshots that help illustrate your request, attach them here. The maximum total file size for uploaded files is 20MB.
+                                If you have any screenshots that help illustrate your request, attach them here. The maximum total file size for uploaded files is 20 MB.
                             </label>
                             @if (!ViewData.ModelState.IsValid)
                             {
@@ -60,7 +60,7 @@
                             <div class="nhsuk-summary-list__row">
 
                                 <dd class="nhsuk-summary-list__value">
-                                    @a.OriginalFileName
+                                    @a.OriginalFileName (@a.SizeMb.ToString() MB)
                                 </dd>
                                 <dd class="nhsuk-summary-list__actions">
                                     <a asp-action="DeleteImage" asp-all-route-data="@cancelLinkData" asp-route-imageName="@a.FileName" asp-route-imageId="@a.Id">