Skip to content

TD-6181: SIT defects #1416

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 17, 2025
Merged

TD-6181: SIT defects #1416

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c1f4cb
TD-6181: SIT defects
swapnamol-abraham Sep 17, 2025
4224a42
Added courses also in the fliterSummary
swapnamol-abraham Sep 17, 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
21 changes: 10 additions & 11 deletions LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,6 @@
<div class="nhsuk-bg-pale-blue nhsuk-card-banner nhsuk-card-banner-empty"></div>
}
</div>
@if (item.Providers?.Count > 0)
{
<div class="card-provider-details">
@ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name)
</div>
}
else
{
<div class="card-provider-details @cardStyle"></div>
}

<div class="nhsuk-card__content catalogue-card-content">

<h3 class="nhsuk-card__heading nhsuk-heading-m">
Expand Down Expand Up @@ -132,6 +121,16 @@
</div>
</div>
</div>
@if (item.Providers?.Count > 0)
{
<div class="card-provider-details">
@ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name)
</div>
}
else
{
<div class="card-provider-details @cardStyle"></div>
}
</div>

</li>
Expand Down
21 changes: 10 additions & 11 deletions LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,6 @@
<div class="nhsuk-bg-pale-blue nhsuk-card-banner nhsuk-card-banner-empty"></div>
}
</div>
@if (item.Providers?.Count > 0)
{
<div class="card-provider-details">
@ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name)
</div>
}
else
{
<div class="card-provider-details @cardStyle"></div>
}

<div class="nhsuk-card__content catalogue-card-content">

<h3 class="nhsuk-card__heading nhsuk-heading-m">
Expand Down Expand Up @@ -119,6 +108,16 @@
</div>
</div>
</div>
@if (item.Providers?.Count > 0)
{
<div class="card-provider-details">
@ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name)
</div>
}
else
{
<div class="card-provider-details @cardStyle"></div>
}
</div>

</li>
Expand Down
215 changes: 107 additions & 108 deletions LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
var suggestedTerm = Model.DidYouMeanEnabled ? Model.SuggestedCatalogue : searhTerm;

string GetCatalogueUrl(string catalogueUrl, SearchClickPayloadModel list, int catalogueId)
{
{
string encodedCatalogueUrl = HttpUtility.UrlEncode("/Catalogue/" + catalogueUrl);
string searchSignalQueryEncoded = HttpUtility.UrlEncode(HttpUtility.UrlDecode(list?.SearchSignal?.Query));
string groupId = HttpUtility.UrlEncode(Model.GroupId.ToString());
Expand All @@ -24,125 +24,124 @@
&GroupId={groupId}&searchId={list?.SearchSignal.SearchId}&timeOfSearch={list?.SearchSignal.TimeOfSearch}&userQuery={HttpUtility.UrlEncode(list?.SearchSignal?.UserQuery)}
&query={searchSignalQueryEncoded}&name={list?.DocumentFields?.Name}";
return url;
}
}

}

@section styles{
<link rel="stylesheet" type="text/css" href="~/css/nhsuk/pages/catalogue.css" asp-append-version="true" />
@section styles {
<link rel="stylesheet" type="text/css" href="~/css/nhsuk/pages/catalogue.css" asp-append-version="true" />
}

<div class="nhsuk-width-container app-width-container" style="width:100%">
@if (hasSearchTerm)
{
var parms = new Dictionary<string, string> { { "term", searhTerm } };
<vc:back-link asp-controller="Search" asp-action="Index" asp-all-route-data="@parms" link-text="Back to: Search results" />
}
else
{
<vc:back-link asp-controller="Home" asp-action="Index" link-text="Back to: Learning Hub" />
}
<h1 class="nhsuk-u-margin-bottom-5">
@(hasSearchTerm ? $"Search results for {suggestedTerm}" : "All catalogues")
</h1>

<h2 class="nhsuk-u-margin-bottom-5">
@($"{Model.TotalCount} catalogue results")
</h2>


<ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred">

@foreach (var item in Model.Catalogues)
@if (hasSearchTerm)
{
<li class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item">

<div class="nhsuk-card catalogue-card">

<div class="nhsuk-card-banner-container">
@if (!string.IsNullOrWhiteSpace(item.CardImageUrl))
{
<img class="nhsuk-card__img nhsuk-card-banner" src="/api/catalogue/download-image/@item.CardImageUrl" alt="@item.Name" />
}
else if (!string.IsNullOrWhiteSpace(item.BannerUrl))
{
<img class="nhsuk-card__img nhsuk-card-banner" src="/api/catalogue/download-image/@item.BannerUrl" alt="@item.Name" />
}
else
{
<div class="nhsuk-bg-pale-blue nhsuk-card-banner nhsuk-card-banner-empty"></div>
}
</div>
@if (item.Providers?.Count > 0)
{
<div class="card-provider-details">
@ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name)
</div>
}
else
{
<div class="card-provider-details @cardStyle"></div>
}

<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>
</h3>

<div class="nhsuk-card__description catalogue-card-body">
<div class="line-clamp-3 nhsuk-u-margin-bottom-2point5">
@Html.Raw(item.Description)
</div>

<div class="catalogue-meta">
<div>
<div>
@if (item.RestrictedAccess)
var parms = new Dictionary<string, string> { { "term", searhTerm } };
<vc:back-link asp-controller="Search" asp-action="Index" asp-all-route-data="@parms" link-text="Back to: Search results" />
}
else
{
<vc:back-link asp-controller="Home" asp-action="Index" link-text="Back to: Learning Hub" />
}
<h1 class="nhsuk-u-margin-bottom-5">
@(hasSearchTerm ? $"Search results for {suggestedTerm}" : "All catalogues")
</h1>

<h2 class="nhsuk-u-margin-bottom-5">
@($"{Model.TotalCount} catalogue results")
</h2>


<ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred">

@foreach (var item in Model.Catalogues)
{
<li class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item">

<div class="nhsuk-card catalogue-card">

<div class="nhsuk-card-banner-container">
@if (!string.IsNullOrWhiteSpace(item.CardImageUrl))
{
<img class="nhsuk-card__img nhsuk-card-banner" src="/api/catalogue/download-image/@item.CardImageUrl" alt="@item.Name" />
}
else if (!string.IsNullOrWhiteSpace(item.BannerUrl))
{
<img class="nhsuk-card__img nhsuk-card-banner" src="/api/catalogue/download-image/@item.BannerUrl" alt="@item.Name" />
}
else
{
<div class="nhsuk-bg-pale-blue nhsuk-card-banner nhsuk-card-banner-empty"></div>
}
</div>
<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>
</h3>

<div class="nhsuk-card__description catalogue-card-body">
<div class="line-clamp-3 nhsuk-u-margin-bottom-2point5">
@Html.Raw(item.Description)
</div>

<div class="catalogue-meta">
<div>
<div>
@if (item.RestrictedAccess)
{
<div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@((item.HasAccess || this.User.IsInRole("Administrator")) ? "Access Granted" : "Access restricted")</div>
}
</div>
<div>
<a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
asp-route-bookmarked="@item.IsBookmarked"
asp-route-id="@item.BookmarkId"
asp-route-title="@item.Name.Truncate(60)"
asp-route-nodeId="@item.NodeId"
asp-route-path="@item.Url"
asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">
@(item.IsBookmarked ? "Remove from" : "Add to") my bookmarks
</a>
</div>
</div>
<div>
@if (item.Providers?.Count > 0)
{
var provider = item.Providers.First();
<img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
}
else if (!string.IsNullOrEmpty(item.BadgeUrl))
{
<img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-card-badge" />
}
</div>
</div>
</div>
</div>
@if (item.Providers?.Count > 0)
{
<div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@((item.HasAccess || this.User.IsInRole("Administrator")) ? "Access Granted" : "Access restricted")</div>
<div class="card-provider-details">
@ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name)
</div>
}
</div>
<div>
<a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
asp-route-bookmarked="@item.IsBookmarked"
asp-route-id="@item.BookmarkId"
asp-route-title="@item.Name.Truncate(60)"
asp-route-nodeId="@item.NodeId"
asp-route-path="@item.Url"
asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">
@(item.IsBookmarked ? "Remove from" : "Add to") my bookmarks
</a>
</div>
</div>
<div>
@if (item.Providers?.Count > 0)
else
{
var provider = item.Providers.First();
<img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
<div class="card-provider-details @cardStyle"></div>
}
else if (!string.IsNullOrEmpty(item.BadgeUrl))
{
<img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-card-badge" />
}
</div>
</div>
</div>
</div>
</div>

</li>
</li>
}
</ul>

@if (Model.TotalCount > 9)
{
var currentPage = this.ViewBag.PageIndex;
int totalPage = (Model.TotalCount / 9) + (Model.TotalCount % 9 == 0 ? 0 : 1);
var searchQueryParam = hasSearchTerm ? $"&term={searhTerm}" : string.Empty;
var prevUrl = $"/catalogues?pageindex={currentPage - 1}{searchQueryParam}";
var nextUrl = $"/catalogues?pageindex={currentPage + 1}{searchQueryParam}";

@await Html.PartialAsync("_Pagination", new PaginationViewModel(currentPage, totalPage, prevUrl, nextUrl))
}
</ul>

@if (Model.TotalCount > 9)
{
var currentPage = this.ViewBag.PageIndex;
int totalPage = (Model.TotalCount / 9) + (Model.TotalCount % 9 == 0 ? 0 : 1);
var searchQueryParam = hasSearchTerm ? $"&term={searhTerm}" : string.Empty;
var prevUrl = $"/catalogues?pageindex={currentPage - 1}{searchQueryParam}";
var nextUrl = $"/catalogues?pageindex={currentPage + 1}{searchQueryParam}";

@await Html.PartialAsync("_Pagination", new PaginationViewModel(currentPage, totalPage, prevUrl, nextUrl))
}
</div>
Loading
Loading