From 64d8f86ea952bf28cc503e9fc86b93dcbabf0a72 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 12 Mar 2024 12:25:31 +0100
Subject: [PATCH 1/7] refactor(routeList): refs #6971 moved button to
 subtoolbar + same functionality as other subtoolbar items

---
 src/pages/Route/RouteList.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 0b4aa6795..de600bc0e 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -255,6 +255,15 @@ const markAsServed = () => {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
+                <RouterLink :to="{ name: 'RouteCreate' }">
+                    <QBtn
+                        icon="add"
+                        color="primary" 
+                        :disable="!selectedRows?.length"
+                        @click="{ navigate }"
+                    />
+                    <QTooltip>{{ t('newRoute') }}</QTooltip>
+                </RouterLink>
             </template>
         </VnSubToolbar>
         <div class="route-list">
@@ -494,12 +503,6 @@ const markAsServed = () => {
             </VnPaginate>
         </div>
         <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'RouteCreate' }">
-                <QBtn fab icon="add" color="primary" />
-                <QTooltip>
-                    {{ t('newRoute') }}
-                </QTooltip>
-            </RouterLink>
         </QPageSticky>
     </QPage>
 </template>

From fe7d370a0a722524250fc257ed929a6a143c68fc Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 18 Mar 2024 09:48:27 +0100
Subject: [PATCH 2/7] refactor: refs #6837 move travel search like other
 sections

---
 src/pages/Travel/TravelFilter.vue |  9 ---------
 src/pages/Travel/TravelList.vue   | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index c1c0d1bee..7e8d19405 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -60,15 +60,6 @@ const decrement = (paramsObj, key) => {
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        v-model="params.search"
-                        :label="t('params.search')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelectFilter
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index edcfbac52..9de353510 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -8,6 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import TravelSummary from './Card/TravelSummary.vue';
 import TravelFilter from './TravelFilter.vue';
 import FetchData from 'components/FetchData.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
@@ -17,6 +18,12 @@ const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
 
 const warehouses = ref([]);
 
@@ -59,6 +66,15 @@ onMounted(async () => {
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="TravelList"
+                :limit="20"
+                :label="t('searchByIdOrReference')"
+            />
+        </Teleport>
+    </template>
     <FetchData
         url="Warehouses"
         :filter="{ fields: ['id', 'name'] }"
@@ -172,7 +188,9 @@ onMounted(async () => {
 <i18n>
 en:
     addEntry: Add entry
+    searchByIdOrReference: Search by ID or reference
 
 es:
     addEntry: Añadir entrada
+    searchByIdOrReference: Buscar por ID o por referencia
 </i18n>

From d365a36c7e22c204108cb816ec25f71162ad4b6c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 18 Mar 2024 09:51:30 +0100
Subject: [PATCH 3/7] fixed useless variable

---
 src/pages/Travel/TravelList.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 9de353510..a642ce242 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -18,12 +18,6 @@ const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
 
 const warehouses = ref([]);
 

From cf25476a5d73aa422a641b40310078c17e754971 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 18 Mar 2024 21:04:52 -0300
Subject: [PATCH 4/7] Create worker log

---
 src/i18n/en/index.js                |  1 +
 src/i18n/es/index.js                |  1 +
 src/pages/Worker/Card/WorkerLog.vue |  6 ++++++
 src/router/modules/worker.js        | 11 ++++++++++-
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Worker/Card/WorkerLog.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4fe31cd2c..bbfccf719 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -836,6 +836,7 @@ export default {
             workerCreate: 'New worker',
             department: 'Department',
             pda: 'PDA',
+            log: 'Log',
         },
         list: {
             name: 'Name',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 96303e856..b1baa0c0b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -836,6 +836,7 @@ export default {
             workerCreate: 'Nuevo trabajador',
             department: 'Departamentos',
             pda: 'PDA',
+            log: 'Historial',
         },
         list: {
             name: 'Nombre',
diff --git a/src/pages/Worker/Card/WorkerLog.vue b/src/pages/Worker/Card/WorkerLog.vue
new file mode 100644
index 000000000..ef5a2e0d8
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerLog.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Worker" url="/WorkerLogs" />
+</template>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 1c722afe8..448aab79c 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'WorkerMain' },
     menus: {
         main: ['WorkerList', 'WorkerDepartment'],
-        card: ['WorkerNotificationsManager', 'WorkerPda'],
+        card: ['WorkerNotificationsManager', 'WorkerPda', 'WorkerLog'],
         departmentCard: ['BasicData'],
     },
     children: [
@@ -85,6 +85,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
                 },
+                {
+                    name: 'WorkerLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
+                },
             ],
         },
     ],

From 0c8f5f488893597f1a2156dde929bfa35be464e6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 22 Mar 2024 08:15:00 +0100
Subject: [PATCH 5/7] refactor: refs #6971 moved correct button + unmade
 previous changes

---
 src/pages/Route/RouteAutonomous.vue | 28 ++++++++++++++++------------
 src/pages/Route/RouteList.vue       | 23 ++++++++++++++---------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 6fd4d3f90..43dfac340 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -205,6 +205,17 @@ function navigateToRouteSummary(event, row) {
         <div class="route-list">
             <div class="q-pa-md">
                 <QCard class="vn-one q-py-sm q-px-lg">
+                    <QBtn
+                        icon="vn:invoice-in-create"
+                        color="primary"
+                        :disable="!selectedRows?.length"
+                        @click="openDmsUploadDialog"
+                        class="createInvoiceIn"
+                    >
+                        <QTooltip>
+                            {{ t('Create invoiceIn') }}
+                        </QTooltip>
+                    </QBtn>
                     <VnLv class="flex">
                         <template #label>
                             <span class="text-h6">{{ t('Total') }}</span>
@@ -289,18 +300,6 @@ function navigateToRouteSummary(event, row) {
                 </template>
             </VnPaginate>
         </div>
-        <QPageSticky :offset="[20, 20]" v-if="selectedRows?.length">
-            <QBtn
-                fab
-                icon="vn:invoice-in-create"
-                color="primary"
-                @click="openDmsUploadDialog"
-            >
-                <QTooltip>
-                    {{ t('Create invoiceIn') }}
-                </QTooltip>
-            </QBtn>
-        </QPageSticky>
     </QPage>
     <QDialog v-model="dmsDialog.show">
         <VnDms
@@ -326,6 +325,11 @@ function navigateToRouteSummary(event, row) {
         cursor: pointer;
     }
 }
+
+.createInvoiceIn {
+    float: right;
+    margin-top: -0.2%;
+}
 </style>
 <i18n>
 es:
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 241b34d78..cefdf20b8 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -253,15 +253,6 @@ const openTicketsDialog = (id) => {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
-                <RouterLink :to="{ name: 'RouteCreate' }">
-                    <QBtn
-                        icon="add"
-                        color="primary" 
-                        :disable="!selectedRows?.length"
-                        @click="{ navigate }"
-                    />
-                    <QTooltip>{{ t('newRoute') }}</QTooltip>
-                </RouterLink>
             </template>
         </VnSubToolbar>
         <div class="route-list">
@@ -452,6 +443,20 @@ const openTicketsDialog = (id) => {
             </VnPaginate>
         </div>
         <QPageSticky :offset="[20, 20]">
+            <RouterLink :to="{ name: 'RouteCreate' }">
+                <QBtn
+                    fab
+                    icon="add"
+                    color="primary"
+                    :disable="!selectedRows?.length"
+                    @click="
+                        {
+                            navigate;
+                        }
+                    "
+                />
+                <QTooltip>{{ t('newRoute') }}</QTooltip>
+            </RouterLink>
         </QPageSticky>
     </QPage>
 </template>

From bf0e2d3bf661d0d9fc08b029bce745b2a6227edb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Mar 2024 09:52:04 +0100
Subject: [PATCH 6/7] refactor: refs #6971 fixed request changes

---
 src/pages/Route/RouteAutonomous.vue | 28 +++++++++++-----------------
 src/pages/Route/RouteList.vue       | 16 ++++------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 43dfac340..0ecf0a971 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -204,18 +204,7 @@ function navigateToRouteSummary(event, row) {
     <QPage class="column items-center">
         <div class="route-list">
             <div class="q-pa-md">
-                <QCard class="vn-one q-py-sm q-px-lg">
-                    <QBtn
-                        icon="vn:invoice-in-create"
-                        color="primary"
-                        :disable="!selectedRows?.length"
-                        @click="openDmsUploadDialog"
-                        class="createInvoiceIn"
-                    >
-                        <QTooltip>
-                            {{ t('Create invoiceIn') }}
-                        </QTooltip>
-                    </QBtn>
+                <QCard class="vn-one q-py-sm q-px-lg flex justify-between">
                     <VnLv class="flex">
                         <template #label>
                             <span class="text-h6">{{ t('Total') }}</span>
@@ -224,6 +213,16 @@ function navigateToRouteSummary(event, row) {
                             <span class="text-h6 q-ml-md">{{ toCurrency(total) }}</span>
                         </template>
                     </VnLv>
+                    <QBtn
+                        icon="vn:invoice-in-create"
+                        color="primary"
+                        :disable="!selectedRows?.length"
+                        @click="openDmsUploadDialog"
+                    >
+                        <QTooltip>
+                            {{ t('Create invoiceIn') }}
+                        </QTooltip>
+                    </QBtn>
                 </QCard>
             </div>
             <VnPaginate
@@ -325,11 +324,6 @@ function navigateToRouteSummary(event, row) {
         cursor: pointer;
     }
 }
-
-.createInvoiceIn {
-    float: right;
-    margin-top: -0.2%;
-}
 </style>
 <i18n>
 es:
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index b5d2169c6..94c05ad54 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -444,18 +444,10 @@ const openTicketsDialog = (id) => {
         </div>
         <QPageSticky :offset="[20, 20]">
             <RouterLink :to="{ name: 'RouteCreate' }">
-                <QBtn
-                    fab
-                    icon="add"
-                    color="primary"
-                    :disable="!selectedRows?.length"
-                    @click="
-                        {
-                            navigate;
-                        }
-                    "
-                />
-                <QTooltip>{{ t('newRoute') }}</QTooltip>
+                <QBtn fab icon="add" color="primary" />
+                <QTooltip>
+                    {{ t('newRoute') }}
+                </QTooltip>
             </RouterLink>
         </QPageSticky>
     </QPage>

From c335accffb30731b089023bced8b94f6e762b215 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 25 Mar 2024 12:42:48 +0100
Subject: [PATCH 7/7] refs #6905 fix translation and warnings

---
 src/components/FetchData.vue             |  3 +++
 src/components/UserPanel.vue             | 25 +++++-------------------
 src/components/common/VnSelectFilter.vue |  6 +++---
 src/i18n/en/index.js                     |  5 +++++
 src/i18n/es/index.js                     |  5 +++++
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 5b3dcbea7..6d4e79f24 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -60,3 +60,6 @@ async function fetch(fetchFilter = {}) {
     }
 }
 </script>
+<template>
+    <template></template>
+</template>
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 8b3731478..5c143740e 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -173,14 +173,14 @@ function copyUserToken() {
         <div class="col q-gutter-xs q-pa-md">
             <VnRow>
                 <VnSelectFilter
-                    :label="t('localWarehouse')"
+                    :label="t('components.userPanel.localWarehouse')"
                     v-model="user.localWarehouseFk"
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
                 />
                 <VnSelectFilter
-                    :label="t('localBank')"
+                    :label="t('components.userPanel.localBank')"
                     hide-selected
                     v-model="user.localBankFk"
                     :options="accountBankData"
@@ -190,7 +190,7 @@ function copyUserToken() {
             </VnRow>
             <VnRow>
                 <VnSelectFilter
-                    :label="t('localCompany')"
+                    :label="t('components.userPanel.localCompany')"
                     hide-selected
                     v-model="user.companyFk"
                     :options="companiesData"
@@ -198,7 +198,7 @@ function copyUserToken() {
                     option-value="id"
                 />
                 <VnSelectFilter
-                    :label="t('userWarehouse')"
+                    :label="t('components.userPanel.userWarehouse')"
                     hide-selected
                     v-model="user.warehouseFk"
                     :options="warehousesData"
@@ -208,7 +208,7 @@ function copyUserToken() {
             </VnRow>
             <VnRow>
                 <VnSelectFilter
-                    :label="t('userCompany')"
+                    :label="t('components.userPanel.userCompany')"
                     hide-selected
                     v-model="user.companyFk"
                     :options="companiesData"
@@ -228,18 +228,3 @@ function copyUserToken() {
     }
 }
 </style>
-
-<i18n>
-    en:
-        localWarehouse: Local warehouse
-        localBank: Local bank
-        localCompany: Local company
-        userWarehouse: User warehouse
-        userCompany: User company
-    es:
-        localWarehouse: Almacén local
-        localBank: Banco local
-        localCompany: Empresa local
-        userWarehouse: Almacén del usuario
-        userCompany: Empresa del usuario
-</i18n>
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 4903a5327..480d36e4f 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -51,8 +51,8 @@ const $props = defineProps({
         default: null,
     },
     limit: {
-        type: Number,
-        default: 30,
+        type: [Number, String],
+        default: '30',
     },
 });
 
@@ -151,7 +151,7 @@ watch(modelValue, (newValue) => {
         @on-fetch="(data) => setOptions(data)"
         :where="where || { [optionValue]: value }"
         :limit="limit"
-        :order-by="orderBy"
+        :sort-by="sortBy"
         :fields="fields"
     />
     <QSelect
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a9ce1a6ed..4e959702b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1203,6 +1203,11 @@ export default {
             copyToken: 'Token copied to clipboard',
             settings: 'Settings',
             logOut: 'Log Out',
+            localWarehouse: 'Local warehouse',
+            localBank: 'Local bank',
+            localCompany: 'Local company',
+            userWarehouse: 'User warehouse',
+            userCompany: 'User company',
         },
         smartCard: {
             downloadFile: 'Download file',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0977448fb..54db98f66 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1203,6 +1203,11 @@ export default {
             copyToken: 'Token copiado al portapapeles',
             settings: 'Configuración',
             logOut: 'Cerrar sesión',
+            localWarehouse: 'Almacén local',
+            localBank: 'Banco local',
+            localCompany: 'Empresa local',
+            userWarehouse: 'Almacén del usuario',
+            userCompany: 'Empresa del usuario',
         },
         smartCard: {
             downloadFile: 'Descargar archivo',