Skip to content

Commit 618751d

Browse files
committed
TD-4327-verified if supervisor delegate exists.
1 parent 203ad52 commit 618751d

File tree

1 file changed

+7
-6
lines changed
  • DigitalLearningSolutions.Web/Controllers/SupervisorController

1 file changed

+7
-6
lines changed

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ public IActionResult AllStaffList()
339339
var loggedInUserId = User.GetUserId();
340340
var loggedInAdminUser = userService.GetAdminUserById(adminId);
341341
var centreCustomPrompts = centreRegistrationPromptsService.GetCentreRegistrationPromptsByCentreId(centreId);
342-
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId,loggedInAdminUser.CategoryId)
342+
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId, loggedInAdminUser.CategoryId)
343343
.Select(supervisor =>
344344
{
345345
return supervisor;
@@ -358,6 +358,7 @@ public IActionResult ReviewDelegateSelfAssessment(int supervisorDelegateId, int
358358
var loggedInAdminUser = userService.GetAdminUserById(adminId);
359359
var superviseDelegate =
360360
supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0);
361+
if (superviseDelegate == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
361362
var reviewedCompetencies = PopulateCompetencyLevelDescriptors(
362363
selfAssessmentService.GetCandidateAssessmentResultsById(candidateAssessmentId, adminId, selfAssessmentResultId).ToList()
363364
);
@@ -1306,7 +1307,7 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super
13061307
supervisorDelegateDetail.DelegateUserID,
13071308
(int)User.GetCentreId()
13081309
);
1309-
supervisorDelegate.SelfAssessmentCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? adminUser.CategoryId.Value : supervisorDelegate.SelfAssessmentCategory;
1310+
supervisorDelegate.SelfAssessmentCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? adminUser.CategoryId.Value : supervisorDelegate.SelfAssessmentCategory;
13101311
var centreName = adminUser.CentreName;
13111312

13121313
var adminRoles = new AdminRoles(false, false, true, false, false, false, false, false);
@@ -1395,7 +1396,7 @@ public IActionResult CompetencySelfAssessmentCertificatesupervisor(int candidate
13951396
{
13961397
return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
13971398
}
1398-
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value,loggedInAdminUser.CategoryId);
1399+
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value, loggedInAdminUser.CategoryId);
13991400
var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault();
14001401
if ((checkSupervisorDelegate == null))
14011402
{
@@ -1433,9 +1434,9 @@ public async Task<IActionResult> DownloadCertificate(int candidateAssessmentId)
14331434
return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
14341435
}
14351436

1436-
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value, loggedInAdminUser.CategoryId);
1437-
var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault();
1438-
if (checkSupervisorDelegate == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
1437+
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value, loggedInAdminUser.CategoryId);
1438+
var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault();
1439+
if (checkSupervisorDelegate == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
14391440

14401441
var delegateUserId = competencymaindata.LearnerId;
14411442
var competencycount = selfAssessmentService.GetCompetencyCountSelfAssessmentCertificate(candidateAssessmentId);

0 commit comments

Comments
 (0)