Merge pull request #297 from amansinghbais/#291

Improved: code for adding consistency in the item bottom lines in parking cards (#291)
hotwax · Aug 27, 2024 · 16beeed · 16beeed
2 parents 14bc21b + 503f500
commit 16beeed
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/views/Parking.vue b/src/views/Parking.vue
@@ -24,23 +24,23 @@
             </ion-button>
           </ion-item>
           <template v-if="facility.facilityId === '_NA_'">
-            <ion-item lines="full">
+            <ion-item>
               <ion-label>{{ translate('Pending allocation') }}</ion-label>
               <ion-note slot="end">{{ facility.orderCount }}</ion-note>
             </ion-item>
-            <ion-item lines="full">
+            <ion-item lines="none">
               <ion-label>{{ translate('Next brokering') }}</ion-label>
               <ion-note slot="end">{{ facility?.brokeringJob?.runTime ? getDateTime(facility?.brokeringJob?.runTime) : translate("Not scheduled") }}</ion-note>
             </ion-item>
           </template>
-          <ion-item v-else>
+          <ion-item v-else :lines="(isFacilityDescriptionAvailable(facility) || ['BACKORDER', 'PRE_ORDER'].includes(facility.facilityTypeId)) ? '' : 'none'">
             <ion-label>{{ translate('Orders') }}</ion-label>
             <ion-note slot="end">{{ facility.orderCount }}</ion-note>
           </ion-item>
-          <ion-item lines="full" v-if="['BACKORDER', 'PRE_ORDER'].includes(facility.facilityTypeId)">
+          <ion-item :lines="isFacilityDescriptionAvailable(facility) ? 'inset' : 'none'" v-if="['BACKORDER', 'PRE_ORDER'].includes(facility.facilityTypeId)">
             <ion-toggle :checked="facility.autoReleaseJob" :disabled="true">{{ translate('Auto release') }}</ion-toggle>
           </ion-item>
-          <ion-item lines="full" v-if="facility.description && !['BACKORDER', 'PRE_ORDER'].includes(facility.facilityTypeId) && facility.facilityId !== '_NA_'">
+          <ion-item lines="none" v-if="isFacilityDescriptionAvailable(facility)">
             <ion-label>{{ facility.description }}</ion-label>
           </ion-item>
         </ion-card>
@@ -207,6 +207,9 @@ export default defineComponent({
     },
     async fetchArchivedFacilities() {
       await this.store.dispatch('facility/fetchArchivedFacilities')
+    },
+    isFacilityDescriptionAvailable(facility: any) {
+      return facility.description && !['BACKORDER', 'PRE_ORDER'].includes(facility.facilityTypeId) && facility.facilityId !== '_NA_';
     }
   },
   setup() {