TD-4878-Retrieved supervisor list based on Category ID

Author: Auldrin-Possa

DigitalLearningSolutions.Data.Migrations/202410231405_Alter_GetActivitiesForDelegateEnrolment.cs

@@ -0,0 +1,19 @@
+
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202410231405)]
+    public class Alter_GetActivitiesForDelegateEnrolment : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_4878_Alter_GetActivitiesForDelegateEnrolment_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_4878_Alter_GetActivitiesForDelegateEnrolment_Down);
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -457,4 +457,10 @@
   <data name="TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
 </root>

DigitalLearningSolutions.Data.Migrations/Scripts/TD-4878-Alter_GetActivitiesForDelegateEnrolment_Down.sql

@@ -17,6 +17,7 @@ public string? Topic
         }
         public int DelegateStatus { get; set; }
         public bool HideInLearnerPortal { get; set; }
+        public int CategoryID { get; set; }
 
         private string? category;
         private string? topic;

DigitalLearningSolutions.Data.Migrations/Scripts/TD-4878-Alter_GetActivitiesForDelegateEnrolment_Up.sql

@@ -16,5 +16,6 @@ public class SessionEnrolDelegate
         public string? SupervisorEmail { get; set; }
         public bool IsSelfAssessment { get; set; }
         public int AssessmentVersion { get; set; }
+        public int? AssessmentCategoryID { get; set; }
     }
 }

DigitalLearningSolutions.Data/Models/Courses/AvailableCourse.cs

@@ -122,6 +122,7 @@ public IActionResult Index(int delegateId, EnrolCurrentLearningViewModel enrolCu
             sessionEnrol.IsSelfAssessment = selectedCourse.IsSelfAssessment;
             sessionEnrol.AssessmentVersion = selectedCourse.CurrentVersion.GetValueOrDefault();
             sessionEnrol.AssessmentName = selectedCourse.Name;
+            sessionEnrol.AssessmentCategoryID = selectedCourse.CategoryID;
 
             multiPageFormService.SetMultiPageFormData(
                 sessionEnrol,
@@ -201,7 +202,7 @@ public IActionResult EnrolDelegateSupervisor(int delegateId)
             var sessionEnrol = multiPageFormService.GetMultiPageFormData<SessionEnrolDelegate>(
               MultiPageFormDataFeature.EnrolDelegateInActivity,
               TempData).GetAwaiter().GetResult();
-            var supervisorList = supervisorService.GetSupervisorForEnrolDelegate(sessionEnrol.AssessmentID.GetValueOrDefault(), centreId.Value);
+            var supervisorList = supervisorService.GetSupervisorForEnrolDelegate(centreId.Value, sessionEnrol.AssessmentCategoryID.Value);
             if (!sessionEnrol.IsSelfAssessment)
             {
                 var model = new EnrolSupervisorViewModel(
@@ -233,7 +234,7 @@ public IActionResult EnrolDelegateSupervisor(int delegateId, EnrolSupervisorView
         {
             var centreId = GetCentreId();
             var sessionEnrol = multiPageFormService.GetMultiPageFormData<SessionEnrolDelegate>(MultiPageFormDataFeature.EnrolDelegateInActivity, TempData).GetAwaiter().GetResult();
-            var supervisorList = supervisorService.GetSupervisorForEnrolDelegate(sessionEnrol.AssessmentID.Value, centreId.Value);
+            var supervisorList = supervisorService.GetSupervisorForEnrolDelegate(centreId.Value, sessionEnrol.AssessmentCategoryID.Value);
             var roles = supervisorService.GetSupervisorRolesBySelfAssessmentIdForSupervisor(sessionEnrol.AssessmentID.GetValueOrDefault()).ToArray();
 
             if (!ModelState.IsValid)