Skip to content

Develop/fixes/td 7108 my courses and elearning tray #1769

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
swapnamol-abraham merged 5 commits into from
Apr 9, 2026
Merged

Develop/fixes/td 7108 my courses and elearning tray #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0feee2
Merge branch 'RC' of https://github.com/TechnologyEnhancedLearning/Le…
swapnamol-abraham Apr 7, 2026
e9cd8af
Merge branch 'RC' of https://github.com/TechnologyEnhancedLearning/Le…
swapnamol-abraham Apr 8, 2026
9f82cc3
Merge branch 'RC' of https://github.com/TechnologyEnhancedLearning/Le…
swapnamol-abraham Apr 9, 2026
d9120d9
TD-7108: My courses and elearning Tray - eLearning and the Recently C…
swapnamol-abraham Apr 9, 2026
bccb37c
Correc ted for recently completed tray
swapnamol-abraham Apr 9, 2026
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
15 changes: 8 additions & 7 deletions LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<partial name="_LearningActivityCard" model="activityViewModel" />
</li>
}
@if (isLastPage && pagingViewModel.TotalCount >=8)
@if (isLastPage && pagingViewModel.TotalCount >= 8)
{
<li class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item">
<div class="nhsuk-card dashboard-card">
Expand Down Expand Up @@ -190,16 +190,17 @@
else
{
<div class="nhsuk-bg-white nhsuk-u-padding-5">
@if (Model.MyLearnings.Type == "my-in-progress" && Model.MyLearnings.TotalCount <= 0)
{
<h3 class="nhsuk-card__heading nhsuk-heading-m">You have not accessed any learning yet.</h3>
<p class="nhsuk-card__description dashboard-card-body">Accessed resources and courses will be displayed here. Browse from the list of resources below or search for a specific term using the search bar at the top of the screen.</p>
}
else if (Model.MyLearnings.Type == "my-certificates" && Model.MyLearnings.TotalCount <= 0)
@if (Model.MyLearnings.Type == "my-certificates" && Model.MyLearnings.TotalCount <= 0)
{
<h3 nhsuk-card__heading nhsuk-heading-m>You have no certificates.</h3>
<p class="nhsuk-card__description dashboard-card-body">Certificates when available will be displayed here.</p>
}
else if (Model.DashboardTrayLearningResourceType == "elearning" && Model.MyLearnings.TotalCount <= 0)
{
<h3 class="nhsuk-card__heading nhsuk-heading-m">You have not accessed any learning yet.</h3>
<p class="nhsuk-card__description dashboard-card-body">Accessed resources and courses will be displayed here. Browse from the list of resources below or search for a specific term using the search bar at the top of the screen.</p>
}

</div>
}
</div>
Expand Down
16 changes: 12 additions & 4 deletions LearningHub.Nhs.WebUI/Views/Home/_ResourceTray.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,26 @@

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred nhsuk-u-margin-bottom-2">
@if (@Model.Resources.Resources != null)
{
@if (@Model.Resources.Resources.Count() > 0)
{
<ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred nhsuk-u-margin-bottom-2">
@foreach (var resource in Model.Resources.Resources)
{
var resourceViewModel = new Tuple<string, DashboardResourceViewModel>("resources", resource);
<li class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item">
<partial name="_ResourceCard" model="resourceViewModel" />
</li>
}
</ul>
}
else
{
if (Model.Resources.Type == "my-recent-completed")
{
<h3 nhsuk-card__heading nhsuk-heading-m>You have not recently completed any learning.</h3>
<p class="nhsuk-card__description dashboard-card-body">When available your completed learning will be displayed here.</p>
}
</ul>
}
</div>
</div>
<div class="nhsuk-grid-row">
Expand Down
Loading