TechnologyEnhancedLearning
diff --git a/‎DigitalLearningSolutions.Data.Migrations/202508191440_CreateSendRetiringSelfAssessmentNotificationSP.cs‎
Lines changed: 31 additions & 0 deletions b/‎DigitalLearningSolutions.Data.Migrations/202508191440_CreateSendRetiringSelfAssessmentNotificationSP.cs‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Data.Migrations/202509180915_Alter_SendRetiringSelfAssessmentNotification.cs‎
Lines changed: 19 additions & 0 deletions b/‎DigitalLearningSolutions.Data.Migrations/202509180915_Alter_SendRetiringSelfAssessmentNotification.cs‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs‎
Lines changed: 72 additions & 0 deletions b/‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs‎
Lines changed: 72 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx‎
Lines changed: 9 additions & 0 deletions b/‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5552-Alter_SendRetiringSelfAssessmentNotification_Down.sql‎
14.2 KB b/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5552-Alter_SendRetiringSelfAssessmentNotification_Down.sql‎
14.2 KB
diff --git a/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5552-Alter_SendRetiringSelfAssessmentNotification_Up.sql‎
14.4 KB b/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5552-Alter_SendRetiringSelfAssessmentNotification_Up.sql‎
14.4 KB
diff --git a/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5552-SendRetiringNotification.sql‎
14 KB b/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5552-SendRetiringNotification.sql‎
14 KB
diff --git a/‎DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs‎
Lines changed: 5 additions & 2 deletions b/‎DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎DigitalLearningSolutions.Data/Models/SessionData/Supervisor/SessionEnrolOnCompetencyAssessment.cs‎
Lines changed: 1 addition & 0 deletions b/‎DigitalLearningSolutions.Data/Models/SessionData/Supervisor/SessionEnrolOnCompetencyAssessment.cs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎DigitalLearningSolutions.Web.Tests/Controllers/Register/RegisterDelegateByCentreControllerTests.cs‎
Lines changed: 1 addition & 1 deletion b/‎DigitalLearningSolutions.Web.Tests/Controllers/Register/RegisterDelegateByCentreControllerTests.cs‎
Lines changed: 1 addition & 1 deletion
@@ -0,0 +1,31 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+    [Migration(202508191440)]
+    public class CreateSendRetiringSelfAssessmentNotificationSP : Migration
+    {
+        public override void Up()
+        {
+            string generalTELTeam =
+                @"[
+                    { ""FirstName"":"""", ""LastName"":"""", ""Email"":""[email protected]"" },
+                    { ""FirstName"":""Anna"", ""LastName"":""Athanasopoulou"", ""Email"":""[email protected]"" },
+                    { ""FirstName"":""Benjamin"", ""LastName"":""Witton"", ""Email"":""[email protected]"" }
+                ]";
+
+            Execute.Sql(@$"IF NOT EXISTS (SELECT ConfigID FROM Config WHERE ConfigName = 'GeneralTELTeam')
+                        BEGIN
+                          INSERT INTO Config VALUES ('GeneralTELTeam', '{generalTELTeam}', 0,GETDATE(), GETDATE())
+                        END"
+               );
+
+            Execute.Sql(Properties.Resources.TD_5552_SendRetiringNotification);
+        }
+        public override void Down()
+        {
+            Execute.Sql(@"DELETE FROM Config WHERE ConfigName = N'GeneralTELTeam'");
+
+            Execute.Sql("DROP PROCEDURE [dbo].[SendRetiringSelfAssessmentNotification]");
+        }
+    }
+}
@@ -0,0 +1,19 @@
+
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202509180915)]
+    public class Alter_SendRetiringSelfAssessmentNotification : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_5552_Alter_SendRetiringSelfAssessmentNotification_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_5552_Alter_SendRetiringSelfAssessmentNotification_Down);
+        }
+    }
+}
@@ -511,4 +511,13 @@
   <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>
+  <data name="TD_5552_SendRetiringNotification" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5552-SendRetiringNotification.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_5552_Alter_SendRetiringSelfAssessmentNotification_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5552-Alter_SendRetiringSelfAssessmentNotification_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_5552_Alter_SendRetiringSelfAssessmentNotification_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5552-Alter_SendRetiringSelfAssessmentNotification_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
 </root>
@@ -513,11 +513,13 @@ public IEnumerable<Accessor> GetAccessor(int selfAssessmentId, int delegateUserI
         {
             return connection.Query<Accessor>(
                 @"SELECT CASE  WHEN AccessorPRN IS NOT NULL THEN AccessorName+', '+AccessorPRN ELSE AccessorName END AS AccessorList,AccessorName,AccessorPRN   
-                   FROM (SELECT COALESCE(au.Forename + ' ' + au.Surname + (CASE WHEN au.Active = 1 THEN '' ELSE ' (Inactive)' END), sd.SupervisorEmail) AS AccessorName,
+                   FROM (SELECT DISTINCT COALESCE(au.Forename + ' ' + au.Surname + (CASE WHEN au.Active = 1 THEN '' ELSE ' (Inactive)' END), sd.SupervisorEmail) AS AccessorName,
                			u.ProfessionalRegistrationNumber AS AccessorPRN
             FROM SupervisorDelegates AS sd
             INNER JOIN CandidateAssessmentSupervisors AS cas
                 ON sd.ID = cas.SupervisorDelegateId
+            INNER JOIN SelfAssessmentResultSupervisorVerifications AS srsv
+			    ON cas.ID = srsv.CandidateAssessmentSupervisorID
             INNER JOIN CandidateAssessments AS ca
                 ON cas.CandidateAssessmentID = ca.ID
             LEFT OUTER JOIN AdminUsers AS au
@@ -527,7 +529,8 @@ LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr
                 ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
 				INNER JOIN Users AS u ON U.PrimaryEmail =  au.Email 
              WHERE
-              (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (ca.DelegateUserID = @DelegateUserID) AND (ca.SelfAssessmentID = @selfAssessmentId)) Accessor
+                (ca.DelegateUserID = @DelegateUserID) AND (ca.SelfAssessmentID = @selfAssessmentId)
+                    AND (srsv.Verified IS NOT NULL)) Accessor
                 ORDER BY AccessorName, AccessorPRN DESC",
                 new { selfAssessmentId, delegateUserID }
             );
 
@@ -6,5 +6,6 @@ public class SessionEnrolOnCompetencyAssessment
         public int? SelfAssessmentID { get; set; }
         public DateTime? CompleteByDate { get; set; }
         public int? SelfAssessmentSupervisorRoleId { get; set; }
+        public bool ActionConfirmed { get; set; }
     }
 }
@@ -176,7 +176,7 @@ public void LearnerInformationPost_updates_tempdata_correctly()
             const string answer4 = "answer4";
             const string answer5 = "answer5";
             const string answer6 = "answer6";
-            const string professionalRegistrationNumber = "PRN1234";
+            const string professionalRegistrationNumber = "PR123456";
             var model = new LearnerInformationViewModel
             {
                 JobGroup = jobGroupId,
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ public class SessionEnrolOnCompetencyAssessment`
`6`	`6`	`public int? SelfAssessmentID { get; set; }`
`7`	`7`	`public DateTime? CompleteByDate { get; set; }`
`8`	`8`	`public int? SelfAssessmentSupervisorRoleId { get; set; }`
	`9`	`+ public bool ActionConfirmed { get; set; }`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public void LearnerInformationPost_updates_tempdata_correctly()`
`176`	`176`	`const string answer4 = "answer4";`
`177`	`177`	`const string answer5 = "answer5";`
`178`	`178`	`const string answer6 = "answer6";`
`179`		`- const string professionalRegistrationNumber = "PRN1234";`
	`179`	`+ const string professionalRegistrationNumber = "PR123456";`
`180`	`180`	`var model = new LearnerInformationViewModel`
`181`	`181`	`{`
`182`	`182`	`JobGroup = jobGroupId,`