From 6df1d0cf99d544a5a74b63b6e4651f70d67c2bf8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 27 Mar 2024 07:55:50 +0100
Subject: [PATCH 1/3] feat: #7130 added "served" field to RouteList table and
 added to the filter too.

---
 CHANGELOG.md                         |  2 ++
 src/pages/Route/Card/RouteFilter.vue | 13 +++++++++++
 src/pages/Route/Card/RouteForm.vue   |  6 +++--
 src/pages/Route/RouteList.vue        | 34 ++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51dd2010c..046071abd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -   (Tickets) => Se añade la opción de clonar ticket. #6951
 
+-   (Rutas) => Se añade el campo "servida" a la tabla y se añade también a los filtros. #7130
+
 ### Changed
 
 ### Fixed
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 4be1981ab..53898292f 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -197,6 +197,15 @@ const warehouseList = ref([]);
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.isOk"
+                        :label="t('Served')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -212,6 +221,8 @@ en:
         workerFk: Worker
         from: From
         to: To
+        Served: Served
+        no: No
 es:
     params:
         warehouseFk: Almacén
@@ -222,6 +233,7 @@ es:
         workerFk: Trabajador
         from: Desde
         to: Hasta
+        yes: Sí
     Warehouse: Almacén
     Description: Descripción
     Vehicle: Vehículo
@@ -229,4 +241,5 @@ es:
     Worker: Trabajador
     From: Desde
     To: Hasta
+    Served: Servida
 </i18n>
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 60693cbf1..7087037b0 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -11,8 +11,8 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import RouteSearchbar from "pages/Route/Card/RouteSearchbar.vue";
-import {useStateStore} from "stores/useStateStore";
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -26,6 +26,7 @@ const defaultInitialData = {
     description: '',
     vehicleFk: null,
     workerFk: null,
+    isOk: false,
 };
 
 const workerList = ref([]);
@@ -211,6 +212,7 @@ const onSave = (data, response) => {
                             size="sm"
                             v-model="data.isOk"
                             :label="t('Is served')"
+                            clearable
                         />
                     </div>
                 </VnRow>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 94c05ad54..78a806294 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -95,6 +95,13 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
     },
+    {
+        name: 'isServed',
+        label: t('Served'),
+        field: (row) => (row.isOk ? 'Yes' : 'No'),
+        sortable: true,
+        align: 'left',
+    },
     {
         name: 'actions',
         label: '',
@@ -397,6 +404,25 @@ const openTicketsDialog = (id) => {
                                     />
                                 </QTd>
                             </template>
+                            <template #body-cell-isServed="{ row }">
+                                <QTd>
+                                    <div class="lock-icon-cell">
+                                        <QIcon
+                                            :name="'lock'"
+                                            size="xs"
+                                            :color="row.isOk ? 'color-spacer' : 'primary'"
+                                        >
+                                            <QTooltip>
+                                                {{
+                                                    row.isOk
+                                                        ? t('Route is closed')
+                                                        : t('Route is not served')
+                                                }}
+                                            </QTooltip>
+                                        </QIcon>
+                                    </div>
+                                </QTd>
+                            </template>
                             <template #body-cell-actions="props">
                                 <QTd :props="props">
                                     <div class="flex items-center no-wrap table-actions">
@@ -466,6 +492,11 @@ const openTicketsDialog = (id) => {
 .table-actions {
     gap: 12px;
 }
+
+.lock-icon-cell {
+    text-align: center;
+    margin-left: -20%;
+}
 </style>
 <i18n>
 en:
@@ -479,6 +510,7 @@ es:
     Description: Descripción
     Hour started: Hora inicio
     Hour finished: Hora fin
+    Served: Servida
     newRoute: Nueva Ruta
     Clone Selected Routes: Clonar rutas seleccionadas
     Select the starting date: Seleccione la fecha de inicio
@@ -490,4 +522,6 @@ es:
     Add ticket: Añadir tickets
     Preview: Vista previa
     Summary: Resumen
+    Route is closed: La ruta está cerrada
+    Route is not served: La ruta no está servida
 </i18n>

From 37d869d1d5dd2fc962a92160bed13fc5d053acdd Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 28 Mar 2024 12:19:55 +0100
Subject: [PATCH 2/3] refactor: refs #7130 requested changes

---
 src/i18n/en/index.js                  |  4 +++
 src/i18n/es/index.js                  |  4 +++
 src/pages/Route/Card/RouteFilter.vue  |  2 --
 src/pages/Route/Card/RouteSummary.vue | 17 ++++++++++++
 src/pages/Route/RouteList.vue         | 38 +++++++++++----------------
 5 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a0dea0555..4e73bb605 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -997,6 +997,10 @@ export default {
                 downloadCmrs: 'Download CMRs',
             },
         },
+        filter: {
+            no: 'No',
+            yes: 'Yes',
+        },
     },
     supplier: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index be16bc2f8..bbb0e2096 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -997,6 +997,10 @@ export default {
                 downloadCmrs: 'Descargar CMRs',
             },
         },
+        filter: {
+            no: 'No',
+            yes: 'Sí',
+        },
     },
     supplier: {
         pageTitles: {
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 53898292f..bbd71df49 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -222,7 +222,6 @@ en:
         from: From
         to: To
         Served: Served
-        no: No
 es:
     params:
         warehouseFk: Almacén
@@ -233,7 +232,6 @@ es:
         workerFk: Trabajador
         from: Desde
         to: Hasta
-        yes: Sí
     Warehouse: Almacén
     Description: Descripción
     Vehicle: Vehículo
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 34b0dfebd..9316c0f83 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -187,6 +187,15 @@ const ticketColumns = ref([
                         :label="t('route.summary.packages')"
                         :value="getTotalPackages(entity.tickets)"
                     />
+                    <QCheckbox
+                        :label="
+                            entity.route.isOk
+                                ? t('route.summary.closed')
+                                : t('route.summary.open')
+                        "
+                        v-model="entity.route.isOk"
+                        :disable="true"
+                    />
                 </QCard>
                 <QCard class="vn-one">
                     <div class="header">
@@ -278,6 +287,10 @@ en:
             m3: m³
             packaging: Packaging
             ticket: Ticket
+            closed: Closed
+            open: Open
+            yes: Yes
+            no: No
 es:
     route:
         summary:
@@ -301,4 +314,8 @@ es:
             client: Cliente
             warehouse: Almacén
             packaging: Encajado
+            closed: Cerrada
+            open: Abierta
+            yes: Sí
+            no: No
 </i18n>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 78a806294..773b4f773 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -98,7 +98,7 @@ const columns = computed(() => [
     {
         name: 'isServed',
         label: t('Served'),
-        field: (row) => (row.isOk ? 'Yes' : 'No'),
+        field: (row) => Boolean(row.isOk),
         sortable: true,
         align: 'left',
     },
@@ -272,7 +272,7 @@ const openTicketsDialog = (id) => {
                 auto-load
             >
                 <template #body="{ rows }">
-                    <div class="q-pa-md">
+                    <div class="q-pa-md route-table">
                         <QTable
                             v-model:selected="selectedRows"
                             :columns="columns"
@@ -286,7 +286,7 @@ const openTicketsDialog = (id) => {
                             :no-data-label="t('globals.noResults')"
                         >
                             <template #body-cell-worker="{ row }">
-                                <QTd>
+                                <QTd class="table-input-cell">
                                     <VnSelectFilter
                                         :label="t('Worker')"
                                         v-model="row.workerFk"
@@ -319,7 +319,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-agency="{ row }">
-                                <QTd>
+                                <QTd class="table-input-cell">
                                     <VnSelectFilter
                                         :label="t('Agency')"
                                         v-model="row.agencyModeFk"
@@ -336,7 +336,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-vehicle="{ row }">
-                                <QTd>
+                                <QTd class="table-input-cell">
                                     <VnSelectFilter
                                         :label="t('Vehicle')"
                                         v-model="row.vehicleFk"
@@ -404,23 +404,17 @@ const openTicketsDialog = (id) => {
                                     />
                                 </QTd>
                             </template>
-                            <template #body-cell-isServed="{ row }">
+                            <template #body-cell-isServed="props">
                                 <QTd>
-                                    <div class="lock-icon-cell">
-                                        <QIcon
-                                            :name="'lock'"
-                                            size="xs"
-                                            :color="row.isOk ? 'color-spacer' : 'primary'"
-                                        >
-                                            <QTooltip>
-                                                {{
-                                                    row.isOk
-                                                        ? t('Route is closed')
-                                                        : t('Route is not served')
-                                                }}
-                                            </QTooltip>
-                                        </QIcon>
-                                    </div>
+                                    <QCheckbox v-model="props.value" disable>
+                                        <QTooltip>
+                                            {{
+                                                props.value
+                                                    ? t('Route is closed')
+                                                    : t('Route is not served')
+                                            }}
+                                        </QTooltip>
+                                    </QCheckbox>
                                 </QTd>
                             </template>
                             <template #body-cell-actions="props">
@@ -481,7 +475,7 @@ const openTicketsDialog = (id) => {
 
 <style lang="scss" scoped>
 .table-input-cell {
-    min-width: 150px;
+    max-width: 143px;
 }
 
 .route-list {

From 43976e8ceda2721444066c5a87fddf99e4e74ff1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Apr 2024 07:37:19 +0000
Subject: [PATCH 3/3] fix minor bug to show

---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 5adaeca94..2c4a19be5 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -257,7 +257,7 @@ const requiredFieldRule = (val) => val || t('globals.requiredField');
 const isAdministrative = () => hasAny(['administrative']);
 
 const isAgricultural = () =>
-    invoiceIn.value.supplier.sageWithholdingFk == config.value[0].sageWithholdingFk;
+    invoiceIn.value?.supplier?.sageWithholdingFk === config.value[0]?.sageWithholdingFk;
 
 function showPdfInvoice() {
     if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`);