From ce7c39731b3c9c5cc02c5f5df0ea2da721e4cbad Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 20 Aug 2024 18:16:33 +0530
Subject: [PATCH 1/3] Improved: code for adding consistency in the item bottom
 lines in parking cards (#291)

---
 src/views/ManageFacilities.vue |  2 +-
 src/views/Parking.vue          | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/ManageFacilities.vue b/src/views/ManageFacilities.vue
index b47e5270..6c342972 100644
--- a/src/views/ManageFacilities.vue
+++ b/src/views/ManageFacilities.vue
@@ -133,7 +133,7 @@
       }
     },
     props: ['facilityGroupId'],
-    async mounted() {
+    async ionViewWillEnter() {
       emitter.emit('presentLoader')
       await Promise.all([this.fetchFacilities(), this.fetchFacilityGroup()])
       await this.fetchMemberFacilities();
diff --git a/src/views/Parking.vue b/src/views/Parking.vue
index 80f1d3e3..5c4950fb 100644
--- 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="(isFacilityDescriptionAvailable(facility) || ['BACKORDER', 'PRE_ORDER'].includes(facility.facilityTypeId)) ? '' : '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() {

From f142896bbcc6855b7758e6d1e2d86054971cb7c8 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 20 Aug 2024 18:20:28 +0530
Subject: [PATCH 2/3] Reverted: unwanted changes in the code (#291)

---
 src/views/ManageFacilities.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ManageFacilities.vue b/src/views/ManageFacilities.vue
index 6c342972..b47e5270 100644
--- a/src/views/ManageFacilities.vue
+++ b/src/views/ManageFacilities.vue
@@ -133,7 +133,7 @@
       }
     },
     props: ['facilityGroupId'],
-    async ionViewWillEnter() {
+    async mounted() {
       emitter.emit('presentLoader')
       await Promise.all([this.fetchFacilities(), this.fetchFacilityGroup()])
       await this.fetchMemberFacilities();

From 503f5004c756f73dee0e89049ba6323c27855e0b Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 27 Aug 2024 11:08:57 +0530
Subject: [PATCH 3/3] Improved: check for the lines in case of NA facility
 (#291)

---
 src/views/Parking.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Parking.vue b/src/views/Parking.vue
index 5c4950fb..7c6a78d1 100644
--- a/src/views/Parking.vue
+++ b/src/views/Parking.vue
@@ -28,7 +28,7 @@
               <ion-label>{{ translate('Pending allocation') }}</ion-label>
               <ion-note slot="end">{{ facility.orderCount }}</ion-note>
             </ion-item>
-            <ion-item :lines="(isFacilityDescriptionAvailable(facility) || ['BACKORDER', 'PRE_ORDER'].includes(facility.facilityTypeId)) ? '' : 'none'">
+            <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>