From b0d43edbce47bca5a3bc361ea4dfb8db7eb98ac6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 28 Feb 2024 12:02:38 -0300
Subject: [PATCH] Route summary link logic improvement

---
 src/components/ui/CardSummary.vue               | 10 +++++-----
 src/pages/Claim/Card/ClaimSummary.vue           |  1 +
 src/pages/Entry/Card/EntrySummary.vue           |  6 ------
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue |  6 +++++-
 src/pages/Route/Card/RouteSummary.vue           | 11 +++++------
 src/pages/Supplier/Card/SupplierSummary.vue     |  1 -
 src/pages/Travel/Card/TravelSummary.vue         | 10 ----------
 src/router/modules/Supplier.js                  |  1 +
 src/router/modules/claim.js                     |  1 +
 src/router/modules/customer.js                  |  1 +
 src/router/modules/entry.js                     |  1 +
 src/router/modules/invoiceIn.js                 |  1 +
 src/router/modules/invoiceOut.js                |  1 +
 src/router/modules/order.js                     |  1 +
 src/router/modules/route.js                     |  1 +
 src/router/modules/shelving.js                  | 13 ++++++-------
 src/router/modules/ticket.js                    |  1 +
 src/router/modules/travel.js                    |  1 +
 src/router/modules/wagon.js                     |  1 +
 src/router/modules/worker.js                    |  1 +
 20 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 1f89dceda..7799eee72 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -15,8 +15,8 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-    summaryRouteName: {
-        type: String,
+    entityId: {
+        type: Number,
         default: null,
     },
 });
@@ -59,11 +59,11 @@ watch(props, async () => {
                 <div class="summaryHeader bg-primary q-pa-md text-weight-bolder">
                     <slot name="header-left">
                         <router-link
-                            v-if="!isSummary && summaryRouteName"
+                            v-if="!isSummary && route.meta.moduleName"
                             class="header link"
                             :to="{
-                                name: summaryRouteName,
-                                params: { id: entity.id },
+                                name: `${route.meta.moduleName}Summary`,
+                                params: { id: entityId || entity.id },
                             }"
                         >
                             <QIcon name="open_in_new" color="white" size="sm" />
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index b93cbbd81..cc66a8434 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -172,6 +172,7 @@ function openDialog(dmsId) {
     <CardSummary
         ref="summary"
         :url="`Claims/${entityId}/getSummary`"
+        :entity-id="entityId"
         @on-fetch="getClaimDms"
     >
         <template #header="{ entity: { claim } }">
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 3861e0321..7ac25a777 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -147,15 +147,9 @@ const fetchEntryBuys = async () => {
         :url="`Entries/${entityId}/getEntry`"
         @on-fetch="(data) => setEntryData(data)"
     >
-        <template #header-left>
-            <a class="header link" :href="entryUrl">
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </a>
-        </template>
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
         </template>
-
         <template #body>
             <QCard class="vn-one">
                 <a class="header link" :href="entryUrl">
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 5a56a3957..b80bf979d 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -95,7 +95,11 @@ const ticketsColumns = ref([
 </script>
 
 <template>
-    <CardSummary ref="summary" :url="`InvoiceOuts/${entityId}/summary`">
+    <CardSummary
+        ref="summary"
+        :url="`InvoiceOuts/${entityId}/summary`"
+        :entity-id="entityId"
+    >
         <template #header="{ entity: { invoiceOut } }">
             <div>{{ invoiceOut.ref }} - {{ invoiceOut.client?.socialName }}</div>
         </template>
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index df4495d3a..9801f3d28 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -132,12 +132,11 @@ const openBuscaman = async (route, ticket) => {
 
 <template>
     <div class="q-pa-md">
-        <CardSummary ref="summary" :url="`Routes/${entityId}/summary`">
-            <template #header-left>
-                <RouterLink :to="{ name: `RouteSummary`, params: { id: entityId } }">
-                    <QIcon name="open_in_new" color="white" size="sm" />
-                </RouterLink>
-            </template>
+        <CardSummary
+            ref="summary"
+            :url="`Routes/${entityId}/summary`"
+            :entity-id="entityId"
+        >
             <template #header="{ entity }">
                 <span>{{ `${entity?.route.id} - ${entity?.route?.description}` }}</span>
             </template>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 898872ef5..417c2ac0d 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -49,7 +49,6 @@ const isAdministrative = computed(() => {
     <CardSummary
         ref="summaryRef"
         :url="`Suppliers/${entityId}/getSummary`"
-        summary-route-name="SupplierSummary"
         @on-fetch="(data) => setData(data)"
     >
         <template #header>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 2ed6a0487..b17fb0c22 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -236,19 +236,9 @@ async function setTravelData(travelData) {
         :url="`Travels/${entityId}/getTravel`"
         @on-fetch="(data) => setTravelData(data)"
     >
-        <template #header-left>
-            <router-link
-                class="header link"
-                :to="{ name: 'TravelSummary', params: { id: entityId } }"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-                <QTooltip>{{ t('travel.pageTitles.summary') }}</QTooltip>
-            </router-link>
-        </template>
         <template #header>
             <span>{{ travel.ref }} - {{ travel.id }}</span>
         </template>
-
         <template #header-right>
             <QBtn color="white" dense flat icon="more_vert" round size="md">
                 <QTooltip>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index d341ddc25..379a2c2c2 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'suppliers',
         icon: 'vn:supplier',
+        moduleName: 'Supplier',
     },
     component: RouterView,
     redirect: { name: 'SupplierMain' },
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index 1dfd75cff..3ab4f4cbf 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'claims',
         icon: 'vn:claims',
+        moduleName: 'Claim',
     },
     component: RouterView,
     redirect: { name: 'ClaimMain' },
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 716b0fa6c..75188bd32 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'customers',
         icon: 'vn:client',
+        moduleName: 'Customer',
     },
     component: RouterView,
     redirect: { name: 'CustomerMain' },
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 2f6c8cb4c..50a651af5 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'entries',
         icon: 'vn:entry',
+        moduleName: 'Entry',
     },
     component: RouterView,
     redirect: { name: 'EntryMain' },
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 01ed37036..869a3555a 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'invoiceIns',
         icon: 'vn:invoice-in',
+        moduleName: 'InvoiceIn',
     },
     component: RouterView,
     redirect: { name: 'InvoiceInMain' },
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 084cf6ac3..386e04ed8 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'invoiceOuts',
         icon: 'vn:invoice-out',
+        moduleName: 'InvoiceOut',
     },
     component: RouterView,
     redirect: { name: 'InvoiceOutMain' },
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 4599394cd..16d73281b 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'order',
         icon: 'vn:basket',
+        moduleName: 'Order',
     },
     component: RouterView,
     redirect: { name: 'OrderMain' },
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 614345913..fad991fc6 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'routes',
         icon: 'vn:delivery',
+        moduleName: 'Route',
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 494f286c3..d32c7d9f3 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -1,17 +1,18 @@
-import {RouterView} from "vue-router";
+import { RouterView } from 'vue-router';
 
 export default {
     path: '/shelving',
     name: 'Shelving',
     meta: {
         title: 'shelving',
-        icon: 'vn:inventory'
+        icon: 'vn:inventory',
+        moduleName: 'Shelving',
     },
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
     menus: {
         main: ['ShelvingList'],
-        card: ['ShelvingBasicData', 'ShelvingLog']
+        card: ['ShelvingBasicData', 'ShelvingLog'],
     },
     children: [
         {
@@ -51,8 +52,7 @@ export default {
                     meta: {
                         title: 'summary',
                     },
-                    component: () =>
-                        import('pages/Shelving/Card/ShelvingSummary.vue'),
+                    component: () => import('pages/Shelving/Card/ShelvingSummary.vue'),
                 },
                 {
                     name: 'ShelvingBasicData',
@@ -75,6 +75,5 @@ export default {
                 },
             ],
         },
-    ]
+    ],
 };
-
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 73c441b4d..d6b714154 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'tickets',
         icon: 'vn:ticket',
+        moduleName: 'Ticket',
     },
     component: RouterView,
     redirect: { name: 'TicketMain' },
diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js
index 792b393e4..2f1e2150e 100644
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'travel',
         icon: 'local_airport',
+        moduleName: 'Travel',
     },
     component: RouterView,
     redirect: { name: 'TravelMain' },
diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js
index 238e482dd..6f9a4c819 100644
--- a/src/router/modules/wagon.js
+++ b/src/router/modules/wagon.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'wagons',
         icon: 'vn:trolley',
+        moduleName: 'Wagon',
     },
     component: RouterView,
     redirect: { name: 'WagonMain' },
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 27a6f19a9..171e346c6 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'workers',
         icon: 'vn:worker',
+        moduleName: 'Worker',
     },
     component: RouterView,
     redirect: { name: 'WorkerMain' },