Skip to content

Commit 3b38005

Browse files
committed
Squashed commit of the following:
commit f952688 Merge: 357f4ae 549abf6 Author: kevwhitt-hee <[email protected]> Date: Mon Mar 4 10:25:04 2024 +0000 Merge pull request #2558 from TechnologyEnhancedLearning/Develop/Fix/TD-149-Certificate-Supervisor-CentreName-Issue TD-149- skipped supervisor details when learner checks for certificate. commit 549abf6 Author: Auldrin Possa <[email protected]> Date: Mon Mar 4 10:13:33 2024 +0000 TD-149 - skipped supervisor details when learner logged in. commit 357f4ae Merge: 6e25a66 5f1d5d3 Author: kevwhitt-hee <[email protected]> Date: Mon Mar 4 09:07:18 2024 +0000 Merge pull request #2557 from TechnologyEnhancedLearning/Develop/Fix/TD-149-Certificate-Supervisor-CentreName-Issue TD-149-Self assessment certificate - supervisor centre name issue fix commit 5f1d5d3 Author: Auldrin Possa <[email protected]> Date: Mon Mar 4 00:25:21 2024 +0000 TD-149-service method added to get supervisor delegates detail commit 653cc83 Author: Auldrin Possa <[email protected]> Date: Sun Mar 3 19:31:50 2024 +0000 TD-149-created CanViewCertificate helper method to show/hide certificate. Modified the Sql query to return correct centre name.
1 parent eeaa8b3 commit 3b38005

File tree

1 file changed

+7
-4
lines changed
  • DigitalLearningSolutions.Web/Controllers/LearningPortalController

1 file changed

+7
-4
lines changed

DigitalLearningSolutions.Web/Controllers/LearningPortalController/Current.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ int delegateUserId
347347
[NoCaching]
348348
public IActionResult CompetencySelfAssessmentCertificate(int candidateAssessmentId, int route)
349349
{
350-
350+
int supervisorDelegateId = 0;
351351
if (candidateAssessmentId == 0)
352352
{
353353
return NotFound();
@@ -360,8 +360,11 @@ public IActionResult CompetencySelfAssessmentCertificate(int candidateAssessment
360360
}
361361

362362
var delegateUserId = competencymaindata.LearnerId;
363-
var supervisorDelegate = supervisorService.GetSupervisorDelegate(User.GetAdminIdKnownNotNull(), delegateUserId);
364-
363+
if (route == 3)
364+
{
365+
var supervisorDelegate = supervisorService.GetSupervisorDelegate(User.GetAdminIdKnownNotNull(), delegateUserId);
366+
supervisorDelegateId = supervisorDelegate.ID;
367+
}
365368
var recentResults = selfAssessmentService.GetMostRecentResults(competencymaindata.SelfAssessmentID, competencymaindata.LearnerDelegateAccountId).ToList();
366369
var supervisorSignOffs = selfAssessmentService.GetSupervisorSignOffsForCandidateAssessment(competencymaindata.SelfAssessmentID, delegateUserId);
367370

@@ -411,7 +414,7 @@ public IActionResult CompetencySelfAssessmentCertificate(int candidateAssessment
411414
ViewBag.CompetencySummaries = competencySummaries;
412415
var activitySummaryCompetencySelfAssesment = selfAssessmentService.GetActivitySummaryCompetencySelfAssesment(competencymaindata.Id);
413416
var model = new CompetencySelfAssessmentCertificateViewModel(competencymaindata, competencycount, route, accessors, activitySummaryCompetencySelfAssesment, roleCount);
414-
ViewBag.LoggedInSupervisorDelegatesId = supervisorDelegate.ID;
417+
ViewBag.LoggedInSupervisorDelegatesId = supervisorDelegateId;
415418
return View("Current/CompetencySelfAssessmentCertificate", model);
416419
}
417420
[Route("DownloadCertificate")]

0 commit comments

Comments
 (0)