Skip to content

DLSV2-703 Search result count check implemented prior to display result. #1432

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 1 commit into from
Oct 18, 2022
Merged

DLSV2-703 Search result count check implemented prior to display result. #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
137 changes: 71 additions & 66 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/_MyFrameworks.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,72 +14,77 @@
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
<partial name="SearchablePage/_TopPagination" model="Model" />
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />

<table role="table" class="nhsuk-table-responsive">
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Frameworks you are working on</caption>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Framework
</th>
<th role="columnheader" class="" scope="col">
Created
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
<th role="columnheader" class="" scope="col">
Owner
</th>
<th role="columnheader" class="" scope="col">
Actions
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var framework in Model.BrandedFrameworks) {
<tr role="row" class="nhsuk-table__row framework-row">
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Framework </span>
<span class="framework-name">
@framework.FrameworkName
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Created </span>
<span class="framework-created-date">
@framework.CreatedDate.ToShortDateString()
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Status </span>
<span class="framework-publish-status">
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Owner </span>
<span class="framework-owner">
@framework.Owner
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (framework.UserRole > 1) {
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View/Edit
</a>
} else if (framework.UserRole == 1) {
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
Review
</a>
}
</td>
</tr>
}
</tbody>
</table>

@if (Model.MatchingSearchResults > 0)
{
<table role="table" class="nhsuk-table-responsive">
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Frameworks you are working on</caption>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Framework
</th>
<th role="columnheader" class="" scope="col">
Created
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
<th role="columnheader" class="" scope="col">
Owner
</th>
<th role="columnheader" class="" scope="col">
Actions
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var framework in Model.BrandedFrameworks)
{
<tr role="row" class="nhsuk-table__row framework-row">
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Framework </span>
<span class="framework-name">
@framework.FrameworkName
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Created </span>
<span class="framework-created-date">
@framework.CreatedDate.ToShortDateString()
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Status </span>
<span class="framework-publish-status">
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Owner </span>
<span class="framework-owner">
@framework.Owner
</span>
</td>
<td role="cell" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (framework.UserRole > 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View/Edit
</a>
}
else if (framework.UserRole == 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
Review
</a>
}
</td>
</tr>
}
</tbody>
</table>
}
<partial name="SearchablePage/_BottomPagination" model="Model" />

</form>
Expand Down
146 changes: 74 additions & 72 deletions DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,80 @@
@using DigitalLearningSolutions.Data.Models.Frameworks
@model IEnumerable<BrandedFramework>
<table role="table" class="nhsuk-table-responsive">
@if (Model != null && Model.Count() > 0)
{
<table role="table" class="nhsuk-table-responsive">
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">
Frameworks
</caption>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Framework
</th>
<th role="columnheader" class="" scope="col">
Created
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
<th role="columnheader" class="" scope="col">
Owner
</th>
<th role="columnheader" class="" scope="col">
Actions
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var framework in Model)
{
<tr role="row" class="nhsuk-table__row framework-row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Framework </span>
<span class="framework-brand">
@framework.Brand
</span>
@if (framework.Category != null)
{<span>/</span><span class="framework-category"> @framework.Category </span>}<span>/</span>
<span class="framework-name nhsuk-u-font-weight-bold">
@framework.FrameworkName
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Created </span>
<span class="framework-created-date">
@framework.CreatedDate.ToShortDateString()
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Status </span>
<span class="framework-publish-status">
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Owner </span>
<span class="framework-owner">
@framework.Owner
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (framework.UserRole > 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View/Edit
</a>
}
else
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View
</a>
}
</td>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Framework
</th>
<th role="columnheader" class="" scope="col">
Created
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
<th role="columnheader" class="" scope="col">
Owner
</th>
<th role="columnheader" class="" scope="col">
Actions
</th>
</tr>
}
</tbody>
</table>

</thead>
<tbody class="nhsuk-table__body">
@foreach (var framework in Model)
{
<tr role="row" class="nhsuk-table__row framework-row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Framework </span>
<span class="framework-brand">
@framework.Brand
</span>
@if (framework.Category != null)
{<span>/</span><span class="framework-category"> @framework.Category </span>}<span>/</span>
<span class="framework-name nhsuk-u-font-weight-bold">
@framework.FrameworkName
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Created </span>
<span class="framework-created-date">
@framework.CreatedDate.ToShortDateString()
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Status </span>
<span class="framework-publish-status">
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Owner </span>
<span class="framework-owner">
@framework.Owner
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (framework.UserRole > 1)
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View/Edit
</a>
}
else
{
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
View
</a>
}
</td>
</tr>
}
</tbody>
</table>
}