Skip to content

TD-6208 Certificate Status update #1421

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
merged 1 commit into from
Sep 19, 2025
Merged

TD-6208 Certificate Status update #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,24 @@ public static string GetResourceTypeDesc(ResourceTypeEnum resourceType)
/// <returns>The string.</returns>
public static string GetActivityStatusDisplayText(MyLearningCombinedActivitiesViewModel activity)
{
if (activity.ActivityStatus == ActivityStatusEnum.Completed || activity.ActivityStatus == ActivityStatusEnum.Passed || activity.ActivityStatus == ActivityStatusEnum.Passed || activity.ActivityStatus == ActivityStatusEnum.Viewed || activity.ActivityStatus == ActivityStatusEnum.Downloaded)
if (activity.ActivityStatus == ActivityStatusEnum.Completed || activity.ActivityStatus == ActivityStatusEnum.Passed || activity.ActivityStatus == ActivityStatusEnum.Viewed || activity.ActivityStatus == ActivityStatusEnum.Downloaded)
{
return "Completed";
}
else
{
return "InProgress";
}
}

/// <summary>
/// GetCertificateStatusDisplayText.
/// </summary>
/// <param name="activity">The activity.</param>
/// <returns>The string.</returns>
public static string GetCertificateStatusDisplayText(ActivityDetailedItemViewModel activity)
{
if (activity.ActivityStatus == ActivityStatusEnum.Completed || activity.ActivityStatus == ActivityStatusEnum.Passed || activity.ActivityStatus == ActivityStatusEnum.Viewed || activity.ActivityStatus == ActivityStatusEnum.Downloaded)
{
return "Completed";
}
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.GetActivityStatusText(Model.ActivityDetailedItemViewModel)
<span class="nhsuk-table-responsive__heading summaryTableHead">Overall Status </span>@ViewActivityHelper.GetCertificateStatusDisplayText(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.GetActivityStatusText(Model.ActivityDetailedItemViewModel)
<span class="nhsuk-table-responsive__heading">Overall Status </span>@ViewActivityHelper.GetCertificateStatusDisplayText(Model.ActivityDetailedItemViewModel)
</td>

</tr>
Expand Down
Loading