From e8fd3c0a8f2bcb057c41396e211f099be62b7537 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 23 Oct 2024 14:58:03 +0200
Subject: [PATCH] fix: refs #6389 fix front, filters, itp

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Monitor/Ticket/MonitorTicketFilter.vue    | 12 +++++
 src/pages/Monitor/Ticket/MonitorTickets.vue   | 48 ++++++++++++++++---
 src/pages/Monitor/locale/en.yml               |  1 +
 src/pages/Monitor/locale/es.yml               |  1 +
 6 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fa0a14f45..8fd495e68 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -308,6 +308,7 @@ globals:
         email: Email
         SSN: SSN
         fi: FI
+        packing: ITP
     changePass: Change password
     deleteConfirmTitle: Delete selected elements
 errors:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 5dfe90e98..f777089a6 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -312,6 +312,7 @@ globals:
         email: Correo
         SSN: NSS
         fi: NIF
+        packing: ITP
     changePass: Cambiar contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
 errors:
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index ae5dc7a56..f952850d2 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -222,6 +222,18 @@ const getLocale = (label) => {
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        outlined
+                        dense
+                        rounded
+                        :label="t('globals.params.packing')"
+                        v-model="params.packing"
+                        url="ItemPackingTypes"
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 0c4ef1358..dbf2465c1 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -23,6 +23,8 @@ const tableRef = ref(null);
 const provinceOpts = ref([]);
 const stateOpts = ref([]);
 const zoneOpts = ref([]);
+const DepartmentOpts = ref([]);
+const ItemPackingTypeOpts = ref([]);
 const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
 const from = Date.vnNew();
@@ -48,7 +50,10 @@ function exprBuilder(param, value) {
         case 'nickname':
             return { [`t.nickname`]: { like: `%${value}%` } };
         case 'zoneFk':
-        case 'departmentId':
+        case 'department':
+            return { 'd.name': value };
+        case 'packing':
+            return { ItemPackingTypeFk: value };
         case 'totalWithVat':
             return { [`t.${param}`]: value };
     }
@@ -135,6 +140,7 @@ const columns = computed(() => [
         align: 'left',
         format: (row) => row.practicalHour,
         columnFilter: false,
+        dense: true,
     },
     {
         label: t('salesTicketsTable.preparation'),
@@ -227,22 +233,32 @@ const columns = computed(() => [
         label: t('salesTicketsTable.department'),
         name: 'department',
         align: 'left',
-        component: 'select',
-        attrs: {
-            url: 'Departments',
-            optionValue: 'name',
-            optionLabel: 'name',
-        },
         columnFilter: {
             component: 'select',
             url: 'Departments',
             attrs: {
+                options: DepartmentOpts.value,
                 optionValue: 'name',
                 optionLabel: 'name',
                 dense: true,
             },
         },
     },
+    {
+        label: t('salesTicketsTable.packing'),
+        name: 'packing',
+        align: 'left',
+        columnFilter: {
+            component: 'select',
+            url: 'ItemPackingTypes',
+            attrs: {
+                options: ItemPackingTypeOpts.value,
+                'option-value': 'code',
+                'option-label': 'code',
+                dense: true,
+            },
+        },
+    },
     {
         align: 'right',
         name: 'tableActions',
@@ -349,6 +365,24 @@ const openTab = (id) =>
         auto-load
         @on-fetch="(data) => (zoneOpts = data)"
     />
+    <FetchData
+        url="ItemPackingTypes"
+        :filter="{
+            fields: ['code'],
+            order: 'code ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (ItemPackingTypeOpts = data)"
+    />
+    <FetchData
+        url="Departments"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'id ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (DepartmentOpts = data)"
+    />
     <MonitorTicketSearchbar />
     <RightMenu>
         <template #right-panel>
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 083c24e4e..309bfadad 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -44,6 +44,7 @@ salesTicketsTable:
     preparation: Preparation
     payMethod: Pay method
     department: Department
+    packing: ITP
 searchBar:
     label: Search tickets
     info: Search tickets by id or alias
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index a3037d75b..6889c5db1 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -44,6 +44,7 @@ salesTicketsTable:
     preparation: Preparación
     payMethod: Método de pago
     department: Departamento
+    packing: ITP
 searchBar:
     label: Buscar tickets
     info: Buscar tickets por identificador o alias