TD-4751 Mark the Non Reportable flag as true when the user Id of the delegate matches the user Id of the admin record of the supervisor being selected.

Author: ABSinhaa

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -122,7 +122,7 @@ IEnumerable<CourseDelegateForExport> GetCourseDelegatesForExport(string searchSt
             int customisationId, int centreId, bool? isDelegateActive, bool? isProgressLocked, bool? removed, bool? hasCompleted, string? answer1, string? answer2, string? answer3);
 
         int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int supervisorId, string adminEmail,
-            int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId);
+            int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId, int? adminUserId);
 
         bool IsCourseCompleted(int candidateId, int customisationId);
         bool IsCourseCompleted(int candidateId, int customisationId, int progressID);
@@ -442,7 +442,7 @@ public void RemoveCurrentCourse(int progressId, int candidateId, RemovalMethod r
         }
 
         public int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int supervisorId, string adminEmail,
-            int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId)
+            int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId, int? adminUserId)
         {
             IClockUtility clockUtility = new ClockUtility();
             DateTime startedDate = clockUtility.UtcNow;
@@ -541,7 +541,9 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
                         new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic }
                     );
             }
-                if (candidateAssessmentId > 1 && supervisorDelegateId !=0)
+
+            if (candidateAssessmentId > 1 && supervisorDelegateId !=0)
+
             {
                 string sqlQuery = $@"
                 BEGIN TRANSACTION
@@ -558,6 +560,23 @@ BEGIN TRANSACTION
                 , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic });
             }
 
+            if (supervisorId > 0)
+            {
+                
+                adminUserId = Convert.ToInt32(connection.ExecuteScalar(@"SELECT UserID FROM AdminAccounts WHERE (AdminAccounts.ID = @supervisorId)",
+                    new { supervisorId })
+                    );
+
+                if (delegateUserId == adminUserId)
+                {
+                    connection.Execute(
+                            @"UPDATE CandidateAssessments SET NonReportable = 1  WHERE ID = @candidateAssessmentId",
+                            new { candidateAssessmentId }
+                        );
+
+                }
+            }
+
             if (candidateAssessmentId < 1)
             {
                 logger.LogWarning(

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/EnrolController.cs

@@ -326,7 +326,7 @@ public IActionResult EnrolDelegateSummary()
                     sessionEnrol.CompleteByDate,
                     (int)sessionEnrol.DelegateUserID,
                     centreId,
-                    GetAdminID()
+                    GetAdminID(),0
                     );
 
             }

DigitalLearningSolutions.Web/Services/EnrolService.cs

@@ -43,7 +43,8 @@ int EnrolOnActivitySelfAssessment(
             DateTime? completeByDate,
             int delegateUserId,
             int centreId,
-            int? enrolledByAdminId
+            int? enrolledByAdminId,
+            int? adminUserId
             );
     }
     public class EnrolService : IEnrolService
@@ -184,9 +185,9 @@ by the system because a previous course completion has expired.</p>
             return new Email(EnrolEmailSubject, body, emailAddress);
         }
 
-        public int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int supervisorId, string adminEmail, int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId)
+        public int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int supervisorId, string adminEmail, int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId, int? adminUserId)
         {
-            return courseDataService.EnrolOnActivitySelfAssessment(selfAssessmentId, candidateId, supervisorId, adminEmail, selfAssessmentSupervisorRoleId, completeByDate, delegateUserId, centreId, enrolledByAdminId);
+            return courseDataService.EnrolOnActivitySelfAssessment(selfAssessmentId, candidateId, supervisorId, adminEmail, selfAssessmentSupervisorRoleId, completeByDate, delegateUserId, centreId, enrolledByAdminId, adminUserId);
         }
     }
 }