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] 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 {