From 9f4ec4c9f52167ec3d3b388ffa01efdef2f44d2a Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 29 Nov 2023 18:47:16 +0530 Subject: [PATCH] Improved: fetching filters for partyId null, app title, default selected calendar --- public/index.html | 2 +- src/components/CustomScheduleModal.vue | 7 +++++-- src/store/modules/facility/actions.ts | 4 ++-- src/views/FacilityDetails.vue | 8 ++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/public/index.html b/public/index.html index d188a773..4d91e891 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,7 @@ - HotWax Commerce + Facilities diff --git a/src/components/CustomScheduleModal.vue b/src/components/CustomScheduleModal.vue index 203e420f..4ddfc5aa 100644 --- a/src/components/CustomScheduleModal.vue +++ b/src/components/CustomScheduleModal.vue @@ -12,12 +12,13 @@ - {{ translate("Name") }} + + {{ translate("Name") }} * + {{ translate("Daily timings") }} - {{ isDailyTimingsChecked }} @@ -91,6 +92,7 @@ import { IonLabel, IonList, IonModal, + IonText, IonTitle, IonToggle, IonToolbar, @@ -123,6 +125,7 @@ export default defineComponent({ IonLabel, IonList, IonModal, + IonText, IonTitle, IonToggle, IonToolbar, diff --git a/src/store/modules/facility/actions.ts b/src/store/modules/facility/actions.ts index e614c4be..45be5ffe 100644 --- a/src/store/modules/facility/actions.ts +++ b/src/store/modules/facility/actions.ts @@ -370,7 +370,8 @@ const actions: ActionTree = { let parties = [] const params = { inputFields: { - facilityId: payload.facilityId + facilityId: payload.facilityId, + partyId_op: 'not-empty' }, entityName: "FacilityAndParty", filterByDate: 'Y', @@ -392,7 +393,6 @@ const actions: ActionTree = { throw resp.data } } catch(err) { - showToast(translate("Something went wrong")) logger.error('Failed to fetch facility parties', err) } diff --git a/src/views/FacilityDetails.vue b/src/views/FacilityDetails.vue index 3326eeab..225b8c7e 100644 --- a/src/views/FacilityDetails.vue +++ b/src/views/FacilityDetails.vue @@ -92,7 +92,7 @@ {{ translate("Custom schedule") }} - + {{ translate("Add operating hours") }} @@ -324,7 +324,7 @@ - {{ partyRoles[party.roleTypeId] }} + {{ partyRoles[party.roleTypeId] ? partyRoles[party.roleTypeId] : '-' }}

{{ translate("role") }}

 @@ -375,7 +375,7 @@ - {{ location.positionId }} + {{ location.positionId ? location.positionId : '-' }}

{{ translate("sequence") }}

 @@ -497,7 +497,7 @@ export default defineComponent({ defaultDaysToShip: '', // not assinging 0 by default as it will convey the user that the facility can ship same day, but actually defaultDays are not setup on the facility primaryMember: {} as any, isCalendarFound: true, - selectedCalendarId: 'DEFAULT' + selectedCalendarId: '' } }, computed: {