From 58372ef9e83643f3e0d7db0471f59e5e04719f1e Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 10 Aug 2023 07:49:57 +0200
Subject: [PATCH] refs #5995 Href to lilium api link

---
 src/i18n/en/index.js              |  1 +
 src/pages/Route/Cmr/CmrFilter.vue | 22 ++++++++++++++++-
 src/pages/Route/Cmr/CmrList.vue   | 40 ++++++++++++++++---------------
 3 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 3241d155d..2a1391e7e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -453,6 +453,7 @@ export default {
         },
         cmr: {
             list: {
+                total: 'Total {0} records',
                 cmrFk: 'Cmr id',
                 hasCmrDms: `Attached in gestdoc`,
                 true: 'Yes',
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index cf8b0a90c..9488d31d6 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -124,4 +124,24 @@ const countries = ref();
             </QList>
         </template>
     </VnFilterPanel>
-</template>
\ No newline at end of file
+</template>
+
+<i18n>
+    en:
+        params:
+            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,
+</i18n>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index b3854ada0..761d79fa2 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -5,7 +5,6 @@ import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useSession } from 'src/composables/useSession';
 import { toDate } from 'filters/index';
-import { getUrl } from 'composables/getUrl';
 import CmrFilter from './CmrFilter.vue';
 
 const stateStore = useStateStore();
@@ -26,6 +25,7 @@ const columns = computed(() => [
         field: (row) => row.hasCmrDms,
         align: 'center',
         sortable: true,
+        headerStyle: 'padding-left: 35px',
     },
     {
         name: 'ticketFk',
@@ -52,16 +52,15 @@ const columns = computed(() => [
         field: (row) => toDate(row.shipped),
         align: 'center',
         sortable: true,
+        headerStyle: 'padding-left: 33px',
     },
 ]);
-async function openCmr(cmrFk) {
-    const salixUrl = (await getUrl(`Routes/${cmrFk}/cmr`)).replace('#!/', 'api/')
-    window.open(`${salixUrl.replace('#!/', 'api/')}?access_token=${session.getToken()}`);
+function getProjectUrl() {
+    return ((new URL(window.location)).origin);
 };
 </script>
 <template>
     <div class="column items-center">
-        {{ console.log(location) }}
         <div class="list">
             <VnPaginate
                 data-key="CmrList"
@@ -72,27 +71,32 @@ async function openCmr(cmrFk) {
             >
                 <template #body="{ rows }">
                     <QTable
-                    :columns="columns"
-                    :rows="rows"
-                    :dense="$q.screen.lt.md"
-                    :pagination="{ rowsPerPage: null }"
-                    hide-pagination
-                    :grid="$q.screen.lt.md"
-                    auto-load
+                        :columns="columns"
+                        :rows="rows"
+                        :dense="$q.screen.lt.md"
+                        :pagination="{ rowsPerPage: null }"
+                        hide-pagination
+                        :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">
-                            <RouterLink class="text-primary" :to="`${window.location}/api/Routes/${value}/cmr?access_token=${token}`">
-                                <span>{{ value }}</span>
-                            </RouterLink>
+                                <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')"/>
+                            <QBadge
+                                :id="(value) ? 'true' : 'false'" 
+                                :label="(value)
+                                    ? t('route.cmr.list.true')
+                                    : t('route.cmr.list.false')"
+                            />
                         </QTd>
                     </template>
                     </QTable>
@@ -123,6 +127,4 @@ async function openCmr(cmrFk) {
 #false {
     background-color: $negative;
 }
-</style>
-
-
+</style>
\ No newline at end of file