Merge branch 'Release-2024.29-Hotfix' into Release-2024.32

Author: rshrirohit

DigitalLearningSolutions.Data.Migrations/202406270900_Alter_uspCreateProgressRecord_V3.cs

@@ -0,0 +1,19 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202406270900)]
+    public class Alter_uspCreateProgressRecord_V3 : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_4223_Alter_uspCreateProgressRecord_V3_Up);
+            Execute.Sql(Properties.Resources.TD_4223_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_4223_Alter_uspCreateProgressRecord_V3_Down);
+            Execute.Sql(Properties.Resources.TD_4223_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down);
+        }
+    }
+}

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

@@ -388,4 +388,18 @@
   <data name="TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TD-3671-Alter_GetCurrentCoursesForCandidate_V2_proc_up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-</root>
+    
+    <data name="TD_4223_Alter_uspCreateProgressRecord_V3_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Scripts\TD-4223-Alter_uspCreateProgressRecord_V3_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+    </data>
+    <data name="TD_4223_Alter_uspCreateProgressRecord_V3_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Scripts\TD-4223-Alter_uspCreateProgressRecord_V3_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+    </data>
+
+    <data name="TD_4223_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Scripts\TD-4223-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+    </data>
+    <data name="TD_4223_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Scripts\TD-4223-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_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

@@ -437,7 +437,7 @@ public int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId,
             DateTime startedDate = clockUtility.UtcNow;
             DateTime? lastAccessed = null;
             dynamic? completeByDateDynamic = null;
-            int enrolmentMethodId = 2;
+            int enrolmentMethodId = (int)EnrolmentMethod.AdminOrSupervisor;
             if (completeByDate == null || completeByDate.GetValueOrDefault().Year > 1753)
             {
                 completeByDateDynamic = completeByDate!;
@@ -527,7 +527,7 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
             {
                 string sqlQuery = $@"
                 BEGIN TRANSACTION
-                UPDATE CandidateAssessments SET RemovedDate = NULL
+                UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId
                   WHERE ID = @candidateAssessmentId
 
                 UPDATE CandidateAssessmentSupervisors SET Removed = NULL
@@ -537,7 +537,7 @@ BEGIN TRANSACTION
                 COMMIT TRANSACTION";
 
                 connection.Execute(sqlQuery
-                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId });
+                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId });
             }
 
             if (candidateAssessmentId < 1)
@@ -553,6 +553,7 @@ BEGIN TRANSACTION
 
         public void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int centreId)
         {
+            int enrolmentMethodId = (int)EnrolmentMethod.Self;
             var enrolmentExists = Convert.ToInt32(connection.ExecuteScalar(
                 @"SELECT COALESCE
                  ((SELECT ID
@@ -574,9 +575,9 @@ FROM    CandidateAssessments
                 {
                     connection.Execute(
                         @"UPDATE CandidateAssessments
-                        SET RemovedDate = NULL
+                        SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId
                         WHERE ID = @enrolmentExists",
-                        new { enrolmentExists }
+                        new { enrolmentExists, enrolmentMethodId }
                 );
                 }
             }

DigitalLearningSolutions.Data.Migrations/Scripts/TD-4223-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down.sql

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DigitalLearningSolutions.Data.Enums
+{
+    public enum EnrolmentMethod
+    {
+        Self = 1,
+        AdminOrSupervisor,
+        Group,
+        System
+    }
+}