Merge pull request #2730 from TechnologyEnhancedLearning/Develop/Fix/TD-4279-Re-enrol-deleted-self-assessment

TD-4279- Re-enrolling a self assessment for the existing delegates not showing the 'remove' button

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -436,7 +436,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!;
@@ -526,7 +526,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
@@ -536,7 +536,7 @@ BEGIN TRANSACTION
                 COMMIT TRANSACTION";
 
                 connection.Execute(sqlQuery
-                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId });
+                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId });
             }
 
             if (candidateAssessmentId < 1)
@@ -552,6 +552,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
@@ -573,9 +574,9 @@ FROM    CandidateAssessments
                 {
                     connection.Execute(
                         @"UPDATE CandidateAssessments
-                        SET RemovedDate = NULL
+                        SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId
                         WHERE ID = @enrolmentExists",
-                        new { enrolmentExists }
+                        new { enrolmentExists, enrolmentMethodId }
                 );
                 }
             }
@@ -869,8 +870,8 @@ public IEnumerable<CourseStatistics> GetNonArchivedCourseStatisticsAtCentreFilte
 
         public IEnumerable<DelegateCourseInfo> GetDelegateCoursesInfo(int delegateId)
         {
-                return connection.Query<DelegateCourseInfo>(
-                $@"{selectDelegateCourseInfoQuery}
+            return connection.Query<DelegateCourseInfo>(
+            $@"{selectDelegateCourseInfoQuery}
                     WHERE pr.CandidateID = @delegateId
                         AND pr.RemovedDate IS NULL
                         AND ap.DefaultContentTypeID <> 4
@@ -914,8 +915,8 @@ AND ap.DefaultContentTypeID <> 4
                         u.ProfessionalRegistrationNumber,
                         da.CentreID,
                         ap.ArchivedDate",
-                new { delegateId }
-            );            
+            new { delegateId }
+        );
         }
 
         public DelegateCourseInfo? GetDelegateCourseInfoByProgressId(int progressId)

DigitalLearningSolutions.Data/Enums/EnrolmentMethod.cs

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