From edd1b6611014ade156b116b4fec9f19f3a7d2c50 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 21 Apr 2024 16:09:21 +0200
Subject: [PATCH] fix: merge toDateHourMin

---
 src/components/ui/VnNotes.vue                 | 4 ++--
 src/pages/Route/Roadmap/RoadmapDescriptor.vue | 6 +++---
 src/pages/Route/Roadmap/RoadmapSummary.vue    | 6 +++---
 src/pages/Route/RouteRoadmap.vue              | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 5c411ce6a..aeabcb96d 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,6 +1,6 @@
 <script setup>
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
-import { toDateHourMinSec } from 'src/filters';
+import { toDateHourMin } from 'src/filters';
 import { ref } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
@@ -92,7 +92,7 @@ async function insert() {
                                 :name="`${note.worker.user.nickname}`"
                                 :worker-id="note.worker.id"
                             />
-                            {{ toDateHour(note.created) }}
+                            {{ toDateHourMin(note.created) }}
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 3396ce3f1..788173688 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -5,9 +5,9 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import useCardDescription from 'composables/useCardDescription';
-import {dashIfEmpty, toDateHour} from 'src/filters';
+import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import RoadmapDescriptorMenu from "pages/Route/Roadmap/RoadmapDescriptorMenu.vue";
+import RoadmapDescriptorMenu from 'pages/Route/Roadmap/RoadmapDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -41,7 +41,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
     >
         <template #body="{ entity }">
             <VnLv :label="t('Roadmap')" :value="entity?.name" />
-            <VnLv :label="t('ETD')" :value="toDateHour(entity?.etd)" />
+            <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />
             <VnLv :label="t('Carrier')">
                 <template #value>
                     <span class="link" v-if="entity?.supplier?.id">
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 446d381ec..1fed6aa78 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -3,7 +3,7 @@ import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { QIcon, useQuasar } from 'quasar';
-import { dashIfEmpty, toDateHour } from 'src/filters';
+import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import { useStateStore } from 'stores/useStateStore';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
@@ -44,7 +44,7 @@ const columns = ref([
     {
         name: 'ETA',
         label: t('ETA'),
-        field: (row) => toDateHour(row?.eta),
+        field: (row) => toDateHourMin(row?.eta),
         sortable: false,
         align: 'left',
     },
@@ -91,7 +91,7 @@ const openAddStopDialog = () => {
                             </span>
                         </template>
                     </VnLv>
-                    <VnLv :label="t('ETD')" :value="toDateHour(entity?.etd)" />
+                    <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />
                     <VnLv
                         :label="t('Tractor Plate')"
                         :value="dashIfEmpty(entity?.tractorPlate)"
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 4053b57c7..3fffb3829 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -3,7 +3,7 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { dashIfEmpty, toDateHour } from 'src/filters';
+import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import { useQuasar } from 'quasar';
 import toCurrency from 'filters/toCurrency';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -46,7 +46,7 @@ const columns = computed(() => [
     {
         name: 'ETD',
         label: t('ETD'),
-        field: (row) => toDateHour(row.etd),
+        field: (row) => toDateHourMin(row.etd),
         sortable: true,
         align: 'left',
     },