Skip to content

TD-6230: SIT Defects-Recent Learning Page-2 #1419

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 2 commits into from
Sep 19, 2025
Merged

TD-6230: SIT Defects-Recent Learning Page-2 #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdaa30d
TD-6230: SIT Defects-Recent Learning Page-2
swapnamol-abraham Sep 18, 2025
f08d465
TD-6230: Header menu style and pagination issue
swapnamol-abraham Sep 18, 2025
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
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Controllers/HomeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public IActionResult HomepageWithAuthentication()
/// <param name="resourceDashboard">The resource dashboard type.</param>
/// <param name="catalogueDashboard">The catalogue dashboard type.</param>
/// <returns>Home page.</returns>
public async Task<IActionResult> Index(string dashboardTrayLearningResourceType = "all", string myLearningDashboard = "my-in-progress", string resourceDashboard = "popular-resources", string catalogueDashboard = "popular-catalogues")
public async Task<IActionResult> Index(string dashboardTrayLearningResourceType = "all", string myLearningDashboard = "my-in-progress", string resourceDashboard = "my-recent-completed", string catalogueDashboard = "popular-catalogues")
{
if (this.User?.Identity.IsAuthenticated == true)
{
Expand Down
6 changes: 6 additions & 0 deletions LearningHub.Nhs.WebUI/Styles/layout/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,12 @@ input:required:invalid, input:focus:invalid {
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.line-clamp-5 {
display: -webkit-box !important;
overflow: hidden;
-webkit-line-clamp: 5;
-webkit-box-orient: vertical;
}
.search-box-container {
display: flex;
flex-direction: row;
Expand Down
33 changes: 33 additions & 0 deletions LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
}
}

.course-card {
border: 1px solid #1C366A;
border-radius: 8px;
box-shadow: 2px 2px 0 #1C366A;
}

.dashboard-card-content {
display: flex;
flex-direction: column;
Expand Down Expand Up @@ -185,6 +191,33 @@ div.bmj-best-practice-logo-image {
background-color: #f0f4f5;
}

.filterlink {
display: inline-block;
padding: 6px 12px;
font-weight: bold;
text-decoration: none;
border: 2px solid transparent;
border-radius: 4px;
font-family: sans-serif;
}
.filteractive {
color: $nhsuk-blue;
border-color: #0b63ce;
background-color: $nhsuk-pale-blue-color;
}

.filterinactive {
color: #6e6e6e;
border-color: #c2c2c2;
background-color: #f1f1f1;
opacity: 0.7;
}

filterfocus {
color: black;
background-color: #ffeb3b;
border-color: #212b32;
}
.dashboard-paging {
width: 100%;
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<div class="nhsuk-card__content catalogue-card-content">

<h3 class="nhsuk-card__heading nhsuk-heading-m">
<a class="nhsuk-card__link line-clamp-2" asp-controller="Catalogue" asp-action="Index" asp-route-reference="@item.Url">@item.Name</a>
<a class="nhsuk-card__link line-clamp-5" asp-controller="Catalogue" asp-action="Index" asp-route-reference="@item.Url">@item.Name</a>
</h3>

<div class="nhsuk-card__description catalogue-card-body">
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<div class="nhsuk-card__content catalogue-card-content">

<h3 class="nhsuk-card__heading nhsuk-heading-m">
<a class="nhsuk-card__link line-clamp-2" asp-controller="Catalogue" asp-action="Index" asp-route-reference="@item.Url">@item.Name</a>
<a class="nhsuk-card__link line-clamp-5" asp-controller="Catalogue" asp-action="Index" asp-route-reference="@item.Url">@item.Name</a>
</h3>

<div class="nhsuk-card__description catalogue-card-body">
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<div class="nhsuk-card__content catalogue-card-content">

<h3 class="nhsuk-card__heading nhsuk-heading-m">
<a class="nhsuk-card__link line-clamp-2" href="@GetCatalogueUrl(item.Url, item.ClickPayload, item.NodeId)">@item.Name</a>
<a class="nhsuk-card__link line-clamp-5" href="@GetCatalogueUrl(item.Url, item.ClickPayload, item.NodeId)">@item.Name</a>
</h3>

<div class="nhsuk-card__description catalogue-card-body">
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Home/Dashboard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}

<div>
<div class="nhsuk-bg-grey">
<div class="nhsuk-bg-white">
<div class="text-center">
<picture>
<source media="(min-width: 1441px)" srcset="images\dashboard\hero\LH-dashboard-banner_2400x320.jpg" />
Expand All @@ -39,7 +39,7 @@
</div>
</div>

<div class="nhsuk-bg-white">
<div class="nhsuk-bg-grey">
<div class="nhsuk-width-container app-width-container">
<div id="resources">
<partial name="_ResourceTray" model="Model" />
Expand Down
3 changes: 2 additions & 1 deletion LearningHub.Nhs.WebUI/Views/Home/_CatalogueTray.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
CatalogueDashboard = Model.Catalogues.Type,
CurrentPage = Model.Catalogues.CurrentPage,
TotalPages = Model.Catalogues.TotalPages,
TotalCount = Model.Catalogues.TotalCount
TotalCount = Model.Catalogues.TotalCount,
DashboardTrayLearningResourceType = Model.DashboardTrayLearningResourceType
};
}

Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Home/_CertificateCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
}
);
}
<div class="nhsuk-card dashboard-card">
<div class="nhsuk-card dashboard-card @((ResourceTypeEnum)Model.Item2.ResourceTypeId == ResourceTypeEnum.Moodle ? "course-card" : string.Empty)">
<div class="nhsuk-card__content dashboard-card-content">
<div>
<h3 class="nhsuk-card__heading nhsuk-heading-m line-clamp-2">
<h3 class="nhsuk-card__heading nhsuk-heading-m line-clamp-5">

@if ((ResourceTypeEnum)Model.Item2.ResourceTypeId == ResourceTypeEnum.Moodle)
{
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
return moodleApiService.GetCourseUrl(courseId);
}
}
<div class="nhsuk-card dashboard-card">
<div class="nhsuk-card dashboard-card @(ViewActivityHelper.GetResourceTypeDesc(Model.Item2.ResourceType) == "Course" ? "course-card" : string.Empty)">
<div class="nhsuk-card__content dashboard-card-content">
<div>
<h3 class="nhsuk-card__heading nhsuk-heading-m line-clamp-2">
<h3 class="nhsuk-card__heading nhsuk-heading-m line-clamp-5">

@if (ViewActivityHelper.GetResourceTypeDesc(Model.Item2.ResourceType) == "Course")
{
Expand Down
49 changes: 25 additions & 24 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 @@ -32,7 +32,7 @@
<div class="dashboardTray">
<h2>My courses and elearning</h2>

<nav class="subnavbarwhite nhsuk-bg-grey navbar-expand-md nhsuk-u-margin-bottom-5">
<nav class="subnavbarwhite nhsuk-bg-white navbar-expand-md nhsuk-u-margin-bottom-5">
<input class="subnav-hidden-checkbox" id="mylearning-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="collapsingMyLearningSubNavbar" aria-labelledby="mylearning-subnav-hidden-checkbox-label">
<div class="bar">
<div class="navbar-toggler navbar-toggler-left nhsuk-u-font-size-19">@GetActiveTabName()</div>
Expand All @@ -41,42 +41,43 @@
<i class="fa-solid fa-chevron-up display--hide"><span class="nhsuk-u-visually-hidden">Hide Resource Options</span></i>
</label>
</div>
<div class="navbar-collapse collapse nhsuk-bg-grey" id="collapsingMyLearningSubNavbar">
<div class="navbar-collapse collapse nhsuk-bg-white" id="collapsingMyLearningSubNavbar">
<ul class="navbar-nav">
<li class="subnavwhite-item nhsuk-bg-grey @(Model.MyLearnings.Type == "my-in-progress" ? "active" : string.Empty)">
<li class="subnavwhite-item nhsuk-bg-white @(Model.MyLearnings.Type == "my-in-progress" ? "active" : string.Empty)">
<a tabindex="0" class="subnavwhite-link text-nowrap"
asp-controller="Home" asp-action="Index" asp-route-dashboardTrayLearningResourceType="all" asp-route-myLearningDashboard="my-in-progress" asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning">In Progress</a>
</li>

<li class="subnavwhite-item nhsuk-bg-grey @(Model.MyLearnings.Type == "my-certificates" ? "active" : string.Empty)">
<li class="subnavwhite-item nhsuk-bg-white @(Model.MyLearnings.Type == "my-certificates" ? "active" : string.Empty)">
<a tabindex="0" class="subnavwhite-link text-nowrap"
asp-controller="Home" asp-action="Index" asp-route-dashboardTrayLearningResourceType="all" asp-route-myLearningDashboard="my-certificates" asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning">Certificates</a>
</li>
</ul>
</div>
</nav>

<div class="nhsuk-u-padding-bottom-3">
<span class="nhsuk-u-padding-right-3 nhsuk-u-primary-text-color nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">Show</span>

<a asp-action="Index" asp-route-dashboardTrayLearningResourceType="all" [email protected] asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning"
class="nhsuk-u-padding-right-3 nhsuk-u-secondary-text-color nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-text-align-centre @(Model.DashboardTrayLearningResourceType == "all" ? "active" : string.Empty)"
title="All">
<span class="nhsuk-bg-pale-blue">All</span>
</a>

<a asp-action="Index" asp-route-dashboardTrayLearningResourceType="courses" [email protected] asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning"
class="subnavwhite-link text-nowrap nhsuk-u-padding-right-3 nhsuk-u-secondary-text-color nhsuk-u-font-size-16 nhsuk-u-font-weight-bold @(Model.DashboardTrayLearningResourceType == "courses" ? "active" : string.Empty)"
title="In progress">
Courses
</a>

<a asp-action="Index" asp-route-dashboardTrayLearningResourceType="elearning" [email protected] asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning"
class="subnavwhite-link text-nowrap nhsuk-u-padding-right-3 nhsuk-u-secondary-text-color nhsuk-u-font-size-16 nhsuk-u-font-weight-bold @(Model.DashboardTrayLearningResourceType == "elearning" ? "active" : string.Empty)"
title="Completed">
Elearning
</a>

<span class="nhsuk-u-padding-right-3">
<a asp-action="Index" asp-route-dashboardTrayLearningResourceType="all" [email protected] asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning"
class="nhsuk-u-padding-right-3 nhsuk-u-secondary-text-color nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-text-align-centre filterlink @(Model.DashboardTrayLearningResourceType == "all" ? "filteractive" : "filterinactive")"
title="All">
All
</a>
</span>
<span class="nhsuk-u-padding-right-3">
<a asp-action="Index" asp-route-dashboardTrayLearningResourceType="courses" [email protected] asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning"
class="subnavwhite-link text-nowrap nhsuk-u-padding-right-3 nhsuk-u-secondary-text-color nhsuk-u-font-size-16 nhsuk-u-font-weight-bold filterlink @(Model.DashboardTrayLearningResourceType == "courses" ? "filteractive" : "filterinactive")"
title="Courses">
Courses
</a>
</span>
<span class="nhsuk-u-padding-right-3">
<a asp-action="Index" asp-route-dashboardTrayLearningResourceType="elearning" [email protected] asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning"
class="subnavwhite-link text-nowrap nhsuk-u-padding-right-3 nhsuk-u-secondary-text-color nhsuk-u-font-size-16 nhsuk-u-font-weight-bold filterlink @(Model.DashboardTrayLearningResourceType == "elearning" ? "filteractive" : "filterinactive")"
title="Elearning">
Elearning
</a>
</span>
</div>
<div class="nhsuk-grid-row nhsuk-u-margin-bottom-2">
<div class="nhsuk-grid-column-full">
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class="nhsuk-card dashboard-card">
<div class="nhsuk-card__content dashboard-card-content">
<div>
<h3 class="nhsuk-card__heading nhsuk-heading-m line-clamp-2">
<h3 class="nhsuk-card__heading nhsuk-heading-m line-clamp-5">
<a class="nhsuk-card__link" asp-controller="Dashboard" asp-action="RecordDashboardNavigation" asp-route-eventType="@EventTypeEnum.DashBoardResourceView"
asp-route-url="@("/Resource/" + Model.Item2.ResourceReferenceId)" asp-route-resourceReference="@Model.Item2.ResourceReferenceId">@UtilityHelper.StripHtmlFromString(Model.Item2.Title)</a>
</h3>
Expand Down
21 changes: 14 additions & 7 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 @@ -12,8 +12,10 @@
case "recent-resources":
return "Recently added";
case "popular-resources":
default:
return "Most accessed";
case "my-recent-completed":
default:
return "Recently Completed";
}
}
var pagingViewModel = new DashBoardPagingViewModel
Expand All @@ -24,14 +26,15 @@
CatalogueDashboard = Model.Catalogues.Type,
CurrentPage = Model.Resources.CurrentPage,
TotalPages = Model.Resources.TotalPages,
TotalCount = Model.Resources.TotalCount
TotalCount = Model.Resources.TotalCount,
DashboardTrayLearningResourceType = Model.DashboardTrayLearningResourceType
};
}

<div class="dashboardTray">
<h2>Resources</h2>

<nav class="subnavbarwhite navbar-expand-md nhsuk-u-margin-bottom-5">
<nav class="subnavbarwhite nhsuk-bg-grey navbar-expand-md nhsuk-u-margin-bottom-5">
<input class="subnav-hidden-checkbox" id="resources-subnav-hidden-checkbox" role="button" type="checkbox" aria-controls="collapsingResourcesSubNavbar" aria-labelledby="resources-subnav-hidden-checkbox-label">
<div class="bar">
<div class="navbar-toggler navbar-toggler-left nhsuk-u-font-size-19">@GetActiveTabName()</div>
Expand All @@ -41,17 +44,21 @@

</label>
</div>
<div class="navbar-collapse collapse" id="collapsingResourcesSubNavbar">
<div class="navbar-collapse nhsuk-bg-grey collapse" id="collapsingResourcesSubNavbar">
<ul class="navbar-nav">
<li class="subnavwhite-item @(Model.Resources.Type == "rated-resources" ? "active" : string.Empty)">
<li class="subnavwhite-item nhsuk-bg-grey @(Model.Resources.Type == "my-recent-completed" ? "active" : string.Empty)">
<a tabindex="0" class="subnavwhite-link text-nowrap"
asp-controller="Home" asp-action="Index" asp-route-myLearningDashboard="@(Model.MyLearnings.Type)" asp-route-resourceDashboard="my-recent-completed" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="resources">Recently Completed</a>
</li>
<li class="subnavwhite-item nhsuk-bg-grey @(Model.Resources.Type == "rated-resources" ? "active" : string.Empty)">
<a tabindex="0" class="subnavwhite-link text-nowrap"
asp-controller="Home" asp-action="Index" asp-route-myLearningDashboard="@(Model.MyLearnings.Type)" asp-route-resourceDashboard="rated-resources" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="resources">Highly rated</a>
</li>
<li class="subnavwhite-item @(Model.Resources.Type == "recent-resources" ? "active" : string.Empty)">
<li class="subnavwhite-item nhsuk-bg-grey @(Model.Resources.Type == "recent-resources" ? "active" : string.Empty)">
<a tabindex="0" class="subnavwhite-link text-nowrap"
asp-controller="Home" asp-action="Index" asp-route-myLearningDashboard="@(Model.MyLearnings.Type)" asp-route-resourceDashboard="recent-resources" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="resources">Recently added</a>
</li>
<li class="subnavwhite-item @(Model.Resources.Type == "popular-resources" ? "active" : string.Empty)">
<li class="subnavwhite-item nhsuk-bg-grey @(Model.Resources.Type == "popular-resources" ? "active" : string.Empty)">
<a tabindex="0" class="subnavwhite-link text-nowrap"
asp-controller="Home" asp-action="Index" asp-route-myLearningDashboard="@(Model.MyLearnings.Type)" asp-route-resourceDashboard="popular-resources" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="resources">Most accessed</a>
</li>
Expand Down
6 changes: 0 additions & 6 deletions .../LearningHub.Nhs.OpenApi.Repositories/Repositories/Resources/ResourceVersionRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,15 +731,9 @@ public List<ResourceContributionDto> GetContributions(int userId, ResourceContri
var dashboardResources = new List<DashboardResourceDto>();
switch (dashboardType)
{
////case "my-certificates":
//// dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetMyLearningCertificatesDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
//// break;
case "my-recent-completed":
dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetMyRecentCompletedDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
break;
////case "my-in-progress":
//// dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetMyInProgressDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
// break;
case "recent-resources":
dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetRecentDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
break;
Expand Down
Loading