From f59c2409f19631aa6716fbd554d6f48e9ad62856 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 7 Feb 2024 15:01:51 -0300
Subject: [PATCH] travels corrections and improvements

---
 src/pages/Entry/EntryCreate.vue              |  8 +-
 src/pages/Travel/Card/TravelSummary.vue      |  2 +-
 src/pages/Travel/Card/TravelThermographs.vue |  2 +-
 src/pages/Travel/TravelCreate.vue            |  6 +-
 src/pages/Travel/TravelFilter.vue            | 85 ++++----------------
 src/pages/Travel/TravelList.vue              | 48 +++++++++--
 src/router/modules/travel.js                 |  1 -
 7 files changed, 61 insertions(+), 91 deletions(-)

diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index d0a2f7df1b..8c434217aa 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -23,11 +23,11 @@ const stateStore = useStateStore();
 const user = state.getUser();
 const newEntryForm = reactive({
     supplierFk: null,
-    travelFk: route.query?.travelFk || null,
+    travelFk: Number(route.query?.travelFk) || null,
     companyFk: user.value.companyFk || null,
 });
 const suppliersOptions = ref([]);
-const travelsOptionsOptions = ref([]);
+const travelsOptions = ref([]);
 const companiesOptions = ref([]);
 
 const redirectToEntryBasicData = (_, { id }) => {
@@ -47,7 +47,7 @@ const redirectToEntryBasicData = (_, { id }) => {
         url="Travels/filter"
         :filter="{ fields: ['id', 'warehouseInName'] }"
         order="id"
-        @on-fetch="(data) => (travelsOptionsOptions = data)"
+        @on-fetch="(data) => (travelsOptions = data)"
         auto-load
     />
     <FetchData
@@ -110,7 +110,7 @@ const redirectToEntryBasicData = (_, { id }) => {
                             :label="t('Travel')"
                             class="full-width"
                             v-model="data.travelFk"
-                            :options="travelsOptionsOptions"
+                            :options="travelsOptions"
                             option-value="id"
                             option-label="warehouseInName"
                             map-options
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 28f081a025..cf9a9ada0d 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -301,7 +301,7 @@ async function setTravelData(travelData) {
                 <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />
                 <VnLv :label="t('globals.reference')" :value="travel.ref" />
                 <VnLv label="m³" :value="travel.m3" />
-                <VnLv :label="t('globals.totalEntries')" :value="travel.m3" />
+                <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
             </QCard>
             <QCard class="full-width" v-if="entriesTableRows.length > 0">
                 <span class="header">
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 226097e310..a0bdf9c41c 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -101,7 +101,7 @@ const openRemoveDialog = async (id) => {
         });
 };
 
-const redirectToThermographForm = (action, { id = null }) => {
+const redirectToThermographForm = (action, id) => {
     const routeDetails = {
         name: action === 'create' ? 'TravelThermographsCreate' : 'TravelThermographsEdit',
     };
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 8afacdfd6d..abee035624 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -36,11 +36,7 @@ onBeforeMount(() => {
     if (route.query.travelData) {
         const travelData = JSON.parse(route.query.travelData);
         for (let key in newTravelForm) {
-            if (key === 'landed' || key === 'shipped') {
-                newTravelForm[key] = travelData[key].substring(0, 10);
-            } else {
-                newTravelForm[key] = travelData[key];
-            }
+            newTravelForm[key] = travelData[key];
         }
     }
 });
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 62439a2e4d..c1c0d1bee5 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -6,8 +6,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
-
-import { toDate } from 'src/filters';
+import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -60,7 +59,7 @@ const decrement = (paramsObj, key) => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -75,6 +74,7 @@ const decrement = (paramsObj, key) => {
                     <VnSelectFilter
                         :label="t('params.agencyModeFk')"
                         v-model="params.agencyModeFk"
+                        @update:model-value="searchFn()"
                         :options="agenciesOptions"
                         option-value="agencyFk"
                         option-label="name"
@@ -90,6 +90,7 @@ const decrement = (paramsObj, key) => {
                     <VnSelectFilter
                         :label="t('params.warehouseOutFk')"
                         v-model="params.warehouseOutFk"
+                        @update:model-value="searchFn()"
                         :options="warehousesOptions"
                         option-value="id"
                         option-label="name"
@@ -105,6 +106,7 @@ const decrement = (paramsObj, key) => {
                     <VnSelectFilter
                         :label="t('params.warehouseInFk')"
                         v-model="params.warehouseInFk"
+                        @update:model-value="searchFn()"
                         :options="warehousesOptions"
                         option-value="id"
                         option-label="name"
@@ -147,68 +149,20 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <QInput
-                        dense
-                        outlined
-                        rounded
-                        placeholder="dd-mm-aaa"
+                    <VnInputDate
+                        v-model="params.landedFrom"
                         :label="t('params.landedFrom')"
-                        :model-value="toDate(params.landedFrom)"
-                    >
-                        <template #append>
-                            <QIcon name="event" class="cursor-pointer">
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="params.landedFrom">
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                v-close-popup
-                                                :label="t('globals.close')"
-                                                color="primary"
-                                                flat
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <QInput
-                        dense
-                        outlined
-                        rounded
-                        placeholder="dd-mm-aaa"
-                        :model-value="toDate(params.landedTo)"
+                    <VnInputDate
                         :label="t('params.landedTo')"
-                    >
-                        <template #append>
-                            <QIcon name="event" class="cursor-pointer">
-                                <QPopupProxy
-                                    cover
-                                    transition-show="scale"
-                                    transition-hide="scale"
-                                >
-                                    <QDate v-model="params.landedTo">
-                                        <div class="row items-center justify-end">
-                                            <QBtn
-                                                v-close-popup
-                                                :label="t('globals.close')"
-                                                color="primary"
-                                                flat
-                                            />
-                                        </div>
-                                    </QDate>
-                                </QPopupProxy>
-                            </QIcon>
-                        </template>
-                    </QInput>
+                        v-model="params.landedTo"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -216,6 +170,7 @@ const decrement = (paramsObj, key) => {
                     <VnSelectFilter
                         :label="t('params.continent')"
                         v-model="params.continent"
+                        @update:model-value="searchFn()"
                         :options="continentsOptions"
                         option-value="code"
                         option-label="name"
@@ -261,18 +216,6 @@ const decrement = (paramsObj, key) => {
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.input-number >>> input[type='number'] {
-    -moz-appearance: textfield;
-}
-.input-number >>> input::-webkit-outer-spin-button,
-.input-number >>> input::-webkit-inner-spin-button {
-    appearance: none;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 2ce6349a6b..1232f8476e 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -51,6 +51,18 @@ const viewSummary = (id) => {
     });
 };
 
+const getDateQBadgeColor = (date) => {
+    let today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    date = new Date(date);
+    date.setHours(0, 0, 0, 0);
+
+    const timeDifference = today - date;
+    if (timeDifference == 0) return 'warning';
+    if (timeDifference < 0) return 'success';
+};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
@@ -95,14 +107,34 @@ onMounted(async () => {
                                 :label="t('globals.wareHouseOut')"
                                 :value="getWarehouseName(row.warehouseOutFk)"
                             />
-                            <VnLv
-                                :label="t('globals.shipped')"
-                                :value="toDate(row.shipped)"
-                            />
-                            <VnLv
-                                :label="t('globals.landed')"
-                                :value="toDate(row.landed)"
-                            />
+                            <VnLv :label="t('globals.shipped')">
+                                <template #value>
+                                    <QBadge
+                                        v-if="getDateQBadgeColor(row.shipped)"
+                                        :color="getDateQBadgeColor(row.shipped)"
+                                        class="q-ma-none"
+                                        dense
+                                        style="font-size: 14px"
+                                    >
+                                        {{ toDate(row.shipped) }}
+                                    </QBadge>
+                                    <span v-else>{{ toDate(row.shipped) }}</span>
+                                </template>
+                            </VnLv>
+                            <VnLv :label="t('globals.landed')">
+                                <template #value>
+                                    <QBadge
+                                        v-if="getDateQBadgeColor(row.landed)"
+                                        :color="getDateQBadgeColor(row.landed)"
+                                        class="q-ma-none"
+                                        dense
+                                        style="font-size: 14px"
+                                    >
+                                        {{ toDate(row.landed) }}
+                                    </QBadge>
+                                    <span v-else>{{ toDate(row.landed) }}</span>
+                                </template>
+                            </VnLv>
                             <VnLv
                                 v-if="warehouses.length > 0"
                                 :label="t('globals.wareHouseIn')"
diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js
index c34ebe757f..a9670525f2 100644
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@@ -43,7 +43,6 @@ export default {
                     name: 'TravelCreate',
                     meta: {
                         title: 'travelCreate',
-                        icon: '',
                     },
                     component: () => import('src/pages/Travel/TravelCreate.vue'),
                 },