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

Author: rshrirohit

DigitalLearningSolutions.Data.Migrations/202507221424_AddNewColumnsInSelfAssessments.cs

@@ -0,0 +1,22 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+    [Migration(202507221424)]
+    public class AddNewColumnsInSelfAssessments : Migration
+    {
+        public override void Up()
+        {
+            Alter.Table("SelfAssessments")
+               .AddColumn("RetirementDate").AsDateTime().Nullable()
+               .AddColumn("EnrolmentCutoffDate").AsDateTime().Nullable()
+               .AddColumn("RetirementReason").AsString(2000).Nullable();
+        }
+
+        public override void Down()
+        {
+            Delete.Column("RetirementDate").FromTable("SelfAssessments");
+            Delete.Column("EnrolmentCutoffDate").FromTable("SelfAssessments");
+            Delete.Column("RetirementReason").FromTable("SelfAssessments");
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/202507240953_Alter_GetActivitiesForDelegateEnrolment_Retired_SA.cs

@@ -0,0 +1,18 @@
+using FluentMigrator;
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    [Migration(202507240953)]
+    public class Alter_GetActivitiesForDelegateEnrolment_Retired_SA : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_5535_Alter_GetActivitiesForDelegateEnrolment_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_5535_Alter_GetActivitiesForDelegateEnrolment_Down);
+        }
+    }
+}
+

DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs

@@ -499,4 +499,10 @@
   <data name="TD-5759_CreateOrAlterSelfAssessmentReportSPandTVF-Fix_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Scripts\TD-5759_CreateOrAlterSelfAssessmentReportSPandTVF-Fix_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="TD_5535_Alter_GetActivitiesForDelegateEnrolment_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5535-Alter_GetActivitiesForDelegateEnrolment_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_5535_Alter_GetActivitiesForDelegateEnrolment_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5535-Alter_GetActivitiesForDelegateEnrolment_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
 </root>

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -12,28 +12,31 @@ public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int del
         {
             return connection.Query<CurrentSelfAssessment>(
                 @"SELECT  SelfAssessment.Id,
-                        SelfAssessment.Name,
-                        SelfAssessment.Description,
-                        SelfAssessment.IncludesSignposting,
-                        SelfAssessment.IncludeRequirementsFilters,
-                         SelfAssessment. IsSupervisorResultsReviewed,
-                        SelfAssessment.ReviewerCommentsLabel,
-                         SelfAssessment. Vocabulary,
-                         SelfAssessment. NumberOfCompetencies,
-                        SelfAssessment.StartedDate,
-                        SelfAssessment.LastAccessed,
-                        SelfAssessment.CompleteByDate,
-                        SelfAssessment.CandidateAssessmentId,
-                        SelfAssessment.UserBookmark,
-                        SelfAssessment.UnprocessedUpdates,
-                        SelfAssessment.LaunchCount,
-                        SelfAssessment. IsSelfAssessment,
-                         SelfAssessment.SubmittedDate,
-                       SelfAssessment. CentreName,
-                        SelfAssessment.EnrolmentMethodId,
-						Signoff.SignedOff,
-						Signoff.Verified,
-						EnrolledByForename +' '+EnrolledBySurname AS EnrolledByFullName
+                            SelfAssessment.Name,
+                            SelfAssessment.Description,
+                            SelfAssessment.IncludesSignposting,
+                            SelfAssessment.IncludeRequirementsFilters,
+                            SelfAssessment. IsSupervisorResultsReviewed,
+                            SelfAssessment.ReviewerCommentsLabel,
+                            SelfAssessment. Vocabulary,
+                            SelfAssessment. NumberOfCompetencies,
+                            SelfAssessment.StartedDate,
+                            SelfAssessment.LastAccessed,
+                            SelfAssessment.CompleteByDate,
+                            SelfAssessment.CandidateAssessmentId,
+                            SelfAssessment.UserBookmark,
+                            SelfAssessment.UnprocessedUpdates,
+                            SelfAssessment.LaunchCount,
+                            SelfAssessment. IsSelfAssessment,
+                            SelfAssessment.SubmittedDate,
+                            SelfAssessment. CentreName,
+                            SelfAssessment.EnrolmentMethodId,
+                            SelfAssessment.RetirementDate,
+                            SelfAssessment.EnrolmentCutoffDate,
+                            SelfAssessment.RetirementReason,
+                            Signoff.SignedOff,
+                            Signoff.Verified,
+                            EnrolledByForename +' '+EnrolledBySurname AS EnrolledByFullName
                         FROM	(SELECT
                         CA.SelfAssessmentID AS Id,
                         SA.Name,
@@ -56,7 +59,10 @@ public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int del
                         CR.CentreName AS CentreName,
                         CA.EnrolmentMethodId,
 						uEnrolledBy.FirstName AS EnrolledByForename,
-                        uEnrolledBy.LastName AS EnrolledBySurname
+                        uEnrolledBy.LastName AS EnrolledBySurname,
+                        SA.RetirementDate,
+                        SA.EnrolmentCutoffDate,
+                        SA.RetirementReason
                         FROM Centres AS CR INNER JOIN
                         CandidateAssessments AS CA INNER JOIN
                         SelfAssessments AS SA ON CA.SelfAssessmentID = SA.ID ON CR.CentreID = CA.CentreID INNER JOIN
@@ -71,7 +77,7 @@ Competencies AS C RIGHT OUTER JOIN
                     AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)
                     GROUP BY
                         CA.SelfAssessmentID, SA.Name, SA.Description, SA.IncludesSignposting, SA.SupervisorResultsReview,
-                        SA.ReviewerCommentsLabel, SA.IncludeRequirementsFilters,
+                        SA.ReviewerCommentsLabel, SA.IncludeRequirementsFilters, SA.RetirementDate,SA.EnrolmentCutoffDate,SA.RetirementReason, 
                         COALESCE(SA.Vocabulary, 'Capability'), CA.StartedDate, CA.LastAccessed, CA.CompleteByDate,
                         CA.ID,
                         CA.UserBookmark, CA.UnprocessedUpdates, CA.LaunchCount, CA.SubmittedDate, CR.CentreName,CA.EnrolmentMethodId,

DigitalLearningSolutions.Data.Migrations/Scripts/TD-5535-Alter_GetActivitiesForDelegateEnrolment_Down.sql

@@ -16,6 +16,8 @@ public interface ISelfAssessmentDataService
     {
         //Self Assessments
         string? GetSelfAssessmentNameById(int selfAssessmentId);
+        SelfAssessment? GetSelfAssessmentById(int selfAssessmentId);
+        SelfAssessment GetSelfAssessmentRetirementDateById(int selfAssessmentId);
 
         // CompetencyDataService
         IEnumerable<int> GetCompetencyIdsForSelfAssessment(int selfAssessmentId);
@@ -205,6 +207,67 @@ FROM SelfAssessments
             return name;
         }
 
+        public SelfAssessment? GetSelfAssessmentById(int selfAssessmentId)
+        {
+            return connection.Query<SelfAssessment?>(
+                @"SELECT [ID]
+                      ,[Name]
+                      ,[Description]
+                      ,[IncludesSignposting]
+                      ,[BrandID]
+                      ,[CreatedDate]
+                      ,[CreatedByCentreID]
+                      ,[CreatedByAdminID]
+                      ,[ArchivedDate]
+                      ,[ArchivedByAdminID]
+                      ,[IncludeDevelopment]
+                      ,[ParentSelfAssessmentID]
+                      ,[NRPProfessionalGroupID]
+                      ,[NRPSubGroupID]
+                      ,[NRPRoleID]
+                      ,[PublishStatusID]
+                      ,[UpdatedByAdminID]
+                      ,[National]
+                      ,[Public]
+                      ,[Archived]
+                      ,[LastEdit]
+                      ,[SupervisorSelfAssessmentReview]
+                      ,[SupervisorResultsReview]
+                      ,[RAGResults]
+                      ,[LinearNavigation]
+                      ,[CategoryID]
+                      ,[UseDescriptionExpanders]
+                      ,[ManageOptionalCompetenciesPrompt]
+                      ,[Vocabulary]
+                      ,[SignOffRequestorStatement]
+                      ,[SignOffSupervisorStatement]
+                      ,[QuestionLabel]
+                      ,[DescriptionLabel]
+                      ,[EnforceRoleRequirementsForSignOff]
+                      ,[ReviewerCommentsLabel]
+                      ,[ManageSupervisorsDescription]
+                      ,[IncludeRequirementsFilters]
+                      ,[MinimumOptionalCompetencies]
+                      ,[RetirementDate]
+                      ,[EnrolmentCutoffDate]
+                      ,[RetirementReason]
+                FROM SelfAssessments
+                WHERE ID = @selfAssessmentId",
+                new { selfAssessmentId }
+            ).SingleOrDefault();
+        }
+        public SelfAssessment GetSelfAssessmentRetirementDateById(int selfAssessmentId)
+        {
+            var date = connection.QueryFirstOrDefault<SelfAssessment>(
+                @"SELECT Id,Name,[RetirementDate]
+                        FROM SelfAssessments
+                        WHERE ID = @selfAssessmentId"
+            ,
+                new { selfAssessmentId }
+            );
+            return date;
+        }
+
         public (IEnumerable<SelfAssessmentDelegate>, int) GetSelfAssessmentDelegates(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection,
             int? selfAssessmentId, int centreId, bool? isDelegateActive, bool? removed, bool? submitted, bool? signedOff)
         {

DigitalLearningSolutions.Data.Migrations/Scripts/TD-5535-Alter_GetActivitiesForDelegateEnrolment_Up.sql

@@ -796,7 +796,8 @@ FROM    CandidateAssessments AS CA
                              WHERE (DelegateUserID = @delegateUserId) AND (RemovedDate IS NULL)
                                 AND (CompletedDate IS NULL)))
                         AND ((rp.SupervisorSelfAssessmentReview = 1) OR (rp.SupervisorResultsReview = 1))
-                        AND (ISNULL(@categoryId, 0) = 0 OR rp.CategoryID = @categoryId)", new { delegateUserId, centreId, categoryId }
+                        AND (ISNULL(@categoryId, 0) = 0 OR rp.CategoryID = @categoryId) AND 
+						((CAST(rp.RetirementDate AS DATE) >= CAST(GETUTCDATE() AS DATE)) OR rp.RetirementDate IS NULL)", new { delegateUserId, centreId, categoryId }
                 );
         }
 

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -1,4 +1,6 @@
-namespace DigitalLearningSolutions.Data.Models.SelfAssessments
+using System;
+
+namespace DigitalLearningSolutions.Data.Models.SelfAssessments
 {
     public class SelfAssessment : CurrentLearningItem
     {
@@ -11,6 +13,10 @@ public class SelfAssessment : CurrentLearningItem
         public string? ManageOptionalCompetenciesPrompt { get; set; }
         public string? QuestionLabel { get; set; }
         public string? DescriptionLabel { get; set; }
+        public DateTime? RetirementDate { get; set; }
+
+        public DateTime? EnrolmentCutoffDate { get; set; }
+        public string? RetirementReason { get; set; }
 
     }
 }