From b5aae63e15ac0b59b4e333e86ac30095b2de227f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 12 Apr 2024 08:47:25 +0200
Subject: [PATCH 1/6] refs #6976 supplier onUnmounted

---
 src/pages/Supplier/Card/SupplierConsumption.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 33d235a5f..18d163d52 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -15,8 +15,11 @@ import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
+import { useState } from 'src/composables/useState';
 import { useArrayData } from 'composables/useArrayData';
+import { onUnmounted } from 'vue';
 
+const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const route = useRoute();
@@ -32,6 +35,7 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
+onUnmounted(() => state.unset('SupplierConsumption'));
 const dateRanges = computed(() => {
     const ranges = {
         from: null,
@@ -112,6 +116,8 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     await getSupplierConsumptionData();
 });
+
+console.log('dateRange From', dateRanges.value.from);
 </script>
 
 <template>
-- 
2.40.1


From ee80b1d617e1835a1a04760f0fd4fa9435a81457 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 12 Apr 2024 14:34:11 +0200
Subject: [PATCH 2/6] refs #6976 changes table

---
 .../Supplier/Card/SupplierConsumption.vue     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 18d163d52..e7cbca8b1 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -162,16 +162,20 @@ console.log('dateRange From', dateRanges.value.from);
         >
             <template #body="{ row }">
                 <QTr>
-                    <QTd no-hover class="label">{{
-                        t('supplier.consumption.entry')
-                    }}</QTd>
-                    <QTd no-hover>{{ row.id }}</QTd>
-                    <QTd no-hover class="label">{{ t('supplier.consumption.date') }}</QTd>
-                    <QTd no-hover>{{ toDate(row.shipped) }}</QTd>
-                    <QTd no-hover class="label">{{
-                        t('supplier.consumption.reference')
-                    }}</QTd>
-                    <QTd no-hover>{{ row.invoiceNumber }}</QTd>
+                    <QTd no-hover>
+                        <span class="label">{{ t('supplier.consumption.entry') }}: </span>
+                        <span>{{ row.id }}</span>
+                    </QTd>
+                    <QTd no-hover>
+                        <span class="label">{{ t('supplier.consumption.date') }}: </span>
+                        <span>{{ toDate(row.shipped) }}</span></QTd
+                    >
+                    <QTd colspan="6" no-hover>
+                        <span class="label"
+                            >{{ t('supplier.consumption.reference') }}:
+                        </span>
+                        <span>{{ row.invoiceNumber }}</span>
+                    </QTd>
                 </QTr>
                 <QTr v-for="(buy, index) in row.buys" :key="index">
                     <QTd no-hover>
-- 
2.40.1


From d2ec47fe1c87803770425ddb317abd83d21f7cdb Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 22 Apr 2024 11:25:32 +0200
Subject: [PATCH 3/6] refs #6976 total Stems

---
 .../Supplier/Card/SupplierConsumption.vue     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index e7cbca8b1..2b4dfe6b8 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { computed, onMounted } from 'vue';
+import { computed, onMounted, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 
@@ -17,7 +17,6 @@ import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
 import { useArrayData } from 'composables/useArrayData';
-import { onUnmounted } from 'vue';
 
 const state = useState();
 const stateStore = useStateStore();
@@ -35,6 +34,9 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
+console.log('route del principio', route.query.from);
+watch(() => route.query);
+
 onUnmounted(() => state.unset('SupplierConsumption'));
 const dateRanges = computed(() => {
     const ranges = {
@@ -42,6 +44,7 @@ const dateRanges = computed(() => {
         to: null,
     };
 
+    console.log('route del if', route.query.from);
     if (route.query && route.query.params) {
         const params = JSON.parse(route.query.params);
         if (params.from && params.to) {
@@ -52,7 +55,7 @@ const dateRanges = computed(() => {
 
     return ranges;
 });
-
+console.log('dataRanges', dateRanges);
 const reportParams = computed(() => ({
     recipientId: Number(route.params.id),
     ...dateRanges.value,
@@ -112,12 +115,16 @@ const sendCampaignMetricsEmail = ({ address }) => {
 const calculateTotal = (buysArray = []) =>
     buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
 
+const calculateTotalStems = (buysArray = []) =>
+    buysArray.reduce((accumulator, { quantity }) => accumulator + quantity, 0);
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     await getSupplierConsumptionData();
 });
 
 console.log('dateRange From', dateRanges.value.from);
+console.log('dateRange value', dateRanges.value);
 </script>
 
 <template>
@@ -192,10 +199,14 @@ console.log('dateRange From', dateRanges.value.from);
                     <QTd colspan="2" no-hover> {{ dashIfEmpty(buy.total) }}</QTd>
                 </QTr>
                 <QTr>
-                    <QTd colspan="6" no-hover>
+                    <QTd colspan="5" no-hover>
                         <span class="label">{{ t('Total entry') }}: </span>
                         <span>{{ calculateTotal(row.buys) }}</span>
                     </QTd>
+                    <QTd no-hover>
+                        <span class="label">{{ t('Total stems') }}: </span>
+                        <span>{{ calculateTotalStems(row.buys) }}</span>
+                    </QTd>
                 </QTr>
             </template>
         </QTable>
@@ -211,6 +222,7 @@ console.log('dateRange From', dateRanges.value.from);
 <i18n>
 es:
     Total entry: Total entrada
+    Total stems: Total tallos
     Open as PDF: Abrir como PDF
     Send to email: Enviar por email
     This supplier does not have a contact with an email address: Este proveedor no tiene un email de contacto
-- 
2.40.1


From 5cce1df7081dbb8a6ce27df47ffa6fa9a0141d89 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 23 Apr 2024 10:06:57 +0200
Subject: [PATCH 4/6] refs #6976 fix supplierConsumption

---
 .../Supplier/Card/SupplierConsumption.vue     | 64 +++++++++++++++----
 1 file changed, 50 insertions(+), 14 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 2b4dfe6b8..f9fa34c8e 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,9 +1,9 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { computed, onMounted, watch, onUnmounted } from 'vue';
+import { computed, onMounted, watch, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
+import VnLv from 'src/components/ui/VnLv.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
@@ -25,7 +25,7 @@ const route = useRoute();
 const { openReport, sendEmail } = usePrintService();
 const quasar = useQuasar();
 const { notify } = useNotify();
-
+const totalRows = ref({});
 const arrayData = useArrayData('SupplierConsumption', {
     url: 'Suppliers/consumption',
     order: ['itemTypeFk', 'itemName', 'itemSize'],
@@ -34,7 +34,6 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
-console.log('route del principio', route.query.from);
 watch(() => route.query);
 
 onUnmounted(() => state.unset('SupplierConsumption'));
@@ -44,7 +43,6 @@ const dateRanges = computed(() => {
         to: null,
     };
 
-    console.log('route del if', route.query.from);
     if (route.query && route.query.params) {
         const params = JSON.parse(route.query.params);
         if (params.from && params.to) {
@@ -65,7 +63,10 @@ async function getSupplierConsumptionData() {
     await arrayData.fetch({ append: false });
 }
 
-const rows = computed(() => store.data || []);
+const rows = computed(() => {
+    console.log(store.data);
+    return totalEntryPrice(store.data) || [];
+});
 
 const openReportPdf = () => {
     openReport(`Suppliers/${route.params.id}/campaign-metrics-pdf`, reportParams.value);
@@ -112,11 +113,28 @@ const sendCampaignMetricsEmail = ({ address }) => {
     });
 };
 
-const calculateTotal = (buysArray = []) =>
-    buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
+const totalEntryPrice = (rows) => {
+    let totalPrice = 0;
+    let totalQuantity = 0;
+    if (!rows) return totalPrice;
+    for (const row of rows) {
+        let total = 0;
+        let quantity = 0;
+        for (const buy of row.buys) {
+            total = total + buy.total;
+            quantity = quantity + buy.quantity;
+        }
+        row.total = total;
+        row.quantity = quantity;
+        totalPrice = totalPrice + total;
+        totalQuantity = totalQuantity + quantity;
+    }
+    totalRows.value = { totalPrice, totalQuantity };
+    return rows;
+};
 
-const calculateTotalStems = (buysArray = []) =>
-    buysArray.reduce((accumulator, { quantity }) => accumulator + quantity, 0);
+totalEntryPrice(rows.value);
+console.log('row', rows.value);
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
@@ -153,7 +171,23 @@ console.log('dateRange value', dateRanges.value);
             </QTooltip>
         </QBtn>
     </Teleport>
-
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+        <div class="row q-gutter-md">
+            <div>
+                {{ t('Total entries') }}:
+                <QChip :dense="$q.screen.lt.sm" text-color="white">
+                    {{ totalRows.totalPrice }} €
+                </QChip>
+            </div>
+            <QSeparator dark vertical />
+            <div>
+                {{ t('Total stems entries') }}:
+                <QChip :dense="$q.screen.lt.sm" text-color="white">
+                    {{ totalRows.totalQuantity }}
+                </QChip>
+            </div>
+        </div>
+    </Teleport>
     <QPage class="column items-center q-pa-md">
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
             <QScrollArea class="fit text-grey-8">
@@ -186,7 +220,7 @@ console.log('dateRange value', dateRanges.value);
                 </QTr>
                 <QTr v-for="(buy, index) in row.buys" :key="index">
                     <QTd no-hover>
-                        <QBtn flat color="blue" dense>{{ buy.itemName }}</QBtn>
+                        <QBtn flat color="blue" dense no-caps>{{ buy.itemName }}</QBtn>
                         <ItemDescriptorProxy :id="buy.itemFk" />
                     </QTd>
 
@@ -201,11 +235,11 @@ console.log('dateRange value', dateRanges.value);
                 <QTr>
                     <QTd colspan="5" no-hover>
                         <span class="label">{{ t('Total entry') }}: </span>
-                        <span>{{ calculateTotal(row.buys) }}</span>
+                        <span>{{ row.total }} €</span>
                     </QTd>
                     <QTd no-hover>
                         <span class="label">{{ t('Total stems') }}: </span>
-                        <span>{{ calculateTotalStems(row.buys) }}</span>
+                        <span>{{ row.quantity }}</span>
                     </QTd>
                 </QTr>
             </template>
@@ -222,6 +256,8 @@ console.log('dateRange value', dateRanges.value);
 <i18n>
 es:
     Total entry: Total entrada
+    Total entries: Total de las entradas
+    Total stems entries: Total de tallos de las entradas
     Total stems: Total tallos
     Open as PDF: Abrir como PDF
     Send to email: Enviar por email
-- 
2.40.1


From fc275d927436b08fa558c40c5e353939443319d7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Apr 2024 08:29:34 +0200
Subject: [PATCH 5/6] refs #6976 remove logs

---
 src/pages/Supplier/Card/SupplierConsumption.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index ca6d1557f..be3d4a992 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -33,14 +33,12 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
-watch(() => route.query);
-
 onUnmounted(() => state.unset('SupplierConsumption'));
 const dateRanges = computed(() => {
     const { from, to } = arrayData.store?.userParams || {};
     return { from, to };
 });
-console.log('dataRanges', dateRanges);
+
 const reportParams = computed(() => ({
     recipientId: Number(route.params.id),
     ...dateRanges.value,
@@ -127,9 +125,6 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     await getSupplierConsumptionData();
 });
-
-console.log('dateRange From', dateRanges.value.from);
-console.log('dateRange value', dateRanges.value);
 </script>
 
 <template>
-- 
2.40.1


From 966831b6d3605c75d986b7f8c65d65d407927f57 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Apr 2024 09:00:42 +0200
Subject: [PATCH 6/6] refs #6976 fix pr

---
 src/pages/Supplier/Card/SupplierConsumption.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index be3d4a992..8dbb87529 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -49,7 +49,6 @@ async function getSupplierConsumptionData() {
 }
 
 const rows = computed(() => {
-    console.log(store.data);
     return totalEntryPrice(store.data) || [];
 });
 
@@ -118,9 +117,6 @@ const totalEntryPrice = (rows) => {
     return rows;
 };
 
-totalEntryPrice(rows.value);
-console.log('row', rows.value);
-
 onMounted(async () => {
     stateStore.rightDrawer = true;
     await getSupplierConsumptionData();
-- 
2.40.1