Skip to content
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

Improved: UI when displaying selected facilities on the completed page filter(#420) #435

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Improved: UI when displaying selected facilities on the completed page filter(#420) #435

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
34 changes: 14 additions & 20 deletions src/components/Filters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@
<ion-checkbox :value="query.noFacility" @ionChange="updateQuery('noFacility', $event.detail.checked)">{{ translate("No facility") }}</ion-checkbox>
</ion-item>

<ion-item button v-if="showAdditionalFilters().selectedFacilities">
<ion-icon slot="start" :icon="removeCircleOutline"/>
<ion-label>{{ getSelectedFacilities() }}</ion-label>
<ion-button color="danger" v-if="query.facilityIds.length" fill="clear" slot="end" @click="updateQuery('facilityIds', [])">
<ion-icon slot="icon-only" :icon="closeOutline"/>
</ion-button>
</ion-item>
<template v-if="showAdditionalFilters().selectedFacilities">
<ion-item v-for="facilityId in query.facilityIds" :key="facilityId">
<ion-label>{{ getFacilityName(facilityId) }}</ion-label>
<ion-button color="danger" v-if="query.facilityIds.length" fill="clear" slot="end" @click="updateQuery('facilityIds', query.facilityIds.filter((id: string) => id !== facilityId))">
<ion-icon slot="icon-only" :icon="closeCircleOutline"/>
</ion-button>
</ion-item>
<ion-item v-show="!query.facilityIds.length">
<ion-label>{{ translate("All facilities selected") }}</ion-label>
</ion-item>
</template>

<ion-item-divider v-if="showAdditionalFilters().date">
<ion-label>{{ translate("Date") }}</ion-label>
Expand Down Expand Up @@ -133,7 +137,7 @@ import {
IonToolbar
} from "@ionic/vue";
import { computed, ref } from "vue";
import { closeOutline, removeCircleOutline, businessOutline, gitBranchOutline, gitPullRequestOutline, locateOutline } from "ionicons/icons";
import { closeCircleOutline, businessOutline, gitBranchOutline, gitPullRequestOutline, locateOutline } from "ionicons/icons";
import { translate } from '@/i18n'
import store from "@/store";
import router from "@/router";
Expand All @@ -159,18 +163,8 @@ async function updateQuery(key: string, value: any) {
await store.dispatch("count/updateQuery", { key, value })
}

function getSelectedFacilities() {
let value = query.value.facilityIds

// Initially when adding a filter no value is selected thus returning "All facilities selected" as default value
if(!value.length) {
return "All facilities selected";
}
return facilities.value.map((facility: any) => {
if(value?.includes(facility.facilityId)) {
return facility.facilityName || facility.facilityId
}
}).filter((facility: any) => facility).join(", ")
function getFacilityName(facilityId: string) {
return facilities.value.find((facility: any) => facility.facilityId === facilityId)?.facilityName || facilityId
}

function getSelectedValue() {
Expand Down
1 change: 1 addition & 0 deletions src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Accepted by user": "Accepted by user",
"After": "After",
"All": "All",
"All facilities selected": "All facilities selected",
"All of the item(s) are accepted": "All of the item(s) are accepted",
"Add product": "Add product",
"Add to count": "Add to count",
Expand Down
Loading