TD-3876-'Response meeting role requirements' count removed from the certificate. Supervisor list ordered by name.

Author: Auldrin-Possa

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -430,7 +430,7 @@ LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr
 				INNER JOIN Users AS u ON U.PrimaryEmail =  au.Email 
              WHERE
               (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (ca.DelegateUserID = @DelegateUserID) AND (ca.SelfAssessmentID = @selfAssessmentId)) Accessor
-                ORDER BY AccessorPRN DESC",
+                ORDER BY AccessorName, AccessorPRN DESC",
                 new { selfAssessmentId, delegateUserID }
             );
         }
@@ -478,26 +478,5 @@ CandidateAssessmentSupervisorVerifications AS casv INNER JOIN
                 new { CandidateAssessmentSupervisorVerificationsId }
             );
         }
-        public int? GetRoleCount(int candidateAssessmentId)
-        {
-            return connection.QueryFirstOrDefault<int?>(
-                @"SELECT COUNT(sas1.CompetencyID) AS MeetingCount
-                    FROM   SelfAssessmentResultSupervisorVerifications AS sasrv INNER JOIN
-                             SelfAssessmentResults AS sar1 ON sasrv.SelfAssessmentResultId = sar1.ID AND sasrv.Superceded = 0 LEFT OUTER JOIN
-                             CompetencyAssessmentQuestionRoleRequirements AS caqrr1 ON sar1.Result = caqrr1.LevelValue AND 
-			                 sar1.CompetencyID = caqrr1.CompetencyID AND sar1.SelfAssessmentID = caqrr1.SelfAssessmentID AND 
-                             sar1.AssessmentQuestionID = caqrr1.AssessmentQuestionID RIGHT OUTER JOIN
-                             SelfAssessmentStructure AS sas1 INNER JOIN
-                             CandidateAssessments AS ca1 ON sas1.SelfAssessmentID = ca1.SelfAssessmentID INNER JOIN
-                             CompetencyAssessmentQuestions AS caq1 ON sas1.CompetencyID = caq1.CompetencyID ON sar1.SelfAssessmentID=sas1.SelfAssessmentID and 
-			                 sar1.CompetencyID=sas1.CompetencyID AND sar1.AssessmentQuestionID = caq1.AssessmentQuestionID AND sar1.DelegateUserID = ca1.DelegateUserID
-			                 LEFT OUTER JOIN   CandidateAssessmentOptionalCompetencies AS caoc1 ON sas1.CompetencyID = caoc1.CompetencyID AND sas1.CompetencyGroupID = caoc1.CompetencyGroupID AND ca1.ID = caoc1.CandidateAssessmentID
-                    WHERE (ca1.ID = @CandidateAssessmentId) AND (sas1.Optional = 0) AND (NOT (sar1.Result IS NULL)) AND (sasrv.SignedOff = 1) AND (caqrr1.LevelRAG = 3) OR
-                             (ca1.ID = @candidateAssessmentId) AND (caoc1.IncludedInSelfAssessment = 1) AND (NOT (sar1.Result IS NULL)) AND (sasrv.SignedOff = 1) AND (caqrr1.LevelRAG = 3) OR
-                             (ca1.ID = @candidateAssessmentId) AND (sas1.Optional = 0) AND (NOT (sar1.SupportingComments IS NULL)) AND (sasrv.SignedOff = 1) AND (caqrr1.LevelRAG = 3) OR
-                             (ca1.ID = @candidateAssessmentId) AND (caoc1.IncludedInSelfAssessment = 1) AND (NOT (sar1.SupportingComments IS NULL)) AND (sasrv.SignedOff = 1) AND (caqrr1.LevelRAG = 3)",
-                    new { candidateAssessmentId }
-            );
-        }
     }
 }

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -169,7 +169,6 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
         CompetencySelfAssessmentCertificate GetCompetencySelfAssessmentCertificate(int candidateAssessmentID);
         IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserID);
         ActivitySummaryCompetencySelfAssesment GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId);
-        int? GetRoleCount(int candidateAssessmentId);
         bool IsUnsupervisedSelfAssessment(int selfAssessmentId);
     }
 

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs

@@ -76,7 +76,8 @@ int delegateUserId
         {
             return connection.Query<SelfAssessmentSupervisor>(
                 @$"{SelectSelfAssessmentSupervisorQuery}
-                    WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (ca.DelegateUserID = @delegateUserId) AND (ca.SelfAssessmentID = @selfAssessmentId)",
+                    WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (ca.DelegateUserID = @delegateUserId) AND (ca.SelfAssessmentID = @selfAssessmentId)
+                        ORDER BY SupervisorName",
                 new { selfAssessmentId, delegateUserId }
             );
         }
@@ -91,7 +92,8 @@ int delegateUserId
                     WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (sd.DelegateUserID = @delegateUserId)
                         AND (ca.SelfAssessmentID = @selfAssessmentId) AND (sd.SupervisorAdminID IS NOT NULL)
                         AND (coalesce(sasr.ResultsReview, 1) = 1)
-                        AND au.Active = 1",
+                        AND au.Active = 1 
+                    ORDER BY SupervisorName",
                 new { selfAssessmentId, delegateUserId }
             );
         }
@@ -119,7 +121,8 @@ FROM SupervisorDelegates AS sd
                 INNER JOIN DelegateAccounts da ON sd.DelegateUserID = da.UserID and au.CentreID = da.CentreID and da.Active=1
                 WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID IS NOT NULL) AND (sd.DelegateUserID = @delegateUserId)
 		            AND (au.Supervisor = 1 OR au.NominatedSupervisor = 1) AND (au.Active = 1)
-		            AND (ca.SelfAssessmentID <> @selfAssessmentId)",
+		            AND (ca.SelfAssessmentID <> @selfAssessmentId)
+                ORDER BY SupervisorName",
                 new { selfAssessmentId, delegateUserId }
             );
         }
@@ -144,7 +147,8 @@ int delegateUserId
                 @$"{SelectSelfAssessmentSupervisorQuery}
                     WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (sd.DelegateUserID = @delegateUserId) AND (ca.SelfAssessmentID = @selfAssessmentId)
                         AND (sd.SupervisorAdminID IS NOT NULL) AND (coalesce(sasr.SelfAssessmentReview, 1) = 1)
-                        AND (cas.ID NOT IN (SELECT CandidateAssessmentSupervisorID FROM CandidateAssessmentSupervisorVerifications WHERE Verified IS NULL))",
+                        AND (cas.ID NOT IN (SELECT CandidateAssessmentSupervisorID FROM CandidateAssessmentSupervisorVerifications WHERE Verified IS NULL))
+                ORDER BY SupervisorName",
                 new { selfAssessmentId, delegateUserId }
             );
         }
@@ -251,7 +255,8 @@ INNER JOIN CandidateAssessments AS ca
                         AND (cas.Removed IS NULL)
                         AND (sd.Removed IS NULL)
                         )
-                        AND (Supervisor = 1 OR NominatedSupervisor = 1) AND (Active = 1) AND (Email LIKE '%@%')",
+                        AND (Supervisor = 1 OR NominatedSupervisor = 1) AND (Active = 1) AND (Email LIKE '%@%')
+                        ORDER BY Forename, Surname",
                 new { centreId, selfAssessmentId, delegateUserId }
             );
         }

DigitalLearningSolutions.Web/Controllers/LearningPortalController/Current.cs

@@ -374,7 +374,6 @@ public IActionResult CompetencySelfAssessmentCertificate(int candidateAssessment
             }
 
             var competencycount = selfAssessmentService.GetCompetencyCountSelfAssessmentCertificate(candidateAssessmentId);
-            var roleCount = selfAssessmentService.GetRoleCount(candidateAssessmentId);
             var accessors = selfAssessmentService.GetAccessor(competencymaindata.SelfAssessmentID, competencymaindata.LearnerId);
             var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, competencymaindata.SelfAssessmentID);
             var competencyIds = recentResults.Select(c => c.Id).ToArray();
@@ -413,7 +412,7 @@ public IActionResult CompetencySelfAssessmentCertificate(int candidateAssessment
 
             ViewBag.CompetencySummaries = competencySummaries;
             var activitySummaryCompetencySelfAssesment = selfAssessmentService.GetActivitySummaryCompetencySelfAssesment(competencymaindata.Id);
-            var model = new CompetencySelfAssessmentCertificateViewModel(competencymaindata, competencycount, route, accessors, activitySummaryCompetencySelfAssesment, roleCount);
+            var model = new CompetencySelfAssessmentCertificateViewModel(competencymaindata, competencycount, route, accessors, activitySummaryCompetencySelfAssesment);
             ViewBag.LoggedInSupervisorDelegatesId = supervisorDelegateId;
             return View("Current/CompetencySelfAssessmentCertificate", model);
         }
@@ -435,7 +434,6 @@ public async Task<IActionResult> DownloadCertificate(int candidateAssessmentId)
             var delegateUserId = competencymaindata.LearnerId;
 
             var competencycount = selfAssessmentService.GetCompetencyCountSelfAssessmentCertificate(candidateAssessmentId);
-            var roleCount = selfAssessmentService.GetRoleCount(candidateAssessmentId);
             var accessors = selfAssessmentService.GetAccessor(competencymaindata.SelfAssessmentID, competencymaindata.LearnerId);
             var activitySummaryCompetencySelfAssesment = selfAssessmentService.GetActivitySummaryCompetencySelfAssesment(competencymaindata.Id);
             var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, competencymaindata.SelfAssessmentID);
@@ -474,7 +472,7 @@ public async Task<IActionResult> DownloadCertificate(int candidateAssessmentId)
                                       };
 
             ViewBag.CompetencySummaries = competencySummaries;
-            var model = new CompetencySelfAssessmentCertificateViewModel(competencymaindata, competencycount, 1, accessors, activitySummaryCompetencySelfAssesment, roleCount);
+            var model = new CompetencySelfAssessmentCertificateViewModel(competencymaindata, competencycount, 1, accessors, activitySummaryCompetencySelfAssesment);
             var renderedViewHTML = RenderRazorViewToString(this, "Current/DownloadCompetencySelfAssessmentCertificate", model);
 
             var pdfReportResponse = await pdfService.PdfReport(candidateAssessmentId.ToString(), renderedViewHTML, delegateId);

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -639,7 +639,7 @@ public IActionResult StartAddNewSupervisor(int selfAssessmentId)
                User.GetCentreIdKnownNotNull(),
                selfAssessmentId,
                User.GetUserIdKnownNotNull()
-           ).Select(c => new { c.CentreID, c.CentreName }).Distinct().ToList();
+           ).Select(c => new { c.CentreID, c.CentreName }).Distinct().OrderBy(o => o.CentreName).ToList();
 
             if (distinctSupervisorCentres.Count() > 1)
             {
@@ -672,7 +672,7 @@ public IActionResult AddNewSupervisor(int selfAssessmentId,
                 User.GetCentreIdKnownNotNull(),
                 selfAssessmentId,
                 User.GetUserIdKnownNotNull()
-            ).OrderBy(s => s.Forename).ToList();
+            ).ToList();
 
             if (sessionAddSupervisor?.CentreID != null)
             {

DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs

@@ -147,7 +147,6 @@ public int GetSelfAssessmentActivityDelegatesExportCount(string searchString, st
         CompetencySelfAssessmentCertificate GetCompetencySelfAssessmentCertificate(int candidateAssessmentID);
         IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserID);
         ActivitySummaryCompetencySelfAssesment GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId);
-        int? GetRoleCount(int candidateAssessmentId);
         bool IsUnsupervisedSelfAssessment(int selfAssessmentId);
     }
 
@@ -537,11 +536,6 @@ public ActivitySummaryCompetencySelfAssesment GetActivitySummaryCompetencySelfAs
         {
             return selfAssessmentDataService.GetActivitySummaryCompetencySelfAssesment(CandidateAssessmentSupervisorVerificationsId);
 
-        }
-        public int? GetRoleCount(int candidateAssessmentId)
-        {
-            return selfAssessmentDataService.GetRoleCount(candidateAssessmentId);
-
         }
         public bool IsUnsupervisedSelfAssessment(int selfAssessmentId)
         {

DigitalLearningSolutions.Web/ViewModels/LearningPortal/Current/CompetencySelfAssessmentCertificateViewModel.cs

@@ -14,8 +14,7 @@ public CompetencySelfAssessmentCertificateViewModel()
         public CompetencySelfAssessmentCertificateViewModel(CompetencySelfAssessmentCertificate competency,
             IEnumerable<CompetencyCountSelfAssessmentCertificate> competencies,
             int route, IEnumerable<Accessor> accessors,
-           ActivitySummaryCompetencySelfAssesment activitySummaryCompetencySelfAssesment,
-           int? roleCount
+           ActivitySummaryCompetencySelfAssesment activitySummaryCompetencySelfAssesment
          )
         {
             Route = route;
@@ -24,11 +23,9 @@ public CompetencySelfAssessmentCertificateViewModel(CompetencySelfAssessmentCert
             VocabPlural = FrameworkVocabularyHelper.VocabularyPlural(competency.Vocabulary);
             Accessors = accessors;
             ActivitySummaryCompetencySelfAssesment = activitySummaryCompetencySelfAssesment;
-            RoleCount = roleCount;
         }
 
         public int Route { get; set; }
-        public int? RoleCount { get; set; }
         public string? VocabPlural { get; set; }
         public ActivitySummaryCompetencySelfAssesment ActivitySummaryCompetencySelfAssesment { get; set; }
         public CompetencySelfAssessmentCertificate CompetencySelfAssessmentCertificates { get; set; }

DigitalLearningSolutions.Web/Views/LearningPortal/Current/CompetencySelfAssessmentCertificate.cshtml

@@ -200,11 +200,6 @@
                     @sumQuestions
                 </p>
             </div>
-            <div class="activity">
-                <p><b>Responses meeting role requirements</b></p> <p>
-                    @Model.RoleCount
-                </p>
-            </div>
             <div class="activity">
                 <p><b>Responses confirmed by assessor</b></p> <p>
                     @sumVerifiedCount

DigitalLearningSolutions.Web/Views/LearningPortal/Current/DownloadCompetencySelfAssessmentCertificate.cshtml

@@ -512,11 +512,6 @@
                         @sumQuestions
                     </p>
                 </div>
-                <div class="activity">
-                    <p><b>Responses meeting role requirements</b></p> <p>
-                        @Model.RoleCount
-                    </p>
-                </div>
                 <div class="activity">
                     <p><b>Responses confirmed by assessor</b></p> <p>
                         @sumVerifiedCount