Merge pull request #1411 from TechnologyEnhancedLearning/Develop/Fixes/TD-6208

TD-6208 Issue showing old statuses on resource certificates

Author: OluwatobiAwe

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

@@ -130,7 +130,7 @@
                     <td class="no-wrap">@activity.Version </td>
                     <td class="no-wrap">@ViewActivityHelper.GetResourceTypeText(activity)</td>
                     <td class="no-wrap">
-                      @ViewActivityHelper.GetActivityStatus(activity)
+                      @ViewActivityHelper.GetActivityStatusText(activity)
                     </td>
                   </tr>
                 }

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

@@ -1216,7 +1216,7 @@
                                             <span class="nhsuk-table-responsive__heading summaryTableHead">Last Date Completed</span>@Model.ActivityDetailedItemViewModel.ActivityDate.ToString("dd/MM/yyyy")
                                         </td>
                                         <td role="cell" class="nhsuk-table__cell nhsuk-u-padding-left-3 nhsuk-u-padding-top-2 nhsuk-u-padding-right-2 summarytabledetailscells">
-                                            <span class="nhsuk-table-responsive__heading summaryTableHead">Overall Status </span>@ViewActivityHelper.GetActivityStatus(Model.ActivityDetailedItemViewModel)
+                                            <span class="nhsuk-table-responsive__heading summaryTableHead">Overall Status </span>@ViewActivityHelper.GetActivityStatusText(Model.ActivityDetailedItemViewModel)
                                         </td>
 
                                     </tr>
@@ -1399,7 +1399,7 @@
                                         <span class="nhsuk-table-responsive__heading">Last Date Completed</span>@Model.ActivityDetailedItemViewModel.ActivityDate.ToString("dd/MM/yyyy")
                                     </td>
                                     <td role="cell" class="nhsuk-table__cell nhsuk-u-padding-left-3 nhsuk-u-padding-top-2 nhsuk-u-padding-right-2">
-                                        <span class="nhsuk-table-responsive__heading">Overall Status </span>@ViewActivityHelper.GetActivityStatus(Model.ActivityDetailedItemViewModel)
+                                        <span class="nhsuk-table-responsive__heading">Overall Status </span>@ViewActivityHelper.GetActivityStatusText(Model.ActivityDetailedItemViewModel)
                                     </td>
 
                                 </tr>

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,