From 4f3e7e26309aced2bd4a98f1bffd13b5a05bc65b Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 7 Oct 2024 10:03:05 +0200
Subject: [PATCH 1/3] feat: refs #7893 Added waste recalc section

---
 src/i18n/locale/en.yml               |  6 +++
 src/i18n/locale/es.yml               |  6 +++
 src/pages/Entry/EntryWasteRecalc.vue | 76 ++++++++++++++++++++++++++++
 src/router/modules/entry.js          | 17 ++++++-
 4 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Entry/EntryWasteRecalc.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 20a612a82..68214129f 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -105,6 +105,7 @@ globals:
     campaign: Campaign
     weight: Weight
     error: Ups! Something went wrong
+    recalc: Recalculate
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -275,6 +276,7 @@ globals:
         serial: Serial
         medical: Mutual
         RouteExtendedList: Router
+        wasteRecalc: Waste recaclulate
     supplier: Supplier
     created: Created
     worker: Worker
@@ -465,6 +467,10 @@ entry:
             landing: Landing
             isExcludedFromAvailable: Es inventory
             isRaid: Raid
+    wasteRecalc:
+        dateRequired: The date fields are required
+        dateIncoherent: The "from" date cannot be later than the "to" date
+        recalcOk: The wastes were successfully recalculated
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ae0274415..7e1671fbf 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -107,6 +107,7 @@ globals:
     campaign: Campaña
     weight: Peso
     error: ¡Ups! Algo salió mal
+    recalc: Recalcular
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -279,6 +280,7 @@ globals:
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
         medical: Mutua
+        wasteRecalc: Recalcular mermas
     supplier: Proveedor
     created: Fecha creación
     worker: Trabajador
@@ -467,6 +469,10 @@ entry:
             landing: Llegada
             isExcludedFromAvailable: Es inventario
             isRaid: Redada
+    wasteRecalc:
+        dateRequired: Los campos de tipo fecha son obligatorios
+        dateIncoherent: La fecha "desde" no puede ser superior a la fecha "hasta"
+        recalcOk: Se han recalculado las mermas correctamente
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
new file mode 100644
index 000000000..2fb9c3abf
--- /dev/null
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -0,0 +1,76 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+
+const isLoading = ref(false);
+const dateFrom = ref();
+const dateTo = ref();
+const recalc = async () => {
+    const { notify } = useNotify();
+    if (!dateFrom.value || !dateTo.value) {
+        notify('entry.wasteRecalc.dateRequired', 'negative');
+        return;
+    }
+
+    const from = new Date(dateFrom.value);
+    const to = new Date(dateTo.value);
+
+    if (from > to) {
+        notify('entry.wasteRecalc.dateIncoherent', 'negative');
+        return;
+    }
+
+    const params = {
+        schema: 'bs',
+        params: [from, to],
+    };
+
+    try {
+        isLoading.value = true;
+        await axios.post('Applications/waste_addSales/execute-proc', params);
+        notify('entry.wasteRecalc.recalcOk', 'positive');
+    } catch (err) {
+        console.error('Error in execution:', err);
+        notify('entry.wasteRecalc.recalcOk', 'negative');
+    } finally {
+        isLoading.value = false;
+    }
+};
+</script>
+
+<template>
+    <div class="q-pa-lg row justify-center">
+        <QCard class="bg-light" style="width: 300px">
+            <QCardSection>
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateFrom"
+                    :label="t('globals.from')"
+                    rounded
+                    dense
+                />
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateTo"
+                    :label="t('globals.to')"
+                    rounded
+                    dense
+                />
+                <QBtn
+                    color="primary"
+                    text-color="white"
+                    :label="t('globals.recalc')"
+                    icon="Calculate"
+                    :loading="isLoading"
+                    :disable="isLoading"
+                    @click="recalc()"
+                />
+            </QCardSection>
+        </QCard>
+    </div>
+</template>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4750a4301..3add239df 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -12,7 +12,13 @@ export default {
     component: RouterView,
     redirect: { name: 'EntryMain' },
     menus: {
-        main: ['EntryList', 'MyEntries', 'EntryLatestBuys', 'EntryStockBought'],
+        main: [
+            'EntryList',
+            'MyEntries',
+            'EntryLatestBuys',
+            'EntryStockBought',
+            'EntryWasteRecalc',
+        ],
         card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
     },
     children: [
@@ -67,6 +73,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryStockBought.vue'),
                 },
+                {
+                    path: 'waste-recalc',
+                    name: 'EntryWasteRecalc',
+                    meta: {
+                        title: 'wasteRecalc',
+                        icon: 'compost',
+                    },
+                    component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
+                },
             ],
         },
         {

From 178fa8cd21328a688a7697f2c3c38a7408ed2775 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 7 Oct 2024 11:31:16 +0200
Subject: [PATCH 2/3] feat: refs #7893 Requested changes

---
 src/pages/Entry/EntryWasteRecalc.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
index 2fb9c3abf..1dbf8cdf0 100644
--- a/src/pages/Entry/EntryWasteRecalc.vue
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -65,7 +65,6 @@ const recalc = async () => {
                     color="primary"
                     text-color="white"
                     :label="t('globals.recalc')"
-                    icon="Calculate"
                     :loading="isLoading"
                     :disable="isLoading"
                     @click="recalc()"

From 50eed83d05dabadd46fe0f07948564d9ef953ea2 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 7 Oct 2024 13:50:19 +0200
Subject: [PATCH 3/3] feat: refs #7893 Requested changes

---
 src/i18n/locale/en.yml               |  4 ---
 src/i18n/locale/es.yml               |  4 ---
 src/pages/Entry/EntryWasteRecalc.vue | 45 +++++++++++++---------------
 src/pages/Entry/locale/en.yml        |  2 ++
 src/pages/Entry/locale/es.yml        |  2 ++
 5 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index c6a597dea..b73395df2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -474,10 +474,6 @@ entry:
             landing: Landing
             isExcludedFromAvailable: Es inventory
             isRaid: Raid
-    wasteRecalc:
-        dateRequired: The date fields are required
-        dateIncoherent: The "from" date cannot be later than the "to" date
-        recalcOk: The wastes were successfully recalculated
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 78a67aceb..2552c9549 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -476,10 +476,6 @@ entry:
             landing: Llegada
             isExcludedFromAvailable: Es inventario
             isRaid: Redada
-    wasteRecalc:
-        dateRequired: Los campos de tipo fecha son obligatorios
-        dateIncoherent: La fecha "desde" no puede ser superior a la fecha "hasta"
-        recalcOk: Se han recalculado las mermas correctamente
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
index 1dbf8cdf0..cd823beb4 100644
--- a/src/pages/Entry/EntryWasteRecalc.vue
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -1,42 +1,37 @@
 <script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
+import { ref, computed, watch } from 'vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
-const { t } = useI18n();
-
 const isLoading = ref(false);
 const dateFrom = ref();
 const dateTo = ref();
+
+const optionsTo = computed(() => (date) => {
+    if (!dateFrom.value) return true;
+    return new Date(date) >= new Date(dateFrom.value);
+});
+
+watch(dateFrom, (newDateFrom) => {
+    if (dateTo.value && new Date(dateTo.value) < new Date(newDateFrom))
+        dateTo.value = newDateFrom;
+});
+
 const recalc = async () => {
     const { notify } = useNotify();
-    if (!dateFrom.value || !dateTo.value) {
-        notify('entry.wasteRecalc.dateRequired', 'negative');
-        return;
-    }
-
-    const from = new Date(dateFrom.value);
-    const to = new Date(dateTo.value);
-
-    if (from > to) {
-        notify('entry.wasteRecalc.dateIncoherent', 'negative');
-        return;
-    }
 
     const params = {
         schema: 'bs',
-        params: [from, to],
+        params: [new Date(dateFrom.value), new Date(dateTo.value)],
     };
 
     try {
         isLoading.value = true;
         await axios.post('Applications/waste_addSales/execute-proc', params);
-        notify('entry.wasteRecalc.recalcOk', 'positive');
+        notify('wasteRecalc.recalcOk', 'positive');
     } catch (err) {
-        console.error('Error in execution:', err);
-        notify('entry.wasteRecalc.recalcOk', 'negative');
+        console.error(err);
     } finally {
         isLoading.value = false;
     }
@@ -50,23 +45,25 @@ const recalc = async () => {
                 <VnInputDate
                     class="q-mb-lg"
                     v-model="dateFrom"
-                    :label="t('globals.from')"
+                    :label="$t('globals.from')"
                     rounded
                     dense
                 />
                 <VnInputDate
                     class="q-mb-lg"
                     v-model="dateTo"
-                    :label="t('globals.to')"
+                    :options="optionsTo"
+                    :label="$t('globals.to')"
+                    :disable="!dateFrom"
                     rounded
                     dense
                 />
                 <QBtn
                     color="primary"
                     text-color="white"
-                    :label="t('globals.recalc')"
+                    :label="$t('globals.recalc')"
                     :loading="isLoading"
-                    :disable="isLoading"
+                    :disable="isLoading || !(dateFrom && dateTo)"
                     @click="recalc()"
                 />
             </QCardSection>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index b4d7c33bc..f9dbd0589 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -18,3 +18,5 @@ myEntries:
     warehouseInFk: Warehouse in
     daysOnward: Days onward
     daysAgo: Days ago
+wasteRecalc:
+    recalcOk: The wastes were successfully recalculated
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 2dfd601b1..feeea1fc9 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -21,3 +21,5 @@ myEntries:
     warehouseInFk: Alm. entrada
     daysOnward: Días adelante
     daysAgo: Días atras
+wasteRecalc:
+    recalcOk: Se han recalculado las mermas correctamente