diff --git a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs index a357fa37..d7602ee9 100644 --- a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs @@ -524,5 +524,20 @@ public static bool CanDownloadCertificate(this ActivityDetailedItemViewModel act return false; } + + /// + /// GetReportStatusDisplayText. + /// + /// The status. + /// The string. + public static string GetReportStatusDisplayText(string status) + { + if (status == "Not completed") + { + return "In progress"; + } + + return status; + } } } diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue index 2df32d39..d550e1e2 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue @@ -181,7 +181,7 @@ case NotificationType.AccessRequest: return [{ text: 'Access request', className: 'fas fa-lock-alt text-dark pt-1' }]; case NotificationType.ReportProcessed: - return [{ text: 'Report processed', className: 'fa-solid fa-circle-check text-success' }]; + return [{ text: 'Report', className: 'fa-solid fa-circle-check text-success' }]; default: return [{ text: 'unknown', className: '' }]; } diff --git a/LearningHub.Nhs.WebUI/Views/Reports/CreateReportDateSelection.cshtml b/LearningHub.Nhs.WebUI/Views/Reports/CreateReportDateSelection.cshtml index 62f6be07..62c733db 100644 --- a/LearningHub.Nhs.WebUI/Views/Reports/CreateReportDateSelection.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Reports/CreateReportDateSelection.cshtml @@ -36,16 +36,16 @@
Create a course progress report
- + @if (errorHasOccurred) + { + + }

Reporting period

- @if (errorHasOccurred) - { - - } +
@Html.HiddenFor(x=>x.HintText) @@ -56,6 +56,16 @@ For the last:
+ @if (errorHasOccurred) + { +
+ + + Error: Select a reporting period + +
+ } +
@foreach (var (radio, index) in Model.PopulateDateRange().Select((r, i) => (r, i))) { diff --git a/LearningHub.Nhs.WebUI/Views/Reports/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Reports/Index.cshtml index 26a7a270..1a5a9512 100644 --- a/LearningHub.Nhs.WebUI/Views/Reports/Index.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Reports/Index.cshtml @@ -133,7 +133,7 @@
Type:
-
course progress
+
Course progress
Reporting on:
diff --git a/LearningHub.Nhs.WebUI/Views/Reports/_ReportPaging.cshtml b/LearningHub.Nhs.WebUI/Views/Reports/_ReportPaging.cshtml index 5fe25a28..37af2181 100644 --- a/LearningHub.Nhs.WebUI/Views/Reports/_ReportPaging.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Reports/_ReportPaging.cshtml @@ -42,7 +42,7 @@ else {
  • - + Previous : @previousMessage @@ -61,7 +61,7 @@ else {
  • - + Next : @nextMessage diff --git a/LearningHub.Nhs.WebUI/Views/Reports/_ReportTable.cshtml b/LearningHub.Nhs.WebUI/Views/Reports/_ReportTable.cshtml index a5aa336c..733d9a72 100644 --- a/LearningHub.Nhs.WebUI/Views/Reports/_ReportTable.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Reports/_ReportTable.cshtml @@ -139,7 +139,7 @@ Status - @entry.CourseStatus + @ViewActivityHelper.GetReportStatusDisplayText(entry.CourseStatus)