Skip to content

fix(crosstab): invert category filter selection #196

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
nana-boateng merged 1 commit into from
Sep 10, 2025
Merged

fix(crosstab): invert category filter selection #196

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
76 changes: 45 additions & 31 deletions src/app/components/body/cross-tabulation/variable-selection/dropdown/dropdown.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<h3>
{{ selectedVariableLabel() || 'No variable selected' }}
@if (variableOrientation() === 'cols') {
[{{'CROSS_TABULATION.COLUMN' | translate}}]
[{{ 'CROSS_TABULATION.COLUMN' | translate }}]
} @else if (variableOrientation() === 'rows') {
[{{'CROSS_TABULATION.ROW' | translate}}]
[{{ 'CROSS_TABULATION.ROW' | translate }}]
} @else {
[{{'CROSS_TABULATION.SELECT_ROW_COL' | translate}}]
[{{ 'CROSS_TABULATION.SELECT_ROW_COL' | translate }}]
}
</h3>
</div>
Expand All @@ -23,12 +23,16 @@ <h3>
panelStyleClass="rounded bg-base-100 border border-slate-300"
>
<ng-template pTemplate="selectedItem" let-item>{{
item === 'rows' ? ('CROSS_TABULATION.ROW' | translate) : ('CROSS_TABULATION.COLUMN' | translate)
item === 'rows'
? ('CROSS_TABULATION.ROW' | translate)
: ('CROSS_TABULATION.COLUMN' | translate)
}}</ng-template>
<ng-template pTemplate="item" let-item>
<span class="px-2">{{
item === 'rows' ? ('CROSS_TABULATION.ROW' | translate) : ('CROSS_TABULATION.COLUMN' | translate)
}}</span>
<span class="px-2">{{
item === 'rows'
? ('CROSS_TABULATION.ROW' | translate)
: ('CROSS_TABULATION.COLUMN' | translate)
}}</span>
</ng-template>
</p-dropdown>
</label>
Expand All @@ -47,7 +51,7 @@ <h3>
panelStyleClass="rounded bg-base-100 border border-slate-300"
>
<ng-template pTemplate="item" let-item>
<span class="px-2">{{ item.value.labl }}</span>
<span class="px-2">{{ item.value.labl }}</span>
</ng-template>
</p-dropdown>
</label>
Expand Down Expand Up @@ -85,14 +89,16 @@ <h3>
</ng-template>
<ng-template pTemplate="item" let-items>
<span
[ariaDisabled]="variablesAlreadySelected().includes(items.variableID)"
[ariaDisabled]="
variablesAlreadySelected().includes(items.variableID)
"
[ngClass]="{
'text-success hover:bg-current':
variablesAlreadySelected().includes(items.variableID)
variablesAlreadySelected().includes(items.variableID),
}"
class="hover:bg-base-300 py-2.5 w-full h-full"
>
{{ items.label }}
{{ items.label }}
</span>
</ng-template>
<!-- <ng-template pTemplate="selectedItem" let-value>
Expand All @@ -113,7 +119,7 @@ <h3>
[options]="filteredCategories() | keyvalue"
[ngModel]="filteredMissing()"
placeholder="{{ 'CROSS_TABULATION.NONE' | translate }}"
[disabled]="!hasCategories()"
[disabled]="!hasCategories()"
(ngModelChange)="changeMissingValues($event)"
optionLabel="value"
optionValue="key"
Expand All @@ -123,34 +129,37 @@ <h3>
<ng-template pTemplate="empty">
<span>{{ 'CROSS_TABULATION.NO_CATEGORIES' | translate }}</span>
</ng-template>

<ng-template pTemplate="selectedItems" let-items>
@if (!hasCategories()) {
<span>{{ 'CROSS_TABULATION.NONE' | translate }}</span>
} @else {

@for (item of items; track $index) {
<span *ngIf="$index === 0" class="">
{{ item.value }}
</span>
<span *ngIf="$index > 0" class="-ml-1">
, {{ item.value }}
</span>
} @empty {
<span>{{ 'CROSS_TABULATION.NONE' | translate }}</span>
}
@for (item of items; track $index) {
<span *ngIf="$index === 0" class="">
{{ item.value }}
</span>
<span *ngIf="$index > 0" class="-ml-1"> , {{ item.value }} </span>
} @empty {
<span>{{ 'CROSS_TABULATION.NONE' | translate }}</span>
}
}
</ng-template>
<ng-template let-item pTemplate="item">
<div class="">
<input *ngIf="!filteredMissing().includes(item.key)" type="checkbox" />
<input *ngIf="filteredMissing().includes(item.key)" checked type="checkbox" />
<div class="">
<input
*ngIf="filteredMissing().includes(item.key)"
type="checkbox"
/>
<input
*ngIf="!filteredMissing().includes(item.key)"
checked
type="checkbox"
/>
{{ item.value }}
</div>
</ng-template>
<ng-template pTemplate="closeicon" class="hidden"></ng-template>
<ng-template pTemplate="filtericon" class="hidden"></ng-template>

</p-multiSelect>
<!-- <dct-multiselect-dropdown
(changeSelectedItems)="changeMissingValues($event)"
Expand All @@ -165,7 +174,10 @@ <h3>
</div>
<div class="w-full md:w-1/12 relative">
<div class="flex flex-col mt-4 mb-2">
<button (click)="removeVariable(index())" class="p-2 btn-action md:absolute bottom-2 right-0 border rounded border-slate-300 md:border-0">
<button
(click)="removeVariable(index())"
class="p-2 btn-action md:absolute bottom-2 right-0 border rounded border-slate-300 md:border-0"
>
<svg
class="mx-2 w-6 h-6"
fill="none"
Expand All @@ -180,8 +192,10 @@ <h3>
stroke-linejoin="round"
/>
</svg>
<span class="sr-only">{{ 'CROSS_TABULATION.REMOVE_ROW' | translate }}</span>
<span class="sr-only">{{
'CROSS_TABULATION.REMOVE_ROW' | translate
}}</span>
</button>
</div>
</div>
</div>
</div>
⚡