Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ public async Task<IActionResult> DownloadCertificate(int resourceReferenceId, in
var nodePathNodes = await this.hierarchyService.GetNodePathNodes(resource.NodePathId);
var currentUser = await this.userService.GetUserByUserIdAsync((userId == 0) ? this.CurrentUserId : (int)userId);
var userEmployment = await this.userService.GetUserEmploymentByIdAsync(currentUser.PrimaryUserEmploymentId ?? 0);
var resourceItemUrl = this.Settings.LearningHubWebUiUrl.Trim() + "Resource/" + resourceReferenceId + "/Item";
if (activity.Item2.CertificateUrl != null)
{
var file = await this.fileService.DownloadFileAsync(this.filePath, activity.Item2.CertificateUrl);
Expand All @@ -456,7 +457,7 @@ public async Task<IActionResult> DownloadCertificate(int resourceReferenceId, in
}
}

certificateDetails = new CertificateDetails { AccessCount = activity.Item1, ProfessionalRegistrationNumber = userEmployment?.MedicalCouncilNo, NodeViewModels = nodePathNodes, UserViewModel = currentUser, ResourceItemViewModel = resource, ActivityDetailedItemViewModel = new ActivityDetailedItemViewModel(activity.Item2), DownloadCertificate = true, CertificateBase64Image = base64Image };
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 };
var renderedViewHTML = new List<string>();
certificateDetails.PageNo++;
renderedViewHTML.Add(RenderRazorViewToString(this, "LearningCertificate", certificateDetails));
Expand Down
5 changes: 5 additions & 0 deletions LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,10 @@ public class CertificateDetails
/// Gets or sets PageNo.
/// </summary>
public int PageNo { get; set; }

/// <summary>
/// Gets or sets ResourseItem Url for certificate PDF Download.
/// </summary>
public string PdfResoureItemUrl { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@
<h2> @Model.UserViewModel.FirstName @Model.UserViewModel.LastName</h2>
<p class="nhsuk-body-l nhsuk-u-margin-top-7 nhsuk-u-margin-bottom-3">has successfully completed the learning resource </p>
<h2 class="nhsuk-u-margin-bottom-9">
@Model.ActivityDetailedItemViewModel.Title
<a href="@Model.PdfResoureItemUrl" target="_blank">@Model.ActivityDetailedItemViewModel.Title</a>
</h2>
@if (resourceScore)
{
Expand Down Expand Up @@ -1192,7 +1192,7 @@
<tr role="row" class="nhsuk-table__row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-padding-left-3 nhsuk-u-padding-top-2 word-wrapper summarytabledetailscells">
<span class="nhsuk-table-responsive__heading">Learning resource </span>
@Model.ActivityDetailedItemViewModel.Title
<a href="@Model.PdfResoureItemUrl" target="_blank">@Model.ActivityDetailedItemViewModel.Title</a>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-padding-left-3 nhsuk-u-padding-top-2 summarytabledetailscells">
<span class="nhsuk-table-responsive__heading">No. Of Times Accessed </span> @Model.AccessCount
Expand Down