TD-4427 Check the minimum optional competencies have been added before enabling Request Sign-off

Author: sherif-olaboye

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -137,7 +137,8 @@ FROM SelfAssessmentSupervisorRoles AS SelfAssessmentSupervisorRoles_1
                         SA.SignOffRequestorStatement,
                         SA.ManageSupervisorsDescription,
                         CA.NonReportable,
-					 U.FirstName +' '+ U.LastName AS DelegateName
+					 U.FirstName +' '+ U.LastName AS DelegateName,
+                    SA.MinimumOptionalCompetencies
                     FROM CandidateAssessments CA
                     JOIN SelfAssessments SA
                         ON CA.SelfAssessmentID = SA.ID
@@ -162,7 +163,7 @@ GROUP BY
                         CA.LaunchCount, CA.SubmittedDate, SA.LinearNavigation, SA.UseDescriptionExpanders,
                         SA.ManageOptionalCompetenciesPrompt, SA.SupervisorSelfAssessmentReview, SA.SupervisorResultsReview,
                         SA.ReviewerCommentsLabel,SA.EnforceRoleRequirementsForSignOff, SA.ManageSupervisorsDescription,CA.NonReportable,
-                        U.FirstName , U.LastName",
+                        U.FirstName , U.LastName,SA.MinimumOptionalCompetencies",
                 new { delegateUserId, selfAssessmentId }
             );
         }
@@ -335,7 +336,7 @@ FROM CandidateAssessments
                 new { selfAssessmentId, delegateUserId }
             );
         }
-        public CompetencySelfAssessmentCertificate GetCompetencySelfAssessmentCertificate(int candidateAssessmentID)
+        public CompetencySelfAssessmentCertificate? GetCompetencySelfAssessmentCertificate(int candidateAssessmentID)
         {
             return connection.QueryFirstOrDefault<CompetencySelfAssessmentCertificate>(
                 @"SELECT
@@ -423,7 +424,7 @@ LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr
                 new { selfAssessmentId, delegateUserID }
             );
         }
-        public ActivitySummaryCompetencySelfAssesment GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId)
+        public ActivitySummaryCompetencySelfAssesment? GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId)
         {
             return connection.QueryFirstOrDefault<ActivitySummaryCompetencySelfAssesment>(
                 @"SELECT ca.ID AS CandidateAssessmentID, ca.SelfAssessmentID, sa.Name AS RoleName, casv.ID AS CandidateAssessmentSupervisorVerificationId,

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -166,9 +166,9 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
         int? GetDelegateAccountId(int centreId, int delegateUserId);
         int CheckDelegateSelfAssessment(int candidateAssessmentsId);
         IEnumerable<CompetencyCountSelfAssessmentCertificate> GetCompetencyCountSelfAssessmentCertificate(int candidateAssessmentID);
-        CompetencySelfAssessmentCertificate GetCompetencySelfAssessmentCertificate(int candidateAssessmentID);
+        CompetencySelfAssessmentCertificate? GetCompetencySelfAssessmentCertificate(int candidateAssessmentID);
         IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserID);
-        ActivitySummaryCompetencySelfAssesment GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId);
+        ActivitySummaryCompetencySelfAssesment? GetActivitySummaryCompetencySelfAssesment(int CandidateAssessmentSupervisorVerificationsId);
         bool IsUnsupervisedSelfAssessment(int selfAssessmentId);
     }
 

DigitalLearningSolutions.Data/Models/SelfAssessments/SelfAssessment.cs

@@ -4,6 +4,7 @@ public class SelfAssessment : CurrentLearningItem
     {
         public string Description { get; set; } = string.Empty;
         public int NumberOfCompetencies { get; set; }
+        public int MinimumOptionalCompetencies { get; set; }
         public bool LinearNavigation { get; set; }
         public bool HasDelegateNominatedRoles { get; set; }
         public bool UseDescriptionExpanders { get; set; }

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -468,6 +468,7 @@ public IActionResult SelfAssessmentOverview(int selfAssessmentId, string vocabul
                 CompetencyGroups = competencies.GroupBy(competency => competency.CompetencyGroup),
                 PreviousCompetencyNumber = Math.Max(competencies.Count(), 1),
                 NumberOfOptionalCompetencies = optionalCompetencies.Count(),
+                NumberOfAssignOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment ) ,
                 SupervisorSignOffs = supervisorSignOffs,
                 SearchViewModel = searchViewModel
             };

DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs

@@ -13,6 +13,8 @@ public class SelfAssessmentOverviewViewModel
         public IEnumerable<SupervisorSignOff>? SupervisorSignOffs { get; set; }
         public int PreviousCompetencyNumber { get; set; }
         public int NumberOfOptionalCompetencies { get; set; }
+        public int NumberOfAssignOptionalCompetencies { get; set; }
+
         public bool AllQuestionsVerifiedOrNotRequired { get; set; }
         public SearchSelfAssessmentOverviewViewModel SearchViewModel { get; set; }
         public string VocabPlural()

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

@@ -159,7 +159,7 @@
                 <h2>@Model.SelfAssessment.SignOffRoleName Sign-off</h2>
                 <partial name="../../Supervisor/Shared/_SupervisorSignOffSummary.cshtml" model="Model.SupervisorSignOffs"
                          view-data="@(new ViewDataDictionary(ViewData) { { "IsAllCompetencyConfirmed", competencySummaries.Sum(c => (int)c["questionsCount"]) == competencySummaries.Sum(c => (int)c["verifiedCount"]) }})" />
-                @if (Model.AllQuestionsVerifiedOrNotRequired)
+                @if ((Model.AllQuestionsVerifiedOrNotRequired)  && (Model.NumberOfAssignOptionalCompetencies >= Model.SelfAssessment.MinimumOptionalCompetencies)  )
                 {
                     @if (!Model.SupervisorSignOffs.Any())
                     {
@@ -199,6 +199,10 @@
                         All required @Model.SelfAssessment.Vocabulary.ToLower() self-assessments must be completed and confirmed,
                         before requesting @Model.SelfAssessment.SignOffRoleName sign off of the @Model.SelfAssessment.Name.
                     </p>
+                    <p class="nhsuk-body-l">
+                        Your self assessment does not contain enough optional proficiencies to request sign off.
+                        Go to Manage Optional Competencies to choose the optional competencies that you wish to include..
+                    </p>
                 }
             </div>
         }