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

Implemented: single facility selection for facility login(#67) #69

Merged
merged 3 commits into from
Dec 26, 2023
Merged

Implemented: single facility selection for facility login(#67) #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eca7989
Implemented: single facility selection for facility login(#67)
amansinghbais Dec 22, 2023
cba064f
Improved: labels to be displayed on select facility items (#67)
amansinghbais Dec 22, 2023
3e8e6d4
Improved: code for single facility selection on user-details page(#67)
amansinghbais Dec 22, 2023
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
25 changes: 22 additions & 3 deletions src/components/SelectFacilityModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ion-header>

<ion-content>
<ion-list>
<ion-list v-if="!isFacilityLogin">
<ion-item v-for="facility in facilities" :key="facility.facilityId">
<ion-label>
{{ facility.facilityName }}
Expand All @@ -20,7 +20,19 @@
<ion-checkbox slot="end" :checked="isSelected(facility.facilityId)" @ionChange="toggleFacilitySelection(facility)" />
</ion-item>
</ion-list>


<ion-list v-else>
<ion-radio-group :value="selectedFacilities[0].facilityId" @ionChange="updateSelectedFacility($event)">
<ion-item v-for="facility in facilities" :key="facility.facilityId">
<ion-label>
{{ facility.facilityName }}
<p>{{ facility.facilityId }}</p>
</ion-label>
<ion-radio slot="end" :value="facility.facilityId"></ion-radio>
</ion-item>
</ion-radio-group>
</ion-list>

<ion-fab @click="saveFacilities()" vertical="bottom" horizontal="end" slot="fixed">
<ion-fab-button>
<ion-icon :icon="saveOutline" />
Expand All @@ -42,6 +54,8 @@ import {
IonItem,
IonLabel,
IonList,
IonRadio,
IonRadioGroup,
IonTitle,
IonToolbar,
modalController
Expand All @@ -65,10 +79,12 @@ export default defineComponent({
IonItem,
IonLabel,
IonList,
IonRadio,
IonRadioGroup,
IonTitle,
IonToolbar,
},
props: ["selectedFacilities"],
props: ["selectedFacilities", "isFacilityLogin"],
data() {
return {
selectedFacilityValues: JSON.parse(JSON.stringify(this.selectedFacilities)),
Expand Down Expand Up @@ -110,6 +126,9 @@ export default defineComponent({
},
isSelected(facilityId: any) {
return this.selectedFacilityValues.some((facility: any) => facility.facilityId === facilityId);
},
updateSelectedFacility(event: CustomEvent) {
this.selectedFacilityValues = this.facilities.filter((facility: any) => facility.facilityId === event.detail.value)
}
},
setup() {
Expand Down
4 changes: 3 additions & 1 deletion src/store/modules/util/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { showToast } from '@/utils'
import { hasError } from '@/adapter'
import { translate } from '@hotwax/dxp-components'
import { UserService } from '@/services/UserService'

Check warning on line 9 in src/store/modules/util/actions.ts

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (18.x) 

'UserService' is defined but never used

Check warning on line 9 in src/store/modules/util/actions.ts

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (20.x) 

'UserService' is defined but never used

const actions: ActionTree<UtilState, RootState> = {
async fetchRoles({ commit, state }) {
Expand Down Expand Up @@ -104,7 +104,9 @@
const payload = {
"inputFields": {
"parentTypeId": "VIRTUAL_FACILITY",
"parentTypeId_op": "notEqual"
"parentTypeId_op": "notEqual",
"facilityTypeId": "VIRTUAL_FACILITY",
"facilityTypeId_op": "notEqual"
},
"entityName": "FacilityAndType",
"viewSize": 100 // keeping view size 100 as considering that we will have max 100 facilities
Expand Down
10 changes: 9 additions & 1 deletion src/views/UserDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,9 +550,17 @@ export default defineComponent({
return productStoreActionsPopover.present();
},
async selectFacility() {
let componentProps = {
selectedFacilities: this.selectedUser.facilities
} as any

if(this.selectedUser.partyTypeId === 'PARTY_GROUP') {
componentProps['isFacilityLogin'] = true
}

const selectFacilityModal = await modalController.create({
component: SelectFacilityModal,
componentProps: { selectedFacilities: this.selectedUser.facilities }
componentProps
});

selectFacilityModal.onDidDismiss().then( async (result) => {
Expand Down
4 changes: 2 additions & 2 deletions src/views/UserQuickSetup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
{{ facility.facilityName }}
<p>{{ facility.facilityId }}</p>
</ion-label>
<ion-checkbox slot="end" :checked="true" @ionChange="toggleFacilitySelection(facility)" />
<ion-checkbox v-if="!isFacilityLogin" slot="end" :checked="true" @ionChange="toggleFacilitySelection(facility)" />
</ion-item>
</ion-list>

Expand Down Expand Up @@ -429,7 +429,7 @@ export default defineComponent({
async addFacilities() {
const selectFacilityModal = await modalController.create({
component: SelectFacilityModal,
componentProps: { selectedFacilities: this.selectedFacilities }
componentProps: { selectedFacilities: this.selectedFacilities, isFacilityLogin: this.isFacilityLogin() }
});

selectFacilityModal.onDidDismiss().then((result) => {
Expand Down
Loading