Skip to content

TD-6208 Issue showing old statuses on resource certificates #1411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Merge RC changes into CI
merged 3 commits into from
Sep 16, 2025
Merged

TD-6208 Issue showing old statuses on resource certificates #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81b0286
TD-6208 update
OluwatobiAwe Sep 16, 2025
ddd2241
Merge remote-tracking branch 'origin/RC' into Develop/Fixes/TD-6208
OluwatobiAwe Sep 16, 2025
a24a6be
null check for ResourceReferenceID in GetUserCertificateDetails SP
OluwatobiAwe Sep 16, 2025
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
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/MyLearning/ExportToPDF.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
}
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
21 changes: 11 additions & 10 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetUsercertificateDetails.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading