Skip to content

fix(#11184): update task filter UI to match reports filter #11193

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
mrjones-plip merged 8 commits into from
Jun 30, 2026
+34 −8
Merged

fix(#11184): update task filter UI to match reports filter #11193

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3bd4970
fix: update task filter UI to match reports filter
santhosh-7777 Jun 18, 2026
c69db7a
test: update overdue filter selector for radio button change
santhosh-7777 Jun 18, 2026
2697f3f
test: click radio input directly in filterByOverdue
santhosh-7777 Jun 19, 2026
dff84c5
Merge branch 'master' into fix/task-filter-ui-11184
mrjones-plip Jun 19, 2026
23c276b
fix: remove bold styling from overdue radio button labels
santhosh-7777 Jun 20, 2026
b3f84eb
Merge branch 'fix/task-filter-ui-11184' of https://github.com/santhos…
santhosh-7777 Jun 20, 2026
aa9687d
fix: move font-weight normal to CSS file for overdue filter labels
santhosh-7777 Jun 22, 2026
b96f39c
Merge branch 'master' into fix/task-filter-ui-11184
andrablaj Jun 30, 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
2 changes: 1 addition & 1 deletion api/resources/translations/messages-en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,7 @@ tasks.group.leave = Are you sure you want to leave this page? You will no longer
tasks.group.completed = All household tasks completed
tasks.group.title = Other household tasks
tasks.sidebar.filter.title = Filter
tasks.sidebar.filter.reset = Clear all filters
tasks.sidebar.filter.reset = Reset
tasks.sidebar.filter.submit = Apply
tasks.sidebar.filter.overdue = Due date
tasks.sidebar.filter.overdue.overdue = Overdue
Expand Down
5 changes: 3 additions & 2 deletions tests/page-objects/default/tasks/tasks.wdio.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,9 @@ const filterByOverdue = async (overdueOption) => {
await sidebarFilterSelectors.overdueAccordionBody().waitForDisplayed();
}

const option = sidebarFilterSelectors.overdueAccordionBody().$(`a*=${overdueOption}`);
await option.click();
const option = sidebarFilterSelectors.overdueAccordionBody().$(`label*=${overdueOption}`);
const radio = await option.$('input[type="radio"]');
await radio.click();
};

const filterByTaskType = async (taskType) => {
Expand Down
14 changes: 11 additions & 3 deletions webapp/src/ts/components/filters/overdue-filter/overdue-filter.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@
*ngFor="let status of statuses"
[class.selected]="filter?.selected.has(status)"
[class.disabled]="disabled">
<a role="menuitem" tabindex="-1" [attr.data-value]="status" (click)="!disabled && filter?.toggle(status)">
<label style="font-weight: normal;">

@mrjones-plip mrjones-plip Jun 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for this fix! I don't see any inline styles in any of the cht-core/webapp/src/ts/* files - can you please move this change to the appropriate file in cht-core/webapp/src/css/*?

Thanks!

@santhosh-7777 santhosh-7777 Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved the font-weight: normal style from inline HTML to the label block in webapp/src/css/sidebar-filter.less as requested.

<input
type="radio"
name="overdue-filter"
[value]="status"
[checked]="filter?.selected.has(status)"
[disabled]="disabled"
(change)="toggle(status)"
/>
{{ 'tasks.sidebar.filter.overdue.' + status | translate }}
</a>
</label>
</li>
</ul>
</div>
</div>
11 changes: 10 additions & 1 deletion webapp/src/ts/components/filters/overdue-filter/overdue-filter.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,19 @@ export class OverdueFilterComponent {
if (this.disabled) {
return;
}

this.filter.clear();
}

toggle(status: string) {
if (this.filter.selected.has(status)) {
this.filter.clear();
} else {
this.filter.clear();
this.filter.selected.add(status);
this.filter.apply();
}
}

countSelected() {
return this.filter?.countSelected();
}
Expand Down
9 changes: 8 additions & 1 deletion webapp/src/ts/modules/tasks/tasks-sidebar-filter.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@
</mat-expansion-panel>
</mat-accordion>
</div>

<div class="sidebar-footer">
<button type="button" class="btn btn-primary" (click)="toggleSidebarFilter()">
{{ 'tasks.sidebar.filter.submit' | translate }}
</button>
</div>

</div>
</section>

Expand All @@ -88,4 +95,4 @@
<span>{{ numSelected | translate }}</span>
<span class="fa fa-times" (click)="clearFilters(filters); $event.stopPropagation();"></span>
</div>
</ng-template>
</ng-template>