Merge branch 'main' of https://github.com/hotwax/facilities into impr…

…ovements
hotwax · Nov 30, 2023 · 652712f · 652712f
2 parents 4b4ebd1 + 19a2cc7
commit 652712f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>HotWax Commerce</title>
+    <title>Facilities</title>
 
     <base href="/" />
 

diff --git a/src/components/CustomScheduleModal.vue b/src/components/CustomScheduleModal.vue
@@ -12,12 +12,13 @@
 
   <ion-content>
     <ion-item>
-      <ion-label>{{ translate("Name") }}</ion-label>
+      <ion-label>
+        {{ translate("Name") }} <ion-text color="danger">*</ion-text>
+      </ion-label>
       <ion-input v-model="selectedTimesForWeek.description" />
     </ion-item>
     <ion-item lines="full" class="ion-margin-top">
       <ion-label>{{ translate("Daily timings") }}</ion-label>
-      {{ isDailyTimingsChecked }}
       <ion-toggle :checked="isDailyTimingsChecked" @ionChange="updateDailyTimings" slot="end" />
     </ion-item>
 
@@ -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
@@ -374,7 +374,8 @@ const actions: ActionTree<FacilityState, RootState> = {
     let parties = []
     const params = {
       inputFields: {
-        facilityId: payload.facilityId
+        facilityId: payload.facilityId,
+        partyId_op: 'not-empty'
       },
       entityName: "FacilityAndParty",
       filterByDate: 'Y',
@@ -396,7 +397,6 @@ const actions: ActionTree<FacilityState, RootState> = {
         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
@@ -92,7 +92,7 @@
               <ion-label>{{ translate("Custom schedule") }}</ion-label>
               <ion-icon color="primary" :icon="addCircleOutline" button />
             </ion-item>
-            <ion-button fill="outline" expand="block" @click="associateCalendarToFacility">
+            <ion-button fill="outline" expand="block" :disabled="!selectedCalendarId" @click="associateCalendarToFacility">
               {{ translate("Add operating hours") }}
               <ion-icon slot="end" :icon="addCircleOutline" />
             </ion-button>
@@ -324,7 +324,7 @@
               </ion-item>
 
               <ion-label class="tablet">
-                <ion-chip outline>{{ partyRoles[party.roleTypeId] }}</ion-chip>
+                <ion-chip outline>{{ partyRoles[party.roleTypeId] ? partyRoles[party.roleTypeId] : '-' }}</ion-chip>
                 <p>{{ translate("role") }}</p>
               </ion-label>
 
@@ -375,7 +375,7 @@
               </ion-label>
 
               <ion-label>
-                {{ location.positionId }}
+                {{ location.positionId ? location.positionId : '-' }}
                 <p>{{ translate("sequence") }}</p>
               </ion-label>
 
@@ -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: {