TD-5535-Modified SQL query/stored procedure to hide retired self-assessments

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.resx

@@ -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/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -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/Models/SelfAssessments/SelfAssessment.cs

@@ -1,4 +1,6 @@
-namespace DigitalLearningSolutions.Data.Models.SelfAssessments
+using System;
+
+namespace DigitalLearningSolutions.Data.Models.SelfAssessments
 {
     public class SelfAssessment : CurrentLearningItem
     {
@@ -11,6 +13,9 @@ 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; }
 
     }
 }

DigitalLearningSolutions.Web/Controllers/LearningPortalController/Current.cs

@@ -44,7 +44,9 @@ public async Task<IActionResult> Current(
 
             var centreId = User.GetCentreIdKnownNotNull();
             var selfAssessments =
-                selfAssessmentService.GetSelfAssessmentsForCandidate(delegateUserId, centreId, 0);
+                selfAssessmentService.GetSelfAssessmentsForCandidate(delegateUserId, centreId, 0)
+                .Where(r => (r.RetirementDate != null && r.RetirementDate.Value.Date >= DateTime.UtcNow.Date)
+                                            || r.RetirementDate == null).ToList();
 
             var (learningResources, apiIsAccessible) =
                 await GetIncompleteActionPlanResourcesIfSignpostingEnabled(delegateUserId);