Skip to content

Commit f32043e

Browse files
committed
TD-5368 Updating the Tracking system-centre-admin area and promote to admin area
1 parent ac656d7 commit f32043e

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1328,6 +1328,9 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super
13281328
{
13291329
registrationService.PromoteDelegateToAdmin(adminRoles, supervisorDelegate.SelfAssessmentCategory, (int)supervisorDelegateDetail.DelegateUserID, (int)User.GetCentreId(), true);
13301330

1331+
int? learningCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? null : supervisorDelegate.SelfAssessmentCategory;
1332+
var learningCategoryName = courseCategoriesService.GetCourseCategoryName(learningCategory);
1333+
13311334
if (delegateUser != null && adminUser != null)
13321335
{
13331336
var adminRolesEmail = emailGenerationService.GenerateDelegateAdminRolesNotificationEmail(
@@ -1345,7 +1348,7 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super
13451348
isCmsManager: adminRoles.IsCmsManager,
13461349
primaryEmail: delegateUser.EmailAddress,
13471350
centreName: centreName,
1348-
null
1351+
learningCategoryName
13491352
);
13501353

13511354
emailService.SendEmail(adminRolesEmail);

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using DigitalLearningSolutions.Data.Models;
88
using DigitalLearningSolutions.Data.Models.Common;
99
using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
10+
//using DigitalLearningSolutions.Data.Models.Supervisor;
1011
using DigitalLearningSolutions.Data.Models.User;
1112
using DigitalLearningSolutions.Web.Attributes;
1213
using DigitalLearningSolutions.Web.Helpers;
@@ -177,8 +178,10 @@ public IActionResult EditAdminRoles(AdminRolesFormData model, int adminId)
177178
adminRoles,
178179
AdminCategoryHelper.AdminCategoryToCategoryId(model.LearningCategory)
179180
);
181+
int? learningCategory = model.LearningCategory == 0 ? null : model.LearningCategory;
182+
var learningCategoryName = courseCategoriesService.GetCourseCategoryName(learningCategory);
180183

181-
SendNotificationEmail(adminId, adminRoles);
184+
SendNotificationEmail(adminId, adminRoles, learningCategoryName);
182185

183186
return RedirectToAction(
184187
"Index",
@@ -190,7 +193,8 @@ public IActionResult EditAdminRoles(AdminRolesFormData model, int adminId)
190193

191194
private void SendNotificationEmail(
192195
int adminIdToPromote,
193-
AdminRoles adminRoles
196+
AdminRoles adminRoles,
197+
string learningCategoryName
194198
)
195199
{
196200
var adminId = User.GetAdminId();
@@ -216,7 +220,7 @@ AdminRoles adminRoles
216220
isCmsManager: adminRoles.IsCmsManager,
217221
primaryEmail: delegateUserEmailDetails.EmailAddress,
218222
centreName: centreName,
219-
null
223+
learningCategoryName
220224
);
221225

222226
emailService.SendEmail(adminRolesEmail);

0 commit comments

Comments
 (0)