TD-5389 implements NHS national role profile links form

DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs

@@ -23,13 +23,15 @@ public interface ICompetencyAssessmentDataService
         CompetencyAssessmentBase? GetCompetencyAssessmentBaseByName(string competencyAssessmentName, int adminId);
         CompetencyAssessment? GetCompetencyAssessmentById(int competencyAssessmentId, int adminId);
         IEnumerable<NRPProfessionalGroups> GetNRPProfessionalGroups();
+        IEnumerable<NRPSubGroups> GetNRPSubGroups(int? nRPProfessionalGroupID);
+        IEnumerable<NRPRoles> GetNRPRoles(int? nRPSubGroupID);
 
         CompetencyAssessmentTaskStatus GetOrInsertAndReturnAssessmentTaskStatus(int assessmentId, bool frameworkBased);
 
         //UPDATE DATA
         bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName);
 
-        bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID);
+        bool UpdateCompetencyRoleProfileLinks(int competencyAssessmentId, int adminId, int? professionalGroupId, int? subGroupId, int? roleId);
         bool UpdateCompetencyAssessmentBranding(
             int competencyAssessmentId,
             int adminId,
@@ -41,6 +43,7 @@ int categoryId
         bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus);
         bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus);
         bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus);
+        bool UpdateRoleProfileLinksTaskStatus(int assessmentId, bool taskStatus);
         //INSERT DATA
         int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName);
         bool InsertSelfAssessmentFramework(int adminId, int selfAssessmentId, int frameworkId);
@@ -225,11 +228,11 @@ ORDER BY ProfessionalGroup"
             ).FirstOrDefault();
         }
 
-        public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID)
+        public bool UpdateCompetencyRoleProfileLinks(int competencyAssessmentId, int adminId, int? professionalGroupId, int? subGroupId, int? roleId)
         {
             var result = connection.ExecuteScalar(
-                @"SELECT COUNT(*) FROM CompetencyAssessments WHERE ID = @competencyAssessmentId AND NRPProfessionalGroupID = @nrpProfessionalGroupID",
-                new { competencyAssessmentId, nrpProfessionalGroupID }
+                @"SELECT COUNT(*) FROM SelfAssessments WHERE ID = @competencyAssessmentId AND NRPProfessionalGroupID = @professionalGroupId AND NRPSubGroupID = @subGroupId AND NRPRoleID = @roleId",
+                new { competencyAssessmentId, professionalGroupId, subGroupId, roleId }
             );
             int sameCount = Convert.ToInt32(result);
             if (sameCount > 0)
@@ -240,9 +243,9 @@ public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessment
 
             //needs updating:
             var numberOfAffectedRows = connection.Execute(
-                @"UPDATE SelfAssessments SET NRPProfessionalGroupID = @nrpProfessionalGroupID, NRPSubGroupID = NULL, NRPRoleID = NULL, UpdatedByAdminID = @adminId
+                @"UPDATE SelfAssessments SET NRPProfessionalGroupID = @professionalGroupId, NRPSubGroupID = @subGroupId, NRPRoleID = @roleId, UpdatedByAdminID = @adminId
                     WHERE ID = @competencyAssessmentId",
-                new { nrpProfessionalGroupID, adminId, competencyAssessmentId }
+                new { adminId, competencyAssessmentId, professionalGroupId, subGroupId, roleId }
             );
             if (numberOfAffectedRows > 0)
             {
@@ -418,5 +421,43 @@ public bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus)
             }
             return true;
         }
+
+        public IEnumerable<NRPSubGroups> GetNRPSubGroups(int? nRPProfessionalGroupID)
+        {
+            return connection.Query<NRPSubGroups>(
+                @"SELECT ID, SubGroup, Active
+                    FROM   NRPSubGroups
+                    WHERE (Active = 1) AND (NRPProfessionalGroupID = @nRPProfessionalGroupID)
+                    ORDER BY SubGroup", new { nRPProfessionalGroupID }
+            );
+        }
+
+        public IEnumerable<NRPRoles> GetNRPRoles(int? nRPSubGroupID)
+        {
+            return connection.Query<NRPRoles>(
+                @"SELECT ID, RoleProfile AS ProfileName, Active
+                    FROM   NRPRoles
+                    WHERE (Active = 1) AND (NRPSubGroupID = @nRPSubGroupID)
+                    ORDER BY RoleProfile", new { nRPSubGroupID }
+            );
+        }
+
+        public bool UpdateRoleProfileLinksTaskStatus(int assessmentId, bool taskStatus)
+        {
+            var numberOfAffectedRows = connection.Execute(
+               @"UPDATE SelfAssessmentTaskStatus SET NationalRoleProfileTaskStatus = @taskStatus
+                    WHERE SelfAssessmentId = @assessmentId",
+               new { assessmentId, taskStatus }
+           );
+            if (numberOfAffectedRows < 1)
+            {
+                logger.LogWarning(
+                    "Not updating NationalRoleProfileTaskStatus as db update failed. " +
+                    $"assessmentId: {assessmentId}, taskStatus: {taskStatus}"
+                );
+                return false;
+            }
+            return true;
+        }
     }
 }

DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs

@@ -9,7 +9,7 @@
     public interface ICourseCategoriesDataService
     {
         IEnumerable<Category> GetCategoriesForCentreAndCentrallyManagedCourses(int centreId);
-        string? GetCourseCategoryName(int categoryId);
+        string? GetCourseCategoryName(int? categoryId);
     }
 
     public class CourseCategoriesDataService : ICourseCategoriesDataService
@@ -34,7 +34,7 @@ FROM CourseCategories
             );
         }
 
-        public string? GetCourseCategoryName(int categoryId)
+        public string? GetCourseCategoryName(int? categoryId)
         {
             var name = connection.QueryFirstOrDefault<string?>(
                 @"SELECT CategoryName

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -551,7 +551,7 @@ BEGIN TRANSACTION
 
                 UPDATE CandidateAssessmentSupervisors SET Removed = NULL
                  {((selfAssessmentSupervisorRoleId > 0) ? " ,SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID" : string.Empty)}
-                WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId 
+                WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId AND SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID
 
                 COMMIT TRANSACTION";
 

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/CompetencyDataService.cs

@@ -635,16 +635,14 @@ FROM SelfAssessmentResults s inner join
 				SelfAssessmentResultSupervisorVerifications sv ON s.ID = sv.SelfAssessmentResultId AND sv.Superceded = 0 
                     WHERE s.CompetencyID = @competencyId
                         AND s.SelfAssessmentID = @selfAssessmentId
-                        AND s.DelegateUserID = @delegateUserId",
+                        AND s.DelegateUserID = @delegateUserId AND sv.Verified IS NULL",
                 new { selfAssessmentId, delegateUserId, competencyId }
             );
         }
 
         public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id)
         {
 
-            connection.Execute(@"UPDATE SelfAssessmentResults SET Result = NULL WHERE ID =  @id", new { id});
-
             connection.Execute(
                      @"delete from SelfAssessmentResultSupervisorVerifications WHERE SelfAssessmentResultId = @id", new { id });
 

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);
@@ -173,7 +174,7 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
         bool IsCentreSelfAssessment(int selfAssessmentId, int centreId);
         bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId);
         int GetSelfAssessmentCategoryId(int selfAssessmentId);
-        void  RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
+        void RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
         public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(
         int delegateUserId,
         int selfAssessmentId,
@@ -683,9 +684,6 @@ BEGIN TRANSACTION
                         UPDATE CandidateAssessments SET RemovedDate = GETUTCDATE(), RemovalMethodID = 2
                             WHERE ID = @candidateAssessmentsId AND RemovedDate IS NULL
 
-                        UPDATE CandidateAssessmentSupervisors SET Removed = GETUTCDATE()
-                            WHERE CandidateAssessmentID = @candidateAssessmentsId AND Removed IS NULL
-
                         COMMIT TRANSACTION
                 END TRY
                 BEGIN CATCH