Skip to content

Commit 8639131

Browse files
Merge pull request #271 from TechnologyEnhancedLearning/Develop/fixes/TD-2959-LH-Certificate-Hyperlink-doesnt-work-in-the-downloaded-certificate
TD-2959:Added hyperlinks to the existing html for certificate pdf generation
2 parents 82d2c32 + 90f59a7 commit 8639131

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ public async Task<IActionResult> DownloadCertificate(int resourceReferenceId, in
448448
var nodePathNodes = await this.hierarchyService.GetNodePathNodes(resource.NodePathId);
449449
var currentUser = await this.userService.GetUserByUserIdAsync((userId == 0) ? this.CurrentUserId : (int)userId);
450450
var userEmployment = await this.userService.GetUserEmploymentByIdAsync(currentUser.PrimaryUserEmploymentId ?? 0);
451+
var resourceItemUrl = this.Settings.LearningHubWebUiUrl.Trim() + "Resource/" + resourceReferenceId + "/Item";
451452
if (activity.Item2.CertificateUrl != null)
452453
{
453454
var file = await this.fileService.DownloadFileAsync(this.filePath, activity.Item2.CertificateUrl);
@@ -458,7 +459,7 @@ public async Task<IActionResult> DownloadCertificate(int resourceReferenceId, in
458459
}
459460
}
460461

461-
certificateDetails = new CertificateDetails { AccessCount = activity.Item1, ProfessionalRegistrationNumber = userEmployment?.MedicalCouncilNo, NodeViewModels = nodePathNodes, UserViewModel = currentUser, ResourceItemViewModel = resource, ActivityDetailedItemViewModel = new ActivityDetailedItemViewModel(activity.Item2), DownloadCertificate = true, CertificateBase64Image = base64Image };
462+
certificateDetails = new CertificateDetails { AccessCount = activity.Item1, ProfessionalRegistrationNumber = userEmployment?.MedicalCouncilNo, NodeViewModels = nodePathNodes, UserViewModel = currentUser, ResourceItemViewModel = resource, ActivityDetailedItemViewModel = new ActivityDetailedItemViewModel(activity.Item2), DownloadCertificate = true, CertificateBase64Image = base64Image, PdfResoureItemUrl = resourceItemUrl };
462463
var renderedViewHTML = new List<string>();
463464
certificateDetails.PageNo++;
464465
renderedViewHTML.Add(RenderRazorViewToString(this, "LearningCertificate", certificateDetails));

LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,10 @@ public class CertificateDetails
5555
/// Gets or sets PageNo.
5656
/// </summary>
5757
public int PageNo { get; set; }
58+
59+
/// <summary>
60+
/// Gets or sets ResourseItem Url for certificate PDF Download.
61+
/// </summary>
62+
public string PdfResoureItemUrl { get; set; }
5863
}
5964
}

LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@
11281128
<h2> @Model.UserViewModel.FirstName @Model.UserViewModel.LastName</h2>
11291129
<p class="nhsuk-body-l nhsuk-u-margin-top-7 nhsuk-u-margin-bottom-3">has successfully completed the learning resource </p>
11301130
<h2 class="nhsuk-u-margin-bottom-9">
1131-
@Model.ActivityDetailedItemViewModel.Title
1131+
<a href="@Model.PdfResoureItemUrl" target="_blank">@Model.ActivityDetailedItemViewModel.Title</a>
11321132
</h2>
11331133
@if (resourceScore)
11341134
{
@@ -1192,7 +1192,7 @@
11921192
<tr role="row" class="nhsuk-table__row">
11931193
<td role="cell" class="nhsuk-table__cell nhsuk-u-padding-left-3 nhsuk-u-padding-top-2 word-wrapper summarytabledetailscells">
11941194
<span class="nhsuk-table-responsive__heading">Learning resource </span>
1195-
@Model.ActivityDetailedItemViewModel.Title
1195+
<a href="@Model.PdfResoureItemUrl" target="_blank">@Model.ActivityDetailedItemViewModel.Title</a>
11961196
</td>
11971197
<td role="cell" class="nhsuk-table__cell nhsuk-u-padding-left-3 nhsuk-u-padding-top-2 summarytabledetailscells">
11981198
<span class="nhsuk-table-responsive__heading">No. Of Times Accessed </span> @Model.AccessCount

0 commit comments

Comments
 (0)