Merge pull request #3378 from TechnologyEnhancedLearning/DLS-Release-v1.2.3

Dls release v1.2.3 to UAT

Author: kevwhitt-hee

DigitalLearningSolutions.Data.Migrations/202509180915_Alter_SendRetiringSelfAssessmentNotification.cs

@@ -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);
+        }
+    }
+}

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

@@ -508,4 +508,10 @@
   <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>

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -910,19 +910,13 @@ public IActionResult EnrolDelegateSetCompleteBy(int supervisorDelegateId, int da
             {
                 var validationResult = OldDateValidator.ValidateDate(day, month, year);
                 if (!validationResult.DateValid)
-                {
                     return RedirectToAction("EnrolDelegateCompleteBy", new { supervisorDelegateId, day, month, year });
-                }
-                else
-                {
-                    var completeByDate = new DateTime(year, month, day);
-                    sessionEnrolOnRoleProfile.CompleteByDate = completeByDate;
-                    multiPageFormService.SetMultiPageFormData(
-                        sessionEnrolOnRoleProfile,
-                        MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment,
-                        TempData
-                    );
-                }
+
+                sessionEnrolOnRoleProfile.CompleteByDate = new DateTime(year, month, day);
+            }
+            else
+            {
+                sessionEnrolOnRoleProfile.CompleteByDate = null;
             }
 
             var supervisorRoles =