From 9f24f1f97c3e9816c5f30ab2fe5bdc9d003211a3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 26 Mar 2024 09:44:54 +0100
Subject: [PATCH] refactor: refs #6993 merged conflicts

---
 src/pages/Route/RouteList.vue | 76 ++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index cad8a5cb26..94c05ad54e 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -136,7 +136,7 @@ const showRouteReport = () => {
         url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getTokenMultimedia()}`;
     } else {
         const params = new URLSearchParams({
-            access_token: session.getToken(),
+            access_token: session.getTokenMultimedia(),
             id: idString,
         });
         url = `api/Routes/downloadZip?${params.toString()}`;
@@ -261,6 +261,7 @@ const openTicketsDialog = (id) => {
                 data-key="RouteList"
                 url="Routes/filter"
                 :order="['created DESC', 'id DESC']"
+                :limit="20"
                 auto-load
             >
                 <template #body="{ rows }">
@@ -272,49 +273,42 @@ const openTicketsDialog = (id) => {
                             flat
                             row-key="id"
                             selection="multiple"
+                            :rows-per-page-options="[0]"
+                            hide-pagination
+                            :pagination="{ sortBy: 'ID', descending: true }"
+                            :no-data-label="t('globals.noResults')"
                         >
-                            <template #body-cell-worker="props">
-                                <QTd :props="props">
-                                    {{ props.row?.workerUserName }}
-                                    <QPopupEdit
-                                        :model-value="props.row.workerFk"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="
-                                            (worker) => updateWorker(props.row, worker)
-                                        "
+                            <template #body-cell-worker="{ row }">
+                                <QTd>
+                                    <VnSelectFilter
+                                        :label="t('Worker')"
+                                        v-model="row.workerFk"
+                                        :options="workers"
+                                        option-value="id"
+                                        option-label="nickname"
+                                        hide-selected
+                                        dense
+                                        :emit-value="false"
+                                        :rules="validate('Route.workerFk')"
+                                        :is-clearable="false"
+                                        @update:model-value="updateRoute(row)"
                                     >
-                                        <VnSelectFilter
-                                            :label="t('Worker')"
-                                            v-model="scope.value"
-                                            :options="workers"
-                                            option-value="id"
-                                            option-label="name"
-                                            hide-selected
-                                            autofocus
-                                            :emit-value="false"
-                                            :rules="validate('Route.workerFk')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        >
-                                            <template #option="{ opt, itemProps }">
-                                                <QItem
-                                                    v-bind="itemProps"
-                                                    class="q-pa-xs row items-center"
+                                        <template #option="{ opt, itemProps }">
+                                            <QItem
+                                                v-bind="itemProps"
+                                                class="q-pa-xs row items-center"
+                                            >
+                                                <QItemSection
+                                                    class="col-9 justify-center"
                                                 >
-                                                    <QItemSection
-                                                        class="col-9 justify-center"
-                                                    >
-                                                        <span>{{ opt.name }}</span>
-                                                        <span class="text-grey">{{
-                                                            opt.nickname
-                                                        }}</span>
-                                                    </QItemSection>
-                                                </QItem>
-                                            </template>
-                                        </VnSelectFilter>
-                                    </QPopupEdit>
+                                                    <span>{{ opt.name }}</span>
+                                                    <span class="text-grey">{{
+                                                        opt.nickname
+                                                    }}</span>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelectFilter>
                                 </QTd>
                             </template>
                             <template #body-cell-agency="{ row }">