Skip to content

Added HTMX to filtering and sorting for completed view #3653

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
hortha merged 1 commit into from
Jul 27, 2026
Merged

Added HTMX to filtering and sorting for completed view #3653

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
85 changes: 62 additions & 23 deletions src/TeachingRecordSystem.SupportUi/Pages/SupportTasks/Completed.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@

<div class="trs-display-flex trs-column-gap-1 govuk-!-margin-bottom-3">
<govuk-select for="Type"
select-hx-get="@LinkGenerator.SupportTasks.Completed(Model.Search, type: null, Model.CompletedByUserId, Model.SortBy, Model.SortDirection)"
select-hx-trigger="change"
select-hx-select="main"
select-hx-target="main"
select-hx-swap="outerHTML"
select-hx-push-url="true"
class="govuk-!-width-one-half govuk-!-margin-bottom-0"
select-class="govuk-!-width-full">
<govuk-select-label class="govuk-label--s">Task type</govuk-select-label>
Expand All @@ -51,6 +57,12 @@
</govuk-select>

<govuk-select for="CompletedByUserId"
select-hx-get="@LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, completedByUserId: null, Model.SortBy, Model.SortDirection)"
select-hx-trigger="change"
select-hx-select="main"
select-hx-target="main"
select-hx-swap="outerHTML"
select-hx-push-url="true"
class="govuk-!-width-one-half govuk-!-margin-bottom-0"
select-class="govuk-!-width-full">
<govuk-select-label class="govuk-label--s">Completed by</govuk-select-label>
Expand All @@ -66,8 +78,15 @@

<div class="trs-vertical-filters__actions">
<div class="govuk-button-group govuk-!-margin-bottom-0">
<govuk-button type="submit">Apply filters</govuk-button>
<noscript class="trs-display-flex">
<govuk-button type="submit">Apply filters</govuk-button>
</noscript>
<a href="@LinkGenerator.SupportTasks.Completed()"
hx-get="@LinkGenerator.SupportTasks.Completed()"
hx-select="main"
hx-target="main"
hx-swap="outerHTML"
hx-push-url="true"
class="govuk-link">
Clear all
</a>
Expand All @@ -94,27 +113,47 @@
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header"
sort-direction="@(Model.SortBy == CompletedTasksSortByOption.Subject ? Model.SortDirection : null)"
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.Subject, direction))">
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.Subject, direction))"
use-htmx="true"
hx-select="main"
hx-target="main"
hx-push-url="true">
Task
</th>
<th scope="col" class="govuk-table__header trs-!-width-150"
sort-direction="@(Model.SortBy == CompletedTasksSortByOption.CompletedOn ? Model.SortDirection : null)"
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.CompletedOn, direction))">
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.CompletedOn, direction))"
use-htmx="true"
hx-select="main"
hx-target="main"
hx-push-url="true">
Completed on
</th>
<th scope="col" class="govuk-table__header trs-!-width-180"
sort-direction="@(Model.SortBy == CompletedTasksSortByOption.TaskType ? Model.SortDirection : null)"
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.TaskType, direction))">
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.TaskType, direction))"
use-htmx="true"
hx-select="main"
hx-target="main"
hx-push-url="true">
Type
</th>
<th scope="col" class="govuk-table__header trs-!-width-180"
sort-direction="@(Model.SortBy == CompletedTasksSortByOption.Outcome ? Model.SortDirection : null)"
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.Outcome, direction))">
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.Outcome, direction))"
use-htmx="true"
hx-select="main"
hx-target="main"
hx-push-url="true">
Outcome
</th>
<th scope="col" class="govuk-table__header trs-!-width-130"
sort-direction="@(Model.SortBy == CompletedTasksSortByOption.CompletedBy ? Model.SortDirection : null)"
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.CompletedBy, direction))">
link-template="@(direction => LinkGenerator.SupportTasks.Completed(Model.Search, Model.Type, Model.CompletedByUserId, CompletedTasksSortByOption.CompletedBy, direction))"
use-htmx="true"
hx-select="main"
hx-target="main"
hx-push-url="true">
Completed by
</th>
</tr>
Comment thread
hortha marked this conversation as resolved.
Expand Down Expand Up @@ -143,23 +182,23 @@
</table>
}

<div aria-atomic="true" aria-live="polite" role="status" id="status" class="govuk-visually-hidden">
@if (Model.Results!.Count == 0)
{
<text>No matching tasks found.</text>
}
else
{
<text>
Showing @Model.Results!.Count of @Model.TotalTaskCount matching tasks
sorted by @Model.OrderedByLabel (@Model.OrderDirectionLabel).
</text>
}
</div>

<div id="pagination-container">
<partial name="_Pagination" model="@Model.Pagination" />
</div>
<partial name="_Pagination" model="@Model.Pagination" />

</div>
</div>

@section ContainerEnd {
<div aria-atomic="true" aria-live="polite" role="status" id="status" class="govuk-visually-hidden" hx-swap-oob="innerHTML">
@if (Model.Results!.Count == 0)
{
<text>No matching tasks found.</text>
}
else
{
<text>
Showing @Model.Results!.Count of @Model.TotalTaskCount matching tasks
sorted by @Model.OrderedByLabel (@Model.OrderDirectionLabel).
</text>
}
</div>
}
Loading