From fb7d1fc38e9bbfe92ac926c2a88483b8f5b55b21 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 10 Aug 2023 14:10:57 +0200
Subject: [PATCH 1/6] refs #5995 test

---
 src/pages/Route/Cmr/CmrList.vue | 55 +++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 761d79fa2..d8c406396 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -56,8 +56,8 @@ const columns = computed(() => [
     },
 ]);
 function getProjectUrl() {
-    return ((new URL(window.location)).origin);
-};
+    return new URL(window.location).origin;
+}
 </script>
 <template>
     <div class="column items-center">
@@ -79,34 +79,41 @@ function getProjectUrl() {
                         :grid="$q.screen.lt.md"
                         auto-load
                     >
-                    <template #top>
-                        {{ t('route.cmr.list.total', [rows.length]) }}
-                    </template>
-                    <template #body-cell-cmrFk="{ value }">
-                        <QTd align="right" class="text-primary">
-                                <a :href="`${getProjectUrl()}/api/Routes/${value}/cmr?access_token=${token}`" target="_blank">
+                        <template #top>
+                            <div v-if="rows.length">
+                                {{ t('route.cmr.list.total', [rows.length]) }}
+                            </div>
+                        </template>
+                        <template #body-cell-cmrFk="{ value }">
+                            <QTd align="right" class="text-primary">
+                                <a
+                                    :href="`${getProjectUrl()}/api/Routes/${value}/cmr?access_token=${token}`"
+                                    target="_blank"
+                                >
                                     <span class="text-primary">{{ value }}</span>
                                 </a>
-                        </QTd>
-                    </template>
-                    <template #body-cell-hasCmrDms="{ value }">
-                        <QTd align="center">
-                            <QBadge
-                                :id="(value) ? 'true' : 'false'" 
-                                :label="(value)
-                                    ? t('route.cmr.list.true')
-                                    : t('route.cmr.list.false')"
-                            />
-                        </QTd>
-                    </template>
+                            </QTd>
+                        </template>
+                        <template #body-cell-hasCmrDms="{ value }">
+                            <QTd align="center">
+                                <QBadge
+                                    :id="value ? 'true' : 'false'"
+                                    :label="
+                                        value
+                                            ? t('route.cmr.list.true')
+                                            : t('route.cmr.list.false')
+                                    "
+                                />
+                            </QTd>
+                        </template>
                     </QTable>
                 </template>
             </VnPaginate>
         </div>
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-                <QScrollArea class="fit text-grey-8">
-                    <CmrFilter data-key="CmrList" />
-                </QScrollArea>
+            <QScrollArea class="fit text-grey-8">
+                <CmrFilter data-key="CmrList" />
+            </QScrollArea>
         </QDrawer>
     </div>
 </template>
@@ -127,4 +134,4 @@ function getProjectUrl() {
 #false {
     background-color: $negative;
 }
-</style>
\ No newline at end of file
+</style>

From 930c9cdef1eaf9d9fa73c93b18b849b6ecabe26f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 10 Aug 2023 14:18:13 +0200
Subject: [PATCH 2/6] refs #5995 test

---
 src/i18n/en/index.js            | 2 +-
 src/i18n/es/index.js            | 2 +-
 src/pages/Route/Cmr/CmrList.vue | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ad7c85063..e4749a5fc 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -455,7 +455,7 @@ export default {
         },
         cmr: {
             list: {
-                total: 'Total {0} records',
+                total: 'Total {length} records',
                 cmrFk: 'Cmr id',
                 hasCmrDms: `Attached in gestdoc`,
                 true: 'Yes',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 06e6524b6..37377343c 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -455,7 +455,7 @@ export default {
         },
         cmr: {
             list: {
-                total: 'Total {0} registros',
+                total: 'Total {length} registros',
                 cmrFk: 'Id cmr',
                 hasCmrDms: 'Adjuntado en gestdoc',
                 true: 'Sí',
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index d8c406396..748fb9a08 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -80,9 +80,7 @@ function getProjectUrl() {
                         auto-load
                     >
                         <template #top>
-                            <div v-if="rows.length">
-                                {{ t('route.cmr.list.total', [rows.length]) }}
-                            </div>
+                            {{ t('route.cmr.list.total', { length: rows.length }) }}
                         </template>
                         <template #body-cell-cmrFk="{ value }">
                             <QTd align="right" class="text-primary">

From 0287c43b64a3d48af14ba4f206fa1db3d6d6f1eb Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 10 Aug 2023 14:33:25 +0200
Subject: [PATCH 3/6] refs #5995 test

---
 src/i18n/en/index.js            | 2 +-
 src/i18n/es/index.js            | 2 +-
 src/pages/Route/Cmr/CmrList.vue | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index e4749a5fc..ad7c85063 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -455,7 +455,7 @@ export default {
         },
         cmr: {
             list: {
-                total: 'Total {length} records',
+                total: 'Total {0} records',
                 cmrFk: 'Cmr id',
                 hasCmrDms: `Attached in gestdoc`,
                 true: 'Yes',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 37377343c..06e6524b6 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -455,7 +455,7 @@ export default {
         },
         cmr: {
             list: {
-                total: 'Total {length} registros',
+                total: 'Total {0} registros',
                 cmrFk: 'Id cmr',
                 hasCmrDms: 'Adjuntado en gestdoc',
                 true: 'Sí',
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 748fb9a08..c3bd82bd1 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'components/ui/VnPaginate.vue';
@@ -58,6 +58,8 @@ const columns = computed(() => [
 function getProjectUrl() {
     return new URL(window.location).origin;
 }
+
+const my = ref((x) => x);
 </script>
 <template>
     <div class="column items-center">
@@ -80,7 +82,7 @@ function getProjectUrl() {
                         auto-load
                     >
                         <template #top>
-                            {{ t('route.cmr.list.total', { length: rows.length }) }}
+                            {{ t('route.cmr.list.total', [my(rows.length)]) }}
                         </template>
                         <template #body-cell-cmrFk="{ value }">
                             <QTd align="right" class="text-primary">

From 30fe237ed32f478b47313d958d43054a2c467983 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 10 Aug 2023 14:38:04 +0200
Subject: [PATCH 4/6] refs #5995 test

---
 src/pages/Route/Cmr/CmrList.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index c3bd82bd1..5ff931136 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -58,8 +58,6 @@ const columns = computed(() => [
 function getProjectUrl() {
     return new URL(window.location).origin;
 }
-
-const my = ref((x) => x);
 </script>
 <template>
     <div class="column items-center">
@@ -82,7 +80,7 @@ const my = ref((x) => x);
                         auto-load
                     >
                         <template #top>
-                            {{ t('route.cmr.list.total', [my(rows.length)]) }}
+                            {{ `${t('route.cmr.list.total')} ${rows.length}` }}
                         </template>
                         <template #body-cell-cmrFk="{ value }">
                             <QTd align="right" class="text-primary">

From e875dcb064fc05935469eb89fdb5514104f9725e Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 11 Aug 2023 06:28:38 +0200
Subject: [PATCH 5/6] refs #5995 Bug i18n fixed

---
 src/i18n/en/index.js            | 2 +-
 src/i18n/es/index.js            | 2 +-
 src/pages/Route/Cmr/CmrList.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ad7c85063..45114b33f 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -455,7 +455,7 @@ export default {
         },
         cmr: {
             list: {
-                total: 'Total {0} records',
+                total: 'Total records',
                 cmrFk: 'Cmr id',
                 hasCmrDms: `Attached in gestdoc`,
                 true: 'Yes',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 06e6524b6..21691f898 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -455,7 +455,7 @@ export default {
         },
         cmr: {
             list: {
-                total: 'Total {0} registros',
+                total: 'Total registros',
                 cmrFk: 'Id cmr',
                 hasCmrDms: 'Adjuntado en gestdoc',
                 true: 'Sí',
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 761d79fa2..f7c773352 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -80,7 +80,7 @@ function getProjectUrl() {
                         auto-load
                     >
                     <template #top>
-                        {{ t('route.cmr.list.total', [rows.length]) }}
+                        {{ `${t('route.cmr.list.total')}: ${rows.length}` }}
                     </template>
                     <template #body-cell-cmrFk="{ value }">
                         <QTd align="right" class="text-primary">

From 3172a13d222fc8d2260ef524b470f0f828ac10a1 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 11 Aug 2023 06:31:07 +0200
Subject: [PATCH 6/6] refs #5995 Fix traductions i18n

---
 src/pages/Route/Cmr/CmrFilter.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index 9059e0195..eeb111304 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -123,19 +123,19 @@ const countries = ref();
 <i18n>
     en:
         params:
-            cmrFk: Cmr id,
-            hasCmrDms: Attached in gestdoc,
-            ticketFk: Ticketd id,
-            country: Country,
-            clientFk: Client id,
-            shipped: Preparation date,
+            cmrFk: Cmr id
+            hasCmrDms: Attached in gestdoc
+            ticketFk: Ticketd id
+            country: Country
+            clientFk: Client id
+            shipped: Preparation date
     
     es:
         params:
-            cmrFk: Id cmr,
-            hasCmrDms: Adjuntado en gestdoc,
-            ticketFk: Id ticket,
-            country: País,
-            clientFk: Id cliente,
-            shipped: Fecha preparación,
+            cmrFk: Id cmr
+            hasCmrDms: Adjuntado en gestdoc
+            ticketFk: Id ticket
+            country: País
+            clientFk: Id cliente
+            shipped: Fecha preparación
 </i18n>