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

Improved: code for adding consistency in the item bottom lines in parking cards (#291) #297

Merged
merged 3 commits into from
Aug 27, 2024
Merged

Improved: code for adding consistency in the item bottom lines in parking cards (#291) #297

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce7c397
Improved: code for adding consistency in the item bottom lines in par…
amansinghbais Aug 20, 2024
f142896
Reverted: unwanted changes in the code (#291)
amansinghbais Aug 20, 2024
503f500
Improved: check for the lines in case of NA facility (#291)
amansinghbais Aug 27, 2024
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
13 changes: 8 additions & 5 deletions src/views/Parking.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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() {
Expand Down
Loading