From 90f59a72f1b09f94f613f7b7fa9e3f80eb856f93 Mon Sep 17 00:00:00 2001 From: Arunima George Date: Wed, 10 Apr 2024 11:56:37 +0100 Subject: [PATCH] TD-2959:Added hyperlinks to the existing html for certificate pdf generation --- LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs | 3 ++- LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs | 5 +++++ .../Views/MyLearning/LearningCertificate.cshtml | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs index 1061fd44e..a3627ab1e 100644 --- a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs @@ -446,6 +446,7 @@ public async Task 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); @@ -456,7 +457,7 @@ public async Task 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(); certificateDetails.PageNo++; renderedViewHTML.Add(RenderRazorViewToString(this, "LearningCertificate", certificateDetails)); diff --git a/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs b/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs index f4b74519c..f2ee9043b 100644 --- a/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs +++ b/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs @@ -55,5 +55,10 @@ public class CertificateDetails /// Gets or sets PageNo. /// public int PageNo { get; set; } + + /// + /// Gets or sets ResourseItem Url for certificate PDF Download. + /// + public string PdfResoureItemUrl { get; set; } } } diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml index dbecd677b..7194b6c05 100644 --- a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml +++ b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml @@ -1128,7 +1128,7 @@

@Model.UserViewModel.FirstName @Model.UserViewModel.LastName

has successfully completed the learning resource

- @Model.ActivityDetailedItemViewModel.Title + @Model.ActivityDetailedItemViewModel.Title

@if (resourceScore) { @@ -1192,7 +1192,7 @@ Learning resource - @Model.ActivityDetailedItemViewModel.Title + @Model.ActivityDetailedItemViewModel.Title No. Of Times Accessed @Model.AccessCount