diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/ExportToPDF.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/ExportToPDF.cshtml
index d0ba0a0c..4773267b 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/ExportToPDF.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/ExportToPDF.cshtml
@@ -130,7 +130,7 @@
@activity.Version |
@ViewActivityHelper.GetResourceTypeText(activity) |
- @ViewActivityHelper.GetActivityStatus(activity)
+ @ViewActivityHelper.GetActivityStatusText(activity)
|
}
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml
index 120832cf..c8269ae4 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml
@@ -1216,7 +1216,7 @@
Last Date Completed@Model.ActivityDetailedItemViewModel.ActivityDate.ToString("dd/MM/yyyy")
- Overall Status @ViewActivityHelper.GetActivityStatus(Model.ActivityDetailedItemViewModel)
+ Overall Status @ViewActivityHelper.GetActivityStatusText(Model.ActivityDetailedItemViewModel)
|
@@ -1399,7 +1399,7 @@
Last Date Completed@Model.ActivityDetailedItemViewModel.ActivityDate.ToString("dd/MM/yyyy")
- Overall Status @ViewActivityHelper.GetActivityStatus(Model.ActivityDetailedItemViewModel)
+ Overall Status @ViewActivityHelper.GetActivityStatusText(Model.ActivityDetailedItemViewModel)
|
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetUsercertificateDetails.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetUsercertificateDetails.sql
index 41de3441..2e1c7613 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetUsercertificateDetails.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetUsercertificateDetails.sql
@@ -6,6 +6,7 @@
-- Modification History
--
-- 22-08-2025 Tobi Initial Revision
+-- 16-09-2025 Tobi Added null check for ResourceReferenceID
-------------------------------------------------------------------------------
CREATE PROCEDURE [resources].[GetUsercertificateDetails]
@UserId INT,
@@ -74,16 +75,16 @@ BEGIN
rv.Id,
rv.Title,
r.ResourceTypeId,
- (
- SELECT TOP (1) rr.OriginalResourceReferenceId
- FROM resources.ResourceReference rr
- JOIN hierarchy.NodePath np
- ON np.Id = rr.NodePathId
- AND np.NodeId = n.Id
- AND np.Deleted = 0
- WHERE rr.ResourceId = rv.ResourceId
- AND rr.Deleted = 0
- ) AS ResourceReferenceID,
+ COALESCE((
+ SELECT TOP (1) rr.OriginalResourceReferenceId
+ FROM resources.ResourceReference rr
+ JOIN hierarchy.NodePath np
+ ON np.Id = rr.NodePathId
+ AND np.NodeId = n.Id
+ AND np.Deleted = 0
+ WHERE rr.ResourceId = rv.ResourceId
+ AND rr.Deleted = 0
+ ), '') AS ResourceReferenceID,
rv.MajorVersion,
rv.MinorVersion,
COALESCE(ra.ActivityEnd, ra.ActivityStart) AS AwardedDate,