Merge branch 'DLS-Release-v1.3.0' into Develop/Features/TD-5401-Managesupervisionsettings

Author: sherif-olaboye

DigitalLearningSolutions.Data.Migrations/202510221132_AddIncludeLearnerDeclarationPromptToSelfAssessmentsTable.cs

@@ -0,0 +1,18 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202510221132)]
+    public  class AddIncludeLearnerDeclarationPromptToSelfAssessmentsTable : Migration
+    {
+        public override void Up()
+        {
+            Alter.Table("SelfAssessments").AddColumn("IncludeLearnerDeclarationPrompt").AsBoolean().WithDefaultValue(false);
+        }
+
+        public override void Down()
+        {
+            Delete.Column("IncludeLearnerDeclarationPrompt").FromTable("SelfAssessments");
+        }
+    }
+}

DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs

@@ -59,6 +59,15 @@ int categoryId
         bool UpdateOptionalCompetenciesTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus);
         bool UpdateRoleRequirementsTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus);
         bool UpdateWorkingGroupTaskStatus(int assessmentId, bool taskStatus, bool? previousStatus);
+        bool UpdateCompetencyAssessmentOptions(
+           bool includeLearnerDeclarationPrompt,
+           bool includesSignposting,
+           bool linearNavigation,
+           bool useDescriptionExpanders,
+           string? questionLabelText,
+           string? reviewerCommentsLabelText,
+           int competencyAssessmentId, int adminId);
+        bool UpdateCompetencyAssessmentOptionsTaskStatus(int assessmentId, bool taskStatus);
         void MoveCompetencyInSelfAssessment(int competencyAssessmentId,
             int competencyId,
             string direction
@@ -93,6 +102,7 @@ bool UpdateSelfAssessments(int competencyAssessmentId,
         int AddCollaboratorToCompetencyAssessment(int competencyAssessmentId, string? userEmail, bool canModify, int? centreID);
         void RemoveCollaboratorFromCompetencyAssessment(int competencyAssessmentId, int id);
         CompetencyAssessmentCollaboratorNotification? GetCollaboratorNotification(int id, int invitedByAdminId);
+        bool HasCompetencyWithSignpostedLearning(int competencyAssessmentId);
     }
 
     public class CompetencyAssessmentDataService : ICompetencyAssessmentDataService
@@ -109,6 +119,8 @@ public class CompetencyAssessmentDataService : ICompetencyAssessmentDataService
                  sa.SupervisorSelfAssessmentReview,
                  sa.SignOffSupervisorStatement,
                  sa.SignOffRequestorStatement";
+            sa.IncludeLearnerDeclarationPrompt, sa.IncludesSignposting, sa.LinearNavigation, sa.UseDescriptionExpanders, sa.QuestionLabel, sa.ReviewerCommentsLabel,
+                sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview ";
 
         private const string SelfAssessmentFields =
             @", sa.CategoryID, sa.CreatedDate,
@@ -390,7 +402,7 @@ WHERE NOT EXISTS (SELECT 1 FROM SelfAssessmentFrameworks WHERE SelfAssessmentId
             {
                 numberOfAffectedRows = connection.Execute(
                 @"UPDATE SelfAssessmentFrameworks
-                    SET RemovedDate = NULL, RemovedByAdminId = NULL, AmendedByAdminId = @adminId
+                    SET RemovedDate = NULL, RemovedByAdminId = NULL, AmendedByAdminId = @adminId, IsPrimary = 0
                     WHERE SelfAssessmentId = @selfAssessmentId AND FrameworkId = @frameworkId"
             ,
                 new { adminId, selfAssessmentId, frameworkId }
@@ -1136,6 +1148,80 @@ UPDATE SelfAssessments
                     $"competencyAssessmentId: {competencyAssessmentId}, supervised: {supervised}" +
                     $"signoff: {signoff}, confirm: {confirm}, supervisorDeclarationValue: {supervisorDeclarationValue} " +
                     $"supervisorCustomText: {supervisorCustomText}, leanerDeclarationValue: {leanerDeclarationValue}, leanerCustomText: {leanerCustomText} "
+
+        public bool HasCompetencyWithSignpostedLearning(int competencyAssessmentId)
+        {
+            int hasSignpostedLearning = connection.QueryFirstOrDefault<int>(
+                @"SELECT count(*) FROM SelfAssessmentStructure sas INNER JOIN 
+			        CompetencyLearningResources clr ON sas.CompetencyID = clr.CompetencyID AND
+			        clr.RemovedDate IS NULL
+		        WHERE sas.SelfAssessmentID = @competencyAssessmentId",
+                new { competencyAssessmentId });
+
+            return hasSignpostedLearning > 0;
+        }
+        public bool UpdateCompetencyAssessmentOptions(
+            bool includeLearnerDeclarationPrompt,
+            bool includesSignposting,
+            bool linearNavigation,
+            bool useDescriptionExpanders,
+            string? questionLabelText,
+            string? reviewerCommentsLabelText,
+            int competencyAssessmentId, int adminId)
+        {
+            if ((adminId < 1) | (competencyAssessmentId < 1))
+            {
+                logger.LogWarning(
+                    $"Not updating role profile name as it failed server side validation. AdminId: {adminId}, competencyAssessmentId: {competencyAssessmentId}"
+                );
+                return false;
+            }
+
+            var numberOfAffectedRows = connection.Execute(
+                @"UPDATE SelfAssessments SET IncludeLearnerDeclarationPrompt = @includeLearnerDeclarationPrompt,
+                    IncludesSignposting = @includesSignposting,
+                    LinearNavigation = @linearNavigation,
+                    UseDescriptionExpanders = @useDescriptionExpanders,
+                    QuestionLabel = @questionLabelText,
+                    ReviewerCommentsLabel = @reviewerCommentsLabelText,
+                    UpdatedByAdminID = @adminId
+                    WHERE ID = @competencyAssessmentId ",
+                new
+                {
+                    includeLearnerDeclarationPrompt,
+                    includesSignposting,
+                    linearNavigation,
+                    useDescriptionExpanders,
+                    questionLabelText,
+                    reviewerCommentsLabelText,
+                    adminId,
+                    competencyAssessmentId
+                }
+            );
+            if (numberOfAffectedRows < 1)
+            {
+                logger.LogWarning(
+                    "Not updating options/labels as db update failed. " +
+                    $"admin id: {adminId}, competencyAssessmentId: {competencyAssessmentId}"
+                );
+                return false;
+            }
+
+            return true;
+        }
+
+        public bool UpdateCompetencyAssessmentOptionsTaskStatus(int assessmentId, bool taskStatus)
+        {
+            var numberOfAffectedRows = connection.Execute(
+               @"UPDATE SelfAssessmentTaskStatus SET SelfAssessmentOptionsTaskStatus = @taskStatus
+                    WHERE SelfAssessmentId = @assessmentId",
+               new { assessmentId, taskStatus }
+           );
+            if (numberOfAffectedRows < 1)
+            {
+                logger.LogWarning(
+                    "Not updating SelfAssessmentOptionsTaskStatus as db update failed. " +
+                    $"assessmentId: {assessmentId}, taskStatus: {taskStatus}"
                 );
                 return false;
             }

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -223,7 +223,8 @@ FROM SelfAssessmentSupervisorRoles AS SelfAssessmentSupervisorRoles_1
                         SA.ManageSupervisorsDescription,
                         CA.NonReportable,
 					 U.FirstName +' '+ U.LastName AS DelegateName,
-                    SA.MinimumOptionalCompetencies
+                    SA.MinimumOptionalCompetencies,
+					SA.IncludeLearnerDeclarationPrompt
                     FROM CandidateAssessments CA
                     JOIN SelfAssessments SA
                         ON CA.SelfAssessmentID = SA.ID
@@ -248,7 +249,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,SA.MinimumOptionalCompetencies, CA.SelfAssessmentProcessAgreed",
+                        U.FirstName , U.LastName,SA.MinimumOptionalCompetencies, CA.SelfAssessmentProcessAgreed, SA.IncludeLearnerDeclarationPrompt",
                 new { delegateUserId, selfAssessmentId }
             );
         }

DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs

@@ -24,6 +24,14 @@ public class CompetencyAssessmentBase
         public string? SignOffRequestorStatement { get; set; }
         public string? SignOffSupervisorStatement { get; set; }
         public string? Vocabulary { get; set; }
+        public bool IncludeLearnerDeclarationPrompt { get; set; }
+        public bool IncludesSignposting { get; set; }
+        public bool LinearNavigation { get; set; }
+        public bool UseDescriptionExpanders { get; set; }
+        public string? QuestionLabel { get; set; }
+        public string? ReviewerCommentsLabel { get; set; }
+        public bool SupervisorSelfAssessmentReview { get; set; }
+        public bool SupervisorResultsReview { get; set; }
     }
 }
 

DigitalLearningSolutions.Data/Models/SelfAssessments/SelfAssessment.cs

@@ -17,6 +17,7 @@ public class SelfAssessment : CurrentLearningItem
 
         public DateTime? EnrolmentCutoffDate { get; set; }
         public string? RetirementReason { get; set; }
+        public bool IncludeLearnerDeclarationPrompt { get; set; }
 
     }
 }

DigitalLearningSolutions.Web.Tests/TestHelpers/SelfAssessmentTestHelper.cs

@@ -27,7 +27,8 @@ public static CurrentSelfAssessment CreateDefaultSelfAssessment(
             bool useDescriptionExpanders = true,
             string vocabulary = "Capability",
             string verificationRoleName = "Supervisor",
-            string signOffRoleName = "Supervisor"
+            string signOffRoleName = "Supervisor",
+            bool includeLearnerDeclarationPrompt = true
         )
         {
             return new CurrentSelfAssessment
@@ -47,6 +48,7 @@ public static CurrentSelfAssessment CreateDefaultSelfAssessment(
                 Vocabulary = vocabulary,
                 VerificationRoleName = verificationRoleName,
                 SignOffRoleName = signOffRoleName,
+                IncludeLearnerDeclarationPrompt = includeLearnerDeclarationPrompt
             };
         }