From 05fcff1cbfbe7b9079f86be49cd96645dac00f22 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 10 Jul 2024 13:22:19 +0200
Subject: [PATCH 1/2] refs #7409 fix balance

---
 src/i18n/locale/en.yml                  |  1 +
 src/i18n/locale/es.yml                  |  1 +
 src/pages/Worker/Card/WorkerBalance.vue | 45 +++++++++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 373773635..52cac77d5 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -937,6 +937,7 @@ worker:
             debit: Debt
             credit: Have
             concept: Concept
+            id: id
 wagon:
     type:
         name: Name
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f8c6363c2..12a082c16 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -930,6 +930,7 @@ worker:
             debit: Debe
             credit: Haber
             concept: Concepto
+            id: id
 wagon:
     type:
         name: Nombre
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index ad18d61e0..29280f6f7 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -1,14 +1,27 @@
 <script setup>
+import axios from 'axios';
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
+import { useQuasar } from 'quasar';
+import { useVnConfirm } from 'composables/useVnConfirm';
 import VnTable from 'components/VnTable/VnTable.vue';
+
 const tableRef = ref();
 const { t } = useI18n();
 const route = useRoute();
 const entityId = computed(() => route.params.id);
+const quasar = useQuasar();
+const { openConfirmationModal } = useVnConfirm();
 
 const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('worker.balance.tableVisibleColumns.id'),
+        field: 'id',
+        cardVisible: true,
+    },
     {
         align: 'left',
         name: 'paymentDate',
@@ -57,11 +70,43 @@ const columns = computed(() => [
         field: 'concept',
         cardVisible: true,
     },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Remove'),
+                icon: 'delete',
+                action: (row) =>
+                    openConfirmationModal(t('CHANGE ME!'), t('CHANGE ME!'), () =>
+                        deleteBalance(row)
+                    ),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
+async function deleteBalance({ id }) {
+    try {
+        await axios.delete(`workerIncomes/${id}`);
+        quasar.notify({
+            message: t('Remove incomes'),
+            type: 'positive',
+        });
+        tableRef.value.reload();
+    } catch (error) {
+        quasar.notify({
+            message: t('Error'),
+            type: 'error',
+        });
+    }
+}
 </script>
 
 <template>
     <VnTable
+        class="column flex-center"
         ref="tableRef"
         data-key="WorkerBalance"
         :url="`Workers/${entityId}/incomes`"
-- 
2.40.1


From 8df9a95e29a5a7dadc0f5df6a059bd3855a02b1c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 11 Sep 2024 12:50:12 +0200
Subject: [PATCH 2/2] refs #7409 add total

---
 src/pages/Worker/Card/WorkerBalance.vue | 44 +++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index a3e3bb1ab..a78860ded 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -1,11 +1,13 @@
 <script setup>
 import axios from 'axios';
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useQuasar } from 'quasar';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import VnTable from 'components/VnTable/VnTable.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { toCurrency } from 'filters/index';
 
 const tableRef = ref();
 const { t } = useI18n();
@@ -13,6 +15,22 @@ const route = useRoute();
 const entityId = computed(() => route.params.id);
 const quasar = useQuasar();
 const { openConfirmationModal } = useVnConfirm();
+const amount = ref();
+const positiveAmount = ref();
+const negativeAmount = ref();
+const stateStore = useStateStore();
+
+async function fetchBalance(rows, newRows) {
+    if (newRows) rows = newRows;
+    positiveAmount.value = 0;
+    negativeAmount.value = 0;
+    if (!rows || !rows.length) return;
+    for (const row of rows) {
+        positiveAmount.value = positiveAmount.value + row.debit;
+        negativeAmount.value = negativeAmount.value + row.credit;
+    }
+    return (amount.value = positiveAmount.value - negativeAmount.value);
+}
 
 const columns = computed(() => [
     {
@@ -79,8 +97,10 @@ const columns = computed(() => [
                 title: t('Remove'),
                 icon: 'delete',
                 action: (row) =>
-                    openConfirmationModal(t('CHANGE ME!'), t('CHANGE ME!'), () =>
-                        deleteBalance(row)
+                    openConfirmationModal(
+                        t('Do you want to delete this entry?'),
+                        t(''),
+                        () => deleteBalance(row)
                     ),
                 isPrimary: true,
             },
@@ -105,6 +125,16 @@ async function deleteBalance({ id }) {
 </script>
 
 <template>
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+        <div class="row q-gutter-md">
+            <div>
+                {{ t('Total:') }}
+                <QChip :dense="$q.screen.lt.sm" text-color="white">
+                    {{ toCurrency(amount) }}
+                </QChip>
+            </div>
+        </div>
+    </Teleport>
     <VnTable
         class="column flex-center"
         ref="tableRef"
@@ -114,8 +144,8 @@ async function deleteBalance({ id }) {
         save-url="WorkerIncomes/crud"
         :create="{
             urlCreate: 'workerIncomes',
-            title: t('Create workerBalance'),
-            onDataSaved: () => tableRef.reload(),
+            title: t('Create Balance'),
+            onDataSaved: () => fetchBalance(),
             formInitialData: {
                 workerFk: entityId,
             },
@@ -126,10 +156,12 @@ async function deleteBalance({ id }) {
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        @on-fetch="fetchBalance"
     />
 </template>
 
 <i18n>
     es:
-        Create workerBalance: Crear balance
+        Create Balance: Crear balance
+        Do you want to delete this entry?: ¿Desea eliminar esta entrada?
 </i18n>
-- 
2.40.1