Skip to content

Commit 9722f6a

Browse files
authored
Merge pull request #1441 from TechnologyEnhancedLearning/Develop/Fixes/Style-correction-for-the-dashboard
The end title card should appear when the record count is greater tha…
2 parents f0028e2 + 1189f03 commit 9722f6a

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
TotalCount = Model.MyLearnings.TotalCount,
2828
DashboardTrayLearningResourceType = Model.DashboardTrayLearningResourceType,
2929
};
30-
var isLastPage = (Model.MyLearnings.CurrentPage * 3) >= Model.MyLearnings.TotalCount;
30+
var isLastPage = (Model.MyLearnings.CurrentPage * 3) >= 8;
3131
}
3232
<div class="dashboardTray">
3333
<h2>My courses and elearning</h2>

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetMyInprogressLearning
271271
var combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList();
272272
int skip = (pageNumber - 1) * 3;
273273
var totalCount = combainedUserActivities.Count() > 8 ? 8 : combainedUserActivities.Count();
274-
bool isLastPage = skip + 3 >= totalCount;
274+
275+
bool isLastPage = skip + 3 >= 8;
275276
int pageSize = isLastPage ? 2 : 3;
276277
var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(skip).Take(pageSize).ToList();
277278

@@ -354,7 +355,7 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet
354355

355356
int skip = (pageNumber - 1) * 3;
356357
var totalCount = orderedCertificates.Count() > 8 ? 8 : orderedCertificates.Count();
357-
bool isLastPage = skip + 3 >= totalCount;
358+
bool isLastPage = skip + 3 >= 8;
358359
int pageSize = isLastPage ? 2 : 3;
359360
var pagedResults = orderedCertificates.Skip(skip).Take(pageSize).ToList();
360361

0 commit comments

Comments
 (0)