Merge pull request 'fix: refs #7385 rename forecast column to estimated' (!1814) from 7385-fixColumnNameReference into dev

Reviewed-on: #1814
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

src/pages/Route/Card/RouteSummary.vue

@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { QIcon } from 'quasar';
-import { dashIfEmpty, toCurrency, toDate, toHour } from 'src/filters';
+import { dashIfEmpty, toCurrency, toDate, toDateHourMinSec, toHour } from 'src/filters';
 import { openBuscaman } from 'src/utils/buscaman';
 import CardSummary from 'components/ui/CardSummary.vue';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -83,14 +83,14 @@ const ticketColumns = ref([
     {
         name: 'delivered',
         label: t('route.delivered'),
-        field: (row) => dashIfEmpty(toDate(row?.delivered)),
+        field: (row) => dashIfEmpty(toDateHourMinSec(row?.delivered)),
         sortable: false,
         align: 'center',
     },
     {
-        name: 'forecast',
-        label: t('route.forecast'),
-        field: (row) => dashIfEmpty(toDate(row?.forecast)),
+        name: 'estimated',
+        label: t('route.estimated'),
+        field: (row) => dashIfEmpty(toDateHourMinSec(row?.estimated)),
         sortable: false,
         align: 'center',
     },
@@ -103,7 +103,7 @@ const ticketColumns = ref([
     },
     {
         name: 'volume',
-        label: t('route.summary.m3'),
+        label: 'm³',
         field: (row) => row?.volume,
         sortable: false,
         align: 'center',

src/pages/Route/RouteTickets.vue

@@ -2,7 +2,7 @@
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
-import { dashIfEmpty } from 'src/filters';
+import { dashIfEmpty, toDateHourMinSec } from 'src/filters';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
@@ -66,15 +66,15 @@ const columns = computed(() => [
     },
     {
         name: 'delivered',
-        label: t('route.ticket.delivered'),
-        field: (row) => dashIfEmpty(row?.delivered),
+        label: t('route.delivered'),
+        field: (row) => dashIfEmpty(toDateHourMinSec(row?.delivered)),
         sortable: false,
         align: 'left',
     },
     {
         name: 'estimated',
-        label: t('route.ticket.estimated'),
-        field: (row) => dashIfEmpty(row?.estimated),
+        label: t('route.estimated'),
+        field: (row) => dashIfEmpty(toDateHourMinSec(row?.estimated)),
         sortable: false,
         align: 'left',
     },
@@ -254,7 +254,9 @@ const openSmsDialog = async () => {
     <QDialog v-model="confirmationDialog">
         <QCard style="min-width: 350px">
             <QCardSection>
-                <p class="text-h6 q-ma-none">{{ t('route.ticket.selectStartingDate') }}</p>
+                <p class="text-h6 q-ma-none">
+                    {{ t('route.ticket.selectStartingDate') }}
+                </p>
             </QCardSection>
 
             <QCardSection class="q-pt-none">
@@ -265,7 +267,12 @@ const openSmsDialog = async () => {
                 />
             </QCardSection>
             <QCardActions align="right">
-                <QBtn flat :label="t('globals.cancel')" v-close-popup class="text-primary" />
+                <QBtn
+                    flat
+                    :label="t('globals.cancel')"
+                    v-close-popup
+                    class="text-primary"
+                />
                 <QBtn color="primary" v-close-popup @click="cloneRoutes">
                     {{ t('globals.clone') }}
                 </QBtn>
@@ -302,11 +309,7 @@ const openSmsDialog = async () => {
                     class="q-mr-sm"
                     @click="setOrderedPriority"
                 >
-                    <QTooltip
-                        >{{
-                            t('route.ticket.renumberAllTickets')
-                        }}
-                    </QTooltip>
+                    <QTooltip>{{ t('route.ticket.renumberAllTickets') }} </QTooltip>
                 </QBtn>
                 <QBtn
                     icon="sms"
@@ -353,7 +356,11 @@ const openSmsDialog = async () => {
                                             @click="setHighestPriority(row, rows)"
                                         >
                                             <QTooltip>
-                                                {{ t('route.ticket.assignHighestPriority') }}
+                                                {{
+                                                    t(
+                                                        'route.ticket.assignHighestPriority',
+                                                    )
+                                                }}
                                             </QTooltip>
                                         </QIcon>
                                         <VnInput
@@ -368,7 +375,9 @@ const openSmsDialog = async () => {
                                 <QTd>
                                     <span class="link" @click="goToBuscaman(row)">
                                         {{ value }}
-                                        <QTooltip>{{ t('route.ticket.openBuscaman') }}</QTooltip>
+                                        <QTooltip>{{
+                                            t('route.ticket.openBuscaman')
+                                        }}</QTooltip>
                                     </span>
                                 </QTd>
                             </template>

src/pages/Route/locale/en.yml

@@ -103,7 +103,7 @@ route:
     dated: Dated
     preview: Preview
     delivered: Delivered
-    forecast: Forecast
+    estimated: Estimated
     cmr:
         search: Search Cmr
         searchInfo: You can search Cmr by Id
@@ -129,8 +129,6 @@ route:
         PC: PC
         client: Client
         warehouse: Warehouse
-        delivered: Delivered
-        estimated: Estimated
         packages: Packages
         packaging: Packaging
         ticket: Ticket

src/pages/Route/locale/es.yml

@@ -102,7 +102,7 @@ route:
     dated: Fecha
     preview: Vista previa
     delivered: Entregado
-    forecast: Pronóstico
+    estimated: Pronóstico
     cmr:
         list:
             results: resultados
@@ -124,8 +124,6 @@ route:
         PC: CP
         client: Cliente
         warehouse: Almacén
-        delivered: Entregado
-        estimated: Pronóstico
         packages: Bultos
         packaging: Encajado
         ticket: Ticket