From 68ebda625b9594229837e2bbb331d0f2787b53ec Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 25 Sep 2024 14:02:11 +0200
Subject: [PATCH 01/53] fix: refs #7874 refs #6943 ui

---
 .../components/CustomerAddressEdit.vue        | 58 +++++++++----------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 606867388..1e5387815 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -240,39 +240,33 @@ function handleLocation(data, location) {
                 class="row q-gutter-md q-mb-md"
                 v-for="(note, index) in notes"
             >
-                <div class="col">
-                    <VnSelect
-                        :label="t('Observation type')"
-                        :options="observationTypes"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="note.observationTypeFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Description')"
-                        :rules="validate('route.description')"
-                        clearable
-                        v-model="note.description"
-                    />
-                </div>
-                <div class="flex items-center">
-                    <QIcon
-                        @click.stop="deleteNote(note.id, index)"
-                        class="cursor-pointer"
-                        color="primary"
-                        name="delete"
-                        size="sm"
-                    >
-                        <QTooltip>
-                            {{ t('Remove note') }}
-                        </QTooltip>
-                    </QIcon>
-                </div>
+                <VnSelect
+                    :label="t('Observation type')"
+                    :options="observationTypes"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="note.observationTypeFk"
+                />
+                <VnInput
+                    :label="t('Description')"
+                    :rules="validate('route.description')"
+                    clearable
+                    v-model="note.description"
+                />
+                <QIcon
+                    :style="{ flex: 0, 'align-self': $q.screen.gt.xs ? 'end' : 'center' }"
+                    @click.stop="deleteNote(note.id, index)"
+                    class="cursor-pointer"
+                    color="primary"
+                    name="delete"
+                    size="sm"
+                >
+                    <QTooltip>
+                        {{ t('Remove note') }}
+                    </QTooltip>
+                </QIcon>
             </VnRow>
-
             <QBtn
                 @click.stop="addNote()"
                 class="cursor-pointer add-icon q-mt-md"

From 56af4d37364ffa1f665d172052da810c0f175c0b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 25 Sep 2024 14:18:34 +0200
Subject: [PATCH 02/53] feat: refs #7010 added packing type field in customer
 summary and ticket list

---
 .../components/CustomerSummaryTable.vue       | 18 ++++-
 src/pages/Ticket/TicketList.vue               | 70 +++++++++++++++----
 2 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 946296e67..8ebf4aabc 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -32,6 +32,16 @@ const filter = {
         },
         { relation: 'invoiceOut', scope: { fields: ['id'] } },
         { relation: 'agencyMode', scope: { fields: ['name'] } },
+        {
+            relation: 'ticketSales',
+            scope: {
+                fields: ['id', 'concept', 'itemFk'],
+                include: { relation: 'item' },
+                scope: {
+                    fields: ['id', 'name', 'itemPackingTypeFk'],
+                },
+            },
+        },
     ],
     where: { clientFk: route.params.id },
     order: ['shipped DESC', 'id'],
@@ -87,7 +97,13 @@ const columns = computed(() => [
         label: t('Total'),
         name: 'total',
     },
-
+    {
+        align: 'left',
+        name: 'itemPackingTypeFk',
+        label: t('ticketSale.packaging'),
+        format: (row, dashIfEmpty) =>
+            dashIfEmpty(row?.ticketSales[0]?.item.itemPackingTypeFk),
+    },
     {
         align: 'right',
         label: '',
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ad97e75c1..2a1dfd014 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref, onMounted, reactive } from 'vue';
 import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -62,6 +62,7 @@ const dialogData = ref();
 const companiesOptions = ref([]);
 const accountingOptions = ref([]);
 const amountToReturn = ref();
+const salesData = reactive({});
 
 const columns = computed(() => [
     {
@@ -95,6 +96,7 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
+        columnClass: 'expand',
         format: (row, dashIfEmpty) => dashIfEmpty(row.salesPerson),
     },
     {
@@ -153,11 +155,6 @@ const columns = computed(() => [
         },
         columnClass: 'expand',
     },
-    {
-        align: 'left',
-        name: 'refFk',
-        label: t('ticketList.ref'),
-    },
     {
         align: 'left',
         name: 'zoneFk',
@@ -191,6 +188,12 @@ const columns = computed(() => [
         },
         format: (row) => toCurrency(row.totalWithVat),
     },
+    {
+        align: 'left',
+        name: 'itemPackageFk',
+        label: t('ticketSale.packaging'),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.itemPackageFk),
+    },
     {
         align: 'right',
         name: 'tableActions',
@@ -439,6 +442,41 @@ function setReference(data) {
 
     dialogData.value.value.description = newDescription;
 }
+
+async function fetchSalesData(row) {
+    if (salesData[row.id]) {
+        return salesData[row.id]; // Retorna de caché si ya existen datos
+    }
+
+    try {
+        const sales = await getSales(row.id);
+        const packingTypes = getPackingTypes(sales);
+        const result = packingTypes.length > 0 ? packingTypes.join(', ') : '-';
+
+        salesData[row.id] = result; // Cachea el resultado
+        return result;
+    } catch (err) {
+        console.error('Error fetching sales', err);
+        salesData[row.id] = 'Error'; // Cachea el error
+        return 'Error';
+    }
+}
+
+async function getSales(rowId) {
+    const { data } = await axios.get(`Tickets/${rowId}/getSales`);
+    return data;
+}
+
+function getPackingTypes(sales) {
+    const itemPackingTypes = [];
+    sales.forEach((sale) => {
+        const packingType = sale?.item?.itemPackingTypeFk;
+        if (packingType && !itemPackingTypes.includes(packingType)) {
+            itemPackingTypes.push(packingType);
+        }
+    });
+    return itemPackingTypes;
+}
 </script>
 
 <template>
@@ -548,7 +586,7 @@ function setReference(data) {
         </template>
         <template #column-salesPersonFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.salesPerson }}
+                {{ dashIfEmpty(row.salesPerson) }}
                 <CustomerDescriptorProxy :id="row.salesPersonFk" />
             </span>
         </template>
@@ -577,16 +615,16 @@ function setReference(data) {
                     {{ row.state }}
                 </QChip>
             </span>
+            <span v-else-if="row.state === 'Entregado'">
+                <span class="link" @click.stop>
+                    {{ row.refFk }}
+                    <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+                </span>
+            </span>
             <span v-else>
                 {{ row.state }}
             </span>
         </template>
-        <template #column-refFk="{ row }">
-            <span class="link" @click.stop>
-                {{ dashIfEmpty(row.refFk) }}
-                <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
-            </span>
-        </template>
         <template #column-zoneFk="{ row }">
             <span class="link" @click.stop>
                 {{ dashIfEmpty(row.zoneName) }}
@@ -603,6 +641,12 @@ function setReference(data) {
                 {{ row.totalWithVat }}
             </QChip>
         </template>
+        <template #column-itemPackageFk="{ row }">
+            <div v-if="salesData[row.id]">{{ dashIfEmpty(salesData[row.id]) }}</div>
+            <div v-else>
+                {{ fetchSalesData(row) }}
+            </div>
+        </template>
         <template #more-create-dialog="{ data }">
             <VnRow>
                 <VnSelect

From 709a662ceb2e3d600a37676a02049ebf089611c7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 09:08:12 +0200
Subject: [PATCH 03/53] feat: refs #7874  select observation type

---
 src/components/ui/VnNotes.vue             | 117 +++++++++++++++-------
 src/pages/Customer/Card/CustomerNotes.vue |   1 +
 2 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index bf5e86a16..143cd2bf9 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref } from 'vue';
+import { ref, reactive } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -12,36 +12,39 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnAvatar from 'components/ui/VnAvatar.vue';
+import VnRow from './VnRow.vue';
+import VnSelect from '../common/VnSelect.vue';
+import FetchData from '../FetchData.vue';
+import VnInput from '../common/VnInput.vue';
 
 const $props = defineProps({
     url: { type: String, default: null },
     filter: { type: Object, default: () => {} },
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
+    selectType: { type: Boolean, default: false },
 });
 
 const { t } = useI18n();
 const state = useState();
 const quasar = useQuasar();
 const currentUser = ref(state.getUser());
-const newNote = ref('');
+const newNote = reactive({ text: '', observationTypeFk: null });
+const observationTypes = ref([]);
 const vnPaginateRef = ref();
-function handleKeyUp(event) {
-    if (event.key === 'Enter') {
-        event.preventDefault();
-        if (!event.shiftKey) insert();
-    }
-}
+
 async function insert() {
     const body = $props.body;
-    const newBody = { ...body, ...{ text: newNote.value } };
+    const newBody = {
+        ...body,
+        ...{ text: newNote.text, observationTypeFk: newNote.observationTypeFk },
+    };
     await axios.post($props.url, newBody);
     await vnPaginateRef.value.fetch();
-    newNote.value = '';
 }
 
 onBeforeRouteLeave((to, from, next) => {
-    if (newNote.value)
+    if (newNote.text)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -54,6 +57,12 @@ onBeforeRouteLeave((to, from, next) => {
 });
 </script>
 <template>
+    <FetchData
+        url="ObservationTypes"
+        :filter="{ fields: ['id', 'description'] }"
+        :auto-load="selectType"
+        @on-fetch="(data) => observationTypes.push(...data)"
+    />
     <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>
             <VnAvatar :worker-id="currentUser.id" size="md" />
@@ -62,29 +71,38 @@ onBeforeRouteLeave((to, from, next) => {
                 {{ t('globals.now') }}
             </div>
         </QCardSection>
-        <QCardSection class="q-pa-xs q-my-none q-py-none" horizontal>
-            <QInput
-                v-model="newNote"
-                class="full-width"
-                type="textarea"
-                :label="t('Add note here...')"
-                filled
-                size="lg"
-                autogrow
-                autofocus
-                @keyup="handleKeyUp"
-                clearable
-            >
-                <template #append>
-                    <QBtn
-                        :title="t('Save (Enter)')"
-                        icon="save"
-                        color="primary"
-                        flat
-                        @click="insert"
-                    />
-                </template>
-            </QInput>
+        <QCardSection class="q-px-xs q-my-none q-py-none">
+            <VnRow class="full-width">
+                <VnSelect
+                    :label="t('Observation type')"
+                    v-if="selectType"
+                    url="ObservationTypes"
+                    v-model="newNote.observationTypeFk"
+                    option-label="description"
+                    style="flex: 0.15; margin-left: 0"
+                />
+                <VnInput
+                    v-model.trim="newNote.text"
+                    type="textarea"
+                    :label="t('Add note here...')"
+                    filled
+                    size="lg"
+                    autogrow
+                    autofocus
+                    @keyup.enter="insert"
+                    clearable
+                >
+                    <template #append>
+                        <QBtn
+                            :title="t('Save (Enter)')"
+                            icon="save"
+                            color="primary"
+                            flat
+                            @click="insert"
+                        />
+                    </template>
+                </VnInput>
+            </VnRow>
         </QCardSection>
     </QCard>
     <VnPaginate
@@ -98,6 +116,10 @@ onBeforeRouteLeave((to, from, next) => {
         class="show"
         v-bind="$attrs"
         search-url="notes"
+        @on-fetch="
+            newNote.text = '';
+            newNote.observationTypeFk = null;
+        "
     >
         <template #body="{ rows }">
             <TransitionGroup name="list" tag="div" class="column items-center full-width">
@@ -111,17 +133,38 @@ onBeforeRouteLeave((to, from, next) => {
                             :descriptor="false"
                             :worker-id="note.workerFk"
                             size="md"
+                            :title="note.worker?.user.nickname"
                         />
                         <div class="full-width row justify-between q-pa-xs">
                             <VnUserLink
                                 :name="`${note.worker.user.nickname}`"
                                 :worker-id="note.worker.id"
                             />
-                            {{ toDateHourMin(note.created) }}
+                            <span v-text="toDateHourMin(note.created)" />
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">
-                        {{ note.text }}
+                        <VnRow>
+                            <VnSelect
+                                :label="t('Observation type')"
+                                v-if="selectType && note.observationTypeFk"
+                                url="ObservationTypes"
+                                v-model="note.observationTypeFk"
+                                option-label="description"
+                                style="flex: 0.15"
+                                dense
+                                readonly
+                                :is-clearable="false"
+                            />
+                            <span
+                                :style="{
+                                    flex: 0.85,
+                                    'align-self':
+                                        selectType & $q.screen.gt.xs ? 'end' : 'baseline',
+                                }"
+                                v-text="note.text"
+                            />
+                        </VnRow>
                     </QCardSection>
                 </QCard>
             </TransitionGroup>
@@ -156,5 +199,5 @@ onBeforeRouteLeave((to, from, next) => {
         Add note here...: Añadir nota aquí...
         New note: Nueva nota
         Save (Enter): Guardar (Intro)
-
+        Observation type: Tipo de observación
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index a9121f7f5..b85174696 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -22,5 +22,6 @@ const noteFilter = computed(() => {
         :filter="noteFilter"
         :body="{ clientFk: route.params.id }"
         style="overflow-y: auto"
+        :select-type="true"
     />
 </template>

From 6d5a8cba6ffffce3ee6069ae3c28f7271cdeffb1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 26 Sep 2024 10:20:50 +0200
Subject: [PATCH 04/53] refactor: refs #7010 modified customer summary table

---
 .../Customer/components/CustomerSummaryTable.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 8ebf4aabc..bf52b8d6b 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { date } from 'quasar';
 import { toDateFormat } from 'src/filters/date.js';
 
-import { toCurrency } from 'src/filters';
+import { dashIfEmpty, toCurrency } from 'src/filters';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
@@ -101,8 +101,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'itemPackingTypeFk',
         label: t('ticketSale.packaging'),
-        format: (row, dashIfEmpty) =>
-            dashIfEmpty(row?.ticketSales[0]?.item.itemPackingTypeFk),
     },
     {
         align: 'right',
@@ -221,6 +219,18 @@ const setShippedColor = (date) => {
             </QBadge>
             <span v-else> {{ toDateFormat(row.shipped) }}</span>
         </template>
+        <template #column-itemPackingTypeFk="{ row }">
+            <span>
+                {{
+                    dashIfEmpty(
+                        row?.ticketSales
+                            .map((sale) => sale.item?.itemPackingTypeFk || '-')
+                            .filter((value) => value !== '-')
+                            .join(', ')
+                    )
+                }}
+            </span>
+        </template>
     </VnTable>
 </template>
 

From 1c99c01d1dcfe61e595cd322cde9910ac943cb87 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 26 Sep 2024 14:12:59 +0200
Subject: [PATCH 05/53] refactor: refs #7010 modified front

---
 src/pages/Ticket/TicketList.vue | 48 +++------------------------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 2a1dfd014..fe9667bea 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onMounted, reactive } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -62,7 +62,6 @@ const dialogData = ref();
 const companiesOptions = ref([]);
 const accountingOptions = ref([]);
 const amountToReturn = ref();
-const salesData = reactive({});
 
 const columns = computed(() => [
     {
@@ -190,9 +189,9 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'itemPackageFk',
+        name: 'packing',
         label: t('ticketSale.packaging'),
-        format: (row, dashIfEmpty) => dashIfEmpty(row.itemPackageFk),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.packing),
     },
     {
         align: 'right',
@@ -442,41 +441,6 @@ function setReference(data) {
 
     dialogData.value.value.description = newDescription;
 }
-
-async function fetchSalesData(row) {
-    if (salesData[row.id]) {
-        return salesData[row.id]; // Retorna de caché si ya existen datos
-    }
-
-    try {
-        const sales = await getSales(row.id);
-        const packingTypes = getPackingTypes(sales);
-        const result = packingTypes.length > 0 ? packingTypes.join(', ') : '-';
-
-        salesData[row.id] = result; // Cachea el resultado
-        return result;
-    } catch (err) {
-        console.error('Error fetching sales', err);
-        salesData[row.id] = 'Error'; // Cachea el error
-        return 'Error';
-    }
-}
-
-async function getSales(rowId) {
-    const { data } = await axios.get(`Tickets/${rowId}/getSales`);
-    return data;
-}
-
-function getPackingTypes(sales) {
-    const itemPackingTypes = [];
-    sales.forEach((sale) => {
-        const packingType = sale?.item?.itemPackingTypeFk;
-        if (packingType && !itemPackingTypes.includes(packingType)) {
-            itemPackingTypes.push(packingType);
-        }
-    });
-    return itemPackingTypes;
-}
 </script>
 
 <template>
@@ -641,12 +605,6 @@ function getPackingTypes(sales) {
                 {{ row.totalWithVat }}
             </QChip>
         </template>
-        <template #column-itemPackageFk="{ row }">
-            <div v-if="salesData[row.id]">{{ dashIfEmpty(salesData[row.id]) }}</div>
-            <div v-else>
-                {{ fetchSalesData(row) }}
-            </div>
-        </template>
         <template #more-create-dialog="{ data }">
             <VnRow>
                 <VnSelect

From 71201f1007560845041f5010ba6aa7c04f3ecff2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 17:19:05 +0200
Subject: [PATCH 06/53] feat: refs #7874 required fields banner

---
 src/components/ui/VnNotes.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 143cd2bf9..6ae8538e2 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -42,7 +42,6 @@ async function insert() {
     await axios.post($props.url, newBody);
     await vnPaginateRef.value.fetch();
 }
-
 onBeforeRouteLeave((to, from, next) => {
     if (newNote.text)
         quasar.dialog({
@@ -80,6 +79,8 @@ onBeforeRouteLeave((to, from, next) => {
                     v-model="newNote.observationTypeFk"
                     option-label="description"
                     style="flex: 0.15; margin-left: 0"
+                    :required="true"
+                    @keyup.enter.stop="insert"
                 />
                 <VnInput
                     v-model.trim="newNote.text"
@@ -88,9 +89,9 @@ onBeforeRouteLeave((to, from, next) => {
                     filled
                     size="lg"
                     autogrow
-                    autofocus
-                    @keyup.enter="insert"
+                    @keyup.enter.stop="insert"
                     clearable
+                    :required="true"
                 >
                     <template #append>
                         <QBtn

From 0b76d0d556e86e2730e53d4fd317a79604c99f50 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 2 Oct 2024 11:52:16 +0200
Subject: [PATCH 07/53] refactor: refs #7010 added function to get item
 packaging type

---
 .../components/CustomerSummaryTable.vue        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index bf52b8d6b..eb001328c 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -149,6 +149,15 @@ const setShippedColor = (date) => {
     if (difference == 0) return 'warning';
     if (difference < 0) return 'success';
 };
+
+const getItemPackagingType = (row) => {
+    const packagingType = row?.ticketSales
+        .map((sale) => sale.item?.itemPackingTypeFk || '-')
+        .filter((value) => value !== '-')
+        .join(', ');
+
+    return dashIfEmpty(packagingType);
+};
 </script>
 
 <template>
@@ -221,14 +230,7 @@ const setShippedColor = (date) => {
         </template>
         <template #column-itemPackingTypeFk="{ row }">
             <span>
-                {{
-                    dashIfEmpty(
-                        row?.ticketSales
-                            .map((sale) => sale.item?.itemPackingTypeFk || '-')
-                            .filter((value) => value !== '-')
-                            .join(', ')
-                    )
-                }}
+                {{ getItemPackagingType(row) }}
             </span>
         </template>
     </VnTable>

From 8ee4edc5d547d17676df7a8ed194ff5f1471acd1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 3 Oct 2024 08:38:56 +0200
Subject: [PATCH 08/53] perf: refs #7010 customer summary packaging type field

---
 src/pages/Customer/components/CustomerSummaryTable.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index eb001328c..f6013dea9 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -101,6 +101,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'itemPackingTypeFk',
         label: t('ticketSale.packaging'),
+        format: (row) => getItemPackagingType(row),
     },
     {
         align: 'right',
@@ -228,11 +229,6 @@ const getItemPackagingType = (row) => {
             </QBadge>
             <span v-else> {{ toDateFormat(row.shipped) }}</span>
         </template>
-        <template #column-itemPackingTypeFk="{ row }">
-            <span>
-                {{ getItemPackagingType(row) }}
-            </span>
-        </template>
     </VnTable>
 </template>
 

From 01dc25da8ccc320dd336a36297d41c426b599339 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Oct 2024 10:23:27 +0200
Subject: [PATCH 09/53] refactor: refs #7874 create element if condition

---
 src/components/ui/VnNotes.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 6ae8538e2..340f46775 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -57,10 +57,11 @@ onBeforeRouteLeave((to, from, next) => {
 </script>
 <template>
     <FetchData
+        v-if="selectType"
         url="ObservationTypes"
         :filter="{ fields: ['id', 'description'] }"
-        :auto-load="selectType"
-        @on-fetch="(data) => observationTypes.push(...data)"
+        auto-load
+        @on-fetch="(data) => (observationTypes = data)"
     />
     <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>

From ad8b72660fa80917f02598ad823ad0fe15fea3dd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Oct 2024 13:37:21 +0200
Subject: [PATCH 10/53] fix: refs #7353 scopeDays

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 16d5abffb..d24230c64 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -25,7 +25,11 @@ const stateOpts = ref([]);
 const zoneOpts = ref([]);
 const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
-const [from, to] = dateRange(Date.vnNew());
+const from = Date.vnNew();
+from.setHours(0, 0, 0, 0);
+const to = new Date(from.getTime());
+to.setDate(to.getDate() + 1);
+to.setHours(23, 59, 59, 999);
 
 function exprBuilder(param, value) {
     switch (param) {

From cd20db637c6cdf4763274b29618f01f51f53c953 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Oct 2024 15:30:26 +0200
Subject: [PATCH 11/53] fix: refs #7874 btn ui

---
 src/components/ui/VnNotes.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 340f46775..92dd32691 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -101,6 +101,8 @@ onBeforeRouteLeave((to, from, next) => {
                             color="primary"
                             flat
                             @click="insert"
+                            class="q-mb-xs"
+                            dense
                         />
                     </template>
                 </VnInput>

From 4b9588c189544aee28e36f1fa66a23a7ed5ea27b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 08:55:48 +0200
Subject: [PATCH 12/53] refactor: refs #7825 modified worker list form to fill
 the field when a bank entity is created

---
 src/pages/Worker/WorkerList.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index f4ae20591..4b7d028e7 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -93,6 +93,11 @@ onBeforeMount(async () => {
     ).data?.payMethodFk;
 });
 
+const handleNewBankEntity = (response, formData) => {
+    bankEntitiesOptions.value = [...bankEntitiesOptions.value, response];
+    formData.bankEntityFk = response.id;
+};
+
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
     data.postcode = code;
@@ -319,7 +324,10 @@ async function autofillBic(worker) {
                     >
                         <template #form>
                             <CreateBankEntityForm
-                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
+                                @on-data-saved="
+                                    (_, requestResponse) =>
+                                        handleNewBankEntity(requestResponse, data)
+                                "
                             />
                         </template>
                         <template #option="scope">

From 0d31adaa4b1cdd85ca24825969d3cc25a44884bc Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 4 Oct 2024 11:29:21 +0200
Subject: [PATCH 13/53] refs #7767 check holiday

---
 src/pages/Worker/Card/WorkerCalendarFilter.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 2b81b6eaf..95fb2d393 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -3,9 +3,11 @@ import WorkerEventLabel from 'pages/Worker/Card/WorkerEventLabel.vue';
 import FetchData from 'components/FetchData.vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
+import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { toDateFormat } from '../../../filters/date';
+const { notify } = useNotify();
 
 const { t } = useI18n();
 const route = useRoute();
@@ -33,6 +35,9 @@ const props = defineProps({
     },
 });
 
+onMounted(async () => {
+    await checkHolidays(props.contractHolidays);
+});
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
 const selectedBusinessFk = computed({
@@ -60,6 +65,16 @@ const generateYears = () => {
     return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
 };
 
+const checkHolidays = (contractHolidays) => {
+    console.log('contractHolidays', contractHolidays);
+    if (
+        contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||
+        contractHolidays.hoursEnjoyed > contractHolidays.totalHours
+    ) {
+        notify(t('Vacation days have been exceeded'), 'negative');
+    }
+};
+
 const absenceTypeList = ref([]);
 const contractList = ref([]);
 const yearList = ref(generateYears());

From 947f913679b79451d5b790a41d41fdf69873f581 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 09:25:06 +0200
Subject: [PATCH 14/53] refactor: refs #8019 create VnDate

---
 src/components/common/VnDate.vue      | 11 +++++++++++
 src/components/common/VnInputDate.vue | 23 +++++++++++------------
 src/components/common/VnTime.vue      |  6 ++++++
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 src/components/common/VnDate.vue
 create mode 100644 src/components/common/VnTime.vue

diff --git a/src/components/common/VnDate.vue b/src/components/common/VnDate.vue
new file mode 100644
index 000000000..4b65ec4da
--- /dev/null
+++ b/src/components/common/VnDate.vue
@@ -0,0 +1,11 @@
+<script setup>
+const model = defineModel({ type: [String, Number], required: true });
+</script>
+<template>
+    <QDate
+        v-model="model"
+        :landscape="$q.screen.gt.xs"
+        :today-btn="true"
+        :options="$attrs.options"
+    />
+</template>
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 3d5afaf80..1aa797ab7 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -3,6 +3,7 @@ import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useAttrs } from 'vue';
+import VnDate from './VnDate.vue';
 
 const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
@@ -87,6 +88,11 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
+
+const manageDate = (date) => {
+    formattedDate.value = date;
+    isPopupOpen.value = false;
+};
 </script>
 
 <template>
@@ -129,6 +135,7 @@ const styleAttrs = computed(() => {
                 />
             </template>
             <QMenu
+                v-if="$q.screen.gt.xs"
                 transition-show="scale"
                 transition-hide="scale"
                 v-model="isPopupOpen"
@@ -137,19 +144,11 @@ const styleAttrs = computed(() => {
                 :no-focus="true"
                 :no-parent-event="true"
             >
-                <QDate
-                    v-model="popupDate"
-                    :landscape="true"
-                    :today-btn="true"
-                    :options="$attrs.options"
-                    @update:model-value="
-                        (date) => {
-                            formattedDate = date;
-                            isPopupOpen = false;
-                        }
-                    "
-                />
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
             </QMenu>
+            <QDialog v-else v-model="isPopupOpen">
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
+            </QDialog>
         </QInput>
     </div>
 </template>
diff --git a/src/components/common/VnTime.vue b/src/components/common/VnTime.vue
new file mode 100644
index 000000000..135709d2b
--- /dev/null
+++ b/src/components/common/VnTime.vue
@@ -0,0 +1,6 @@
+<script setup>
+const model = defineModel({ type: [String, Number], required: true });
+</script>
+<template>
+    <QTime v-model="model" :landscape="$q.screen.gt.xs" now-btn mask="HH:mm" />
+</template>

From 5c5a35998615b270d4f2423b4247f828fd9524fb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 09:38:39 +0200
Subject: [PATCH 15/53] refactor: refs #8019 create VnTime

---
 src/components/common/VnInputTime.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index a5e7d3002..6d69bc4a5 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -3,6 +3,8 @@ import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
+import VnTime from './VnTime.vue';
+
 const { validations } = useValidator();
 const $attrs = useAttrs();
 const model = defineModel({ type: String });
@@ -107,6 +109,7 @@ function dateToTime(newDate) {
                 />
             </template>
             <QMenu
+                v-if="$q.screen.gt.xs"
                 transition-show="scale"
                 transition-hide="scale"
                 v-model="isPopupOpen"
@@ -115,8 +118,11 @@ function dateToTime(newDate) {
                 :no-focus="true"
                 :no-parent-event="true"
             >
-                <QTime v-model="formattedTime" mask="HH:mm" landscape now-btn />
+                <VnTime v-model="formattedTime" />
             </QMenu>
+            <QDialog v-else v-model="isPopupOpen">
+                <VnTime v-model="formattedTime" />
+            </QDialog>
         </QInput>
     </div>
 </template>

From d1b3e01d871e95a7472900225fa2b2d545aef19c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 13:36:27 +0200
Subject: [PATCH 16/53] chore: refs #8019 refactor css scoped

---
 src/components/common/VnDate.vue | 36 ++++++++++++++++++++++++++++++++
 src/components/ui/VnImg.vue      |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnDate.vue b/src/components/common/VnDate.vue
index 4b65ec4da..cdfa0d258 100644
--- a/src/components/common/VnDate.vue
+++ b/src/components/common/VnDate.vue
@@ -9,3 +9,39 @@ const model = defineModel({ type: [String, Number], required: true });
         :options="$attrs.options"
     />
 </template>
+<style lang="scss" scoped>
+.q-date {
+    width: 240px;
+    min-width: none;
+
+    :deep(.q-date__calendar) {
+        padding-bottom: 0;
+    }
+    :deep(.q-date__view) {
+        min-height: 240px;
+        padding: 8px;
+    }
+    :deep(.q-date__calendar-days-container) {
+        min-height: 160px;
+        height: unset;
+    }
+}
+.q-date--portrait-standard :deep(.q-date__header) {
+    padding: 2px 2px 5px 12px;
+    height: 60px;
+}
+
+@media (min-width: $breakpoint-xs-max) {
+    .q-date--landscape-standard {
+        min-width: 280px;
+
+        :deep(.q-date__header) {
+            min-width: 0;
+            padding: 10px 8px 0 8px;
+        }
+    }
+    .q-date--landscape-standard :deep(.q-date__view) {
+        width: 220px;
+    }
+}
+</style>
diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index ceb4e8468..1b57c20d0 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -58,7 +58,7 @@ defineExpose({
         :class="{ zoomIn: zoom }"
         :src="getUrl()"
         v-bind="$attrs"
-        @click.stop="show = $props.zoom ? true : false"
+        @click.stop="show = $props.zoom"
         spinner-color="primary"
     />
     <QDialog v-if="$props.zoom" v-model="show">

From c81506695314e291aa22d7433d65521711921d37 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 15:55:18 +0200
Subject: [PATCH 17/53] feat: refs #8019 fine-tunning vnDate

---
 src/components/common/VnDate.vue | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/components/common/VnDate.vue b/src/components/common/VnDate.vue
index cdfa0d258..761ac995e 100644
--- a/src/components/common/VnDate.vue
+++ b/src/components/common/VnDate.vue
@@ -2,46 +2,28 @@
 const model = defineModel({ type: [String, Number], required: true });
 </script>
 <template>
-    <QDate
-        v-model="model"
-        :landscape="$q.screen.gt.xs"
-        :today-btn="true"
-        :options="$attrs.options"
-    />
+    <QDate v-model="model" :today-btn="true" :options="$attrs.options" />
 </template>
 <style lang="scss" scoped>
 .q-date {
-    width: 240px;
-    min-width: none;
+    width: 245px;
+    min-width: unset;
 
     :deep(.q-date__calendar) {
         padding-bottom: 0;
     }
     :deep(.q-date__view) {
-        min-height: 240px;
+        min-height: 245px;
         padding: 8px;
     }
     :deep(.q-date__calendar-days-container) {
         min-height: 160px;
         height: unset;
     }
-}
-.q-date--portrait-standard :deep(.q-date__header) {
-    padding: 2px 2px 5px 12px;
-    height: 60px;
-}
 
-@media (min-width: $breakpoint-xs-max) {
-    .q-date--landscape-standard {
-        min-width: 280px;
-
-        :deep(.q-date__header) {
-            min-width: 0;
-            padding: 10px 8px 0 8px;
-        }
-    }
-    .q-date--landscape-standard :deep(.q-date__view) {
-        width: 220px;
+    :deep(.q-date__header) {
+        padding: 2px 2px 5px 12px;
+        height: 60px;
     }
 }
 </style>

From 4344458bb067f4c6595f02df580dffd3e5e08a84 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 16:02:29 +0200
Subject: [PATCH 18/53] feat: refs #8019 fine-tunning vnTime

---
 src/components/common/VnTime.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnTime.vue b/src/components/common/VnTime.vue
index 135709d2b..369f80432 100644
--- a/src/components/common/VnTime.vue
+++ b/src/components/common/VnTime.vue
@@ -2,5 +2,15 @@
 const model = defineModel({ type: [String, Number], required: true });
 </script>
 <template>
-    <QTime v-model="model" :landscape="$q.screen.gt.xs" now-btn mask="HH:mm" />
+    <QTime v-model="model" now-btn mask="HH:mm" />
 </template>
+<style lang="scss" scoped>
+.q-time {
+    width: 230px;
+    min-width: unset;
+    :deep(.q-time__header) {
+        min-height: unset;
+        height: 50px;
+    }
+}
+</style>

From 73e5039ec39d351672548f22400fc0c6c52220a5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Oct 2024 08:35:24 +0200
Subject: [PATCH 19/53] refs #7986 create front

---
 src/pages/Worker/Card/WorkerMoto.vue | 187 +++++++++++++++++++++++++++
 1 file changed, 187 insertions(+)
 create mode 100644 src/pages/Worker/Card/WorkerMoto.vue

diff --git a/src/pages/Worker/Card/WorkerMoto.vue b/src/pages/Worker/Card/WorkerMoto.vue
new file mode 100644
index 000000000..a53aac270
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerMoto.vue
@@ -0,0 +1,187 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { ref, computed } from 'vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const paginate = ref();
+const dialog = ref();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+const routeId = computed(() => route.params.id);
+
+const initialData = computed(() => {
+    return {
+        userFk: routeId.value,
+        deviceProductionFk: null,
+        simSerialNumber: null,
+    };
+});
+
+const deallocatePDA = async (deviceProductionFk) => {
+    try {
+        await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+            pda: deviceProductionFk,
+        });
+        notify(t('PDA deallocated'), 'positive');
+    } catch (err) {
+        console.error('Error deallocating PDA');
+    }
+    paginate.value.fetch();
+};
+
+function reloadData() {
+    initialData.value.deviceProductionFk = null;
+    initialData.value.simSerialNumber = null;
+    paginate.value.fetch();
+}
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md centerCard">
+        <FetchData
+            url="workers/getAvailablePda"
+            @on-fetch="(data) => (deviceProductions = data)"
+            auto-load
+        />
+        <VnPaginate
+            ref="paginate"
+            data-key="WorkerPda"
+            url="DeviceProductionUsers"
+            :filter="{ where: { userFk: routeId } }"
+            order="id"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-px-md q-mb-sm container"
+                >
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.pda.currentPDA')"
+                            :model-value="row?.deviceProductionFk"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Model')"
+                            :model-value="row?.deviceProduction?.modelFk"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Serial number')"
+                            :model-value="row?.deviceProduction?.serialNumber"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Current SIM')"
+                            :model-value="row?.simSerialNumber"
+                            disable
+                        />
+                        <QBtn
+                            flat
+                            icon="delete"
+                            color="primary"
+                            class="btn-delete"
+                            @click="
+                                openConfirmationModal(
+                                    t(`Remove PDA`),
+                                    t('Do you want to remove this PDA?'),
+                                    () => deallocatePDA(row.deviceProductionFk)
+                                )
+                            "
+                        >
+                            <QTooltip>
+                                {{ t('worker.pda.removePDA') }}
+                            </QTooltip>
+                        </QBtn>
+                    </VnRow>
+                </QCard>
+            </template>
+        </VnPaginate>
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
+                <QDialog ref="dialog">
+                    <FormModelPopup
+                        :title="t('Add new device')"
+                        url-create="DeviceProductionUsers"
+                        model="DeviceProductionUser"
+                        :form-initial-data="initialData"
+                        @on-data-saved="reloadData()"
+                    >
+                        <template #form-inputs="{ data }">
+                            <VnRow>
+                                <VnSelect
+                                    :label="t('worker.pda.newPDA')"
+                                    v-model="data.deviceProductionFk"
+                                    :options="deviceProductions"
+                                    option-label="id"
+                                    option-value="id"
+                                    id="deviceProductionFk"
+                                    hide-selected
+                                >
+                                    <template #option="scope">
+                                        <QItem v-bind="scope.itemProps">
+                                            <QItemSection>
+                                                <QItemLabel
+                                                    >ID: {{ scope.opt?.id }}</QItemLabel
+                                                >
+                                                <QItemLabel caption>
+                                                    {{ scope.opt?.modelFk }},
+                                                    {{ scope.opt?.serialNumber }}
+                                                </QItemLabel>
+                                            </QItemSection>
+                                        </QItem>
+                                    </template>
+                                </VnSelect>
+                                <VnInput
+                                    v-model="data.simSerialNumber"
+                                    :label="t('SIM serial number')"
+                                    id="simSerialNumber"
+                                    use-input
+                                />
+                            </VnRow>
+                        </template>
+                    </FormModelPopup>
+                </QDialog>
+            </QBtn>
+            <QTooltip>
+                {{ t('globals.new') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+<style lang="scss" scoped>
+.btn-delete {
+    max-width: 4%;
+    margin-top: 30px;
+}
+</style>
+<i18n>
+es:
+    Model: Modelo
+    Serial number: Número de serie
+    Current SIM: SIM actual
+    Add new device: Añadir nuevo dispositivo
+    PDA deallocated: PDA desasignada
+    Remove PDA: Eliminar PDA
+    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
+    You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
+    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+</i18n>

From e0f60ed1181c2548ba77b4e2a55461c7b6492e5e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 8 Oct 2024 11:07:05 +0000
Subject: [PATCH 20/53] test: fix VnLocation

---
 .../integration/vnComponent/vnLocation.spec.js       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 78dc38899..c1b0cf929 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -64,7 +64,7 @@ describe('VnLocation', () => {
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon`
             ).click();
             cy.get(
-                `#q-portal--dialog--4 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
+                `#q-portal--dialog--5 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
             ).should('have.value', province);
         });
     });
@@ -133,6 +133,8 @@ describe('VnLocation', () => {
             );
             cy.get('.q-mt-lg > .q-btn--standard').click();
             cy.get(`${createForm.prefix}`).should('not.exist');
+            cy.waitForElement('.q-form');
+
             checkVnLocation(postCode, province);
         });
         it('Create city', () => {
@@ -144,10 +146,12 @@ describe('VnLocation', () => {
             cy.get(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
             ).click();
-            cy.selectOption('#q-portal--dialog--2 .q-select', 'one');
-            cy.get('#q-portal--dialog--2 .q-input').type(province);
-            cy.get('#q-portal--dialog--2 .q-btn--standard').click();
+            cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
+            cy.get('#q-portal--dialog--3 .q-input').type(province);
+            cy.get('#q-portal--dialog--3 .q-btn--standard').click();
             cy.get('#q-portal--dialog--1 .q-btn--standard').click();
+            cy.waitForElement('.q-form');
+
             checkVnLocation(postCode, province);
         });
 

From 6a797460806cf628f9310a7c54d35fb878c29b03 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 8 Oct 2024 13:18:51 +0200
Subject: [PATCH 21/53] test: fix TicketDescriptor

---
 test/cypress/integration/ticket/ticketDescriptor.spec.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 8192b7c7c..0ba2723a2 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -1,7 +1,8 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
-    const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
-    const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
+    const listItem = '[role="menu"] .q-list .q-item';
+    const toCloneOpt = 'To clone ticket';
+    const setWeightOpt = 'Set weight';
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;
@@ -14,7 +15,7 @@ describe('Ticket descriptor', () => {
     it('should clone the ticket without warehouse', () => {
         cy.visit('/#/ticket/1/summary');
         cy.openActionsDescriptor();
-        cy.get(toCloneOpt).click();
+        cy.contains(listItem, toCloneOpt).click();
         cy.clickConfirm();
         cy.get(warehouseValue).contains('Warehouse One');
         cy.get(summaryHeader)
@@ -28,7 +29,7 @@ describe('Ticket descriptor', () => {
     it('should set the weight of the ticket', () => {
         cy.visit('/#/ticket/10/summary');
         cy.openActionsDescriptor();
-        cy.get(setWeightOpt).click();
+        cy.contains(listItem, setWeightOpt).click();
         cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight');
         cy.get('.q-dialog input').type(weight);
         cy.clickConfirm();

From 855032e4a63765927536c8a266ccce7ec472b28e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Oct 2024 15:36:57 +0200
Subject: [PATCH 22/53] refs #7986 fix front

---
 src/pages/Worker/Card/WorkerMoto.vue     | 187 -------------
 src/pages/Worker/Card/WorkerOperator.vue | 322 +++++++++++++++++++++++
 src/router/modules/worker.js             |  12 +
 3 files changed, 334 insertions(+), 187 deletions(-)
 delete mode 100644 src/pages/Worker/Card/WorkerMoto.vue
 create mode 100644 src/pages/Worker/Card/WorkerOperator.vue

diff --git a/src/pages/Worker/Card/WorkerMoto.vue b/src/pages/Worker/Card/WorkerMoto.vue
deleted file mode 100644
index a53aac270..000000000
--- a/src/pages/Worker/Card/WorkerMoto.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import { ref, computed } from 'vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-import FetchData from 'components/FetchData.vue';
-import FormModelPopup from 'src/components/FormModelPopup.vue';
-import { useVnConfirm } from 'composables/useVnConfirm';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const paginate = ref();
-const dialog = ref();
-const route = useRoute();
-const { openConfirmationModal } = useVnConfirm();
-const routeId = computed(() => route.params.id);
-
-const initialData = computed(() => {
-    return {
-        userFk: routeId.value,
-        deviceProductionFk: null,
-        simSerialNumber: null,
-    };
-});
-
-const deallocatePDA = async (deviceProductionFk) => {
-    try {
-        await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
-            pda: deviceProductionFk,
-        });
-        notify(t('PDA deallocated'), 'positive');
-    } catch (err) {
-        console.error('Error deallocating PDA');
-    }
-    paginate.value.fetch();
-};
-
-function reloadData() {
-    initialData.value.deviceProductionFk = null;
-    initialData.value.simSerialNumber = null;
-    paginate.value.fetch();
-}
-</script>
-
-<template>
-    <QPage class="column items-center q-pa-md centerCard">
-        <FetchData
-            url="workers/getAvailablePda"
-            @on-fetch="(data) => (deviceProductions = data)"
-            auto-load
-        />
-        <VnPaginate
-            ref="paginate"
-            data-key="WorkerPda"
-            url="DeviceProductionUsers"
-            :filter="{ where: { userFk: routeId } }"
-            order="id"
-            auto-load
-        >
-            <template #body="{ rows }">
-                <QCard
-                    flat
-                    bordered
-                    :key="row.id"
-                    v-for="row of rows"
-                    class="card q-px-md q-mb-sm container"
-                >
-                    <VnRow>
-                        <VnInput
-                            :label="t('worker.pda.currentPDA')"
-                            :model-value="row?.deviceProductionFk"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Model')"
-                            :model-value="row?.deviceProduction?.modelFk"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Serial number')"
-                            :model-value="row?.deviceProduction?.serialNumber"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Current SIM')"
-                            :model-value="row?.simSerialNumber"
-                            disable
-                        />
-                        <QBtn
-                            flat
-                            icon="delete"
-                            color="primary"
-                            class="btn-delete"
-                            @click="
-                                openConfirmationModal(
-                                    t(`Remove PDA`),
-                                    t('Do you want to remove this PDA?'),
-                                    () => deallocatePDA(row.deviceProductionFk)
-                                )
-                            "
-                        >
-                            <QTooltip>
-                                {{ t('worker.pda.removePDA') }}
-                            </QTooltip>
-                        </QBtn>
-                    </VnRow>
-                </QCard>
-            </template>
-        </VnPaginate>
-        <QPageSticky :offset="[18, 18]">
-            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
-                <QDialog ref="dialog">
-                    <FormModelPopup
-                        :title="t('Add new device')"
-                        url-create="DeviceProductionUsers"
-                        model="DeviceProductionUser"
-                        :form-initial-data="initialData"
-                        @on-data-saved="reloadData()"
-                    >
-                        <template #form-inputs="{ data }">
-                            <VnRow>
-                                <VnSelect
-                                    :label="t('worker.pda.newPDA')"
-                                    v-model="data.deviceProductionFk"
-                                    :options="deviceProductions"
-                                    option-label="id"
-                                    option-value="id"
-                                    id="deviceProductionFk"
-                                    hide-selected
-                                >
-                                    <template #option="scope">
-                                        <QItem v-bind="scope.itemProps">
-                                            <QItemSection>
-                                                <QItemLabel
-                                                    >ID: {{ scope.opt?.id }}</QItemLabel
-                                                >
-                                                <QItemLabel caption>
-                                                    {{ scope.opt?.modelFk }},
-                                                    {{ scope.opt?.serialNumber }}
-                                                </QItemLabel>
-                                            </QItemSection>
-                                        </QItem>
-                                    </template>
-                                </VnSelect>
-                                <VnInput
-                                    v-model="data.simSerialNumber"
-                                    :label="t('SIM serial number')"
-                                    id="simSerialNumber"
-                                    use-input
-                                />
-                            </VnRow>
-                        </template>
-                    </FormModelPopup>
-                </QDialog>
-            </QBtn>
-            <QTooltip>
-                {{ t('globals.new') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
-</template>
-<style lang="scss" scoped>
-.btn-delete {
-    max-width: 4%;
-    margin-top: 30px;
-}
-</style>
-<i18n>
-es:
-    Model: Modelo
-    Serial number: Número de serie
-    Current SIM: SIM actual
-    Add new device: Añadir nuevo dispositivo
-    PDA deallocated: PDA desasignada
-    Remove PDA: Eliminar PDA
-    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
-    You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
-    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
-</i18n>
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
new file mode 100644
index 000000000..13b531a33
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -0,0 +1,322 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { ref, computed } from 'vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import { size } from 'cypress/types/lodash';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const paginate = ref();
+const dialog = ref();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+const routeId = computed(() => route.params.id);
+
+const initialData = computed(() => {
+    return {
+        workerFk: routeId.value,
+        numberOfWagons: 2,
+        trainFk: 1,
+        itemPackingTypeFk: 'H',
+        warehouseFk: 60,
+        sectorFk: null,
+        labelerFk: null,
+        linesLimit: 20,
+        volumenLimit: 0.5,
+        sizeLimit: null,
+        isOnReservationMode: 0,
+        machineFk: null,
+    };
+});
+
+// const deallocatePDA = async (deviceProductionFk) => {
+//     try {
+//         await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+//             pda: deviceProductionFk,
+//         });
+//         notify(t('PDA deallocated'), 'positive');
+//     } catch (err) {
+//         console.error('Error deallocating PDA');
+//     }
+//     paginate.value.fetch();
+// };
+
+function reloadData() {
+    // initialData.value.deviceProductionFk = null;
+    // initialData.value.simSerialNumber = null;
+    paginate.value.fetch();
+}
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md centerCard">
+        <FetchData
+            url="shelvings/trains"
+            @on-fetch="(data) => (trainsData = data)"
+            auto-load
+        />
+        <FetchData
+            url="items/ItemPackingTypes"
+            @on-fetch="(data) => (ItemPackingTypesData = data)"
+            auto-load
+        />
+        <FetchData
+            url="warehouses"
+            @on-fetch="(data) => (warehousesData = data)"
+            auto-load
+        />
+        <FetchData
+            url="shelvings/sectors"
+            @on-fetch="(data) => (shelvingsData = data)"
+            auto-load
+        />
+        <FetchData url="machines" @on-fetch="(data) => (machinesData = data)" auto-load />
+        <VnPaginate
+            ref="paginate"
+            data-key="WorkerPda"
+            url="Operators"
+            :filter="{ where: { workerFk: routeId } }"
+            order="id"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-px-md q-mb-sm container"
+                >
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.operator.numberOfWagons')"
+                            :model-value="row?.numberOfWagons"
+                            disable
+                        />
+                        <VnSelect
+                            :label="t('worker.operator.train')"
+                            :options="trainsData"
+                            hide-selected
+                            option-label="name"
+                            option-value="id"
+                            v-model="data.trainFk"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnSelect
+                            :label="t('worker.operator.itemPackingType')"
+                            :options="ItemPackingTypesData"
+                            hide-selected
+                            option-label="code"
+                            option-value="code"
+                            v-model="data.itemPackingTypeFk"
+                        />
+                        <VnSelect
+                            :label="t('worker.operator.warehouse')"
+                            :options="warehousesData"
+                            hide-selected
+                            option-label="name"
+                            option-value="id"
+                            v-model="data.warehouseFk"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnSelect
+                            :label="t('worker.operator.sector')"
+                            :options="shelvingsData"
+                            hide-selected
+                            option-label="description"
+                            option-value="id"
+                            v-model="data.sectorFk"
+                        />
+                        <VnInput
+                            :label="t('worker.operator.labeler')"
+                            :model-value="row?.labelerFk"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.operator.linesLimit')"
+                            :model-value="row?.linesLimit"
+                        />
+                        <VnInput
+                            :label="t('worker.operator.volumeLimit')"
+                            :model-value="row?.volumeLimit"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.operator.sizeLimit')"
+                            :model-value="row?.sizeLimit"
+                        />
+                        <VnInput
+                            :label="t('worker.operator.sizeLimit')"
+                            :model-value="row?.sizeLimit"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.operator.isOnReservationMode')"
+                            :model-value="row?.isOnReservationMode"
+                        />
+                        <VnSelect
+                            :label="t('worker.operator.machine')"
+                            :options="machinesData"
+                            hide-selected
+                            option-label="plate"
+                            option-value="id"
+                            v-model="data.machineFk"
+                        />
+                    </VnRow>
+                    <!-- <QBtn
+                            flat
+                            icon="delete"
+                            color="primary"
+                            class="btn-delete"
+                            @click="
+                                openConfirmationModal(
+                                    t(`Remove PDA`),
+                                    t('Do you want to remove this PDA?'),
+                                    () => deallocatePDA(row.deviceProductionFk)
+                                )
+                            "
+                        >
+                            <QTooltip>
+                                {{ t('worker.pda.removePDA') }}
+                            </QTooltip>
+                        </QBtn>-->
+                </QCard>
+            </template>
+        </VnPaginate>
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
+                <QDialog ref="dialog">
+                    <FormModelPopup
+                        :title="t('Add new device')"
+                        url-create="operators"
+                        model="operator"
+                        :form-initial-data="initialData"
+                        @on-data-saved="reloadData()"
+                    >
+                        <template #form-inputs="{ data }">
+                            <VnRow>
+                                <VnInput
+                                    :label="t('worker.operator.numberOfWagons')"
+                                    :model-value="row?.numberOfWagons"
+                                    disable
+                                />
+                                <VnSelect
+                                    :label="t('worker.operator.train')"
+                                    :options="trainsData"
+                                    hide-selected
+                                    option-label="name"
+                                    option-value="id"
+                                    v-model="data.trainFk"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnSelect
+                                    :label="t('worker.operator.itemPackingType')"
+                                    :options="ItemPackingTypesData"
+                                    hide-selected
+                                    option-label="code"
+                                    option-value="code"
+                                    v-model="data.itemPackingTypeFk"
+                                />
+                                <VnSelect
+                                    :label="t('worker.operator.warehouse')"
+                                    :options="warehousesData"
+                                    hide-selected
+                                    option-label="name"
+                                    option-value="id"
+                                    v-model="data.warehouseFk"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnSelect
+                                    :label="t('worker.operator.sector')"
+                                    :options="shelvingsData"
+                                    hide-selected
+                                    option-label="description"
+                                    option-value="id"
+                                    v-model="data.sectorFk"
+                                />
+                                <VnInput
+                                    :label="t('worker.operator.labeler')"
+                                    :model-value="row?.labelerFk"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnInput
+                                    :label="t('worker.operator.linesLimit')"
+                                    :model-value="row?.linesLimit"
+                                />
+                                <VnInput
+                                    :label="t('worker.operator.volumeLimit')"
+                                    :model-value="row?.volumeLimit"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnInput
+                                    :label="t('worker.operator.sizeLimit')"
+                                    :model-value="row?.sizeLimit"
+                                />
+                                <VnInput
+                                    :label="t('worker.operator.sizeLimit')"
+                                    :model-value="row?.sizeLimit"
+                                />
+                            </VnRow>
+                            <VnRow>
+                                <VnInput
+                                    :label="t('worker.operator.isOnReservationMode')"
+                                    :model-value="row?.isOnReservationMode"
+                                />
+                                <VnSelect
+                                    :label="t('worker.operator.machine')"
+                                    :options="machinesData"
+                                    hide-selected
+                                    option-label="plate"
+                                    option-value="id"
+                                    v-model="data.machineFk"
+                                />
+                            </VnRow>
+                        </template>
+                    </FormModelPopup>
+                </QDialog>
+            </QBtn>
+            <QTooltip>
+                {{ t('globals.new') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+<style lang="scss" scoped>
+.btn-delete {
+    max-width: 4%;
+    margin-top: 30px;
+}
+</style>
+<i18n>
+es:
+    Model: Modelo
+    Serial number: Número de serie
+    Current SIM: SIM actual
+    Add new device: Añadir nuevo dispositivo
+    PDA deallocated: PDA desasignada
+    Remove PDA: Eliminar PDA
+    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
+    You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
+    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+</i18n>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 7258881be..d7199a4e6 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -1,3 +1,5 @@
+import { path } from 'chromium';
+import { name } from 'quasar/dist/icon-set/material-icons.umd.prod';
 import { RouterView } from 'vue-router';
 
 export default {
@@ -27,6 +29,7 @@ export default {
             'WorkerBalance',
             'WorkerFormation',
             'WorkerMedical',
+            'WorkerOperator',
         ],
     },
     children: [
@@ -208,6 +211,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/Card/WorkerMedical.vue'),
                 },
+                {
+                    name: 'WorkerOperator',
+                    path: 'operator',
+                    meta: {
+                        title: 'operator',
+                        icon: 'person',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerOperator.vue'),
+                },
             ],
         },
     ],

From cfe95df9e84c5841077bdcb480459a19940dfd7c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Oct 2024 09:46:07 +0200
Subject: [PATCH 23/53] fix: refs #7524 use dynamic load

---
 src/pages/Ticket/TicketCreateDialog.vue | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
index 1493adc53..4138884bf 100644
--- a/src/pages/Ticket/TicketCreateDialog.vue
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -27,7 +27,6 @@ const initialFormState = reactive({
     warehouseId: user.value.warehouseFk,
     landed: null,
 });
-const clientOptions = ref([]);
 const agenciesOptions = ref([]);
 const addressesOptions = ref([]);
 const warehousesOptions = ref([]);
@@ -111,12 +110,6 @@ const redirectToTicketList = (_, { id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Clients"
-        @on-fetch="(data) => (clientOptions = data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
-        auto-load
-    />
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
@@ -137,7 +130,9 @@ const redirectToTicketList = (_, { id }) => {
                     <VnSelect
                         :label="t('ticket.create.client')"
                         v-model="data.clientId"
-                        :options="clientOptions"
+                        url="Clients"
+                        :fields="['id', 'name', 'defaultAddressFk']"
+                        sort-by="id"
                         option-value="id"
                         option-label="name"
                         hide-selected

From e58818e89116805f718e2b6e0ec1c1f3d7878736 Mon Sep 17 00:00:00 2001
From: Jon Elias <jon@verdnatura.es>
Date: Thu, 10 Oct 2024 08:14:24 +0000
Subject: [PATCH 24/53] fix: Use geoFk for ZoneDeliveryPanel

---
 src/pages/Zone/ZoneDeliveryPanel.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 088811b01..8057f4ba4 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -94,9 +94,10 @@ watch(
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
                 sort-by="code, townFk"
-                option-value="code"
+                option-value="geoFk"
                 option-label="code"
                 option-filter="code"
+                option-filter-value="code"
                 hide-selected
                 dense
                 outlined

From 8b68c0afeb3ac857c8fb70a7b92ea4d2f1296836 Mon Sep 17 00:00:00 2001
From: Jon Elias <jon@verdnatura.es>
Date: Thu, 10 Oct 2024 08:30:56 +0000
Subject: [PATCH 25/53] fix: improve geoFk for ZoneDeliveryPanel

---
 src/pages/Zone/ZoneDeliveryPanel.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 8057f4ba4..423095d6e 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -96,8 +96,7 @@ watch(
                 sort-by="code, townFk"
                 option-value="geoFk"
                 option-label="code"
-                option-filter="code"
-                option-filter-value="code"
+                :filter-options="['code', 'geoFk']"
                 hide-selected
                 dense
                 outlined

From 44c4c378f998f430418d8258f3906544c43d0791 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Oct 2024 11:02:03 +0200
Subject: [PATCH 26/53] chore: refs #7874 add default ob type

---
 .../CustomerDefaulterAddObservation.vue       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 5798e7512..9bdb0ad5b 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -28,16 +28,26 @@ const newObservation = ref(null);
 
 const onSubmit = async () => {
     try {
-        const data = $props.clients.map((item) => {
-            return { clientFk: item.clientFk, text: newObservation.value };
-        });
-        await axios.post('ClientObservations', data);
+        const observationTypeFk = (
+            await axios.get('ObservationTypes/findOne', {
+                params: { filter: { where: { description: 'Finance' } } },
+            })
+        ).data?.id;
 
-        const payload = {
+        const bodyObs = $props.clients.map((item) => {
+            return {
+                clientFk: item.clientFk,
+                text: newObservation.value,
+                observationTypeFk,
+            };
+        });
+        await axios.post('ClientObservations', bodyObs);
+
+        const bodyObsMail = {
             defaulters: $props.clients,
             observation: newObservation.value,
         };
-        await axios.post('Defaulters/observationEmail', payload);
+        await axios.post('Defaulters/observationEmail', bodyObsMail);
 
         await $props.promise();
 

From 5af14b1b528a36c3c50134bfb7cb93f17c8af18c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Oct 2024 12:12:03 +0200
Subject: [PATCH 27/53] chore: refs #7874 fix test

---
 test/cypress/integration/claim/claimNotes.spec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/claim/claimNotes.spec.js b/test/cypress/integration/claim/claimNotes.spec.js
index a4a493cda..d7a918db1 100644
--- a/test/cypress/integration/claim/claimNotes.spec.js
+++ b/test/cypress/integration/claim/claimNotes.spec.js
@@ -1,4 +1,6 @@
 describe('ClaimNotes', () => {
+    const saveBtn = '.q-field__append > .q-btn > .q-btn__content > .q-icon';
+    const firstNote = '.q-infinite-scroll :nth-child(1) > .q-card__section--vert';
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/claim/${2}/notes`);
@@ -7,7 +9,7 @@ describe('ClaimNotes', () => {
     it('should add a new note', () => {
         const message = 'This is a new message.';
         cy.get('.q-textarea').type(message);
-        cy.get('.q-field__append > .q-btn > .q-btn__content > .q-icon').click(); //save
-        cy.get(':nth-child(1) > .q-card__section--vert').should('have.text', message);
+        cy.get(saveBtn).click();
+        cy.get(firstNote).should('have.text', message);
     });
 });

From 50042ed45be0484c3c5d9ed5c71fdb5ffba97250 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Oct 2024 16:49:41 +0200
Subject: [PATCH 28/53] feat: refs #7874 prevent submit if empty fields

---
 src/components/ui/VnNotes.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 92dd32691..63b21f92a 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -34,6 +34,8 @@ const observationTypes = ref([]);
 const vnPaginateRef = ref();
 
 async function insert() {
+    if (!newNote.text || !newNote.observationTypeFk) return;
+
     const body = $props.body;
     const newBody = {
         ...body,

From eebac7b36cc41c19f5df82f485e02efb5989acbe Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 14 Oct 2024 08:51:26 +0200
Subject: [PATCH 29/53] fix: fixed e2e test

---
 test/cypress/integration/entry/myEntry.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index dca74dec2..4addec1c4 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -11,7 +11,7 @@ describe('EntryMy when is supplier', () => {
 
     it('should open buyLabel when is supplier', () => {
         cy.get(
-            '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
+            '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
         ).click();
         cy.get('.q-card__actions > .q-btn').click();
         cy.window().its('open').should('be.called');

From 6a624b12a5a8f37325d08781b48e6cccaec17b97 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 09:28:51 +0200
Subject: [PATCH 30/53] refs: #6898 hotfix accounts

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

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 177466478..bc009d3ad 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -99,7 +99,11 @@ const setWireTransfer = async () => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
+                    <VnInput
+                        :label="t('supplier.accounts.iban')"
+                        v-model="row.iban"
+                        :required="true"
+                    >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
                                 <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
@@ -113,6 +117,7 @@ const setWireTransfer = async () => {
                         option-label="bic"
                         option-value="id"
                         hide-selected
+                        :required="true"
                         :roles-allowed-to-create="['financial']"
                     >
                         <template #form>

From 85b068eddb3262e762b403a286cdbcdb49895eab Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 10:21:02 +0200
Subject: [PATCH 31/53] refs #6898 #6899 hotfix lists

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 8 ++++++++
 src/pages/Supplier/SupplierList.vue     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 5157d957b..09de62b27 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -13,6 +13,8 @@ import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import InvoiceOutFilter from './InvoiceOutFilter.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -179,6 +181,11 @@ watchEffect(selectedRows);
         :label="t('searchInvoice')"
         data-key="invoiceOut"
     />
+    <RightMenu>
+        <template #right-panel>
+            <InvoiceOutFilter data-key="invoiceOut" />
+        </template>
+    </RightMenu>
     <VnSubToolbar>
         <template #st-actions>
             <QBtn
@@ -203,6 +210,7 @@ watchEffect(selectedRows);
                 active: true,
             },
         }"
+        :right-search="false"
         v-model:selected="selectedRows"
         order="id DESC"
         :columns="columns"
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ad668f0c0..ea79947a4 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -3,6 +3,8 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -93,6 +95,11 @@ const columns = computed(() => [
 
 <template>
     <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
+    <RightMenu>
+        <template #right-panel>
+            <SupplierListFilter data-key="SuppliersList" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
@@ -109,6 +116,7 @@ const columns = computed(() => [
                 return data;
             },
         }"
+        :right-search="false"
         order="id ASC"
         :columns="columns"
         auto-load

From 4b78c1acd001fff12223ba5323a254571ada921d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 12:00:05 +0200
Subject: [PATCH 32/53] fix: refs #7524 dynamic

---
 src/components/common/VnSelect.vue            |  2 ++
 .../Department/Card/DepartmentBasicData.vue   | 15 ++---------
 src/pages/InvoiceOut/InvoiceOutFilter.vue     | 15 -----------
 src/pages/Item/ItemTypeCreate.vue             | 11 +++-----
 src/pages/ItemType/Card/ItemTypeBasicData.vue | 11 +++-----
 src/pages/Order/Card/OrderCreateDialog.vue    | 13 ++++------
 src/pages/Order/Card/OrderFilter.vue          | 12 ---------
 src/pages/Shelving/Card/ShelvingFilter.vue    | 15 -----------
 src/pages/Ticket/TicketFilter.vue             | 26 ++++++-------------
 9 files changed, 23 insertions(+), 97 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index aa629767d..952b7dd8c 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -227,6 +227,8 @@ function nullishToTrue(value) {
 }
 
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
+defineExpose({ opts: myOptions });
 </script>
 
 <template>
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 98abfd6b9..141bb4159 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -1,9 +1,7 @@
 <script setup>
-import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -11,17 +9,8 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-
-const workersOptions = ref([]);
-const clientsOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
-    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
     <FormModel
         :url="`Departments/${route.params.id}`"
         model="department"
@@ -62,7 +51,7 @@ const clientsOptions = ref([]);
                 <VnSelect
                     :label="t('department.bossDepartment')"
                     v-model="data.workerFk"
-                    :options="workersOptions"
+                    url="Workers/search"
                     option-value="id"
                     option-label="name"
                     hide-selected
@@ -72,7 +61,7 @@ const clientsOptions = ref([]);
                 <VnSelect
                     :label="t('department.selfConsumptionCustomer')"
                     v-model="data.clientFk"
-                    :options="clientsOptions"
+                    url="Clients"
                     option-value="id"
                     option-label="name"
                     hide-selected
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index d0d42ea9b..9ce8cc254 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -15,25 +15,10 @@ const props = defineProps({
         required: true,
     },
 });
-
-const workers = ref();
-const workersCopy = ref();
 const states = ref();
-
-function setWorkers(data) {
-    workers.value = data;
-    workersCopy.value = data;
-}
 </script>
-
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="setWorkers"
-        auto-load
-    />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue
index b7b06bbe6..290a40389 100644
--- a/src/pages/Item/ItemTypeCreate.vue
+++ b/src/pages/Item/ItemTypeCreate.vue
@@ -15,7 +15,6 @@ const router = useRouter();
 
 const newItemTypeForm = reactive({});
 
-const workersOptions = ref([]);
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);
 
@@ -25,12 +24,6 @@ const redirectToItemTypeBasicData = (_, { id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Workers"
-        @on-fetch="(data) => (workersOptions = data)"
-        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
-        auto-load
-    />
     <FetchData
         url="ItemCategories"
         @on-fetch="(data) => (categoriesOptions = data)"
@@ -61,7 +54,9 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                     <VnSelect
                         v-model="data.workerFk"
                         :label="t('itemType.shared.worker')"
-                        :options="workersOptions"
+                        url="Workers"
+                        sort-by="firstName ASC"
+                        :fields="['id', 'firstName']"
                         option-value="id"
                         option-label="firstName"
                         hide-selected
diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
index 51e24272d..39076f129 100644
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -12,17 +12,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 const route = useRoute();
 const { t } = useI18n();
 
-const workersOptions = ref([]);
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers"
-        @on-fetch="(data) => (workersOptions = data)"
-        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
-        auto-load
-    />
     <FetchData
         url="ItemCategories"
         @on-fetch="(data) => (categoriesOptions = data)"
@@ -50,7 +43,9 @@ const temperaturesOptions = ref([]);
                 <VnSelect
                     v-model="data.workerFk"
                     :label="t('shared.worker')"
-                    :options="workersOptions"
+                    url="Workers"
+                    sort-by="firstName"
+                    :fields="['id', 'firstName']"
                     option-value="id"
                     option-label="firstName"
                     hide-selected
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index 27b0171f2..bcc62aa43 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -126,12 +126,6 @@ onMounted(async () => {
 </script>
 
 <template>
-    <FetchData
-        url="addresses"
-        @on-fetch="(data) => (clientOptions = data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
-        auto-load
-    />
     <FormModelPopup
         url-create="Orders/new"
         :title="t('Create Order')"
@@ -165,13 +159,16 @@ onMounted(async () => {
                     </template>
                 </VnSelect>
                 <VnSelect
+                    ref="addressRef"
                     :label="t('order.form.addressFk')"
                     v-model="data.addressId"
-                    :options="addressList"
+                    url="addresses"
+                    :fields="['id', 'nickname', 'defaultAddressFk', 'street', 'city']"
+                    sort-by="id"
                     option-value="id"
                     option-label="street"
                     hide-selected
-                    :disable="!addressList?.length"
+                    :disable="!$refs.addressRef?.length"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index be47eed54..917369919 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -17,10 +17,6 @@ const props = defineProps({
 
 const agencyFilter = { fields: ['id', 'name'] };
 const agencyList = ref(null);
-const salesPersonFilter = {
-    fields: ['id', 'nickname'],
-};
-const salesPersonList = ref(null);
 const sourceList = ref([]);
 </script>
 
@@ -32,14 +28,6 @@ const sourceList = ref([]);
         auto-load
         @on-fetch="(data) => (agencyList = data)"
     />
-    <FetchData
-        url="Workers/search"
-        :filter="salesPersonFilter"
-        sort-by="nickname ASC"
-        @on-fetch="(data) => (salesPersonList = data)"
-        :params="{ departmentCodes: ['VT'] }"
-        auto-load
-    />
     <FetchData
         url="Orders/getSourceValues"
         :filter="{ fields: ['value'] }"
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index 0056ffaec..56cf4f58c 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -1,7 +1,5 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
@@ -14,22 +12,9 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['search']);
-
-const workers = ref();
-
-function setWorkers(data) {
-    workers.value = data;
-}
 </script>
 
 <template>
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        sort-by="firstName ASC"
-        @on-fetch="setWorkers"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 3b9833ce2..95cac4a47 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -15,7 +16,6 @@ const props = defineProps({
     },
 });
 
-const workers = ref([]);
 const provinces = ref([]);
 const states = ref([]);
 const agencies = ref([]);
@@ -27,12 +27,6 @@ const warehouses = ref([]);
     <FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -66,23 +60,19 @@ const warehouses = ref([]);
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <QSelect
+                <QItemSection>
+                    <VnSelect
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
-                        :options="workers"
+                        url="Workers/activeWithInheritedRole"
+                        :where="{ role: 'salesPerson' }"
                         option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
+                        option-label="firstName"
+                        :use-like="false"
+                        sort-by="firstName ASC"
                         dense
                         outlined
                         rounded
-                        :input-debounce="0"
                     />
                 </QItemSection>
             </QItem>

From 4ff3c18f33bc8738655b27c0c1ba20c991591d2d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 13:00:15 +0200
Subject: [PATCH 33/53] feat: refs #7874 use badge type

---
 src/components/ui/VnNotes.vue | 69 +++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 63b21f92a..98a511484 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -81,7 +81,7 @@ onBeforeRouteLeave((to, from, next) => {
                     url="ObservationTypes"
                     v-model="newNote.observationTypeFk"
                     option-label="description"
-                    style="flex: 0.15; margin-left: 0"
+                    style="flex: 0.15"
                     :required="true"
                     @keyup.enter.stop="insert"
                 />
@@ -142,35 +142,29 @@ onBeforeRouteLeave((to, from, next) => {
                             :title="note.worker?.user.nickname"
                         />
                         <div class="full-width row justify-between q-pa-xs">
-                            <VnUserLink
-                                :name="`${note.worker.user.nickname}`"
-                                :worker-id="note.worker.id"
-                            />
+                            <div>
+                                <VnUserLink
+                                    :name="`${note.worker.user.nickname}`"
+                                    :worker-id="note.worker.id"
+                                />
+                                <QBadge
+                                    class="q-ml-xs"
+                                    outline
+                                    color="grey"
+                                    v-if="selectType && note.observationTypeFk"
+                                >
+                                    {{
+                                        observationTypes.find(
+                                            (ot) => ot.id === note.observationTypeFk
+                                        )?.description
+                                    }}
+                                </QBadge>
+                            </div>
                             <span v-text="toDateHourMin(note.created)" />
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">
-                        <VnRow>
-                            <VnSelect
-                                :label="t('Observation type')"
-                                v-if="selectType && note.observationTypeFk"
-                                url="ObservationTypes"
-                                v-model="note.observationTypeFk"
-                                option-label="description"
-                                style="flex: 0.15"
-                                dense
-                                readonly
-                                :is-clearable="false"
-                            />
-                            <span
-                                :style="{
-                                    flex: 0.85,
-                                    'align-self':
-                                        selectType & $q.screen.gt.xs ? 'end' : 'baseline',
-                                }"
-                                v-text="note.text"
-                            />
-                        </VnRow>
+                        {{ note.text }}
                     </QCardSection>
                 </QCard>
             </TransitionGroup>
@@ -180,12 +174,6 @@ onBeforeRouteLeave((to, from, next) => {
 <style lang="scss" scoped>
 .q-card {
     width: 90%;
-    @media (max-width: $breakpoint-sm) {
-        width: 100%;
-    }
-    &__section {
-        word-wrap: break-word;
-    }
 }
 .q-dialog .q-card {
     width: 400px;
@@ -199,6 +187,23 @@ onBeforeRouteLeave((to, from, next) => {
     opacity: 0;
     background-color: $primary;
 }
+
+.vn-row > :nth-child(2) {
+    margin-left: 0;
+}
+
+@media (max-width: $breakpoint-xs) {
+    .vn-row > :deep(*) {
+        margin-left: 0;
+    }
+    .q-card {
+        width: 100%;
+
+        &__section {
+            padding: 0;
+        }
+    }
+}
 </style>
 <i18n>
     es:

From b225f6a4c879cd1151aec64ed3bb0f48cedc2b73 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 13:18:34 +0200
Subject: [PATCH 34/53] refs #7767 fix contractHolidays

---
 .../Worker/Card/WorkerCalendarFilter.vue      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 95fb2d393..cc99cde0e 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { toDateFormat } from '../../../filters/date';
 const { notify } = useNotify();
 
@@ -35,9 +35,13 @@ const props = defineProps({
     },
 });
 
-onMounted(async () => {
-    await checkHolidays(props.contractHolidays);
-});
+watch(
+    () => props.contractHolidays,
+    (newValue) => {
+        checkHolidays(newValue);
+    },
+    { deep: true, immediate: true }
+);
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
 const selectedBusinessFk = computed({
@@ -58,22 +62,23 @@ const selectedAbsenceType = computed({
     },
 });
 
-const generateYears = () => {
+function generateYears() {
     const now = Date.vnNew();
     const maxYear = now.getFullYear() + 1;
 
     return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
-};
+}
 
-const checkHolidays = (contractHolidays) => {
+function checkHolidays(contractHolidays) {
     console.log('contractHolidays', contractHolidays);
+    if (!contractHolidays) return;
     if (
         contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||
         contractHolidays.hoursEnjoyed > contractHolidays.totalHours
     ) {
         notify(t('Vacation days have been exceeded'), 'negative');
     }
-};
+}
 
 const absenceTypeList = ref([]);
 const contractList = ref([]);

From 0f3168456aac154a0e7ab3d81f0f97d19f1af358 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 13:22:59 +0200
Subject: [PATCH 35/53] chore: refs #7524 sort by firstName

---
 src/pages/ItemType/Card/ItemTypeBasicData.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
index 39076f129..d35fbb17d 100644
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -44,7 +44,7 @@ const temperaturesOptions = ref([]);
                     v-model="data.workerFk"
                     :label="t('shared.worker')"
                     url="Workers"
-                    sort-by="firstName"
+                    sort-by="firstName ASC"
                     :fields="['id', 'firstName']"
                     option-value="id"
                     option-label="firstName"

From 8258fbb91ee478798dc56d3b126bb425620b61e1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 13:24:12 +0200
Subject: [PATCH 36/53] refs #7767 remove onMounted

---
 src/pages/Worker/Card/WorkerCalendarFilter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index cc99cde0e..963fb05a7 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { toDateFormat } from '../../../filters/date';
 const { notify } = useNotify();
 

From 0fb9b22935c1dec0e5d456e29e92d6dcd355e491 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 14:09:52 +0200
Subject: [PATCH 37/53] chore: refs #7874 refactor code

---
 src/components/ui/VnNotes.vue                      |  2 +-
 .../Defaulter/CustomerDefaulterAddObservation.vue  | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 98a511484..e23eeb121 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -29,7 +29,7 @@ const { t } = useI18n();
 const state = useState();
 const quasar = useQuasar();
 const currentUser = ref(state.getUser());
-const newNote = reactive({ text: '', observationTypeFk: null });
+const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
 
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 9bdb0ad5b..27dfe48e6 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -25,20 +25,22 @@ const { notify } = useNotify();
 const { t } = useI18n();
 
 const newObservation = ref(null);
+const obsId = ref(null);
 
 const onSubmit = async () => {
     try {
-        const observationTypeFk = (
-            await axios.get('ObservationTypes/findOne', {
-                params: { filter: { where: { description: 'Finance' } } },
-            })
-        ).data?.id;
+        if (!obsId.value)
+            obsId.value = (
+                await axios.get('ObservationTypes/findOne', {
+                    params: { filter: { where: { description: 'Finance' } } },
+                })
+            ).data?.id;
 
         const bodyObs = $props.clients.map((item) => {
             return {
                 clientFk: item.clientFk,
                 text: newObservation.value,
-                observationTypeFk,
+                observationTypeFk: obsId.value,
             };
         });
         await axios.post('ClientObservations', bodyObs);

From 245c02735756d9c62ff5658ba967ce08efef7d23 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 15:43:59 +0200
Subject: [PATCH 38/53] chore: refs #7874 refactor imports

---
 src/components/ui/VnNotes.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index e23eeb121..876081235 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -12,10 +12,10 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnAvatar from 'components/ui/VnAvatar.vue';
-import VnRow from './VnRow.vue';
-import VnSelect from '../common/VnSelect.vue';
-import FetchData from '../FetchData.vue';
-import VnInput from '../common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'components/common/VnInput.vue';
 
 const $props = defineProps({
     url: { type: String, default: null },

From 2d34921cf5a29addf67aa87bc27b202db77ee4e2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 15:52:12 +0200
Subject: [PATCH 39/53] fix: refs #7524 paginate

---
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 774b42478..53a1f2ec1 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -168,7 +168,6 @@ const downloadCSV = async () => {
                 }
             }
         "
-        :limit="0"
         :columns="columns"
         auto-load
         :is-editable="false"

From dfceb9403cc5b69a7da50ea94174f14f4599fc80 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 07:54:52 +0200
Subject: [PATCH 40/53] fix: refs #7986 fix front

---
 src/i18n/locale/en.yml                   | 12 ++++
 src/i18n/locale/es.yml                   | 13 +++++
 src/pages/Worker/Card/WorkerOperator.vue | 73 ++++++------------------
 src/router/modules/worker.js             |  2 -
 4 files changed, 44 insertions(+), 56 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b73395df2..422c21d82 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -840,6 +840,18 @@ worker:
             debit: Debt
             credit: Have
             concept: Concept
+    operator:
+        numberOfWagons: Number of wagons
+        train: Train
+        itemPackingType: Item packing type
+        warehouse: Warehouse
+        sector: Sector
+        labeler: Printer
+        linesLimit: Lines limit
+        volumeLimit: Volume limit
+        sizeLimit: Size limit
+        isOnReservationMode: Reservation mode
+        Machine: Machine
 wagon:
     pageTitles:
         wagons: Wagons
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 2552c9549..ce2384d89 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -838,6 +838,19 @@ worker:
             debit: Debe
             credit: Haber
             concept: Concepto
+    operator:
+        numberOfWagons: Número de vagones
+        train: tren
+        itemPackingType: Tipo de embalaje
+        warehouse: Almacén
+        sector: Sector
+        labeler: Impresora
+        linesLimit: Líneas límite
+        volumeLimit: Volumen límite
+        sizeLimit: Tamaño límite
+        isOnReservationMode: Modo de reserva
+        Machine: Máquina
+
 wagon:
     pageTitles:
         wagons: Vagones
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 13b531a33..ce1c142e9 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -2,26 +2,17 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { ref, computed } from 'vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'components/FetchData.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
-import { useVnConfirm } from 'composables/useVnConfirm';
-
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import { size } from 'cypress/types/lodash';
 
 const { t } = useI18n();
-const { notify } = useNotify();
-
 const paginate = ref();
 const dialog = ref();
 const route = useRoute();
-const { openConfirmationModal } = useVnConfirm();
 const routeId = computed(() => route.params.id);
 
 const initialData = computed(() => {
@@ -40,52 +31,34 @@ const initialData = computed(() => {
         machineFk: null,
     };
 });
-
-// const deallocatePDA = async (deviceProductionFk) => {
-//     try {
-//         await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
-//             pda: deviceProductionFk,
-//         });
-//         notify(t('PDA deallocated'), 'positive');
-//     } catch (err) {
-//         console.error('Error deallocating PDA');
-//     }
-//     paginate.value.fetch();
-// };
-
-function reloadData() {
-    // initialData.value.deviceProductionFk = null;
-    // initialData.value.simSerialNumber = null;
-    paginate.value.fetch();
-}
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md centerCard">
         <FetchData
-            url="shelvings/trains"
+            url="Shelvings/Train"
             @on-fetch="(data) => (trainsData = data)"
             auto-load
         />
         <FetchData
-            url="items/ItemPackingTypes"
+            url="Items/ItemPackingType"
             @on-fetch="(data) => (ItemPackingTypesData = data)"
             auto-load
         />
         <FetchData
-            url="warehouses"
+            url="Warehouses"
             @on-fetch="(data) => (warehousesData = data)"
             auto-load
         />
         <FetchData
-            url="shelvings/sectors"
+            url="Shelvings/Sector"
             @on-fetch="(data) => (shelvingsData = data)"
             auto-load
         />
-        <FetchData url="machines" @on-fetch="(data) => (machinesData = data)" auto-load />
+        <FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
         <VnPaginate
             ref="paginate"
-            data-key="WorkerPda"
+            data-key="WorkerOperator"
             url="Operators"
             :filter="{ where: { workerFk: routeId } }"
             order="id"
@@ -102,7 +75,7 @@ function reloadData() {
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.numberOfWagons')"
-                            :model-value="row?.numberOfWagons"
+                            :model-value="data?.numberOfWagons"
                             disable
                         />
                         <VnSelect
@@ -143,34 +116,30 @@ function reloadData() {
                         />
                         <VnInput
                             :label="t('worker.operator.labeler')"
-                            :model-value="row?.labelerFk"
+                            :model-value="data?.labelerFk"
                         />
                     </VnRow>
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.linesLimit')"
-                            :model-value="row?.linesLimit"
+                            :model-value="data?.linesLimit"
                         />
                         <VnInput
                             :label="t('worker.operator.volumeLimit')"
-                            :model-value="row?.volumeLimit"
+                            :model-value="data?.volumeLimit"
                         />
                     </VnRow>
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.sizeLimit')"
-                            :model-value="row?.sizeLimit"
+                            :model-value="data?.sizeLimit"
                         />
-                        <VnInput
-                            :label="t('worker.operator.sizeLimit')"
-                            :model-value="row?.sizeLimit"
-                        />
-                    </VnRow>
-                    <VnRow>
                         <VnInput
                             :label="t('worker.operator.isOnReservationMode')"
-                            :model-value="row?.isOnReservationMode"
+                            :model-value="data?.isOnReservationMode"
                         />
+                    </VnRow>
+                    <VnRow>
                         <VnSelect
                             :label="t('worker.operator.machine')"
                             :options="machinesData"
@@ -255,33 +224,29 @@ function reloadData() {
                                 />
                                 <VnInput
                                     :label="t('worker.operator.labeler')"
-                                    :model-value="row?.labelerFk"
+                                    :model-value="data?.labelerFk"
                                 />
                             </VnRow>
                             <VnRow>
                                 <VnInput
                                     :label="t('worker.operator.linesLimit')"
-                                    :model-value="row?.linesLimit"
+                                    :model-value="data?.linesLimit"
                                 />
                                 <VnInput
                                     :label="t('worker.operator.volumeLimit')"
-                                    :model-value="row?.volumeLimit"
+                                    :model-value="data?.volumeLimit"
                                 />
                             </VnRow>
                             <VnRow>
                                 <VnInput
                                     :label="t('worker.operator.sizeLimit')"
-                                    :model-value="row?.sizeLimit"
-                                />
-                                <VnInput
-                                    :label="t('worker.operator.sizeLimit')"
-                                    :model-value="row?.sizeLimit"
+                                    :model-value="data?.sizeLimit"
                                 />
                             </VnRow>
                             <VnRow>
                                 <VnInput
                                     :label="t('worker.operator.isOnReservationMode')"
-                                    :model-value="row?.isOnReservationMode"
+                                    :model-value="data?.isOnReservationMode"
                                 />
                                 <VnSelect
                                     :label="t('worker.operator.machine')"
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index d7199a4e6..c2a9e668f 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -1,5 +1,3 @@
-import { path } from 'chromium';
-import { name } from 'quasar/dist/icon-set/material-icons.umd.prod';
 import { RouterView } from 'vue-router';
 
 export default {

From bc581caa4ebd0b5ab2c9c2fd9f3ded1ef4b1579a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 07:57:19 +0200
Subject: [PATCH 41/53] fix: refs #7767 console remove

---
 src/pages/Worker/Card/WorkerCalendarFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 963fb05a7..67b7df907 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -70,7 +70,6 @@ function generateYears() {
 }
 
 function checkHolidays(contractHolidays) {
-    console.log('contractHolidays', contractHolidays);
     if (!contractHolidays) return;
     if (
         contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||

From 3bb5f66ce727184f7ffb80236c676eb8acbf7150 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 15 Oct 2024 08:43:58 +0200
Subject: [PATCH 42/53] fix(claimNotes): refs #8093 $props.selectType &&
 !newNote.observationTypeFk

---
 src/components/ui/VnNotes.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 876081235..b395b3934 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -34,7 +34,7 @@ const observationTypes = ref([]);
 const vnPaginateRef = ref();
 
 async function insert() {
-    if (!newNote.text || !newNote.observationTypeFk) return;
+    if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
 
     const body = $props.body;
     const newBody = {

From 0f84baf1a8c4db983d30e74ab99a6410d8800199 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 15 Oct 2024 09:29:06 +0200
Subject: [PATCH 43/53] build: init version 24.44

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eaaa0b812..a61c8f21a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.42.0",
+    "version": "24.44.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From af830591b37063a9a21d428c7a2081125099ee8d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 09:44:55 +0200
Subject: [PATCH 44/53] fix: refs #7986 front fixed

---
 src/i18n/locale/en.yml                   |  2 +-
 src/i18n/locale/es.yml                   |  2 +-
 src/pages/Worker/Card/WorkerOperator.vue | 66 ++++++++++++------------
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 422c21d82..dd11c165d 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -851,7 +851,7 @@ worker:
         volumeLimit: Volume limit
         sizeLimit: Size limit
         isOnReservationMode: Reservation mode
-        Machine: Machine
+        machine: Machine
 wagon:
     pageTitles:
         wagons: Wagons
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ce2384d89..27a45d9ce 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -849,7 +849,7 @@ worker:
         volumeLimit: Volumen límite
         sizeLimit: Tamaño límite
         isOnReservationMode: Modo de reserva
-        Machine: Máquina
+        machine: Máquina
 
 wagon:
     pageTitles:
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index ce1c142e9..88097878f 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -1,16 +1,19 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import FormModel from 'components/FormModel.vue';
 
 const { t } = useI18n();
-const paginate = ref();
+
+const formModelRef = ref();
 const dialog = ref();
 const route = useRoute();
 const routeId = computed(() => route.params.id);
@@ -31,17 +34,17 @@ const initialData = computed(() => {
         machineFk: null,
     };
 });
+watch(
+    () => route.params.id,
+    () => formModelRef.value.reset()
+);
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md centerCard">
+        <FetchData url="Trains" @on-fetch="(data) => (trainsData = data)" auto-load />
         <FetchData
-            url="Shelvings/Train"
-            @on-fetch="(data) => (trainsData = data)"
-            auto-load
-        />
-        <FetchData
-            url="Items/ItemPackingType"
+            url="ItemPackingTypes"
             @on-fetch="(data) => (ItemPackingTypesData = data)"
             auto-load
         />
@@ -50,18 +53,14 @@ const initialData = computed(() => {
             @on-fetch="(data) => (warehousesData = data)"
             auto-load
         />
-        <FetchData
-            url="Shelvings/Sector"
-            @on-fetch="(data) => (shelvingsData = data)"
-            auto-load
-        />
+        <FetchData url="Sectors" @on-fetch="(data) => (shelvingsData = data)" auto-load />
         <FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
-        <VnPaginate
-            ref="paginate"
-            data-key="WorkerOperator"
+
+        <FormModel
+            ref="formModelRef"
+            :form-initial-data="initialData"
             url="Operators"
             :filter="{ where: { workerFk: routeId } }"
-            order="id"
             auto-load
         >
             <template #body="{ rows }">
@@ -75,8 +74,7 @@ const initialData = computed(() => {
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.numberOfWagons')"
-                            :model-value="data?.numberOfWagons"
-                            disable
+                            :model-value="row?.numberOfWagons"
                         />
                         <VnSelect
                             :label="t('worker.operator.train')"
@@ -84,7 +82,7 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="name"
                             option-value="id"
-                            v-model="data.trainFk"
+                            v-model="row.trainFk"
                         />
                     </VnRow>
                     <VnRow>
@@ -94,7 +92,7 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="code"
                             option-value="code"
-                            v-model="data.itemPackingTypeFk"
+                            v-model="row.itemPackingTypeFk"
                         />
                         <VnSelect
                             :label="t('worker.operator.warehouse')"
@@ -102,7 +100,7 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="name"
                             option-value="id"
-                            v-model="data.warehouseFk"
+                            v-model="row.warehouseFk"
                         />
                     </VnRow>
                     <VnRow>
@@ -112,31 +110,36 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="description"
                             option-value="id"
-                            v-model="data.sectorFk"
+                            v-model="row.sectorFk"
                         />
                         <VnInput
                             :label="t('worker.operator.labeler')"
-                            :model-value="data?.labelerFk"
+                            :model-value="row.labelerFk"
+                            lazy-rules
                         />
                     </VnRow>
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.linesLimit')"
-                            :model-value="data?.linesLimit"
+                            :model-value="row.linesLimit"
+                            lazy-rules
                         />
                         <VnInput
                             :label="t('worker.operator.volumeLimit')"
-                            :model-value="data?.volumeLimit"
+                            :model-value="row.volumeLimit"
+                            lazy-rules
                         />
                     </VnRow>
                     <VnRow>
                         <VnInput
                             :label="t('worker.operator.sizeLimit')"
-                            :model-value="data?.sizeLimit"
+                            :model-value="row.sizeLimit"
+                            lazy-rules
                         />
                         <VnInput
                             :label="t('worker.operator.isOnReservationMode')"
-                            :model-value="data?.isOnReservationMode"
+                            :model-value="row.isOnReservationMode"
+                            lazy-rules
                         />
                     </VnRow>
                     <VnRow>
@@ -146,7 +149,7 @@ const initialData = computed(() => {
                             hide-selected
                             option-label="plate"
                             option-value="id"
-                            v-model="data.machineFk"
+                            v-model="row.machineFk"
                         />
                     </VnRow>
                     <!-- <QBtn
@@ -168,7 +171,7 @@ const initialData = computed(() => {
                         </QBtn>-->
                 </QCard>
             </template>
-        </VnPaginate>
+        </FormModel>
         <QPageSticky :offset="[18, 18]">
             <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
                 <QDialog ref="dialog">
@@ -183,8 +186,7 @@ const initialData = computed(() => {
                             <VnRow>
                                 <VnInput
                                     :label="t('worker.operator.numberOfWagons')"
-                                    :model-value="row?.numberOfWagons"
-                                    disable
+                                    :model-value="data.numberOfWagons"
                                 />
                                 <VnSelect
                                     :label="t('worker.operator.train')"

From b4245d05fbd28b8a1c421b7344de6959666eb2e7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 13:00:01 +0200
Subject: [PATCH 45/53] fix: refs #7986 crudModel

---
 src/i18n/locale/en.yml                   |   1 +
 src/i18n/locale/es.yml                   |   1 +
 src/pages/Worker/Card/WorkerOperator.vue | 313 +++++++++--------------
 3 files changed, 116 insertions(+), 199 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index dd11c165d..3742a773e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -743,6 +743,7 @@ worker:
         locker: Locker
         balance: Balance
         medical: Medical
+        operator: Operator
     list:
         name: Name
         email: Email
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 27a45d9ce..f92ac93d8 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -750,6 +750,7 @@ worker:
         balance: Balance
         formation: Formación
         medical: Mutua
+        operator: Operario
     list:
         name: Nombre
         email: Email
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 88097878f..a667d083e 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -3,18 +3,23 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { ref, computed, watch } from 'vue';
 import FetchData from 'components/FetchData.vue';
-import FormModelPopup from 'src/components/FormModelPopup.vue';
+// import CrudModelPopup from 'src/components/CrudModelPopup.vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import FormModel from 'components/FormModel.vue';
+import CrudModel from 'components/CrudModel.vue';
 
 const { t } = useI18n();
 
-const formModelRef = ref();
+const test = ref({});
 const dialog = ref();
+const warehousesData = ref([]);
+const itemPackingTypesData = ref([]);
+const sectorsData = ref([]);
+const trainsData = ref([]);
+const machinesData = ref([]);
 const route = useRoute();
 const routeId = computed(() => route.params.id);
 
@@ -34,10 +39,10 @@ const initialData = computed(() => {
         machineFk: null,
     };
 });
-watch(
-    () => route.params.id,
-    () => formModelRef.value.reset()
-);
+// watch(
+//     () => route.params.id,
+//     () => CrudModelRef.value.reset()
+// );
 </script>
 
 <template>
@@ -45,7 +50,7 @@ watch(
         <FetchData url="Trains" @on-fetch="(data) => (trainsData = data)" auto-load />
         <FetchData
             url="ItemPackingTypes"
-            @on-fetch="(data) => (ItemPackingTypesData = data)"
+            @on-fetch="(data) => (itemPackingTypesData = data)"
             auto-load
         />
         <FetchData
@@ -53,106 +58,105 @@ watch(
             @on-fetch="(data) => (warehousesData = data)"
             auto-load
         />
-        <FetchData url="Sectors" @on-fetch="(data) => (shelvingsData = data)" auto-load />
+        <FetchData url="Sectors" @on-fetch="(data) => (sectorsData = data)" auto-load />
         <FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
-
-        <FormModel
-            ref="formModelRef"
-            :form-initial-data="initialData"
+        <CrudModel
+            data-key="workerOperator"
             url="Operators"
-            :filter="{ where: { workerFk: routeId } }"
+            model="workerOperator"
+            :filter="{ where: { workerFk: route.params.id } }"
+            ref="test"
+            :data-required="{ workerFk: route.params.id }"
+            :default-save="false"
             auto-load
         >
             <template #body="{ rows }">
-                <QCard
-                    flat
-                    bordered
-                    :key="row.id"
-                    v-for="row of rows"
-                    class="card q-px-md q-mb-sm container"
-                >
-                    <VnRow>
-                        <VnInput
-                            :label="t('worker.operator.numberOfWagons')"
-                            :model-value="row?.numberOfWagons"
-                        />
-                        <VnSelect
-                            :label="t('worker.operator.train')"
-                            :options="trainsData"
-                            hide-selected
-                            option-label="name"
-                            option-value="id"
-                            v-model="row.trainFk"
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnSelect
-                            :label="t('worker.operator.itemPackingType')"
-                            :options="ItemPackingTypesData"
-                            hide-selected
-                            option-label="code"
-                            option-value="code"
-                            v-model="row.itemPackingTypeFk"
-                        />
-                        <VnSelect
-                            :label="t('worker.operator.warehouse')"
-                            :options="warehousesData"
-                            hide-selected
-                            option-label="name"
-                            option-value="id"
-                            v-model="row.warehouseFk"
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnSelect
-                            :label="t('worker.operator.sector')"
-                            :options="shelvingsData"
-                            hide-selected
-                            option-label="description"
-                            option-value="id"
-                            v-model="row.sectorFk"
-                        />
-                        <VnInput
-                            :label="t('worker.operator.labeler')"
-                            :model-value="row.labelerFk"
-                            lazy-rules
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnInput
-                            :label="t('worker.operator.linesLimit')"
-                            :model-value="row.linesLimit"
-                            lazy-rules
-                        />
-                        <VnInput
-                            :label="t('worker.operator.volumeLimit')"
-                            :model-value="row.volumeLimit"
-                            lazy-rules
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnInput
-                            :label="t('worker.operator.sizeLimit')"
-                            :model-value="row.sizeLimit"
-                            lazy-rules
-                        />
-                        <VnInput
-                            :label="t('worker.operator.isOnReservationMode')"
-                            :model-value="row.isOnReservationMode"
-                            lazy-rules
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnSelect
-                            :label="t('worker.operator.machine')"
-                            :options="machinesData"
-                            hide-selected
-                            option-label="plate"
-                            option-value="id"
-                            v-model="row.machineFk"
-                        />
-                    </VnRow>
-                    <!-- <QBtn
+                <div v-if="rows.length">
+                    <QCard
+                        flat
+                        bordered
+                        :key="row"
+                        v-for="row of rows"
+                        class="card q-px-md q-mb-sm container"
+                    >
+                        <VnRow>
+                            <VnInput
+                                :label="t('worker.operator.numberOfWagons')"
+                                v-model="row.numberOfWagons"
+                            />
+                            <VnSelect
+                                :label="t('worker.operator.train')"
+                                :options="trainsData"
+                                hide-selected
+                                v-model="row.trainFk"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.operator.itemPackingType')"
+                                :options="itemPackingTypesData"
+                                hide-selected
+                                option-label="code"
+                                option-value="code"
+                                v-model="row.itemPackingTypeFk"
+                            />
+                            <VnSelect
+                                :label="t('worker.operator.warehouse')"
+                                :options="warehousesData"
+                                hide-selected
+                                v-model="row.warehouseFk"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.operator.sector')"
+                                :options="sectorsData"
+                                hide-selected
+                                option-label="description"
+                                v-model="row.sectorFk"
+                            />
+                            <VnInput
+                                :label="t('worker.operator.labeler')"
+                                v-model="row.labelerFk"
+                                lazy-rules
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                :label="t('worker.operator.linesLimit')"
+                                v-model="row.linesLimit"
+                                lazy-rules
+                            />
+                            <VnInput
+                                :label="t('worker.operator.volumeLimit')"
+                                v-model="row.volumeLimit"
+                                lazy-rules
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                :label="t('worker.operator.sizeLimit')"
+                                v-model="row.sizeLimit"
+                                lazy-rules
+                            />
+                            <VnInput
+                                :label="t('worker.operator.isOnReservationMode')"
+                                v-model="row.isOnReservationMode"
+                                lazy-rules
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                :label="t('worker.operator.machine')"
+                                :options="machinesData"
+                                hide-selected
+                                option-label="plate"
+                                v-model="row.machineFk"
+                            />
+                        </VnRow>
+                    </QCard>
+                </div>
+                <!-- <QBtn
                             flat
                             icon="delete"
                             color="primary"
@@ -169,103 +173,14 @@ watch(
                                 {{ t('worker.pda.removePDA') }}
                             </QTooltip>
                         </QBtn>-->
-                </QCard>
             </template>
-        </FormModel>
-        <QPageSticky :offset="[18, 18]">
-            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
-                <QDialog ref="dialog">
-                    <FormModelPopup
-                        :title="t('Add new device')"
-                        url-create="operators"
-                        model="operator"
-                        :form-initial-data="initialData"
-                        @on-data-saved="reloadData()"
-                    >
-                        <template #form-inputs="{ data }">
-                            <VnRow>
-                                <VnInput
-                                    :label="t('worker.operator.numberOfWagons')"
-                                    :model-value="data.numberOfWagons"
-                                />
-                                <VnSelect
-                                    :label="t('worker.operator.train')"
-                                    :options="trainsData"
-                                    hide-selected
-                                    option-label="name"
-                                    option-value="id"
-                                    v-model="data.trainFk"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnSelect
-                                    :label="t('worker.operator.itemPackingType')"
-                                    :options="ItemPackingTypesData"
-                                    hide-selected
-                                    option-label="code"
-                                    option-value="code"
-                                    v-model="data.itemPackingTypeFk"
-                                />
-                                <VnSelect
-                                    :label="t('worker.operator.warehouse')"
-                                    :options="warehousesData"
-                                    hide-selected
-                                    option-label="name"
-                                    option-value="id"
-                                    v-model="data.warehouseFk"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnSelect
-                                    :label="t('worker.operator.sector')"
-                                    :options="shelvingsData"
-                                    hide-selected
-                                    option-label="description"
-                                    option-value="id"
-                                    v-model="data.sectorFk"
-                                />
-                                <VnInput
-                                    :label="t('worker.operator.labeler')"
-                                    :model-value="data?.labelerFk"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnInput
-                                    :label="t('worker.operator.linesLimit')"
-                                    :model-value="data?.linesLimit"
-                                />
-                                <VnInput
-                                    :label="t('worker.operator.volumeLimit')"
-                                    :model-value="data?.volumeLimit"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnInput
-                                    :label="t('worker.operator.sizeLimit')"
-                                    :model-value="data?.sizeLimit"
-                                />
-                            </VnRow>
-                            <VnRow>
-                                <VnInput
-                                    :label="t('worker.operator.isOnReservationMode')"
-                                    :model-value="data?.isOnReservationMode"
-                                />
-                                <VnSelect
-                                    :label="t('worker.operator.machine')"
-                                    :options="machinesData"
-                                    hide-selected
-                                    option-label="plate"
-                                    option-value="id"
-                                    v-model="data.machineFk"
-                                />
-                            </VnRow>
-                        </template>
-                    </FormModelPopup>
-                </QDialog>
-            </QBtn>
-            <QTooltip>
-                {{ t('globals.new') }}
-            </QTooltip>
+        </CrudModel>
+        <QPageSticky
+            position="bottom-right"
+            :offset="[25, 25]"
+            v-if="!test.formData?.length"
+        >
+            <QBtn fab color="primary" icon="add" @click="test.insert()" />
         </QPageSticky>
     </QPage>
 </template>

From 15f171da0fe58dd80b6945c8fc454d925b075bb3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 15 Oct 2024 13:12:37 +0200
Subject: [PATCH 46/53] perf: refs #7825 create bank entity

---
 src/components/CreateBankEntityForm.vue |  4 ++--
 src/pages/Worker/WorkerList.vue         | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 0a3c10f57..a42be6ef8 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -31,8 +31,8 @@ const countriesFilter = {
 
 const countriesOptions = ref([]);
 
-const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
+const onDataSaved = (...args) => {
+    emit('onDataSaved', ...args);
 };
 
 onMounted(async () => {
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 4b7d028e7..99ea609a1 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -29,6 +29,7 @@ const postcodesOptions = ref([]);
 
 const user = useState().getUser();
 const defaultPayMethod = ref();
+const bankEntitiesRef = ref();
 const columns = computed(() => [
     {
         align: 'left',
@@ -93,10 +94,11 @@ onBeforeMount(async () => {
     ).data?.payMethodFk;
 });
 
-const handleNewBankEntity = (response, formData) => {
-    bankEntitiesOptions.value = [...bankEntitiesOptions.value, response];
-    formData.bankEntityFk = response.id;
-};
+async function handleNewBankEntity(data, resp) {
+    await bankEntitiesRef.value.fetch();
+    data.bankEntityFk = resp.id;
+    bankEntitiesOptions.value.push(resp);
+}
 
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
@@ -157,6 +159,7 @@ async function autofillBic(worker) {
         auto-load
     />
     <FetchData
+        ref="bankEntitiesRef"
         url="BankEntities"
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
@@ -325,8 +328,7 @@ async function autofillBic(worker) {
                         <template #form>
                             <CreateBankEntityForm
                                 @on-data-saved="
-                                    (_, requestResponse) =>
-                                        handleNewBankEntity(requestResponse, data)
+                                    (_, resp) => handleNewBankEntity(data, resp)
                                 "
                             />
                         </template>

From a30915f99ecb4a9d631ff381c483c3b87ea52ca6 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 14:42:26 +0200
Subject: [PATCH 47/53] fix: refs #7986 fix operator, fix crudmodel update

---
 src/pages/Worker/Card/WorkerOperator.vue | 57 ++++++++++++++++--------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index a667d083e..0bd6d46e2 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -10,10 +10,11 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import CrudModel from 'components/CrudModel.vue';
+import axios from 'axios';
 
 const { t } = useI18n();
 
-const test = ref({});
+const crudModelRef = ref();
 const dialog = ref();
 const warehousesData = ref([]);
 const itemPackingTypesData = ref([]);
@@ -39,10 +40,11 @@ const initialData = computed(() => {
         machineFk: null,
     };
 });
-// watch(
-//     () => route.params.id,
-//     () => CrudModelRef.value.reset()
-// );
+
+async function insert() {
+    await axios.post('Operators', initialData.value);
+    crudModelRef.value.reload();
+}
 </script>
 
 <template>
@@ -58,16 +60,17 @@ const initialData = computed(() => {
             @on-fetch="(data) => (warehousesData = data)"
             auto-load
         />
+        <FetchData url="Printers" @on-fetch="(data) => (PrintersData = data)" auto-load />
         <FetchData url="Sectors" @on-fetch="(data) => (sectorsData = data)" auto-load />
         <FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
         <CrudModel
             data-key="workerOperator"
             url="Operators"
-            model="workerOperator"
+            primary-key="workerFk"
             :filter="{ where: { workerFk: route.params.id } }"
-            ref="test"
             :data-required="{ workerFk: route.params.id }"
-            :default-save="false"
+            ref="crudModelRef"
+            search-url="operator"
             auto-load
         >
             <template #body="{ rows }">
@@ -75,7 +78,7 @@ const initialData = computed(() => {
                     <QCard
                         flat
                         bordered
-                        :key="row"
+                        :key="row.$index"
                         v-for="row of rows"
                         class="card q-px-md q-mb-sm container"
                     >
@@ -115,11 +118,27 @@ const initialData = computed(() => {
                                 option-label="description"
                                 v-model="row.sectorFk"
                             />
-                            <VnInput
+                            <VnSelect
                                 :label="t('worker.operator.labeler')"
+                                :options="PrintersData"
+                                hide-selected
+                                option-label="name"
                                 v-model="row.labelerFk"
-                                lazy-rules
-                            />
+                            >
+                                <template #option="scope">
+                                    <QItem v-bind="scope.itemProps">
+                                        <QItemSection>
+                                            <QItemLabel
+                                                >ID: {{ scope.opt?.id }}</QItemLabel
+                                            >
+                                            <QItemLabel caption>
+                                                {{ scope.opt?.id }},
+                                                {{ scope.opt?.name }}
+                                            </QItemLabel>
+                                        </QItemSection>
+                                    </QItem>
+                                </template>
+                            </VnSelect>
                         </VnRow>
                         <VnRow>
                             <VnInput
@@ -175,12 +194,14 @@ const initialData = computed(() => {
                         </QBtn>-->
             </template>
         </CrudModel>
-        <QPageSticky
-            position="bottom-right"
-            :offset="[25, 25]"
-            v-if="!test.formData?.length"
-        >
-            <QBtn fab color="primary" icon="add" @click="test.insert()" />
+        <QPageSticky position="bottom-right" :offset="[25, 25]">
+            <QBtn
+                fab
+                color="primary"
+                icon="add"
+                @click="insert()"
+                v-if="!crudModelRef?.formData?.length"
+            />
         </QPageSticky>
     </QPage>
 </template>

From cad3fddc3ee0734ae75b31ddc2d617793f7e0427 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 14:52:52 +0200
Subject: [PATCH 48/53] fix: refs #7986 descriptor fix

---
 src/i18n/locale/en.yml | 1 +
 src/i18n/locale/es.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3742a773e..fa0a14f45 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -277,6 +277,7 @@ globals:
         medical: Mutual
         RouteExtendedList: Router
         wasteRecalc: Waste recaclulate
+        operator: Operator
     supplier: Supplier
     created: Created
     worker: Worker
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f92ac93d8..5dfe90e98 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -281,6 +281,7 @@ globals:
         serial: Facturas por serie
         medical: Mutua
         wasteRecalc: Recalcular mermas
+        operator: Operario
     supplier: Proveedor
     created: Fecha creación
     worker: Trabajador

From e06ce4f8a49a5aff575b076c20b076c64c915e3b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 14:56:32 +0200
Subject: [PATCH 49/53] fix: refs #7986 clean code

---
 src/pages/Worker/Card/WorkerOperator.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 0bd6d46e2..2eb14de3b 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -1,21 +1,17 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { ref, computed, watch } from 'vue';
+import { ref, computed } from 'vue';
 import FetchData from 'components/FetchData.vue';
-// import CrudModelPopup from 'src/components/CrudModelPopup.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import CrudModel from 'components/CrudModel.vue';
 import axios from 'axios';
 
 const { t } = useI18n();
 
 const crudModelRef = ref();
-const dialog = ref();
 const warehousesData = ref([]);
 const itemPackingTypesData = ref([]);
 const sectorsData = ref([]);

From e0c294bce61f055809d52c89a92ad91d1ab4788b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 16 Oct 2024 09:16:57 +0200
Subject: [PATCH 50/53] test(claimDevelopment): skip intermitent e2e

---
 test/cypress/integration/claim/claimDevelopment.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index 81fc33ecd..eb39f340a 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -33,7 +33,8 @@ describe('ClaimDevelopment', () => {
         cy.saveCard();
     });
 
-    it('should add and remove new line', () => {
+    // TODO: #8112
+    xit('should add and remove new line', () => {
         cy.wait(['@workers', '@workers']);
         cy.addCard();
 

From c42c811444a767f0c5ac884383429b5b41e8a341 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 17 Oct 2024 17:39:49 +0200
Subject: [PATCH 51/53] fix: refs #7353 load on scroll end

---
 src/components/VnTable/VnTable.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 5a30f4d53..05bc6edeb 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -134,6 +134,7 @@ const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
 const tableFilterRef = ref([]);
+const tableRef = ref();
 
 const tableModes = [
     {
@@ -321,6 +322,12 @@ function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
+
+function handleScroll() {
+    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
+    const isAtBottom = tMiddle.scrollHeight - tMiddle.scrollTop === tMiddle.clientHeight;
+    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
+}
 </script>
 <template>
     <QDrawer
@@ -405,6 +412,7 @@ function handleOnDataSaved(_) {
         </template>
         <template #body="{ rows }">
             <QTable
+                ref="tableRef"
                 v-bind="table"
                 class="vnTable"
                 :columns="splittedColumns.columns"
@@ -416,12 +424,7 @@ function handleOnDataSaved(_) {
                 flat
                 :style="isTableMode && `max-height: ${tableHeight}`"
                 :virtual-scroll="isTableMode"
-                @virtual-scroll="
-                    (event) =>
-                        event.index > rows.length - 2 &&
-                        ($props.crudModel?.paginate ?? true) &&
-                        CrudModelRef.vnPaginateRef.paginate()
-                "
+                @virtual-scroll="handleScroll"
                 @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                 @update:selected="emit('update:selected', $event)"
             >

From 1f4b681b5bb0d8c70015f6533049a688b9f9196d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 18 Oct 2024 08:44:27 +0200
Subject: [PATCH 52/53] fix: refs #7986 clean code

---
 src/pages/Worker/Card/WorkerOperator.vue | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index 2eb14de3b..cdacc72c0 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -171,23 +171,6 @@ async function insert() {
                         </VnRow>
                     </QCard>
                 </div>
-                <!-- <QBtn
-                            flat
-                            icon="delete"
-                            color="primary"
-                            class="btn-delete"
-                            @click="
-                                openConfirmationModal(
-                                    t(`Remove PDA`),
-                                    t('Do you want to remove this PDA?'),
-                                    () => deallocatePDA(row.deviceProductionFk)
-                                )
-                            "
-                        >
-                            <QTooltip>
-                                {{ t('worker.pda.removePDA') }}
-                            </QTooltip>
-                        </QBtn>-->
             </template>
         </CrudModel>
         <QPageSticky position="bottom-right" :offset="[25, 25]">

From 0c2d9e6ec60775f23fdea36b6131fb8753127eb5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 18 Oct 2024 10:08:46 +0200
Subject: [PATCH 53/53] fix: refs #7353 load on scroll end 80% zoom

---
 src/components/VnTable/VnTable.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 05bc6edeb..5239fe859 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -325,7 +325,8 @@ function handleOnDataSaved(_) {
 
 function handleScroll() {
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
-    const isAtBottom = tMiddle.scrollHeight - tMiddle.scrollTop === tMiddle.clientHeight;
+    const { scrollHeight, scrollTop, clientHeight } = tMiddle;
+    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
     if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
 }
 </script>