From 0bd48d476b5c517201efdae94b5257eb449f8114 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 20 Dec 2024 10:35:31 +0100
Subject: [PATCH 1/7] test: refs #7100 added test to vnNotes component

---
 .../components/common/VnNotes.spec.js         | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 test/vitest/__tests__/components/common/VnNotes.spec.js

diff --git a/test/vitest/__tests__/components/common/VnNotes.spec.js b/test/vitest/__tests__/components/common/VnNotes.spec.js
new file mode 100644
index 000000000..cdd97a924
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnNotes.spec.js
@@ -0,0 +1,66 @@
+import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnNotes from 'src/components/ui/VnNotes.vue';
+
+describe('VnNotes', () => {
+    let vm;
+    let spyFetch;
+    let postMock;
+
+    beforeAll(async () => {        
+        vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
+
+        vm = createWrapper(VnNotes, {
+            propsData: {
+                url: '/test',
+                filter: { order: 'created DESC' },
+                body: { name: 'Tony', lastName: 'Stark' },
+                addNote: false,
+                selectType: true,
+            }
+        }).vm;
+    });
+
+    beforeEach(() => {
+        postMock = vi.spyOn(axios, 'post').mockResolvedValue({ data: {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1} });
+        spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('insert', () => {
+        it('should not call axios.post if newNote.text is empty', async () => {
+            vm.newNote.text = '';
+            vm.newNote.observationTypeFk = 1;
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should not call axios.post if observationTypeFk is missing and selectType is set', async () => {
+            vm.newNote.text = 'Test Note';
+            vm.newNote.observationTypeFk = null;
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
+            vm.newNote.text = 'Test Note';
+            vm.newNote.observationTypeFk = 1;
+
+            const expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+            
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+    });
+});
\ No newline at end of file

From 69451862bf79616f5ebe40408f6b7b387dc98c14 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 20 Dec 2024 13:20:11 +0100
Subject: [PATCH 2/7] test: refs #7100 modified test and added more cases

---
 .../components/common/VnNotes.spec.js         | 64 +++++++++++++++----
 1 file changed, 53 insertions(+), 11 deletions(-)

diff --git a/test/vitest/__tests__/components/common/VnNotes.spec.js b/test/vitest/__tests__/components/common/VnNotes.spec.js
index cdd97a924..598ea4526 100644
--- a/test/vitest/__tests__/components/common/VnNotes.spec.js
+++ b/test/vitest/__tests__/components/common/VnNotes.spec.js
@@ -4,21 +4,23 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
 
 describe('VnNotes', () => {
     let vm;
+    let wrapper;
     let spyFetch;
     let postMock;
+    let expectedBody;
 
     beforeAll(async () => {        
         vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
 
-        vm = createWrapper(VnNotes, {
+        wrapper = createWrapper(VnNotes, {
             propsData: {
                 url: '/test',
-                filter: { order: 'created DESC' },
                 body: { name: 'Tony', lastName: 'Stark' },
-                addNote: false,
-                selectType: true,
+                selectType: false,
             }
-        }).vm;
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
     });
 
     beforeEach(() => {
@@ -31,9 +33,10 @@ describe('VnNotes', () => {
     });
 
     describe('insert', () => {
-        it('should not call axios.post if newNote.text is empty', async () => {
-            vm.newNote.text = '';
-            vm.newNote.observationTypeFk = 1;
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
+            vm.newNote.text = null;
+            vm.newNote.observationTypeFk = null;
+            await wrapper.setProps({ selectType: true });
 
             await vm.insert();
 
@@ -41,9 +44,10 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should not call axios.post if observationTypeFk is missing and selectType is set', async () => {
-            vm.newNote.text = 'Test Note';
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
+            vm.newNote.text = "";
             vm.newNote.observationTypeFk = null;
+            await wrapper.setProps({ selectType: false });
 
             await vm.insert();
 
@@ -51,11 +55,49 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
+        it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
+            vm.newNote.text = 'Test Note';
+            vm.newNote.observationTypeFk = null;
+            await wrapper.setProps({ selectType: true });
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
+            vm.newNote.text = "Test Note";
+            vm.newNote.observationTypeFk = null;
+            await wrapper.setProps({ selectType: false });
+
+            expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {
+            vm.newNote.text = "Test Note";
+            vm.newNote.observationTypeFk = 1;
+            await wrapper.setProps({ selectType: false });
+
+            expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+
         it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
             vm.newNote.text = 'Test Note';
             vm.newNote.observationTypeFk = 1;
+            wrapper.setProps({ selectType: false });
 
-            const expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+            expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
             
             await vm.insert();
 

From 07afbc82efe2038278545a90311fe52c08f404e3 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 23 Dec 2024 09:29:50 +0100
Subject: [PATCH 3/7] refactor: refs #7100 delete unnecesary set prop

---
 test/vitest/__tests__/components/common/VnNotes.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/vitest/__tests__/components/common/VnNotes.spec.js b/test/vitest/__tests__/components/common/VnNotes.spec.js
index 598ea4526..c9b40007b 100644
--- a/test/vitest/__tests__/components/common/VnNotes.spec.js
+++ b/test/vitest/__tests__/components/common/VnNotes.spec.js
@@ -16,7 +16,6 @@ describe('VnNotes', () => {
             propsData: {
                 url: '/test',
                 body: { name: 'Tony', lastName: 'Stark' },
-                selectType: false,
             }
         });
         wrapper = wrapper.wrapper;

From 7a2de50d7d01d3ce9785165fa6baf2e13a368ef1 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 26 Dec 2024 08:29:29 +0100
Subject: [PATCH 4/7] feat: refs #8117 filters and values added as needed

---
 src/components/common/VnSelect.vue            |  4 ++--
 src/components/common/VnSelectWorker.vue      |  3 ++-
 src/pages/Claim/ClaimFilter.vue               | 11 +--------
 src/pages/Entry/EntryFilter.vue               | 10 +++++---
 src/pages/Entry/EntryLatestBuysFilter.vue     | 10 ++++----
 src/pages/InvoiceIn/InvoiceInFilter.vue       | 17 ++++++++++++--
 src/pages/InvoiceIn/InvoiceInList.vue         |  6 ++---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 12 +---------
 src/pages/Item/ItemList.vue                   | 11 +++++++++
 src/pages/Item/ItemListFilter.vue             | 23 ++++++++-----------
 src/pages/Item/ItemRequestFilter.vue          |  1 -
 src/pages/Order/Card/OrderFilter.vue          |  1 +
 src/pages/Ticket/TicketFilter.vue             | 10 ++++----
 src/pages/Travel/ExtraCommunityFilter.vue     | 16 ++++++++++++-
 src/pages/Travel/TravelFilter.vue             |  6 ++---
 15 files changed, 81 insertions(+), 60 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 8aa725b4a..795291f1e 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -194,10 +194,10 @@ function filter(val, options) {
         }
 
         if (!row) return;
-        const id = row[$props.optionValue];
+        const id = String(row[$props.optionValue]);
         const optionLabel = String(row[$props.optionLabel]).toLowerCase();
 
-        return id == search || optionLabel.includes(search);
+        return id.includes(search) || optionLabel.includes(search);
     });
 }
 
diff --git a/src/components/common/VnSelectWorker.vue b/src/components/common/VnSelectWorker.vue
index b0fef4443..9a8151a3d 100644
--- a/src/components/common/VnSelectWorker.vue
+++ b/src/components/common/VnSelectWorker.vue
@@ -51,6 +51,7 @@ const url = computed(() => {
         option-value="id"
         option-label="nickname"
         :fields="['id', 'name', 'nickname', 'code']"
+        :filter-options="['id', 'name', 'nickname', 'code']"
         sort-by="nickname ASC"
     >
         <template #prepend v-if="$props.hasAvatar">
@@ -71,7 +72,7 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        {{ scope.opt.nickname }}, {{ scope.opt.code }}
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index c28e95cb8..b4dd4ee1b 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -93,16 +93,7 @@ defineExpose({ states });
                     outlined
                     rounded
                     dense
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                />
                 <VnSelect
                     :label="t('claim.responsible')"
                     v-model="params.claimResponsibleFk"
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index f50810eb7..f91f7f128 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -123,6 +123,7 @@ const companiesOptions = ref([]);
                         option-value="id"
                         option-label="name"
                         :fields="['id', 'name', 'nickname']"
+                        :filter-options="['id', 'name', 'nickname']"
                         sort-by="nickname"
                         hide-selected
                         dense
@@ -132,9 +133,12 @@ const companiesOptions = ref([]);
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{
-                                        scope.opt?.name + ': ' + scope.opt?.nickname
-                                    }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index 83124c1bf..7ceaa1325 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -69,12 +69,14 @@ const tagValues = ref([]);
                         use-input
                         @update:model-value="searchFn()"
                     >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
                                     <QItemLabel caption>
-                                        {{ opt.nickname }}
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 653692026..6259030e0 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -68,13 +68,26 @@ function handleDaysAgo(params, daysAgo) {
                     <VnSelect
                         v-model="params.supplierFk"
                         url="Suppliers"
-                        :fields="['id', 'nickname']"
+                        :fields="['id', 'nickname', 'name']"
                         :label="getLocale('supplierFk')"
                         option-label="nickname"
                         dense
                         outlined
                         rounded
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index db6e7d214..252ac9256 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -178,18 +178,18 @@ const cols = computed(() => [
             <VnSelect
                 v-model="data.supplierFk"
                 url="Suppliers"
-                :fields="['id', 'nickname']"
+                :fields="['id', 'nickname', 'name']"
                 :label="t('globals.supplier')"
                 option-value="id"
                 option-label="nickname"
-                :filter-options="['id', 'name']"
+                :filter-options="['id', 'name', 'nickname']"
                 :required="true"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
                         <QItemSection>
                             <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt?.id }}, {{  scope.opt?.name }} </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index e6c689523..4e70d4f43 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -101,17 +101,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>
-                                #{{ scope.opt?.id }} {{ scope.opt?.name }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
+            />
             <VnSelect
                 :label="t('invoiceOutSerialType')"
                 v-model="formData.serialType"
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 4aa3b13fe..ac9b0b532 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -139,6 +139,17 @@ const columns = computed(() => [
         label: t('item.list.typeName'),
         name: 'typeName',
         align: 'left',
+        component: 'select',
+        columnFilter: {
+            name: 'typeFk',
+            attrs: {
+                url: 'ItemTypes',
+                fields: ['id', 'name'],
+            },
+        },
+        columnField: {
+            component: null,
+        }
     },
     {
         label: t('item.list.category'),
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 484265b49..a8349c935 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -199,17 +199,7 @@ onMounted(async () => {
                         dense
                         outlined
                         rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.name}`)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -265,6 +255,7 @@ onMounted(async () => {
                         option-value="id"
                         option-label="name"
                         :fields="['id', 'name', 'nickname']"
+                        :filter-options="['id', 'name', 'nickname']"
                         sort-by="name ASC"
                         hide-selected
                         dense
@@ -274,9 +265,12 @@ onMounted(async () => {
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{
-                                        scope.opt?.name + ': ' + scope.opt?.nickname
-                                    }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
@@ -375,6 +369,7 @@ onMounted(async () => {
                         :model-value="fieldFilter.selectedField"
                         :options="moreFields"
                         option-label="label"
+                        option-value="label"                        
                         dense
                         outlined
                         rounded
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 4e8ae0d42..457035f29 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -149,7 +149,6 @@ onMounted(async () => {
                         :label="t('params.requesterFk')"
                         v-model="params.requesterFk"
                         @update:model-value="searchFn()"
-                        :fields="['id', 'name']"
                         :params="{ departmentCodes: ['VT'] }"
                         hide-selected
                         dense
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index dc86600ac..977b2971d 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -97,6 +97,7 @@ const sourceList = ref([]);
                     v-model="params.sourceApp"
                     :options="sourceList"
                     option-label="value"
+                    option-value="value"
                     dense
                     outlined
                     rounded
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index bde27f30e..74763c2a9 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -101,7 +101,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="states">
-                    <QSelect
+                    <VnSelect
                         :label="t('State')"
                         v-model="params.stateFk"
                         @update:model-value="searchFn()"
@@ -122,7 +122,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="groupedStates">
-                    <QSelect
+                    <VnSelect
                         :label="t('Grouped state')"
                         v-model="params.groupedStates"
                         @update:model-value="searchFn()"
@@ -217,7 +217,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="provinces">
-                    <QSelect
+                    <VnSelect
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
@@ -238,7 +238,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="agencies">
-                    <QSelect
+                    <VnSelect
                         :label="t('Agency')"
                         v-model="params.agencyModeFk"
                         @update:model-value="searchFn()"
@@ -259,7 +259,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="warehouses">
-                    <QSelect
+                    <VnSelect
                         :label="t('Warehouse')"
                         v-model="params.warehouseFk"
                         @update:model-value="searchFn()"
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 75b744168..273158a34 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -221,7 +221,20 @@ warehouses();
                         dense
                         outlined
                         rounded
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
@@ -232,6 +245,7 @@ warehouses();
                         :options="continentsOptions"
                         option-value="code"
                         option-label="name"
+                        :filter-options="['code', 'name']"
                         hide-selected
                         dense
                         outlined
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index bb78080ef..90901ee4d 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -140,10 +140,10 @@ en:
         Id: Contains
         ref: Reference
         agency: Agency
-        warehouseInFk: W. In
+        warehouseInFk: Warehouse In
         shipped: Shipped
         shipmentHour: Shipment Hour
-        warehouseOut: W. Out
+        warehouseOut: Warehouse Out
         landed: Landed
         landingHour: Landing Hour
         totalEntries: Σ
@@ -156,7 +156,7 @@ es:
         warehouseInFk: Alm.Entrada
         shipped: F.Envío
         shipmentHour: Hora de envío
-        warehouseOut: Alm.Entrada
+        warehouseOut: Alm.Salida
         landed: F.Entrega
         landingHour: Hora de entrega
         totalEntries: Σ

From f4ba551df4911620f33e2b3ab6aeb115148c9990 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 26 Dec 2024 10:51:24 +0100
Subject: [PATCH 5/7] fix: refs #8117 update salesPersonFk filter options and
 URL for improved data retrieval

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index ef03ec20d..f363f5bf8 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -110,15 +110,13 @@ const columns = computed(() => [
         name: 'salesPersonFk',
         field: 'userName',
         align: 'left',
-        optionFilter: 'firstName',
         columnFilter: {
             component: 'select',
             attrs: {
-                url: 'Workers/activeWithInheritedRole',
-                fields: ['id', 'name'],
+                url: 'Workers/search?departmentCodes=["VT"]',
+                fields: ['id', 'name', 'nickname', 'code'],
                 sortBy: 'nickname ASC',
-                where: { role: 'salesPerson' },
-                useLike: false,
+                optionLabel: 'nickname',
             },
         },
     },

From 771ecf1cc699e0ddbd8b10d4d38dd2770007be0c Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 30 Dec 2024 07:40:25 +0100
Subject: [PATCH 6/7] refactor: refs #7100 refactorized with methods

---
 .../common/__tests__/VnNotes.spec.js          | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/components/common/__tests__/VnNotes.spec.js b/src/components/common/__tests__/VnNotes.spec.js
index c9b40007b..249e801d7 100644
--- a/src/components/common/__tests__/VnNotes.spec.js
+++ b/src/components/common/__tests__/VnNotes.spec.js
@@ -9,6 +9,16 @@ describe('VnNotes', () => {
     let postMock;
     let expectedBody;
 
+    function generateExpectedBody() {
+        expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+    }
+
+    async function setTestParams(text, observationType, type){
+        vm.newNote.text = text;
+        vm.newNote.observationTypeFk = observationType;
+        wrapper.setProps({ selectType: type });
+    }
+
     beforeAll(async () => {        
         vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
 
@@ -29,13 +39,12 @@ describe('VnNotes', () => {
 
     afterEach(() => {
         vi.clearAllMocks();
+        expectedBody = {};
     });
 
     describe('insert', () => {
         it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
-            vm.newNote.text = null;
-            vm.newNote.observationTypeFk = null;
-            await wrapper.setProps({ selectType: true });
+            await setTestParams( null, null, true );
 
             await vm.insert();
 
@@ -44,9 +53,7 @@ describe('VnNotes', () => {
         });
 
         it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
-            vm.newNote.text = "";
-            vm.newNote.observationTypeFk = null;
-            await wrapper.setProps({ selectType: false });
+            await setTestParams( "", null, false );
 
             await vm.insert();
 
@@ -55,9 +62,7 @@ describe('VnNotes', () => {
         });
 
         it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
-            vm.newNote.text = 'Test Note';
-            vm.newNote.observationTypeFk = null;
-            await wrapper.setProps({ selectType: true });
+            await setTestParams( "Test Note", null, true );
 
             await vm.insert();
 
@@ -66,11 +71,9 @@ describe('VnNotes', () => {
         });
 
         it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
-            vm.newNote.text = "Test Note";
-            vm.newNote.observationTypeFk = null;
-            await wrapper.setProps({ selectType: false });
+            await setTestParams( "Test Note", null, false );
 
-            expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+            generateExpectedBody();
 
             await vm.insert();
 
@@ -78,12 +81,10 @@ describe('VnNotes', () => {
             expect(spyFetch).toHaveBeenCalled();
         });
 
-        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {
-            vm.newNote.text = "Test Note";
-            vm.newNote.observationTypeFk = 1;
-            await wrapper.setProps({ selectType: false });
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {            
+            await setTestParams( "Test Note", 1, false );
 
-            expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+            generateExpectedBody();
 
             await vm.insert();
 
@@ -92,11 +93,9 @@ describe('VnNotes', () => {
         });
 
         it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
-            vm.newNote.text = 'Test Note';
-            vm.newNote.observationTypeFk = 1;
-            wrapper.setProps({ selectType: false });
+            await setTestParams( "Test Note", 1, true );
 
-            expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+            generateExpectedBody();
             
             await vm.insert();
 

From 23afe3276ce5689b7ee428a383a43c759f7c8131 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 2 Jan 2025 15:13:36 +0100
Subject: [PATCH 7/7] refactor: refs #7100 added const mockData

---
 src/components/common/__tests__/VnNotes.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/__tests__/VnNotes.spec.js b/src/components/common/__tests__/VnNotes.spec.js
index 249e801d7..8f24a7f14 100644
--- a/src/components/common/__tests__/VnNotes.spec.js
+++ b/src/components/common/__tests__/VnNotes.spec.js
@@ -8,6 +8,7 @@ describe('VnNotes', () => {
     let spyFetch;
     let postMock;
     let expectedBody;
+    const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
 
     function generateExpectedBody() {
         expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
@@ -33,7 +34,7 @@ describe('VnNotes', () => {
     });
 
     beforeEach(() => {
-        postMock = vi.spyOn(axios, 'post').mockResolvedValue({ data: {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1} });
+        postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
         spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
     });