diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss index b7c572fb..bdf291bd 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss @@ -50,7 +50,7 @@ .course-card { border: 1px solid #d8dde0; border-radius: 8px; - box-shadow: 2px 2px 0 #d8dde0; + box-shadow: 2px 2px 0 #1C366A; } .dashboard-card-content { diff --git a/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml index 4ea63101..0cc67118 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml @@ -146,6 +146,45 @@ } + @if (isLastPage) + { +
  • +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    +
    Cant find what your looking for?
    + +
    +
    + +
  • + } } else diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs index fda7e14c..faf4f5c0 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs @@ -351,12 +351,13 @@ public async Task GetUserCertificateDet allCertificates = allCertificates.Where(c => allowedTypeIds.Contains(c.ResourceTypeId)); var orderedCertificates = allCertificates.OrderByDescending(c => c.AwardedDate); + int skip = (pageNumber - 1) * 3; var totalCount = orderedCertificates.Count(); - var pagedResults = orderedCertificates - .Skip(skip) - .Take(3) - .ToList(); + bool isLastPage = skip + 3 >= 8; + int pageSize = isLastPage ? 2 : 3; + var pagedResults = orderedCertificates.Skip(skip).Take(pageSize).ToList(); + return new MyLearningCertificatesDetailedViewModel { Certificates = pagedResults,