Merge pull request #2564 from TechnologyEnhancedLearning/Develop/Fix/TD-3876-Responses-meeting-role-requirements-count

TD-3876-SQL query modified to return valid assessment question responses count in the certificate

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -478,20 +478,25 @@ CandidateAssessmentSupervisorVerifications AS casv INNER JOIN
                 new { CandidateAssessmentSupervisorVerificationsId }
             );
         }
-        public int? GetRoleCount(int CandidateId)
+        public int? GetRoleCount(int candidateAssessmentId)
         {
             return connection.QueryFirstOrDefault<int?>(
-                @"SELECT COUNT(sas1.CompetencyID) AS RoleCount FROM    
-                              SelfAssessmentResults AS sar1 
-							  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 = @CandidateId ) AND (CAOC1.IncludedInSelfAssessment = 1)",
-                new { CandidateId }
+                @"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,7 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
         CompetencySelfAssessmentCertificate GetCompetencySelfAssessmentCertificate(int candidateAssessmentID);
         IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserID);
         ActivitySummaryCompetencySelfAssesment GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId);
-        int? GetRoleCount(int CandidateId);
+        int? GetRoleCount(int candidateAssessmentId);
         bool IsUnsupervisedSelfAssessment(int selfAssessmentId);
     }
 

DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs

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

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

@@ -201,7 +201,7 @@
                 </p>
             </div>
             <div class="activity">
-                <p><b>Response meeting role requirements</b></p> <p>
+                <p><b>Responses meeting role requirements</b></p> <p>
                     @Model.RoleCount
                 </p>
             </div>

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

@@ -513,7 +513,7 @@
                     </p>
                 </div>
                 <div class="activity">
-                    <p><b>Response meeting role requirements</b></p> <p>
+                    <p><b>Responses meeting role requirements</b></p> <p>
                         @Model.RoleCount
                     </p>
                 </div>