Merge branch 'DLS-Release-v1.1.2' into UAT

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -298,6 +298,13 @@ INNER JOIN CompetencyGroups AS CG
             }
         }
 
+        public void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId)
+        {
+            var numberOfAffectedRows = connection.Execute(
+              @" DELETE FROM CandidateAssessmentSupervisorVerifications WHERE ID = @candidateAssessmentSupervisorVerificationsId ",
+            new { candidateAssessmentSupervisorVerificationsId });
+        }
+
 
         public void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate)
         {

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -78,6 +78,7 @@ int competencyId
 
         void UpdateLastAccessed(int selfAssessmentId, int delegateUserId);
         void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int competencyGroupsId);
+        void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId);
         void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate);
 
         void SetSubmittedDateNow(int selfAssessmentId, int delegateUserId);

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -1565,7 +1565,18 @@ ManageOptionalCompetenciesViewModel model
                 }
 
             }
-           
+
+            if (!selfAssessmentService.HasMinimumOptionalCompetencies(selfAssessmentId, delegateUserId))
+            {
+                var supervisorsSignOffs = selfAssessmentService.GetSupervisorSignOffsForCandidateAssessment(selfAssessmentId, delegateUserId);
+
+                if (supervisorsSignOffs.FirstOrDefault() is { Verified: null, Removed: null })
+                {
+                    selfAssessmentService.RemoveSignoffRequestById(supervisorsSignOffs.FirstOrDefault().ID);
+                }
+            }
+
+
             return RedirectToAction("SelfAssessmentOverview", new { selfAssessmentId, vocabulary });
         }
 
@@ -1577,9 +1588,9 @@ public IActionResult RequestSignOff(int selfAssessmentId)
             var delegateId = User.GetCandidateIdKnownNotNull();
             var recentResults = selfAssessmentService.GetMostRecentResults(selfAssessmentId, delegateId).ToList();
             var competencySummaries = CertificateHelper.CompetencySummation(recentResults);
-           
-            if (competencySummaries.QuestionsCount != competencySummaries.VerifiedCount)  return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
-            
+
+            if (competencySummaries.QuestionsCount != competencySummaries.VerifiedCount) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
+
             var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);
             var supervisors =
                 selfAssessmentService.GetSignOffSupervisorsForSelfAssessmentId(selfAssessmentId, delegateUserId);
@@ -1591,7 +1602,7 @@ public IActionResult RequestSignOff(int selfAssessmentId)
                 NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment)
             };
             if (model.NumberOfSelfAssessedOptionalCompetencies < model.SelfAssessment.MinimumOptionalCompetencies) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
-            
+
             return View("SelfAssessments/RequestSignOff", model);
         }
 

DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs

@@ -27,6 +27,7 @@ public interface ISelfAssessmentService
 
         void UpdateLastAccessed(int selfAssessmentId, int delegateUserId);
         void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int competencyGroupsId);
+        void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId);
         void IncrementLaunchCount(int selfAssessmentId, int delegateUserId);
 
         void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate);
@@ -160,7 +161,7 @@ public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultswithSupervisorV
         int selfAssessmentId,
         int competencyId
     );
-       void RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
+        void RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
     }
 
     public class SelfAssessmentService : ISelfAssessmentService
@@ -201,6 +202,10 @@ public void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int
         {
             selfAssessmentDataService.RemoveSignoffRequests(selfAssessmentId, delegateUserId, competencyGroupId);
         }
+        public void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId)
+        {
+            selfAssessmentDataService.RemoveSignoffRequestById(candidateAssessmentSupervisorVerificationsId);
+        }
         public void IncrementLaunchCount(int selfAssessmentId, int delegateUserId)
         {
             selfAssessmentDataService.IncrementLaunchCount(selfAssessmentId, delegateUserId);
@@ -467,10 +472,10 @@ public void RemoveEnrolment(int selfAssessmentId, int delegateUserId)
 
             var selfAssessmentCategoryId = selfAssessmentDataService.GetSelfAssessmentCategoryId((int)selfAssessmentId);
 
-            if (adminCategoryId > 0  && adminCategoryId != selfAssessmentCategoryId)
+            if (adminCategoryId > 0 && adminCategoryId != selfAssessmentCategoryId)
             {
                 // return null variants of the object when the categoryID mismatches 
-                return (new SelfAssessmentDelegatesData(), null);      
+                return (new SelfAssessmentDelegatesData(), null);
             }
 
             (var delegateselfAssessments, int resultCount) = selfAssessmentDataService.GetSelfAssessmentDelegates(searchString, offSet, itemsPerPage, sortBy, sortDirection,
@@ -603,7 +608,7 @@ int competencyId
         }
         public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id)
         {
-             selfAssessmentDataService.RemoveReviewCandidateAssessmentOptionalCompetencies(id);
+            selfAssessmentDataService.RemoveReviewCandidateAssessmentOptionalCompetencies(id);
         }
     }
 }