Merge pull request #3149 from TechnologyEnhancedLearning/DLS-Release-v1.3.0

Dls release v1.3.0 to DEV

Author: kevwhitt-hee

DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs

@@ -0,0 +1,57 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+    using FluentMigrator.SqlServer;
+    [Migration(202501280929)]
+    public class CreateCompetencyAssessmentTables : Migration
+    {
+        public override void Up()
+        {
+            Create.Table("SelfAssessmentFrameworks")
+               .WithColumn("ID").AsInt32().NotNullable().PrimaryKey().Identity()
+               .WithColumn("SelfAssessmentId").AsInt32().NotNullable().ForeignKey("SelfAssessments", "ID")
+               .WithColumn("FrameworkId").AsInt32().NotNullable().ForeignKey("Frameworks", "ID")
+               .WithColumn("CreatedDate").AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentDateTime)
+               .WithColumn("CreatedByAdminId").AsInt32().NotNullable().ForeignKey("AdminAccounts", "ID")
+               .WithColumn("RemovedDate").AsDateTime().Nullable()
+               .WithColumn("RemovedByAdminId").AsInt32().Nullable().ForeignKey("AdminAccounts", "ID")
+               .WithColumn("AmendedDate").AsDateTime().Nullable()
+               .WithColumn("AmendedByAdminId").AsInt32().Nullable().ForeignKey("AdminAccounts", "ID");
+            Create.Table("SelfAssessmentTaskStatus")
+               .WithColumn("ID").AsInt32().NotNullable().PrimaryKey().Identity()
+               .WithColumn("SelfAssessmentId").AsInt32().NotNullable().ForeignKey("SelfAssessments", "ID").Unique()
+               .WithColumn("IntroductoryTextTaskStatus").AsBoolean().Nullable()
+               .WithColumn("BrandingTaskStatus").AsBoolean().Nullable()
+               .WithColumn("VocabularyTaskStatus").AsBoolean().Nullable()
+               .WithColumn("WorkingGroupTaskStatus").AsBoolean().Nullable()
+               .WithColumn("NationalRoleProfileTaskStatus").AsBoolean().Nullable()
+               .WithColumn("FrameworkLinksTaskStatus").AsBoolean().Nullable()
+               .WithColumn("SelectCompetenciesTaskStatus").AsBoolean().Nullable()
+               .WithColumn("OptionalCompetenciesTaskStatus").AsBoolean().Nullable()
+               .WithColumn("RoleRequirementsTaskStatus").AsBoolean().Nullable()
+               .WithColumn("SupervisorRolesTaskStatus").AsBoolean().Nullable()
+               .WithColumn("SelfAssessmentOptionsTaskStatus").AsBoolean().Nullable()
+               .WithColumn("ReviewTaskStatus").AsBoolean().Nullable();
+            Alter.Table("SelfAssessments").AlterColumn("Description").AsString(int.MaxValue).Nullable();
+            Execute.Sql($@"INSERT INTO SelfAssessmentFrameworks (SelfAssessmentId, FrameworkId, CreatedByAdminId)
+                            SELECT sa.ID, fc.FrameworkID, sa.CreatedByAdminID
+                            FROM   SelfAssessments AS sa INNER JOIN
+                                         SelfAssessmentStructure AS sas ON sa.ID = sas.SelfAssessmentID INNER JOIN
+                                         FrameworkCompetencies AS fc ON sas.CompetencyID = fc.CompetencyID
+                            GROUP BY sa.ID, fc.FrameworkID, sa.CreatedByAdminID
+                            ");
+            Execute.Sql($@"INSERT INTO SelfAssessmentTaskStatus (SelfAssessmentId, IntroductoryTextTaskStatus, BrandingTaskStatus, VocabularyTaskStatus, WorkingGroupTaskStatus, NationalRoleProfileTaskStatus, FrameworkLinksTaskStatus, SelectCompetenciesTaskStatus, OptionalCompetenciesTaskStatus, RoleRequirementsTaskStatus, SupervisorRolesTaskStatus, SelfAssessmentOptionsTaskStatus)
+                            SELECT ID, 1,1,1,1,1,1,1,1,1,1,1
+                            FROM   SelfAssessments AS sa
+                            ");
+        }
+
+        public override void Down()
+        {
+            Delete.Table("SelfAssessmentFrameworks");
+            Delete.Table("SelfAssessmentTaskStatus");
+            Alter.Table("SelfAssessments").AlterColumn("Description").AsString(int.MaxValue).NotNullable();
+        }
+
+    }
+}

DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.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/CourseCategoriesDataService.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/CourseDataService.cs

@@ -285,7 +285,7 @@ public class FrameworkDataService : IFrameworkDataService
             fwr.ID AS FrameworkReviewID";
 
         private const string BrandedFrameworkFields =
-            @",(SELECT BrandName
+            @", FW.Description, FW.FrameworkConfig AS Vocabulary, (SELECT BrandName
                                  FROM    Brands
                                  WHERE (BrandID = FW.BrandID)) AS Brand,
                                  (SELECT CategoryName
@@ -581,7 +581,7 @@ OUTPUT INSERTED.Id
                     VALUES (@groupName, @groupDescription, @adminId)",
                 new { groupName, groupDescription, adminId }
             );
-            
+
             return existingId;
         }
 
@@ -613,7 +613,7 @@ FROM            [FrameworkCompetencyGroups]
                                  WHERE        ([FrameworkID] = @frameworkId)), 0)+1, @frameworkId)",
                 new { groupId, adminId, frameworkId }
             );
-           
+
             return existingId;
         }
 
@@ -1047,7 +1047,7 @@ public void UpdateFrameworkCompetency(int frameworkCompetencyId, string name, st
                 @"UPDATE Competencies SET Name = @name, Description = @description, UpdatedByAdminID = @adminId, AlwaysShowDescription = CASE WHEN @alwaysShowDescription IS NULL THEN AlwaysShowDescription ELSE @alwaysShowDescription END
                     FROM   Competencies INNER JOIN FrameworkCompetencies AS fc ON Competencies.ID = fc.CompetencyID
                     WHERE (fc.Id = @frameworkCompetencyId)",
-                new { name, description, adminId, frameworkCompetencyId, alwaysShowDescription}
+                new { name, description, adminId, frameworkCompetencyId, alwaysShowDescription }
             );
             if (numberOfAffectedRows < 1)
             {
@@ -2175,15 +2175,15 @@ public void ArchiveReviewRequest(int reviewId)
                  FROM    FrameworkCollaborators
                  WHERE (FrameworkID = FW.ID) AND (IsDeleted=0)))) AS MyFrameworksCount,
 
-                 (SELECT COUNT(*) FROM SelfAssessments) AS RoleProfileCount,
+                 (SELECT COUNT(*) FROM SelfAssessments) AS CompetencyAssessmentCount,
 
                  (SELECT COUNT(*) FROM SelfAssessments AS RP LEFT OUTER JOIN
              SelfAssessmentCollaborators AS RPC ON RPC.SelfAssessmentID = RP.ID AND RPC.AdminID = @adminId
 WHERE (RP.CreatedByAdminID = @adminId) OR
              (@adminId IN
                  (SELECT AdminID
                  FROM    SelfAssessmentCollaborators
-                 WHERE (SelfAssessmentID = RP.ID)))) AS MyRoleProfileCount",
+                 WHERE (SelfAssessmentID = RP.ID)))) AS MyCompetencyAssessmentCount",
                 new { adminId }
             ).FirstOrDefault();
         }
@@ -2193,7 +2193,7 @@ public IEnumerable<DashboardToDoItem> GetDashboardToDoItems(int adminId)
             return connection.Query<DashboardToDoItem>(
                 @"SELECT
                         FW.ID AS FrameworkID,
-                        0 AS RoleProfileID,
+                        0 AS SelfAssessmentID,
                         FW.FrameworkName AS ItemName,
                         AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName,
                         FWR.SignOffRequired,
@@ -2205,8 +2205,8 @@ FROM FrameworkReviews AS FWR
                     WHERE (FWC.AdminID = @adminId) AND (FWR.ReviewComplete IS NULL) AND (FWR.Archived IS NULL)
                     UNION ALL
                     SELECT
-                        0 AS SelfAssessmentID,
-                        RP.ID AS SelfAssessmentID,
+                        0 AS FrameworkID,
+                        RP.ID AS CompetencyAssessmentID,
                         RP.Name AS ItemName,
                         AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName,
                         RPR.SignOffRequired,

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.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/RoleProfileDataService.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 });