From e499fd151173e7d026b862bfb8d36e8173fa4678 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Wed, 30 Nov 2022 15:00:02 +0100
Subject: [PATCH 01/32] working on create deliveryMan

---
 src/i18n/en/index.js                          |  41 ++++++
 src/i18n/es/index.js                          |  41 ++++++
 src/pages/Route/Card/DeliveryManBasicData.vue | 115 ++++++++++++++++
 src/pages/Route/Card/DeliveryManCard.vue      |  58 ++++++++
 .../Route/Card/DeliveryManDescriptor.vue      |  82 ++++++++++++
 src/pages/Route/Card/DeliveryManSummary.vue   | 124 ++++++++++++++++++
 src/pages/Route/DeliveryManCreate.vue         |  44 +++++++
 src/pages/Route/DeliveryManList.vue           |  78 +++++++++++
 src/pages/Route/RouteMain.vue                 |  17 +++
 src/router/modules/route.js                   |  65 +++++++++
 src/router/routes.js                          |   6 +-
 11 files changed, 669 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Route/Card/DeliveryManBasicData.vue
 create mode 100644 src/pages/Route/Card/DeliveryManCard.vue
 create mode 100644 src/pages/Route/Card/DeliveryManDescriptor.vue
 create mode 100644 src/pages/Route/Card/DeliveryManSummary.vue
 create mode 100644 src/pages/Route/DeliveryManCreate.vue
 create mode 100644 src/pages/Route/DeliveryManList.vue
 create mode 100644 src/pages/Route/RouteMain.vue
 create mode 100644 src/router/modules/route.js

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 88fae5bb7..f567edcab 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -251,6 +251,47 @@ export default {
             returnOfMaterial: 'Return of material authorization (RMA)',
         },
     },
+    route: {
+        pageTitles: {
+            routes: 'Routes',
+            deliveryManList: 'Delivery Men',
+            basicData: 'Basic Data',
+            deliveryManCreate: 'Create Delivery Man',
+        },
+        deliveryMan: {
+            list: {
+                deliveryMan: 'Delivery man',
+                supplier: 'Supplier',
+                id: 'ID',
+                minCost: 'Minimum cost',
+                minM3: 'M3',
+                agency: 'Agency',
+            },
+            basicData: {
+                supplier: 'Supplier',
+                id: 'ID',
+                minCost: 'Minimum cost',
+                minM3: 'M3',
+                agency: 'Agency',
+            },
+            card: {
+                supplier: 'Supplier',
+                id: 'ID',
+                minCost: 'Minimum cost',
+                minM3: 'M3',
+                agency: 'Agency',
+            },
+            summary: {
+                deliveryMan: 'Delivery man',
+                supplier: 'Supplier',
+                id: 'ID',
+                minCost: 'Minimum cost',
+                minM3: 'M3',
+                agency: 'Agency',
+            },
+        }
+
+    },
     components: {
         topbar: {},
         userPanel: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0103b1a92..567fe71e4 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -250,6 +250,47 @@ export default {
             returnOfMaterial: 'Autorización de retorno de materiales (RMA)',
         },
     },
+    route: {
+        pageTitles: {
+            routes: 'Rutas',
+            deliveryManList: 'Repartidores',
+            basicData: 'Datos básicos',
+            deliveryManCreate: 'Crear Repartidor',
+        },
+        deliveryMan: {
+            list: {
+                deliveryMan: 'Repartidor',
+                supplier: 'Proveedor',
+                id: 'ID',
+                minCost: 'Coste mínimo',
+                minM3: 'Número de M3',
+                agency: 'Agencia',
+            },
+            basicData: {
+                supplier: 'Proveedor',
+                id: 'ID',
+                minCost: 'Coste mínimo',
+                minM3: 'Número de M3',
+                agency: 'Agencia',
+            },
+            card: {
+                supplier: 'Proveedor',
+                id: 'ID',
+                minCost: 'Coste mínimo',
+                minM3: 'Número de M3',
+                agency: 'Agencia',
+            },
+            summary: {
+                deliveryMan: 'Repartidor',
+                supplier: 'Proveedor',
+                id: 'ID',
+                minCost: 'Coste mínimo',
+                minM3: 'Número de M3',
+                agency: 'Agencia',
+            }
+        }
+
+    },
     components: {
         topbar: {},
         userPanel: {
diff --git a/src/pages/Route/Card/DeliveryManBasicData.vue b/src/pages/Route/Card/DeliveryManBasicData.vue
new file mode 100644
index 000000000..1aad8d8cc
--- /dev/null
+++ b/src/pages/Route/Card/DeliveryManBasicData.vue
@@ -0,0 +1,115 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const suppliers = ref([]);
+const agencyModes = ref([]);
+
+function setSuppliers(data) {
+    suppliers.value = data;
+}
+
+function setAgencyModes(data) {
+    agencyModes.value = data;
+}
+
+const filter = {
+    include: [
+        {
+            relation: 'deliveryManAgency',
+            scope: {
+                include: {
+                    relation: 'agencyMode',
+                },
+            },
+        },
+        {
+            relation: 'supplier',
+        },
+    ],
+};
+</script>
+<template>
+    <fetch-data url="Suppliers" @on-fetch="setSuppliers" auto-load />
+    <fetch-data url="AgencyModes" @on-fetch="setAgencyModes" auto-load />
+
+    <div class="container">
+        <q-card>
+            <form-model :url="`DeliveryMans/${route.params.id}`" :filter="filter" model="deliveryMan">
+                <template #form="{ data, validate }">
+                    <div class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <q-input v-model="data.id" :label="t('route.deliveryMan.basicData.id')" disable />
+                        </div>
+                        <div class="col">
+                            <q-select
+                                v-model="data.supplierFk"
+                                :options="suppliers"
+                                option-value="id"
+                                option-label="name"
+                                emit-value
+                                :label="t('route.deliveryMan.basicData.supplier')"
+                                map-options
+                                use-input
+                                :rules="validate('deliveryMan.supplierFk')"
+                                :input-debounce="0"
+                            >
+                            </q-select>
+                        </div>
+                    </div>
+                    <div class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <q-input
+                                v-model="data.minCost"
+                                :label="t('route.deliveryMan.basicData.minCost')"
+                                :rules="validate('deliveryMan.minCost')"
+                            />
+                        </div>
+                        <div class="col">
+                            <q-input
+                                v-model="data.minM3"
+                                :label="t('route.deliveryMan.basicData.minM3')"
+                                :rules="validate('deliveryMan.minM3')"
+                            />
+                        </div>
+                    </div>
+                    <div class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <q-select
+                                v-model="data.deliveryManAgency.agencyModeFk"
+                                :options="agencyModes"
+                                option-value="id"
+                                option-label="name"
+                                emit-value
+                                :label="t('route.deliveryMan.basicData.agency')"
+                                map-options
+                                use-input
+                                :rules="validate('deliveryMan.deliveryManAgency.agencyModeFk')"
+                                :input-debounce="0"
+                            >
+                            </q-select>
+                        </div>
+                    </div>
+                </template>
+            </form-model>
+        </q-card>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+    display: flex;
+    justify-content: center;
+}
+
+.q-card {
+    width: 800px;
+}
+</style>
diff --git a/src/pages/Route/Card/DeliveryManCard.vue b/src/pages/Route/Card/DeliveryManCard.vue
new file mode 100644
index 000000000..cabf0266c
--- /dev/null
+++ b/src/pages/Route/Card/DeliveryManCard.vue
@@ -0,0 +1,58 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useState } from 'composables/useState';
+import DeliveryManDescriptor from './DeliveryManDescriptor.vue';
+
+const { t } = useI18n();
+const state = useState();
+</script>
+<template>
+    <q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500">
+        <q-scroll-area class="fit">
+            <delivery-man-descriptor />
+            <q-separator />
+            <q-list>
+                <q-item :to="{ name: 'DeliveryManBasicData' }" clickable v-ripple>
+                    <q-item-section avatar>
+                        <q-icon name="vn:settings" />
+                    </q-item-section>
+                    <q-item-section>{{ t('route.pageTitles.basicData') }}</q-item-section>
+                </q-item>
+            </q-list>
+        </q-scroll-area>
+    </q-drawer>
+    <q-page-container>
+        <q-page class="q-pa-md">
+            <router-view></router-view>
+        </q-page>
+    </q-page-container>
+</template>
+
+<style lang="scss">
+.q-scrollarea__content {
+    max-width: 100%;
+}
+</style>
+
+<style lang="scss" scoped>
+.descriptor {
+    max-width: 256px;
+
+    h5 {
+        margin: 0 15px;
+    }
+
+    .header {
+        display: flex;
+        justify-content: space-between;
+    }
+
+    .q-card__actions {
+        justify-content: center;
+    }
+
+    #descriptor-skeleton .q-card__actions {
+        justify-content: space-between;
+    }
+}
+</style>
diff --git a/src/pages/Route/Card/DeliveryManDescriptor.vue b/src/pages/Route/Card/DeliveryManDescriptor.vue
new file mode 100644
index 000000000..6d9e64c32
--- /dev/null
+++ b/src/pages/Route/Card/DeliveryManDescriptor.vue
@@ -0,0 +1,82 @@
+<script setup>
+import axios from 'axios';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
+import { computed, onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+onMounted(async () => {
+    await fetch();
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const deliveryMan = ref();
+async function fetch() {
+    const filter = {
+        include: [
+            {
+                relation: 'deliveryManAgency',
+                scope: {
+                    include: {
+                        relation: 'agencyMode',
+                    },
+                },
+            },
+            {
+                relation: 'supplier',
+            },
+        ],
+    };
+    const options = { params: { filter } };
+    const { data } = await axios.get(`DeliveryMans/${entityId.value}`, options);
+
+    if (data) deliveryMan.value = data;
+}
+</script>
+
+<template>
+    <skeleton-descriptor v-if="!deliveryMan" />
+    <card-descriptor v-if="deliveryMan" module="DeliveryMan" :data="deliveryMan">
+        <template #body>
+            <q-list>
+                <q-item>
+                    <q-item-section>
+                        <q-item-label caption>{{ t('route.deliveryMan.card.supplier') }}</q-item-label>
+                        <q-item-label>{{ deliveryMan.supplier.name }}</q-item-label>
+                    </q-item-section>
+                </q-item>
+                <q-item>
+                    <q-item-section>
+                        <q-item-label caption>{{ t('route.deliveryMan.card.agency') }}</q-item-label>
+                        <q-item-label>{{ deliveryMan.deliveryManAgency.agencyMode.name }}</q-item-label>
+                    </q-item-section>
+                </q-item>
+                <q-item>
+                    <q-item-section>
+                        <q-item-label caption>{{ t('route.deliveryMan.card.minCost') }}</q-item-label>
+                        <q-item-label>{{ deliveryMan.minCost }}</q-item-label>
+                    </q-item-section>
+                    <q-item-section>
+                        <q-item-label caption>{{ t('route.deliveryMan.card.minM3') }}</q-item-label>
+                        <q-item-label>{{ deliveryMan.minM3 }}</q-item-label>
+                    </q-item-section>
+                </q-item>
+            </q-list>
+        </template>
+    </card-descriptor>
+</template>
diff --git a/src/pages/Route/Card/DeliveryManSummary.vue b/src/pages/Route/Card/DeliveryManSummary.vue
new file mode 100644
index 000000000..b76ca8a05
--- /dev/null
+++ b/src/pages/Route/Card/DeliveryManSummary.vue
@@ -0,0 +1,124 @@
+<script setup>
+import axios from 'axios';
+import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
+import { computed, onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+onMounted(() => fetch());
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const entityId = computed(() => $props.id || route.params.id);
+
+const filter = {
+    include: [
+        {
+            relation: 'deliveryManAgency',
+            scope: {
+                include: {
+                    relation: 'agencyMode',
+                },
+            },
+        },
+        {
+            relation: 'supplier',
+        },
+    ],
+};
+
+const deliveryMan = ref(null);
+function fetch() {
+    const id = entityId.value;
+    axios
+        .get(`DeliveryMans/${id}`, {
+            params: {
+                filter,
+            },
+        })
+        .then(({ data }) => {
+            deliveryMan.value = data;
+        });
+}
+</script>
+
+<template>
+    <div class="summary container">
+        <q-card>
+            <skeleton-summary v-if="!deliveryMan" />
+            <template v-if="deliveryMan">
+                <div class="header bg-primary q-pa-sm q-mb-md">
+                    {{ t('route.deliveryMan.summary.deliveryMan') }} #{{ deliveryMan.id }}
+                </div>
+                <q-list>
+                    <q-item>
+                        <q-item-section>
+                            <q-item-label caption>{{ t('route.deliveryMan.summary.supplier') }}</q-item-label>
+                            <q-item-label>{{ deliveryMan.supplier.name }}</q-item-label>
+                        </q-item-section>
+                        <q-item-section>
+                            <q-item-label caption>{{ t('route.deliveryMan.summary.agency') }}</q-item-label>
+                            <q-item-label>{{ deliveryMan.deliveryManAgency.agencyMode.name }}</q-item-label>
+                        </q-item-section>
+                        <q-item-section>
+                            <q-item-label caption>{{ t('route.deliveryMan.summary.minCost') }}</q-item-label>
+                            <q-item-label>{{ deliveryMan.minCost }}</q-item-label>
+                        </q-item-section>
+                        <q-item-section>
+                            <q-item-label caption>{{ t('route.deliveryMan.summary.minM3') }}</q-item-label>
+                            <q-item-label>{{ deliveryMan.minM3 }}</q-item-label>
+                        </q-item-section>
+                    </q-item>
+                    <q-item> </q-item>
+                </q-list>
+            </template>
+        </q-card>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+    display: flex;
+    justify-content: center;
+}
+
+.q-card {
+    width: 100%;
+    max-width: 950px;
+}
+
+.summary {
+    .header {
+        text-align: center;
+        font-size: 18px;
+    }
+
+    #slider-container {
+        max-width: 80%;
+        margin: 0 auto;
+
+        .q-slider {
+            .q-slider__marker-labels:nth-child(1) {
+                transform: none;
+            }
+            .q-slider__marker-labels:nth-child(2) {
+                transform: none;
+                left: auto !important;
+                right: 0%;
+            }
+        }
+    }
+}
+
+.q-dialog .summary {
+    max-width: 1200px;
+}
+</style>
diff --git a/src/pages/Route/DeliveryManCreate.vue b/src/pages/Route/DeliveryManCreate.vue
new file mode 100644
index 000000000..8cb66d510
--- /dev/null
+++ b/src/pages/Route/DeliveryManCreate.vue
@@ -0,0 +1,44 @@
+<script setup>
+import axios from 'axios';
+import { reactive } from 'vue';
+
+const deliveryMan = reactive({
+    supplierFk: null,
+    agencyMode: null,
+    minCost: null,
+    minM3: null,
+});
+
+async function onSubmit() {
+    await axios.post('DeliveryMans', {
+        supplierFk: deliveryMan.supplierFk,
+        minCost: deliveryMan.minCost,
+        minM3: deliveryMan.minM3,
+    });
+}
+</script>
+
+<template>
+    <q-page class="q-pa-md">
+        <q-card class="q-pa-md">
+            <q-banner v-if="hasChanges" class="text-white bg-warning">
+                <q-icon name="warning" size="md" class="q-mr-md" />
+                <span>{{ t('globals.changesToSave') }}</span>
+            </q-banner>
+            <q-form @submit="onSubmit" @reset="onReset" class="q-gutter-md">
+                <q-input filled v-model="deliveryMan.minCost" label="Your name *" lazy-rules />
+                <div>
+                    <q-btn label="Submit" type="submit" color="primary" />
+                    <q-btn label="Reset" type="reset" color="primary" flat class="q-ml-sm" />
+                </div>
+            </q-form>
+        </q-card>
+    </q-page>
+</template>
+
+<style lang="scss" scoped>
+.card {
+    width: 100%;
+    max-width: 60em;
+}
+</style>
diff --git a/src/pages/Route/DeliveryManList.vue b/src/pages/Route/DeliveryManList.vue
new file mode 100644
index 000000000..2103e6129
--- /dev/null
+++ b/src/pages/Route/DeliveryManList.vue
@@ -0,0 +1,78 @@
+<script setup>
+import Paginate from 'components/Paginate.vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+const { t } = useI18n();
+const router = useRouter();
+
+const filter = {
+    include: [
+        {
+            relation: 'deliveryManAgency',
+            scope: {
+                include: {
+                    relation: 'agencyMode',
+                },
+            },
+        },
+        {
+            relation: 'supplier',
+        },
+    ],
+};
+
+function navigate(id) {
+    router.push({ path: `/route/${id}` });
+}
+</script>
+
+<template>
+    <q-page class="q-pa-md">
+        <paginate url="DeliveryMans" :filter="filter" sort-by="id DESC" auto-load>
+            <template #body="{ rows }">
+                <q-card class="card" v-for="row of rows" :key="row.id">
+                    <q-item class="q-pa-none items-start cursor-pointer q-hoverable" v-ripple clickable>
+                        <q-item-section class="q-pa-md" @click="navigate(row.id)">
+                            <div class="text-h6 link">{{ t('route.deliveryMan.list.deliveryMan') }}</div>
+                            <q-item-label caption>#{{ row.id }}</q-item-label>
+                            <q-list>
+                                <q-item class="q-pa-none">
+                                    <q-item-section>
+                                        <q-item-label caption>{{ t('route.deliveryMan.list.supplier') }}</q-item-label>
+                                        <q-item-label>{{ row.supplier.name }}</q-item-label>
+                                    </q-item-section>
+                                    <q-item-section>
+                                        <q-item-label caption>{{ t('route.deliveryMan.list.minCost') }}</q-item-label>
+                                        <q-item-label>{{ row.minCost }}</q-item-label>
+                                    </q-item-section>
+                                </q-item>
+                                <q-item class="q-pa-none">
+                                    <q-item-section>
+                                        <q-item-label caption>{{ t('route.deliveryMan.list.minM3') }}</q-item-label>
+                                        <q-item-label>{{ row.minM3 }}</q-item-label>
+                                    </q-item-section>
+                                    <q-item-section>
+                                        <q-item-label caption>{{ t('route.deliveryMan.list.agency') }}</q-item-label>
+                                        <q-item-label v-if="row.deliveryManAgency">{{
+                                            row.deliveryManAgency.agencyMode.name
+                                        }}</q-item-label>
+                                    </q-item-section>
+                                </q-item>
+                            </q-list>
+                        </q-item-section>
+                        <q-separator vertical />
+                        <q-card-actions vertical>
+                            <q-btn flat round color="orange" icon="arrow_circle_right" @click="navigate(row.id)">
+                                <q-tooltip>{{ t('components.smartCard.openCard') }}</q-tooltip>
+                            </q-btn>
+                        </q-card-actions>
+                    </q-item>
+                </q-card>
+            </template>
+        </paginate>
+        <q-page-sticky position="bottom-right" :offset="[18, 18]">
+            <q-fab icon="person_add" direction="up" color="orange"> </q-fab>
+        </q-page-sticky>
+    </q-page>
+</template>
diff --git a/src/pages/Route/RouteMain.vue b/src/pages/Route/RouteMain.vue
new file mode 100644
index 000000000..fd50f1521
--- /dev/null
+++ b/src/pages/Route/RouteMain.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { useState } from 'src/composables/useState';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const state = useState();
+</script>
+
+<template>
+    <q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500">
+        <q-scroll-area class="fit text-grey-8">
+            <LeftMenu />
+        </q-scroll-area>
+    </q-drawer>
+    <q-page-container>
+        <router-view></router-view>
+    </q-page-container>
+</template>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
new file mode 100644
index 000000000..a5e86a446
--- /dev/null
+++ b/src/router/modules/route.js
@@ -0,0 +1,65 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    name: 'Route',
+    path: '/route',
+    meta: {
+        title: 'routes',
+        icon: 'vn:delivery'
+    },
+    component: RouterView,
+    redirect: { name: 'RouteMain' },
+    children: [
+        {
+            path: '',
+            name: 'RouteMain',
+            component: () => import('src/pages/Route/RouteMain.vue'),
+            redirect: { name: 'DeliveryManList' },
+            children: [
+                {
+                    name: 'DeliveryManList',
+                    path: 'deliveryMan/list',
+                    meta: {
+                        title: 'deliveryManList',
+                        icon: 'person',
+                    },
+                    component: () => import('src/pages/Route/DeliveryManList.vue'),
+                },
+                {
+                    name: 'DeliveryManCreate',
+                    path: 'deliveryMan/create',
+                    meta: {
+                        title: 'deliveryManCreate',
+                        icon: 'vn:addperson',
+                    },
+                    component: () => import('src/pages/Route/DeliveryManCreate.vue'),
+                },
+
+            ]
+        },
+        {
+            name: 'DeliveryManCard',
+            path: ':id',
+            component: () => import('src/pages/Route/Card/DeliveryManCard.vue'),
+            redirect: { name: 'DeliveryManSummary' },
+            children: [
+                {
+                    name: 'DeliveryManSummary',
+                    path: 'deliveryMan/summary',
+                    meta: {
+                        title: 'summary',
+                    },
+                    component: () => import('src/pages/Route/Card/DeliveryManSummary.vue'),
+                },
+                {
+                    name: 'DeliveryManBasicData',
+                    path: 'deliveryMan/basic-data',
+                    meta: {
+                        title: 'basicData',
+                    },
+                    component: () => import('src/pages/Route/Card/DeliveryManBasicData.vue'),
+                },
+            ]
+        },
+    ]
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index a7261379f..f0090d380 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -1,6 +1,7 @@
 import customer from './modules/customer';
 import ticket from './modules/ticket';
 import claim from './modules/claim';
+import route from './modules/route';
 
 const routes = [
     {
@@ -25,13 +26,14 @@ const routes = [
             customer,
             ticket,
             claim,
+            route,
             {
                 path: '/:pathMatch(.*)*',
                 name: 'NotFound',
                 component: () => import('../pages/NotFound.vue'),
-            }
+            },
         ],
     }
 ];
 
-export default routes;
\ No newline at end of file
+export default routes;

From 20e284fe594507ecc15542ce98bba359921ce5b5 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Thu, 1 Dec 2022 15:16:41 +0100
Subject: [PATCH 02/32] wornking on invoiceAllocation

---
 src/i18n/en/index.js                  |   1 +
 src/i18n/es/index.js                  |   1 +
 src/pages/Route/DeliveryManCreate.vue | 114 +++++++++++++++++++----
 src/pages/Route/DeliveryManList.vue   |  13 ++-
 src/pages/Route/InvoiceAllocation.vue | 126 ++++++++++++++++++++++++++
 src/router/modules/route.js           |   9 ++
 6 files changed, 244 insertions(+), 20 deletions(-)
 create mode 100644 src/pages/Route/InvoiceAllocation.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index f567edcab..66c8b5ca5 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -257,6 +257,7 @@ export default {
             deliveryManList: 'Delivery Men',
             basicData: 'Basic Data',
             deliveryManCreate: 'Create Delivery Man',
+            invoiceAllocation: 'Invoice Allocation',
         },
         deliveryMan: {
             list: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 567fe71e4..bbc335a6e 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -256,6 +256,7 @@ export default {
             deliveryManList: 'Repartidores',
             basicData: 'Datos básicos',
             deliveryManCreate: 'Crear Repartidor',
+            invoiceAllocation: 'Imputación Facturas',
         },
         deliveryMan: {
             list: {
diff --git a/src/pages/Route/DeliveryManCreate.vue b/src/pages/Route/DeliveryManCreate.vue
index 8cb66d510..fbe0be4d0 100644
--- a/src/pages/Route/DeliveryManCreate.vue
+++ b/src/pages/Route/DeliveryManCreate.vue
@@ -1,44 +1,126 @@
 <script setup>
 import axios from 'axios';
-import { reactive } from 'vue';
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'components/FetchData.vue';
+
+const { t } = useI18n();
 
 const deliveryMan = reactive({
     supplierFk: null,
-    agencyMode: null,
+    agencyModeFk: null,
     minCost: null,
     minM3: null,
 });
 
+const suppliers = ref([]);
+const agencyModes = ref([]);
+
+function setSuppliers(data) {
+    suppliers.value = data;
+}
+
+function setAgencyModes(data) {
+    agencyModes.value = data;
+}
+
 async function onSubmit() {
-    await axios.post('DeliveryMans', {
-        supplierFk: deliveryMan.supplierFk,
-        minCost: deliveryMan.minCost,
-        minM3: deliveryMan.minM3,
-    });
+    try {
+        const newDeliveryMan = await axios.post('DeliveryMans', {
+            supplierFk: deliveryMan.supplierFk,
+            minCost: deliveryMan.minCost,
+            minM3: deliveryMan.minM3,
+        });
+
+        if (deliveryMan.agencyModeFk) {
+            await axios.post(`DeliveryManAgencys/${newDeliveryMan.id}`, {
+                agencyModeFk: deliveryMan.agencyMode,
+            });
+        }
+    } catch (e) {
+        console.error(e);
+    }
 }
 </script>
 
 <template>
-    <q-page class="q-pa-md">
+    <fetch-data url="Suppliers" @on-fetch="setSuppliers" auto-load />
+    <fetch-data url="AgencyModes" @on-fetch="setAgencyModes" auto-load />
+    <div class="container">
         <q-card class="q-pa-md">
             <q-banner v-if="hasChanges" class="text-white bg-warning">
                 <q-icon name="warning" size="md" class="q-mr-md" />
                 <span>{{ t('globals.changesToSave') }}</span>
             </q-banner>
             <q-form @submit="onSubmit" @reset="onReset" class="q-gutter-md">
-                <q-input filled v-model="deliveryMan.minCost" label="Your name *" lazy-rules />
-                <div>
-                    <q-btn label="Submit" type="submit" color="primary" />
-                    <q-btn label="Reset" type="reset" color="primary" flat class="q-ml-sm" />
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <q-input
+                            filled
+                            v-model="deliveryMan.minCost"
+                            :label="t('route.deliveryMan.basicData.minCost')"
+                            :rules="[(val) => val > 0]"
+                            lazy-rules
+                        />
+                    </div>
+                    <div class="col">
+                        <q-input
+                            filled
+                            v-model="deliveryMan.minM3"
+                            :label="t('route.deliveryMan.basicData.minM3')"
+                            :rules="[(val) => val > 0]"
+                            lazy-rules
+                        />
+                    </div>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <q-select
+                            v-model="deliveryMan.supplierFk"
+                            :options="suppliers"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            :label="t('route.deliveryMan.basicData.supplier')"
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        >
+                        </q-select>
+                    </div>
+                    <div class="col">
+                        <q-select
+                            v-model="deliveryMan.agencyModeFk"
+                            :options="agencyModes"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            :label="t('route.deliveryMan.basicData.agency')"
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        >
+                        </q-select>
+                    </div>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <q-btn label="Submit" type="submit" color="primary" />
+                        <q-btn label="Reset" type="reset" color="primary" flat class="q-ml-sm" />
+                    </div>
                 </div>
             </q-form>
         </q-card>
-    </q-page>
+    </div>
 </template>
 
 <style lang="scss" scoped>
-.card {
-    width: 100%;
-    max-width: 60em;
+.q-card {
+    width: 800px;
+}
+
+.container {
+    display: flex;
+    justify-content: center;
 }
 </style>
diff --git a/src/pages/Route/DeliveryManList.vue b/src/pages/Route/DeliveryManList.vue
index 2103e6129..058be1e80 100644
--- a/src/pages/Route/DeliveryManList.vue
+++ b/src/pages/Route/DeliveryManList.vue
@@ -22,9 +22,13 @@ const filter = {
     ],
 };
 
-function navigate(id) {
+function navigateCard(id) {
     router.push({ path: `/route/${id}` });
 }
+
+function navigateCreate() {
+    router.push({ path: `/route/deliveryMan/create` });
+}
 </script>
 
 <template>
@@ -33,7 +37,7 @@ function navigate(id) {
             <template #body="{ rows }">
                 <q-card class="card" v-for="row of rows" :key="row.id">
                     <q-item class="q-pa-none items-start cursor-pointer q-hoverable" v-ripple clickable>
-                        <q-item-section class="q-pa-md" @click="navigate(row.id)">
+                        <q-item-section class="q-pa-md" @click="navigateCard(row.id)">
                             <div class="text-h6 link">{{ t('route.deliveryMan.list.deliveryMan') }}</div>
                             <q-item-label caption>#{{ row.id }}</q-item-label>
                             <q-list>
@@ -63,7 +67,7 @@ function navigate(id) {
                         </q-item-section>
                         <q-separator vertical />
                         <q-card-actions vertical>
-                            <q-btn flat round color="orange" icon="arrow_circle_right" @click="navigate(row.id)">
+                            <q-btn flat round color="orange" icon="arrow_circle_right" @click="navigateCard(row.id)">
                                 <q-tooltip>{{ t('components.smartCard.openCard') }}</q-tooltip>
                             </q-btn>
                         </q-card-actions>
@@ -71,7 +75,8 @@ function navigate(id) {
                 </q-card>
             </template>
         </paginate>
-        <q-page-sticky position="bottom-right" :offset="[18, 18]">
+        <q-page-sticky position="bottom-right" :offset="[18, 18]" @click="navigateCreate()"
+            ><q-tooltip>{{ t('route.pageTitles.deliveryManCreate') }}</q-tooltip>
             <q-fab icon="person_add" direction="up" color="orange"> </q-fab>
         </q-page-sticky>
     </q-page>
diff --git a/src/pages/Route/InvoiceAllocation.vue b/src/pages/Route/InvoiceAllocation.vue
new file mode 100644
index 000000000..fbe0be4d0
--- /dev/null
+++ b/src/pages/Route/InvoiceAllocation.vue
@@ -0,0 +1,126 @@
+<script setup>
+import axios from 'axios';
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'components/FetchData.vue';
+
+const { t } = useI18n();
+
+const deliveryMan = reactive({
+    supplierFk: null,
+    agencyModeFk: null,
+    minCost: null,
+    minM3: null,
+});
+
+const suppliers = ref([]);
+const agencyModes = ref([]);
+
+function setSuppliers(data) {
+    suppliers.value = data;
+}
+
+function setAgencyModes(data) {
+    agencyModes.value = data;
+}
+
+async function onSubmit() {
+    try {
+        const newDeliveryMan = await axios.post('DeliveryMans', {
+            supplierFk: deliveryMan.supplierFk,
+            minCost: deliveryMan.minCost,
+            minM3: deliveryMan.minM3,
+        });
+
+        if (deliveryMan.agencyModeFk) {
+            await axios.post(`DeliveryManAgencys/${newDeliveryMan.id}`, {
+                agencyModeFk: deliveryMan.agencyMode,
+            });
+        }
+    } catch (e) {
+        console.error(e);
+    }
+}
+</script>
+
+<template>
+    <fetch-data url="Suppliers" @on-fetch="setSuppliers" auto-load />
+    <fetch-data url="AgencyModes" @on-fetch="setAgencyModes" auto-load />
+    <div class="container">
+        <q-card class="q-pa-md">
+            <q-banner v-if="hasChanges" class="text-white bg-warning">
+                <q-icon name="warning" size="md" class="q-mr-md" />
+                <span>{{ t('globals.changesToSave') }}</span>
+            </q-banner>
+            <q-form @submit="onSubmit" @reset="onReset" class="q-gutter-md">
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <q-input
+                            filled
+                            v-model="deliveryMan.minCost"
+                            :label="t('route.deliveryMan.basicData.minCost')"
+                            :rules="[(val) => val > 0]"
+                            lazy-rules
+                        />
+                    </div>
+                    <div class="col">
+                        <q-input
+                            filled
+                            v-model="deliveryMan.minM3"
+                            :label="t('route.deliveryMan.basicData.minM3')"
+                            :rules="[(val) => val > 0]"
+                            lazy-rules
+                        />
+                    </div>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <q-select
+                            v-model="deliveryMan.supplierFk"
+                            :options="suppliers"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            :label="t('route.deliveryMan.basicData.supplier')"
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        >
+                        </q-select>
+                    </div>
+                    <div class="col">
+                        <q-select
+                            v-model="deliveryMan.agencyModeFk"
+                            :options="agencyModes"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            :label="t('route.deliveryMan.basicData.agency')"
+                            map-options
+                            use-input
+                            :input-debounce="0"
+                        >
+                        </q-select>
+                    </div>
+                </div>
+                <div class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <q-btn label="Submit" type="submit" color="primary" />
+                        <q-btn label="Reset" type="reset" color="primary" flat class="q-ml-sm" />
+                    </div>
+                </div>
+            </q-form>
+        </q-card>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.q-card {
+    width: 800px;
+}
+
+.container {
+    display: flex;
+    justify-content: center;
+}
+</style>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index a5e86a446..e7c3806de 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -34,6 +34,15 @@ export default {
                     },
                     component: () => import('src/pages/Route/DeliveryManCreate.vue'),
                 },
+                {
+                    name: 'InvoiceAllocation',
+                    path: '/invoiceAllocation',
+                    meta: {
+                        title: 'invoiceAllocation',
+                        icon: 'vn:invoice-in',
+                    },
+                    component: () => import('src/pages/Route/InvoiceAllocation.vue'),
+                },
 
             ]
         },

From 0e7e804475de24d22033c44211576858473d3fcc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 3 May 2024 13:18:46 +0200
Subject: [PATCH 03/32] feat: refs #6598 create useAcl composable

---
 src/composables/useAcl.js     | 35 +++++++++++++++++++++++++++++++++++
 src/composables/useSession.js |  2 ++
 src/composables/useState.js   | 11 +++++++++++
 src/router/index.js           |  2 ++
 4 files changed, 50 insertions(+)
 create mode 100644 src/composables/useAcl.js

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
new file mode 100644
index 000000000..3121646f1
--- /dev/null
+++ b/src/composables/useAcl.js
@@ -0,0 +1,35 @@
+import { useState } from './useState';
+import axios from 'axios';
+
+export function useAcl() {
+    const state = useState();
+
+    async function fetch() {
+        const { data } = await axios.get('VnUsers/acls');
+        const acls = {};
+        data.forEach((acl) => {
+            acls[acl.model] = acls[acl.model] || {};
+            acls[acl.model][acl.property] = acls[acl.model][acl.property] || {};
+            acls[acl.model][acl.property][acl.accessType] = true;
+        });
+
+        state.setAcls(acls);
+    }
+
+    function hasAny(model, property, accessType) {
+        const acls = acls[model];
+        if (acls) {
+            for (const prop of ['*', property]) {
+                const acl = acls[prop];
+                if (acl && (acl['*'] || acl[accessType])) return true;
+            }
+        }
+        return false;
+    }
+
+    return {
+        fetch,
+        hasAny,
+        state,
+    };
+}
diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 56bce0279..ca2abef00 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -1,5 +1,6 @@
 import { useState } from './useState';
 import { useRole } from './useRole';
+import { useAcl } from './useAcl';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
 import useNotify from './useNotify';
@@ -88,6 +89,7 @@ export function useSession() {
         setSession(data);
 
         await useRole().fetch();
+        await useAcl().fetch();
         await useUserConfig().fetch();
         await useTokenConfig().fetch();
 
diff --git a/src/composables/useState.js b/src/composables/useState.js
index e671d41bd..95b9fdfd2 100644
--- a/src/composables/useState.js
+++ b/src/composables/useState.js
@@ -13,6 +13,7 @@ const user = ref({
 });
 
 const roles = ref([]);
+const acls = ref([]);
 const tokenConfig = ref({});
 const drawer = ref(true);
 const headerMounted = ref(false);
@@ -53,6 +54,14 @@ export function useState() {
     function setRoles(data) {
         roles.value = data;
     }
+
+    function getAcls() {
+        return computed(() => acls.value);
+    }
+
+    function setAcls(data) {
+        acls.value = data;
+    }
     function getTokenConfig() {
         return computed(() => {
             return tokenConfig.value;
@@ -80,6 +89,8 @@ export function useState() {
         setUser,
         getRoles,
         setRoles,
+        getAcls,
+        setAcls,
         getTokenConfig,
         setTokenConfig,
         set,
diff --git a/src/router/index.js b/src/router/index.js
index 7a0aedcae..41ff4c1da 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,6 +13,7 @@ import { useRole } from 'src/composables/useRole';
 import { useUserConfig } from 'src/composables/useUserConfig';
 import { toLowerCamel } from 'src/filters';
 import { useTokenConfig } from 'src/composables/useTokenConfig';
+import { useAcl } from 'src/composables/useAcl';
 
 const state = useState();
 const session = useSession();
@@ -55,6 +56,7 @@ export default route(function (/* { store, ssrContext } */) {
             const stateRoles = state.getRoles().value;
             if (stateRoles.length === 0) {
                 await useRole().fetch();
+                await useAcl().fetch();
                 await useUserConfig().fetch();
                 await useTokenConfig().fetch();
             }

From 4b4c02c01a3fd0af89f16c1ff71d5a49ab1ba0c3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 3 May 2024 16:40:11 +0200
Subject: [PATCH 04/32] feat: refs #6273 create worker form toggle

---
 src/pages/Worker/WorkerCreate.vue | 310 ++++++++++++++----------------
 src/pages/Worker/locale/es.yml    |   1 +
 2 files changed, 149 insertions(+), 162 deletions(-)

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 6c2c9f36e..24b6153c4 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -1,27 +1,20 @@
 <script setup>
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
+import { useUserConfig } from 'src/composables/useUserConfig';
 import VnRow from 'components/ui/VnRow.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-import { useUserConfig } from 'src/composables/useUserConfig';
+import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 
 const { t } = useI18n();
 
-const workerConfigFilter = {
-    field: ['payMethodFk'],
-};
-
 const newWorkerForm = ref({
     companyFk: null,
     payMethodFk: null,
@@ -47,6 +40,7 @@ const workersOptions = ref([]);
 const payMethodsOptions = ref([]);
 const bankEntitiesOptions = ref([]);
 const postcodesOptions = ref([]);
+const isFreelancer = ref(false);
 
 const onFetchWorkerConfig = (workerConfig) => {
     newWorkerForm.value.payMethodFk = workerConfig.payMethodFk;
@@ -69,15 +63,13 @@ onMounted(async () => {
     newWorkerForm.value = { companyFk: userInfo.companyFk };
 });
 </script>
-
 <template>
     <FetchData
         url="WorkerConfigs/findOne"
         @on-fetch="(data) => onFetchWorkerConfig(data)"
-        :filter="workerConfigFilter"
+        :filter="{ field: ['payMethodFk'] }"
         auto-load
     />
-
     <FetchData
         url="Companies"
         @on-fetch="(data) => (companiesOptions = data)"
@@ -98,165 +90,159 @@ onMounted(async () => {
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
     />
-
     <QPage>
-        <VnSubToolbar />
+        <VnSubToolbar>
+            <template #st-data>
+                <QBtnGroup>
+                    <QBtn
+                        :label="`${t('globals.worker')}`"
+                        :title="`${t('globals.worker')}`"
+                        color="primary"
+                        icon="vn:worker"
+                        @click="isFreelancer = false"
+                    />
+                    <QBtn
+                        :label="`${t('Freelancer')}`"
+                        :title="`${t('Freelancer')}`"
+                        flat
+                        color="primary"
+                        icon="person"
+                        @click="isFreelancer = true"
+                    />
+                </QBtnGroup>
+            </template>
+        </VnSubToolbar>
         <FormModel
             url-create="Workers/new"
             model="worker"
             :form-initial-data="newWorkerForm"
         >
             <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.firstName"
-                            :label="t('worker.create.name')"
-                            :rules="validate('Worker.firstName')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.lastNames"
-                            :label="t('worker.create.lastName')"
-                            :rules="validate('Worker.lastNames')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInputDate
-                            v-model="data.birth"
-                            :label="t('worker.create.birth')"
-                            :rules="validate('Worker.birth')"
-                        />
-                    </div>
+                <VnRow>
+                    <VnInput
+                        v-model="data.firstName"
+                        :label="t('worker.create.name')"
+                        :rules="validate('Worker.firstName')"
+                    />
+                    <VnInput
+                        v-model="data.lastNames"
+                        :label="t('worker.create.lastName')"
+                        :rules="validate('Worker.lastNames')"
+                    />
+                    <VnInput
+                        v-show="isFreelancer"
+                        v-model="data.code"
+                        :label="t('worker.create.code')"
+                        :rules="validate('Worker.code')"
+                    />
+                    <VnInputDate
+                        v-show="!isFreelancer"
+                        v-model="data.birth"
+                        :label="t('worker.create.birth')"
+                        :rules="validate('Worker.birth')"
+                    />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.fi"
-                            :label="t('worker.create.fi')"
-                            :rules="validate('Worker.fi')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.code"
-                            :label="t('worker.create.code')"
-                            :rules="validate('Worker.code')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.phone"
-                            :label="t('worker.create.phone')"
-                            :rules="validate('Worker.phone')"
-                        />
-                    </div>
+                <VnRow v-show="!isFreelancer">
+                    <VnInput
+                        v-model="data.fi"
+                        :label="t('worker.create.fi')"
+                        :rules="validate('Worker.fi')"
+                    />
+                    <VnInput
+                        v-model="data.code"
+                        :label="t('worker.create.code')"
+                        :rules="validate('Worker.code')"
+                    />
+                    <VnInput
+                        v-model="data.phone"
+                        :label="t('worker.create.phone')"
+                        :rules="validate('Worker.phone')"
+                    />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnLocation
-                            :rules="validate('Worker.postcode')"
-                            :roles-allowed-to-create="['deliveryAssistant']"
-                            :options="postcodesOptions"
-                            v-model="data.location"
-                            @update:model-value="
-                                (location) => handleLocation(data, location)
-                            "
-                        >
-                        </VnLocation>
-                    </div>
+                <VnRow v-show="!isFreelancer">
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.location"
+                        @update:model-value="(location) => handleLocation(data, location)"
+                    >
+                    </VnLocation>
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            :label="t('worker.create.street')"
-                            v-model="data.street"
-                            :rules="validate('Worker.street')"
-                        />
-                    </div>
+                <VnRow>
+                    <VnInput
+                        v-show="!isFreelancer"
+                        :label="t('worker.create.street')"
+                        v-model="data.street"
+                        :rules="validate('Worker.street')"
+                    />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnInput
-                            v-model="data.name"
-                            :label="t('worker.create.webUser')"
-                            :rules="validate('Worker.name')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            v-model="data.email"
-                            :label="t('worker.create.personalEmail')"
-                            :rules="validate('Worker.email')"
-                        />
-                    </div>
+                <VnRow>
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('worker.create.webUser')"
+                        :rules="validate('Worker.name')"
+                    />
+                    <VnInput
+                        v-model="data.email"
+                        :label="t('worker.create.personalEmail')"
+                        :rules="validate('Worker.email')"
+                    />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('worker.create.company')"
-                            v-model="data.companyFk"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                            hide-selected
-                            :rules="validate('Worker.company')"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnSelect
-                            :label="t('worker.create.boss')"
-                            v-model="data.bossFk"
-                            :options="workersOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            :rules="validate('Worker.boss')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                        <QItemLabel caption
-                                            >{{ scope.opt.nickname }},
-                                            {{ scope.opt.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
+                <VnRow>
+                    <VnSelect
+                        :label="t('worker.create.company')"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        hide-selected
+                        :rules="validate('Worker.company')"
+                    />
+                    <VnSelect
+                        :label="t('worker.create.boss')"
+                        v-model="data.bossFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        :rules="validate('Worker.boss')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt.nickname }},
+                                        {{ scope.opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('worker.create.payMethods')"
-                            v-model="data.payMethodFk"
-                            :options="payMethodsOptions"
-                            option-value="id"
-                            option-label="name"
-                            map-options
-                            hide-selected
-                            :rules="validate('Worker.payMethodFk')"
-                        />
-                    </div>
-
-                    <div class="col">
-                        <VnInput
-                            v-model="data.iban"
-                            :label="t('worker.create.iban')"
-                            :rules="validate('Worker.iban')"
-                        >
-                            <template #append>
-                                <QIcon name="info" class="cursor-info">
-                                    <QTooltip>{{
-                                        t('components.iban_tooltip')
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnInput>
-                    </div>
+                <VnRow v-show="!isFreelancer">
+                    <VnSelect
+                        :label="t('worker.create.payMethods')"
+                        v-model="data.payMethodFk"
+                        :options="payMethodsOptions"
+                        option-value="id"
+                        option-label="name"
+                        map-options
+                        hide-selected
+                        :rules="validate('Worker.payMethodFk')"
+                    />
+                    <VnInput
+                        v-model="data.iban"
+                        :label="t('worker.create.iban')"
+                        :rules="validate('Worker.iban')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
                     <VnSelectDialog
                         :label="t('worker.create.bankEntity')"
                         v-model="data.bankEntityFk"
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 86dd9d0d9..0d31e0955 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -1,2 +1,3 @@
 Search worker: Buscar trabajador
 You can search by worker id or name: Puedes buscar por id o nombre del trabajador
+Freelancer: Autónomo

From 7c1ce7f56039b333bc1adf3156f0d0a761a430c6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 3 May 2024 17:38:16 +0200
Subject: [PATCH 05/32] feat: refs #6243 replace url

---
 src/pages/Route/Cmr/CmrList.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 69f030fa0..6963baf41 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -91,8 +91,7 @@ function downloadPdfs() {
 }
 </script>
 <template>
-      <template v-if="stateStore.isHeaderMounted()">
-
+    <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
                 <QBtn
@@ -113,7 +112,7 @@ function downloadPdfs() {
         <div class="list">
             <VnPaginate
                 data-key="CmrList"
-                :url="`Routes/getExternalCmrs`"
+                :url="`Routes/cmrs`"
                 order="cmrFk DESC"
                 limit="null"
                 auto-load

From 12ff55a010487a4f6717b191b400471a2f3bbb74 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 15 May 2024 17:24:01 +0200
Subject: [PATCH 06/32] fix: refs #6598 get acls

---
 src/composables/useAcl.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 3121646f1..362a7c551 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -1,5 +1,5 @@
-import { useState } from './useState';
 import axios from 'axios';
+import { useState } from './useState';
 
 export function useAcl() {
     const state = useState();
@@ -17,14 +17,13 @@ export function useAcl() {
     }
 
     function hasAny(model, property, accessType) {
-        const acls = acls[model];
-        if (acls) {
-            for (const prop of ['*', property]) {
-                const acl = acls[prop];
-                if (acl && (acl['*'] || acl[accessType])) return true;
-            }
-        }
-        return false;
+        const modelAcls = state.getAcls().value[model];
+        if (!modelAcls) return false;
+    
+        return ['*', property].some(prop => {
+            const acl = modelAcls[prop];
+            return acl && (acl['*'] || acl[accessType]);
+        });
     }
 
     return {

From 74e330e523e0aa9a82c79f2e817b613e8e44aeff Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 16 May 2024 14:05:39 +0200
Subject: [PATCH 07/32] fix: refs #6598 fix unit tests

---
 .../__tests__/composables/useSession.spec.js    | 17 ++++++++---------
 test/vitest/__tests__/pages/Login/Login.spec.js |  5 +++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 2292859a9..6e08807cf 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -1,5 +1,5 @@
 import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import { axios } from 'app/test/vitest/helper';
 import { useSession } from 'composables/useSession';
 import { useState } from 'composables/useState';
 
@@ -7,6 +7,7 @@ const session = useSession();
 const state = useState();
 
 describe('session', () => {
+
     describe('getToken / setToken', () => {
         it('should return an empty string if no token is found in local or session storage', async () => {
             const expectedToken = '';
@@ -87,13 +88,15 @@ describe('session', () => {
                     },
                 },
             ];
+            beforeEach(() => {
+                vi.spyOn(axios, 'get').mockImplementation((url) => {
+                    if(url === 'VnUsers/acls') return Promise.resolve({data: []});
+                    return Promise.resolve({data: { roles: rolesData, user: expectedUser }}); 
+                });
+            })
 
             it('should fetch the user roles and then set token in the sessionStorage', async () => {
                 const expectedRoles = ['salesPerson', 'admin'];
-                vi.spyOn(axios, 'get').mockResolvedValue({
-                    data: { roles: rolesData, user: expectedUser },
-                });
-
                 const expectedToken = 'mySessionToken';
                 const expectedTokenMultimedia = 'mySessionTokenMultimedia';
                 const keepLogin = false;
@@ -117,10 +120,6 @@ describe('session', () => {
 
             it('should fetch the user roles and then set token in the localStorage', async () => {
                 const expectedRoles = ['salesPerson', 'admin'];
-                vi.spyOn(axios, 'get').mockResolvedValue({
-                    data: { roles: rolesData, user: expectedUser },
-                });
-
                 const expectedToken = 'myLocalToken';
                 const expectedTokenMultimedia = 'myLocalTokenMultimedia';
                 const keepLogin = true;
diff --git a/test/vitest/__tests__/pages/Login/Login.spec.js b/test/vitest/__tests__/pages/Login/Login.spec.js
index 6e2de9870..9b9968736 100644
--- a/test/vitest/__tests__/pages/Login/Login.spec.js
+++ b/test/vitest/__tests__/pages/Login/Login.spec.js
@@ -23,8 +23,9 @@ describe('Login', () => {
             },
         };
         vi.spyOn(axios, 'post').mockResolvedValueOnce({ data: { token: 'token' } });
-        vi.spyOn(axios, 'get').mockResolvedValue({
-            data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }},
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+            return Promise.resolve({data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }}});
         });
         vi.spyOn(vm.quasar, 'notify');
 

From 1d67233e691c0c7cdd03b273a4c1039c880d1af7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 16 May 2024 16:29:42 +0200
Subject: [PATCH 08/32] feat: refs #6598 unit tests

---
 src/composables/useAcl.js                     | 15 +++--
 .../__tests__/composables/useAcl.spec.js      | 57 +++++++++++++++++++
 .../__tests__/composables/useSession.spec.js  |  9 +--
 3 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 test/vitest/__tests__/composables/useAcl.spec.js

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 362a7c551..46aaa3c25 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,14 +16,13 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, property, accessType) {
-        const modelAcls = state.getAcls().value[model];
-        if (!modelAcls) return false;
-    
-        return ['*', property].some(prop => {
-            const acl = modelAcls[prop];
-            return acl && (acl['*'] || acl[accessType]);
-        });
+    function hasAny(model, prop, accessType) {
+        const acls = state.getAcls().value[model];
+        if (acls) 
+            return ['*', prop].some((key) => {
+                const acl = acls[key];
+                return acl && (acl['*'] || acl[accessType]);
+            });
     }
 
     return {
diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/test/vitest/__tests__/composables/useAcl.spec.js
new file mode 100644
index 000000000..d468720e5
--- /dev/null
+++ b/test/vitest/__tests__/composables/useAcl.spec.js
@@ -0,0 +1,57 @@
+import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
+import { axios, flushPromises } from 'app/test/vitest/helper';
+import { useAcl } from 'src/composables/useAcl';
+
+describe('useAcl', () => {
+    const acl = useAcl();
+    const mockAcls = [
+        {
+            model: 'Address',
+            property: '*',
+            accessType: '*',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: 'employee',
+            id: 3,
+        },
+        {
+            model: 'Worker',
+            property: 'holidays',
+            accessType: 'READ',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: 'employee',
+            id: 13,
+        },
+    ];
+    const expectedAcls = {
+        Address: { '*': { '*': true } },
+        Worker: { holidays: { READ: true } },
+    };
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockResolvedValue({ data: mockAcls });
+        vi.spyOn(acl.state, 'setAcls');
+    });
+
+    beforeEach(async () => await acl.fetch());
+
+    afterEach(async () => {
+        await flushPromises();
+        acl.state.setAcls([]);
+    });
+
+    describe('fetch', () => {
+        it('should call setUser and setRoles of the state with the expected data', async () => {
+            expect(acl.state.setAcls).toHaveBeenCalledWith(expectedAcls);
+        });
+    });
+
+    describe('hasAny', () => {
+        it('should return true if a role matched', async () =>
+            expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy());
+
+        it('should return false if no roles matched', async () => {
+            expect(acl.hasAny('Worker', '*', 'WRITE')).toBeFalsy();
+        });
+    });
+});
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 6e08807cf..831acbf18 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -7,7 +7,6 @@ const session = useSession();
 const state = useState();
 
 describe('session', () => {
-
     describe('getToken / setToken', () => {
         it('should return an empty string if no token is found in local or session storage', async () => {
             const expectedToken = '';
@@ -90,10 +89,12 @@ describe('session', () => {
             ];
             beforeEach(() => {
                 vi.spyOn(axios, 'get').mockImplementation((url) => {
-                    if(url === 'VnUsers/acls') return Promise.resolve({data: []});
-                    return Promise.resolve({data: { roles: rolesData, user: expectedUser }}); 
+                    if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+                    return Promise.resolve({
+                        data: { roles: rolesData, user: expectedUser },
+                    });
                 });
-            })
+            });
 
             it('should fetch the user roles and then set token in the sessionStorage', async () => {
                 const expectedRoles = ['salesPerson', 'admin'];

From 12811692eb5c799f915863dfedd9177dbdd6fd56 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 17 May 2024 12:09:42 +0200
Subject: [PATCH 09/32] feat: refs #6598 add more tests

---
 .../__tests__/composables/useAcl.spec.js      | 79 +++++++++++++------
 1 file changed, 55 insertions(+), 24 deletions(-)

diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/test/vitest/__tests__/composables/useAcl.spec.js
index d468720e5..a2b44b5e7 100644
--- a/test/vitest/__tests__/composables/useAcl.spec.js
+++ b/test/vitest/__tests__/composables/useAcl.spec.js
@@ -1,4 +1,4 @@
-import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
+import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
 import { axios, flushPromises } from 'app/test/vitest/helper';
 import { useAcl } from 'src/composables/useAcl';
 
@@ -12,7 +12,6 @@ describe('useAcl', () => {
             permission: 'ALLOW',
             principalType: 'ROLE',
             principalId: 'employee',
-            id: 3,
         },
         {
             model: 'Worker',
@@ -21,37 +20,69 @@ describe('useAcl', () => {
             permission: 'ALLOW',
             principalType: 'ROLE',
             principalId: 'employee',
-            id: 13,
+        },
+        {
+            model: 'Url',
+            property: 'getByUser',
+            accessType: 'READ',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: '$everyone',
+        },
+        {
+            model: 'TpvTransaction',
+            property: 'start',
+            accessType: 'WRITE',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: '$authenticated',
         },
     ];
-    const expectedAcls = {
-        Address: { '*': { '*': true } },
-        Worker: { holidays: { READ: true } },
-    };
-    beforeAll(() => {
+
+    beforeAll(async () => {
         vi.spyOn(axios, 'get').mockResolvedValue({ data: mockAcls });
-        vi.spyOn(acl.state, 'setAcls');
+        await acl.fetch();
     });
 
-    beforeEach(async () => await acl.fetch());
-
-    afterEach(async () => {
-        await flushPromises();
-        acl.state.setAcls([]);
-    });
-
-    describe('fetch', () => {
-        it('should call setUser and setRoles of the state with the expected data', async () => {
-            expect(acl.state.setAcls).toHaveBeenCalledWith(expectedAcls);
-        });
-    });
+    afterAll(async () => await flushPromises());
 
     describe('hasAny', () => {
-        it('should return true if a role matched', async () =>
-            expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy());
+        it('should return false if no roles matched', async () => {
+            expect(acl.hasAny('Worker', 'updateAttributes', 'WRITE')).toBeFalsy();
+        });
 
         it('should return false if no roles matched', async () => {
-            expect(acl.hasAny('Worker', '*', 'WRITE')).toBeFalsy();
+            expect(acl.hasAny('Worker', 'holidays', 'READ')).toBeTruthy();
+        });
+
+        describe('*', () => {
+            it('should return true if an acl matched', async () => {
+                expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy();
+            });
+
+            it('should return false if no acls matched', async () => {
+                expect(acl.hasAny('Worker', '*', 'READ')).toBeFalsy();
+            });
+        });
+
+        describe('$authenticated', () => {
+            it('should return false if no acls matched', async () => {
+                expect(acl.hasAny('Url', 'getByUser', '*')).toBeFalsy();
+            });
+
+            it('should return true if an acl matched', async () => {
+                expect(acl.hasAny('Url', 'getByUser', 'READ')).toBeTruthy();
+            });
+        });
+
+        describe('$everyone', () => {
+            it('should return false if no acls matched', async () => {
+                expect(acl.hasAny('TpvTransaction', 'start', 'READ')).toBeFalsy();
+            });
+
+            it('should return false if an acl matched', async () => {
+                expect(acl.hasAny('TpvTransaction', 'start', 'WRITE')).toBeTruthy();
+            });
         });
     });
 });

From 68213721a760cda496feaba1005eef868439a061 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 23 May 2024 13:09:11 +0200
Subject: [PATCH 10/32] feat: refs #7003 new data order in section

---
 src/pages/Item/ItemFixedPrice.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index e74f7f828..b4c83ca86 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -55,7 +55,7 @@ const params = reactive({});
 const arrayData = useArrayData('ItemFixedPrices', {
     url: 'FixedPrices/filter',
     userParams: params,
-    order: ['itemFk'],
+    order: ['name ASC'],
     exprBuilder: exprBuilder,
 });
 const store = arrayData.store;

From 56a46cd1306e7a6ccb34ace2268086116a0728ef Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 3 Jun 2024 11:52:19 +0200
Subject: [PATCH 11/32] 4560

---
 src/components/FormPopup.vue                     |  2 +-
 src/pages/Route/Roadmap/RoadmapAddStopDialog.vue |  2 +-
 src/pages/Route/Roadmap/RoadmapStops.vue         |  8 ++++----
 src/pages/Route/Roadmap/RoadmapSummary.vue       | 12 ++++++------
 src/router/routes.js                             |  2 --
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue
index e203a7c75..2da986006 100644
--- a/src/components/FormPopup.vue
+++ b/src/components/FormPopup.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
diff --git a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
index 810ef42c8..f20619033 100644
--- a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
+++ b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
@@ -34,7 +34,7 @@ const updateDefaultStop = (data) => {
 const onSave = async () => {
     isLoading.value = true;
     try {
-        await axios.post('ExpeditionTrucks', { ...roadmapStopForm });
+        await axios.post('RoadmapStops', { ...roadmapStopForm });
         emit('ok');
     } finally {
         isLoading.value = false;
diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 5c3bd51e7..9e6ac82f4 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -33,9 +33,9 @@ const updateDefaultStop = (data) => {
     <div class="q-pa-lg">
         <CrudModel
             ref="roadmapStopsCrudRef"
-            data-key="ExpeditionTrucks"
-            url="ExpeditionTrucks"
-            model="ExpeditionTrucks"
+            data-key="RoadmapStops"
+            url="RoadmapStops"
+            model="RoadmapStops"
             :filter="{ where: { roadmapFk: route.params?.id } }"
             :default-remove="false"
             :data-required="defaultStop"
@@ -86,7 +86,7 @@ const updateDefaultStop = (data) => {
 </template>
 <i18n>
 es:
-    Warehouse: Almacén
+    Address: Consignatario
     ETA date: Fecha ETA
     ETA hour: Hora ETA
     Description: Descripción
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 1fed6aa78..01246b647 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -35,9 +35,9 @@ onUnmounted(hideRightDrawer);
 
 const columns = ref([
     {
-        name: 'warehouse',
-        label: t('Warehouse'),
-        field: (row) => dashIfEmpty(row?.warehouse?.name),
+        name: 'address',
+        label: t('Address'),
+        field: (row) => dashIfEmpty(row?.address?.nickname),
         sortable: true,
         align: 'left',
     },
@@ -54,8 +54,8 @@ const filter = {
         { relation: 'supplier' },
         { relation: 'worker' },
         {
-            relation: 'expeditionTruck',
-            scope: { include: [{ relation: 'warehouse' }] },
+            relation: 'roadmapStop',
+            scope: { include: [{ relation: 'address' }] },
         },
     ],
 };
@@ -146,7 +146,7 @@ const openAddStopDialog = () => {
                     </div>
                     <QTable
                         :columns="columns"
-                        :rows="entity?.expeditionTruck"
+                        :rows="entity?.roadmapStop"
                         :rows-per-page-options="[0]"
                         row-key="id"
                         flat
diff --git a/src/router/routes.js b/src/router/routes.js
index 591f2121d..bf52a5ac2 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -8,7 +8,6 @@ import invoiceOut from './modules/invoiceOut';
 import invoiceIn from './modules/invoiceIn';
 import wagon from './modules/wagon';
 import supplier from './modules/Supplier';
-import route from './modules/route';
 import travel from './modules/travel';
 import department from './modules/department';
 import ItemType from './modules/itemType';
@@ -62,7 +61,6 @@ const routes = [
             customer,
             ticket,
             claim,
-            route,
             worker,
             shelving,
             invoiceOut,

From 1bc99cbd228b092c5dc956ea07b7d22a67e8ff82 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 3 Jun 2024 16:30:59 +0200
Subject: [PATCH 12/32] feat: refs  #6243 show all cmrs & filter by warehouse

---
 CHANGELOG.md                      |  1 +
 src/i18n/locale/en.yml            |  2 +-
 src/i18n/locale/es.yml            |  2 +-
 src/pages/Route/Cmr/CmrFilter.vue | 30 ++++++++++++++++++++++--------
 src/pages/Route/Cmr/CmrList.vue   | 21 ++++++++++++++++++---
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 250aa01a2..f589b5e9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
+-   (Route) => Ahora se muestran todos los cmrs
 
 ## [2418.01]
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 0ce21e9b2..010a9f481 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -956,7 +956,7 @@ roadmap:
 route:
     pageTitles:
         routes: Routes
-        cmrsList: External CMRs list
+        cmrsList: CMRs list
         RouteList: List
         routeCreate: New route
         basicData: Basic Data
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index c2f61d001..d469046bc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -944,7 +944,7 @@ roadmap:
 route:
     pageTitles:
         routes: Rutas
-        cmrsList: Listado de CMRs externos
+        cmrsList: Listado de CMRs
         RouteList: Listado
         routeCreate: Nueva ruta
         basicData: Datos básicos
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index 553f19431..32040ddd6 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -1,11 +1,11 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -16,10 +16,11 @@ const props = defineProps({
 });
 
 const countries = ref();
+const warehouses = ref();
 </script>
-
 <template>
     <FetchData url="Countries" @on-fetch="(data) => (countries = data)" auto-load />
+    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -93,13 +94,13 @@ const countries = ref();
                 <QItemSection v-if="!countries">
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
-                <QItemSection v-if="countries" class="q-mb-sm">
-                    <QSelect
+                <QItemSection v-if="countries">
+                    <VnSelect
                         :label="t('route.cmr.list.country')"
                         v-model="params.country"
                         :options="countries"
-                        option-value="country"
-                        option-label="country"
+                        option-label="name"
+                        option-value="id"
                         transition-show="jump-down"
                         transition-hide="jump-up"
                         emit-value
@@ -111,9 +112,23 @@ const countries = ref();
                         <template #prepend>
                             <QIcon name="flag" size="sm"></QIcon>
                         </template>
-                    </QSelect>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <VnSelect
+                    :label="t('globals.warehouse')"
+                    :options="warehouses"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="params.warehouseFk"
+                    rounded
+                    dense
+                    outlined
+                >
+                </VnSelect>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInputDate
@@ -126,7 +141,6 @@ const countries = ref();
         </template>
     </VnFilterPanel>
 </template>
-
 <i18n>
     en:
         params:
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 6963baf41..5198e9fa2 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -9,12 +9,14 @@ import { toDate } from 'filters/index';
 import CmrFilter from './CmrFilter.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const selected = ref([]);
+const warehouses = ref([]);
 
 const columns = computed(() => [
     {
@@ -64,6 +66,13 @@ const columns = computed(() => [
         sortable: true,
         headerStyle: 'padding-left: 33px',
     },
+    {
+        name: 'warehouseFk',
+        label: t('globals.warehouse'),
+        field: ({ warehouseFk }) => warehouseFk,
+        align: 'center',
+        sortable: true,
+    },
     {
         name: 'icons',
         align: 'center',
@@ -108,6 +117,7 @@ function downloadPdfs() {
             </div>
         </Teleport>
     </template>
+    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <div class="column items-center">
         <div class="list">
             <VnPaginate
@@ -160,6 +170,11 @@ function downloadPdfs() {
                                 <CustomerDescriptorProxy :id="value" />
                             </QTd>
                         </template>
+                        <template #body-cell-warehouseFk="{ value }">
+                            <QTd align="center">
+                                {{ warehouses.find(({ id }) => id === value)?.name }}
+                            </QTd>
+                        </template>
                         <template #body-cell-icons="{ value }">
                             <QTd align="center">
                                 <a :href="getCmrUrl(value)" target="_blank">
@@ -181,13 +196,13 @@ function downloadPdfs() {
         </div>
         <QPageSticky :offset="[20, 20]">
             <QBtn @click="downloadPdfs" fab icon="cloud_download" color="primary" />
+            <QTooltip>
+                {{ t('route.cmr.list.downloadCmrs') }}
+            </QTooltip>
         </QPageSticky>
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
             <QScrollArea class="fit text-grey-8">
                 <CmrFilter data-key="CmrList" />
-                <QTooltip>
-                    {{ t('route.cmr.list.downloadCmrs') }}
-                </QTooltip>
             </QScrollArea>
         </QDrawer>
     </div>

From 0b0754f76e62adf7bb194a75ea2ef572d09c5ef4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 4 Jun 2024 09:33:51 +0200
Subject: [PATCH 13/32] refactor: refs #6273 replace QBtnGroup with QRadio for
 worker type selection

---
 src/pages/Worker/WorkerCreate.vue | 105 +++++++++++++-----------------
 src/pages/Worker/locale/es.yml    |   3 +-
 2 files changed, 47 insertions(+), 61 deletions(-)

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index a3aad5041..4147201e1 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -93,23 +93,8 @@ onMounted(async () => {
     <QPage>
         <VnSubToolbar>
             <template #st-data>
-                <QBtnGroup>
-                    <QBtn
-                        :label="`${t('globals.worker')}`"
-                        :title="`${t('globals.worker')}`"
-                        color="primary"
-                        icon="vn:worker"
-                        @click="isFreelancer = false"
-                    />
-                    <QBtn
-                        :label="`${t('Freelancer')}`"
-                        :title="`${t('Freelancer')}`"
-                        flat
-                        color="primary"
-                        icon="person"
-                        @click="isFreelancer = true"
-                    />
-                </QBtnGroup>
+                <QRadio v-model="isFreelancer" :val="false" :label="`${t('Internal')}`" />
+                <QRadio v-model="isFreelancer" :val="true" :label="`${t('External')}`" />
             </template>
         </VnSubToolbar>
         <FormModel
@@ -130,52 +115,10 @@ onMounted(async () => {
                         :rules="validate('Worker.lastNames')"
                     />
                     <VnInput
-                        v-show="isFreelancer"
                         v-model="data.code"
                         :label="t('worker.create.code')"
                         :rules="validate('Worker.code')"
                     />
-                    <VnInputDate
-                        v-show="!isFreelancer"
-                        v-model="data.birth"
-                        :label="t('worker.create.birth')"
-                        :rules="validate('Worker.birth')"
-                    />
-                </VnRow>
-                <VnRow v-show="!isFreelancer">
-                    <VnInput
-                        v-model="data.fi"
-                        :label="t('worker.create.fi')"
-                        :rules="validate('Worker.fi')"
-                    />
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('worker.create.code')"
-                        :rules="validate('Worker.code')"
-                    />
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('worker.create.phone')"
-                        :rules="validate('Worker.phone')"
-                    />
-                </VnRow>
-                <VnRow v-show="!isFreelancer">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.location"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    >
-                    </VnLocation>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-show="!isFreelancer"
-                        :label="t('worker.create.street')"
-                        v-model="data.street"
-                        :rules="validate('Worker.street')"
-                    />
                 </VnRow>
                 <VnRow>
                     <VnInput
@@ -221,7 +164,46 @@ onMounted(async () => {
                         </template>
                     </VnSelect>
                 </VnRow>
-                <VnRow v-show="!isFreelancer">
+                <VnRow>
+                    <VnInput
+                        v-model="data.fi"
+                        :label="t('worker.create.fi')"
+                        :rules="validate('Worker.fi')"
+                        :disable="isFreelancer"
+                    />
+                    <VnInputDate
+                        v-model="data.birth"
+                        :label="t('worker.create.birth')"
+                        :rules="validate('Worker.birth')"
+                        :disable="isFreelancer"
+                    />
+                    <VnInput
+                        v-model="data.phone"
+                        :label="t('worker.create.phone')"
+                        :rules="validate('Worker.phone')"
+                        :disable="isFreelancer"
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.location"
+                        @update:model-value="(location) => handleLocation(data, location)"
+                        :disable="isFreelancer"
+                    >
+                    </VnLocation>
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        :label="t('worker.create.street')"
+                        v-model="data.street"
+                        :rules="validate('Worker.street')"
+                        :disable="isFreelancer"
+                    />
+                </VnRow>
+                <VnRow>
                     <VnSelect
                         :label="t('worker.create.payMethods')"
                         v-model="data.payMethodFk"
@@ -231,11 +213,13 @@ onMounted(async () => {
                         map-options
                         hide-selected
                         :rules="validate('Worker.payMethodFk')"
+                        :disable="isFreelancer"
                     />
                     <VnInput
                         v-model="data.iban"
                         :label="t('worker.create.iban')"
                         :rules="validate('Worker.iban')"
+                        :disable="isFreelancer"
                     >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
@@ -252,6 +236,7 @@ onMounted(async () => {
                         hide-selected
                         :roles-allowed-to-create="['salesAssistant', 'hr']"
                         :rules="validate('Worker.bankEntity')"
+                        :disable="isFreelancer"
                     >
                         <template #form>
                             <CreateBankEntityForm
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 268c32b81..f74cb4fdb 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -1,4 +1,5 @@
 Search worker: Buscar trabajador
 You can search by worker id or name: Puedes buscar por id o nombre del trabajador
-Freelancer: Autónomo
 Locker: Taquilla
+Internal: Interno
+External: Externo

From f1df969fa697a2e60ceaf5d99fec9162d02c10f9 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 4 Jun 2024 10:52:00 +0200
Subject: [PATCH 14/32] feat: refs #560 refactor descriptor

---
 .../Route/Roadmap/RoadmapAddStopForm.vue      | 37 ++++++++++++++-----
 src/pages/Route/Roadmap/RoadmapCard.vue       | 30 +++++++--------
 src/pages/Route/Roadmap/RoadmapSummary.vue    | 15 ++++++--
 src/pages/Route/RouteRoadmap.vue              |  4 +-
 4 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/src/pages/Route/Roadmap/RoadmapAddStopForm.vue b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
index 736280e99..6cc21fd4d 100644
--- a/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
+++ b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
@@ -23,28 +23,43 @@ const props = defineProps({
 });
 
 const { t } = useI18n();
-const warehouseList = ref([]);
+const addressList = ref([]);
 const form = computed(() => props.formData);
 const isDialog = computed(() => props.layout === 'dialog');
+const onFetch = (data) => {
+    addressList.value = data.map((roadmap) => ({
+        id: roadmap.addressFk,
+        nickname: roadmap.address ? roadmap.address.nickname : '',
+    }));
+};
 </script>
+
 <template>
     <FetchData
-        url="Warehouses"
+        url="RoadmapAddresses"
         auto-load
-        :filter="{ fields: ['id', 'name'] }"
-        sort-by="name"
+        :filter="{
+            include: [
+                {
+                    relation: 'address',
+                    scope: {
+                        fields: ['nickname'],
+                    },
+                },
+            ],
+        }"
         limit="30"
-        @on-fetch="(data) => (warehouseList = data)"
+        @on-fetch="onFetch"
     />
     <div :class="[isDialog ? 'column' : 'form-gap', 'full-width flex']">
         <QCardSection class="flex-grow q-px-none flex-1">
             <VnSelect
-                v-model.number="form.warehouseFk"
+                v-model.number="form.addressFk"
                 class="full-width"
-                :label="t('Warehouse')"
-                :options="warehouseList"
+                :label="t('Address')"
+                :options="addressList"
                 option-value="id"
-                option-label="name"
+                option-label="nickname"
                 emit-value
                 map-options
                 use-input
@@ -80,6 +95,7 @@ const isDialog = computed(() => props.layout === 'dialog');
         </QCardSection>
     </div>
 </template>
+
 <style lang="scss" scoped>
 .form-gap {
     gap: 16px;
@@ -93,9 +109,10 @@ const isDialog = computed(() => props.layout === 'dialog');
     flex: 2;
 }
 </style>
+
 <i18n>
 es:
-    Warehouse: Almacén
+    Address: Dirección
     ETA date: Fecha ETA
     ETA hour: Hora ETA
     Description: Descripción
diff --git a/src/pages/Route/Roadmap/RoadmapCard.vue b/src/pages/Route/Roadmap/RoadmapCard.vue
index d6b02824b..4e8f8dd50 100644
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@@ -1,21 +1,17 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
-import RoadmapDescriptor from "pages/Route/Roadmap/RoadmapDescriptor.vue";
-
-const stateStore = useStateStore();
+import VnCard from 'components/common/VnCard.vue';
+import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
+import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <RoadmapDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <RouterView></RouterView>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Roadmap"
+        base-url="Roadmaps"
+        :descriptor="RoadmapDescriptor"
+        :filter-panel="RoadmapFilter"
+        search-data-key="RoadmapList"
+        search-url="Roadmaps"
+        searchbar-label="Search roadmap"
+        searchbar-info="You can search by roadmap id or customer name"
+    />
 </template>
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 8604cc30a..e9969c2f7 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -55,7 +55,16 @@ const filter = {
         { relation: 'worker' },
         {
             relation: 'roadmapStop',
-            scope: { include: [{ relation: 'address' }] },
+            scope: {
+                include: [
+                    {
+                        relation: 'address',
+                        scope: {
+                            fields: ['nickname'],
+                        },
+                    },
+                ],
+            },
         },
     ],
 };
@@ -154,8 +163,6 @@ const openAddStopDialog = () => {
                         :rows="entity?.roadmapStop"
                         :rows-per-page-options="[0]"
                         row-key="id"
-                        flat
-                        hide-pagination
                     />
                 </QCard>
             </template>
@@ -171,7 +178,7 @@ es:
     Worker: Trabajador
     Observations: Observaciones
     Stops: Paradas
-    Warehouse: Almacén
+    Address: Dirección
     Go to stops: Ir a paradas
     Add stop: Añadir parada
 </i18n>
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 2ed8b6a9a..06c632ad4 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -284,9 +284,9 @@ function navigateToRoadmapSummary(event, row) {
 <i18n>
 es:
     Search roadmaps: Buscar troncales
-    You can search by roadmap reference: Puedes buscar por referencia de la troncal
+    You can search by roadmap reference: Puedes buscar por referencia del troncal
     Delete roadmap(s): Eliminar troncal(es)
-    Selected roadmaps will be removed: Las troncales seleccionadas serán eliminadas
+    Selected roadmaps will be removed: Los troncales seleccionadas serán eliminados
     Are you sure you want to continue?: ¿Seguro que quieres continuar?
     The date can't be empty: La fecha no puede estar vacía
     Clone Selected Routes: Clonar rutas seleccionadas

From 857aca49dd5b0bcad405aa0bb434c07356629685 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 4 Jun 2024 14:06:04 +0200
Subject: [PATCH 15/32] feat: refs #4560 sin DeliveryMan

---
 src/pages/Route/Card/DeliveryManBasicData.vue | 115 ----------------
 src/pages/Route/Card/DeliveryManCard.vue      |  58 --------
 .../Route/Card/DeliveryManDescriptor.vue      |  82 ------------
 src/pages/Route/Card/DeliveryManSummary.vue   | 124 -----------------
 src/pages/Route/DeliveryManCreate.vue         | 126 ------------------
 src/pages/Route/DeliveryManList.vue           |  83 ------------
 src/pages/Route/InvoiceAllocation.vue         | 126 ------------------
 src/pages/Route/Roadmap/RoadmapBasicData.vue  |   2 -
 src/pages/Route/Roadmap/RoadmapStops.vue      |   2 -
 9 files changed, 718 deletions(-)
 delete mode 100644 src/pages/Route/Card/DeliveryManBasicData.vue
 delete mode 100644 src/pages/Route/Card/DeliveryManCard.vue
 delete mode 100644 src/pages/Route/Card/DeliveryManDescriptor.vue
 delete mode 100644 src/pages/Route/Card/DeliveryManSummary.vue
 delete mode 100644 src/pages/Route/DeliveryManCreate.vue
 delete mode 100644 src/pages/Route/DeliveryManList.vue
 delete mode 100644 src/pages/Route/InvoiceAllocation.vue

diff --git a/src/pages/Route/Card/DeliveryManBasicData.vue b/src/pages/Route/Card/DeliveryManBasicData.vue
deleted file mode 100644
index 1aad8d8cc..000000000
--- a/src/pages/Route/Card/DeliveryManBasicData.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-
-const route = useRoute();
-const { t } = useI18n();
-
-const suppliers = ref([]);
-const agencyModes = ref([]);
-
-function setSuppliers(data) {
-    suppliers.value = data;
-}
-
-function setAgencyModes(data) {
-    agencyModes.value = data;
-}
-
-const filter = {
-    include: [
-        {
-            relation: 'deliveryManAgency',
-            scope: {
-                include: {
-                    relation: 'agencyMode',
-                },
-            },
-        },
-        {
-            relation: 'supplier',
-        },
-    ],
-};
-</script>
-<template>
-    <fetch-data url="Suppliers" @on-fetch="setSuppliers" auto-load />
-    <fetch-data url="AgencyModes" @on-fetch="setAgencyModes" auto-load />
-
-    <div class="container">
-        <q-card>
-            <form-model :url="`DeliveryMans/${route.params.id}`" :filter="filter" model="deliveryMan">
-                <template #form="{ data, validate }">
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <q-input v-model="data.id" :label="t('route.deliveryMan.basicData.id')" disable />
-                        </div>
-                        <div class="col">
-                            <q-select
-                                v-model="data.supplierFk"
-                                :options="suppliers"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                :label="t('route.deliveryMan.basicData.supplier')"
-                                map-options
-                                use-input
-                                :rules="validate('deliveryMan.supplierFk')"
-                                :input-debounce="0"
-                            >
-                            </q-select>
-                        </div>
-                    </div>
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <q-input
-                                v-model="data.minCost"
-                                :label="t('route.deliveryMan.basicData.minCost')"
-                                :rules="validate('deliveryMan.minCost')"
-                            />
-                        </div>
-                        <div class="col">
-                            <q-input
-                                v-model="data.minM3"
-                                :label="t('route.deliveryMan.basicData.minM3')"
-                                :rules="validate('deliveryMan.minM3')"
-                            />
-                        </div>
-                    </div>
-                    <div class="row q-gutter-md q-mb-md">
-                        <div class="col">
-                            <q-select
-                                v-model="data.deliveryManAgency.agencyModeFk"
-                                :options="agencyModes"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                :label="t('route.deliveryMan.basicData.agency')"
-                                map-options
-                                use-input
-                                :rules="validate('deliveryMan.deliveryManAgency.agencyModeFk')"
-                                :input-debounce="0"
-                            >
-                            </q-select>
-                        </div>
-                    </div>
-                </template>
-            </form-model>
-        </q-card>
-    </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-    display: flex;
-    justify-content: center;
-}
-
-.q-card {
-    width: 800px;
-}
-</style>
diff --git a/src/pages/Route/Card/DeliveryManCard.vue b/src/pages/Route/Card/DeliveryManCard.vue
deleted file mode 100644
index cabf0266c..000000000
--- a/src/pages/Route/Card/DeliveryManCard.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useState } from 'composables/useState';
-import DeliveryManDescriptor from './DeliveryManDescriptor.vue';
-
-const { t } = useI18n();
-const state = useState();
-</script>
-<template>
-    <q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500">
-        <q-scroll-area class="fit">
-            <delivery-man-descriptor />
-            <q-separator />
-            <q-list>
-                <q-item :to="{ name: 'DeliveryManBasicData' }" clickable v-ripple>
-                    <q-item-section avatar>
-                        <q-icon name="vn:settings" />
-                    </q-item-section>
-                    <q-item-section>{{ t('route.pageTitles.basicData') }}</q-item-section>
-                </q-item>
-            </q-list>
-        </q-scroll-area>
-    </q-drawer>
-    <q-page-container>
-        <q-page class="q-pa-md">
-            <router-view></router-view>
-        </q-page>
-    </q-page-container>
-</template>
-
-<style lang="scss">
-.q-scrollarea__content {
-    max-width: 100%;
-}
-</style>
-
-<style lang="scss" scoped>
-.descriptor {
-    max-width: 256px;
-
-    h5 {
-        margin: 0 15px;
-    }
-
-    .header {
-        display: flex;
-        justify-content: space-between;
-    }
-
-    .q-card__actions {
-        justify-content: center;
-    }
-
-    #descriptor-skeleton .q-card__actions {
-        justify-content: space-between;
-    }
-}
-</style>
diff --git a/src/pages/Route/Card/DeliveryManDescriptor.vue b/src/pages/Route/Card/DeliveryManDescriptor.vue
deleted file mode 100644
index 6d9e64c32..000000000
--- a/src/pages/Route/Card/DeliveryManDescriptor.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<script setup>
-import axios from 'axios';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
-import { computed, onMounted, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
-
-onMounted(async () => {
-    await fetch();
-});
-
-const route = useRoute();
-const { t } = useI18n();
-
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
-
-const deliveryMan = ref();
-async function fetch() {
-    const filter = {
-        include: [
-            {
-                relation: 'deliveryManAgency',
-                scope: {
-                    include: {
-                        relation: 'agencyMode',
-                    },
-                },
-            },
-            {
-                relation: 'supplier',
-            },
-        ],
-    };
-    const options = { params: { filter } };
-    const { data } = await axios.get(`DeliveryMans/${entityId.value}`, options);
-
-    if (data) deliveryMan.value = data;
-}
-</script>
-
-<template>
-    <skeleton-descriptor v-if="!deliveryMan" />
-    <card-descriptor v-if="deliveryMan" module="DeliveryMan" :data="deliveryMan">
-        <template #body>
-            <q-list>
-                <q-item>
-                    <q-item-section>
-                        <q-item-label caption>{{ t('route.deliveryMan.card.supplier') }}</q-item-label>
-                        <q-item-label>{{ deliveryMan.supplier.name }}</q-item-label>
-                    </q-item-section>
-                </q-item>
-                <q-item>
-                    <q-item-section>
-                        <q-item-label caption>{{ t('route.deliveryMan.card.agency') }}</q-item-label>
-                        <q-item-label>{{ deliveryMan.deliveryManAgency.agencyMode.name }}</q-item-label>
-                    </q-item-section>
-                </q-item>
-                <q-item>
-                    <q-item-section>
-                        <q-item-label caption>{{ t('route.deliveryMan.card.minCost') }}</q-item-label>
-                        <q-item-label>{{ deliveryMan.minCost }}</q-item-label>
-                    </q-item-section>
-                    <q-item-section>
-                        <q-item-label caption>{{ t('route.deliveryMan.card.minM3') }}</q-item-label>
-                        <q-item-label>{{ deliveryMan.minM3 }}</q-item-label>
-                    </q-item-section>
-                </q-item>
-            </q-list>
-        </template>
-    </card-descriptor>
-</template>
diff --git a/src/pages/Route/Card/DeliveryManSummary.vue b/src/pages/Route/Card/DeliveryManSummary.vue
deleted file mode 100644
index b76ca8a05..000000000
--- a/src/pages/Route/Card/DeliveryManSummary.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<script setup>
-import axios from 'axios';
-import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
-import { computed, onMounted, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
-onMounted(() => fetch());
-
-const route = useRoute();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
-const entityId = computed(() => $props.id || route.params.id);
-
-const filter = {
-    include: [
-        {
-            relation: 'deliveryManAgency',
-            scope: {
-                include: {
-                    relation: 'agencyMode',
-                },
-            },
-        },
-        {
-            relation: 'supplier',
-        },
-    ],
-};
-
-const deliveryMan = ref(null);
-function fetch() {
-    const id = entityId.value;
-    axios
-        .get(`DeliveryMans/${id}`, {
-            params: {
-                filter,
-            },
-        })
-        .then(({ data }) => {
-            deliveryMan.value = data;
-        });
-}
-</script>
-
-<template>
-    <div class="summary container">
-        <q-card>
-            <skeleton-summary v-if="!deliveryMan" />
-            <template v-if="deliveryMan">
-                <div class="header bg-primary q-pa-sm q-mb-md">
-                    {{ t('route.deliveryMan.summary.deliveryMan') }} #{{ deliveryMan.id }}
-                </div>
-                <q-list>
-                    <q-item>
-                        <q-item-section>
-                            <q-item-label caption>{{ t('route.deliveryMan.summary.supplier') }}</q-item-label>
-                            <q-item-label>{{ deliveryMan.supplier.name }}</q-item-label>
-                        </q-item-section>
-                        <q-item-section>
-                            <q-item-label caption>{{ t('route.deliveryMan.summary.agency') }}</q-item-label>
-                            <q-item-label>{{ deliveryMan.deliveryManAgency.agencyMode.name }}</q-item-label>
-                        </q-item-section>
-                        <q-item-section>
-                            <q-item-label caption>{{ t('route.deliveryMan.summary.minCost') }}</q-item-label>
-                            <q-item-label>{{ deliveryMan.minCost }}</q-item-label>
-                        </q-item-section>
-                        <q-item-section>
-                            <q-item-label caption>{{ t('route.deliveryMan.summary.minM3') }}</q-item-label>
-                            <q-item-label>{{ deliveryMan.minM3 }}</q-item-label>
-                        </q-item-section>
-                    </q-item>
-                    <q-item> </q-item>
-                </q-list>
-            </template>
-        </q-card>
-    </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-    display: flex;
-    justify-content: center;
-}
-
-.q-card {
-    width: 100%;
-    max-width: 950px;
-}
-
-.summary {
-    .header {
-        text-align: center;
-        font-size: 18px;
-    }
-
-    #slider-container {
-        max-width: 80%;
-        margin: 0 auto;
-
-        .q-slider {
-            .q-slider__marker-labels:nth-child(1) {
-                transform: none;
-            }
-            .q-slider__marker-labels:nth-child(2) {
-                transform: none;
-                left: auto !important;
-                right: 0%;
-            }
-        }
-    }
-}
-
-.q-dialog .summary {
-    max-width: 1200px;
-}
-</style>
diff --git a/src/pages/Route/DeliveryManCreate.vue b/src/pages/Route/DeliveryManCreate.vue
deleted file mode 100644
index fbe0be4d0..000000000
--- a/src/pages/Route/DeliveryManCreate.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<script setup>
-import axios from 'axios';
-import { reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
-
-const { t } = useI18n();
-
-const deliveryMan = reactive({
-    supplierFk: null,
-    agencyModeFk: null,
-    minCost: null,
-    minM3: null,
-});
-
-const suppliers = ref([]);
-const agencyModes = ref([]);
-
-function setSuppliers(data) {
-    suppliers.value = data;
-}
-
-function setAgencyModes(data) {
-    agencyModes.value = data;
-}
-
-async function onSubmit() {
-    try {
-        const newDeliveryMan = await axios.post('DeliveryMans', {
-            supplierFk: deliveryMan.supplierFk,
-            minCost: deliveryMan.minCost,
-            minM3: deliveryMan.minM3,
-        });
-
-        if (deliveryMan.agencyModeFk) {
-            await axios.post(`DeliveryManAgencys/${newDeliveryMan.id}`, {
-                agencyModeFk: deliveryMan.agencyMode,
-            });
-        }
-    } catch (e) {
-        console.error(e);
-    }
-}
-</script>
-
-<template>
-    <fetch-data url="Suppliers" @on-fetch="setSuppliers" auto-load />
-    <fetch-data url="AgencyModes" @on-fetch="setAgencyModes" auto-load />
-    <div class="container">
-        <q-card class="q-pa-md">
-            <q-banner v-if="hasChanges" class="text-white bg-warning">
-                <q-icon name="warning" size="md" class="q-mr-md" />
-                <span>{{ t('globals.changesToSave') }}</span>
-            </q-banner>
-            <q-form @submit="onSubmit" @reset="onReset" class="q-gutter-md">
-                <div class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <q-input
-                            filled
-                            v-model="deliveryMan.minCost"
-                            :label="t('route.deliveryMan.basicData.minCost')"
-                            :rules="[(val) => val > 0]"
-                            lazy-rules
-                        />
-                    </div>
-                    <div class="col">
-                        <q-input
-                            filled
-                            v-model="deliveryMan.minM3"
-                            :label="t('route.deliveryMan.basicData.minM3')"
-                            :rules="[(val) => val > 0]"
-                            lazy-rules
-                        />
-                    </div>
-                </div>
-                <div class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <q-select
-                            v-model="deliveryMan.supplierFk"
-                            :options="suppliers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            :label="t('route.deliveryMan.basicData.supplier')"
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        >
-                        </q-select>
-                    </div>
-                    <div class="col">
-                        <q-select
-                            v-model="deliveryMan.agencyModeFk"
-                            :options="agencyModes"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            :label="t('route.deliveryMan.basicData.agency')"
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        >
-                        </q-select>
-                    </div>
-                </div>
-                <div class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <q-btn label="Submit" type="submit" color="primary" />
-                        <q-btn label="Reset" type="reset" color="primary" flat class="q-ml-sm" />
-                    </div>
-                </div>
-            </q-form>
-        </q-card>
-    </div>
-</template>
-
-<style lang="scss" scoped>
-.q-card {
-    width: 800px;
-}
-
-.container {
-    display: flex;
-    justify-content: center;
-}
-</style>
diff --git a/src/pages/Route/DeliveryManList.vue b/src/pages/Route/DeliveryManList.vue
deleted file mode 100644
index 058be1e80..000000000
--- a/src/pages/Route/DeliveryManList.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<script setup>
-import Paginate from 'components/Paginate.vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-const { t } = useI18n();
-const router = useRouter();
-
-const filter = {
-    include: [
-        {
-            relation: 'deliveryManAgency',
-            scope: {
-                include: {
-                    relation: 'agencyMode',
-                },
-            },
-        },
-        {
-            relation: 'supplier',
-        },
-    ],
-};
-
-function navigateCard(id) {
-    router.push({ path: `/route/${id}` });
-}
-
-function navigateCreate() {
-    router.push({ path: `/route/deliveryMan/create` });
-}
-</script>
-
-<template>
-    <q-page class="q-pa-md">
-        <paginate url="DeliveryMans" :filter="filter" sort-by="id DESC" auto-load>
-            <template #body="{ rows }">
-                <q-card class="card" v-for="row of rows" :key="row.id">
-                    <q-item class="q-pa-none items-start cursor-pointer q-hoverable" v-ripple clickable>
-                        <q-item-section class="q-pa-md" @click="navigateCard(row.id)">
-                            <div class="text-h6 link">{{ t('route.deliveryMan.list.deliveryMan') }}</div>
-                            <q-item-label caption>#{{ row.id }}</q-item-label>
-                            <q-list>
-                                <q-item class="q-pa-none">
-                                    <q-item-section>
-                                        <q-item-label caption>{{ t('route.deliveryMan.list.supplier') }}</q-item-label>
-                                        <q-item-label>{{ row.supplier.name }}</q-item-label>
-                                    </q-item-section>
-                                    <q-item-section>
-                                        <q-item-label caption>{{ t('route.deliveryMan.list.minCost') }}</q-item-label>
-                                        <q-item-label>{{ row.minCost }}</q-item-label>
-                                    </q-item-section>
-                                </q-item>
-                                <q-item class="q-pa-none">
-                                    <q-item-section>
-                                        <q-item-label caption>{{ t('route.deliveryMan.list.minM3') }}</q-item-label>
-                                        <q-item-label>{{ row.minM3 }}</q-item-label>
-                                    </q-item-section>
-                                    <q-item-section>
-                                        <q-item-label caption>{{ t('route.deliveryMan.list.agency') }}</q-item-label>
-                                        <q-item-label v-if="row.deliveryManAgency">{{
-                                            row.deliveryManAgency.agencyMode.name
-                                        }}</q-item-label>
-                                    </q-item-section>
-                                </q-item>
-                            </q-list>
-                        </q-item-section>
-                        <q-separator vertical />
-                        <q-card-actions vertical>
-                            <q-btn flat round color="orange" icon="arrow_circle_right" @click="navigateCard(row.id)">
-                                <q-tooltip>{{ t('components.smartCard.openCard') }}</q-tooltip>
-                            </q-btn>
-                        </q-card-actions>
-                    </q-item>
-                </q-card>
-            </template>
-        </paginate>
-        <q-page-sticky position="bottom-right" :offset="[18, 18]" @click="navigateCreate()"
-            ><q-tooltip>{{ t('route.pageTitles.deliveryManCreate') }}</q-tooltip>
-            <q-fab icon="person_add" direction="up" color="orange"> </q-fab>
-        </q-page-sticky>
-    </q-page>
-</template>
diff --git a/src/pages/Route/InvoiceAllocation.vue b/src/pages/Route/InvoiceAllocation.vue
deleted file mode 100644
index fbe0be4d0..000000000
--- a/src/pages/Route/InvoiceAllocation.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<script setup>
-import axios from 'axios';
-import { reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
-
-const { t } = useI18n();
-
-const deliveryMan = reactive({
-    supplierFk: null,
-    agencyModeFk: null,
-    minCost: null,
-    minM3: null,
-});
-
-const suppliers = ref([]);
-const agencyModes = ref([]);
-
-function setSuppliers(data) {
-    suppliers.value = data;
-}
-
-function setAgencyModes(data) {
-    agencyModes.value = data;
-}
-
-async function onSubmit() {
-    try {
-        const newDeliveryMan = await axios.post('DeliveryMans', {
-            supplierFk: deliveryMan.supplierFk,
-            minCost: deliveryMan.minCost,
-            minM3: deliveryMan.minM3,
-        });
-
-        if (deliveryMan.agencyModeFk) {
-            await axios.post(`DeliveryManAgencys/${newDeliveryMan.id}`, {
-                agencyModeFk: deliveryMan.agencyMode,
-            });
-        }
-    } catch (e) {
-        console.error(e);
-    }
-}
-</script>
-
-<template>
-    <fetch-data url="Suppliers" @on-fetch="setSuppliers" auto-load />
-    <fetch-data url="AgencyModes" @on-fetch="setAgencyModes" auto-load />
-    <div class="container">
-        <q-card class="q-pa-md">
-            <q-banner v-if="hasChanges" class="text-white bg-warning">
-                <q-icon name="warning" size="md" class="q-mr-md" />
-                <span>{{ t('globals.changesToSave') }}</span>
-            </q-banner>
-            <q-form @submit="onSubmit" @reset="onReset" class="q-gutter-md">
-                <div class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <q-input
-                            filled
-                            v-model="deliveryMan.minCost"
-                            :label="t('route.deliveryMan.basicData.minCost')"
-                            :rules="[(val) => val > 0]"
-                            lazy-rules
-                        />
-                    </div>
-                    <div class="col">
-                        <q-input
-                            filled
-                            v-model="deliveryMan.minM3"
-                            :label="t('route.deliveryMan.basicData.minM3')"
-                            :rules="[(val) => val > 0]"
-                            lazy-rules
-                        />
-                    </div>
-                </div>
-                <div class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <q-select
-                            v-model="deliveryMan.supplierFk"
-                            :options="suppliers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            :label="t('route.deliveryMan.basicData.supplier')"
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        >
-                        </q-select>
-                    </div>
-                    <div class="col">
-                        <q-select
-                            v-model="deliveryMan.agencyModeFk"
-                            :options="agencyModes"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            :label="t('route.deliveryMan.basicData.agency')"
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        >
-                        </q-select>
-                    </div>
-                </div>
-                <div class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <q-btn label="Submit" type="submit" color="primary" />
-                        <q-btn label="Reset" type="reset" color="primary" flat class="q-ml-sm" />
-                    </div>
-                </div>
-            </q-form>
-        </q-card>
-    </div>
-</template>
-
-<style lang="scss" scoped>
-.q-card {
-    width: 800px;
-}
-
-.container {
-    display: flex;
-    justify-content: center;
-}
-</style>
diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index a6c2f7d4d..19b6a1b3d 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -3,7 +3,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModel from 'components/FormModel.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
@@ -22,7 +21,6 @@ const onSave = (data, response) => {
 };
 </script>
 <template>
-    <VnSubToolbar />
     <FetchData
         url="Suppliers"
         auto-load
diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 9e6ac82f4..8ff044d2d 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import FetchData from 'components/FetchData.vue';
 import { ref } from 'vue';
 import CrudModel from 'components/CrudModel.vue';
@@ -23,7 +22,6 @@ const updateDefaultStop = (data) => {
 };
 </script>
 <template>
-    <VnSubToolbar />
     <FetchData
         :url="`Roadmaps/${route.params?.id}`"
         auto-load

From 7e0ceca6231070a061e6586af7342de6f29b500d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 4 Jun 2024 17:38:04 +0200
Subject: [PATCH 16/32] feat: refs #6273 freelance form & vnRadio

---
 src/components/common/VnRadio.vue |  6 +++
 src/pages/Worker/WorkerCreate.vue | 79 ++++++++++++-------------------
 2 files changed, 36 insertions(+), 49 deletions(-)
 create mode 100644 src/components/common/VnRadio.vue

diff --git a/src/components/common/VnRadio.vue b/src/components/common/VnRadio.vue
new file mode 100644
index 000000000..4eeb9dbe9
--- /dev/null
+++ b/src/components/common/VnRadio.vue
@@ -0,0 +1,6 @@
+<script setup>
+const model = defineModel({ type: Boolean, required: true });
+</script>
+<template>
+    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
+</template>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 4147201e1..28ed9ee1c 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useUserConfig } from 'src/composables/useUserConfig';
 import VnRow from 'components/ui/VnRow.vue';
@@ -12,43 +12,18 @@ import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+import VnRadio from 'src/components/common/VnRadio.vue';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const { t } = useI18n();
-
-const newWorkerForm = ref({
-    companyFk: null,
-    payMethodFk: null,
-    firstName: null,
-    lastNames: null,
-    birth: null,
-    fi: null,
-    code: null,
-    phone: null,
-    postcode: null,
-    provinceFk: null,
-    city: null,
-    street: null,
-    name: null,
-    email: null,
-    bossFk: null,
-    iban: null,
-    bankEntityFk: null,
-});
+const state = useStateStore();
 
 const companiesOptions = ref([]);
 const workersOptions = ref([]);
 const payMethodsOptions = ref([]);
 const bankEntitiesOptions = ref([]);
 const postcodesOptions = ref([]);
-const isFreelancer = ref(false);
-
-const onFetchWorkerConfig = (workerConfig) => {
-    newWorkerForm.value.payMethodFk = workerConfig.payMethodFk;
-};
-
-const onBankEntityCreated = (data) => {
-    bankEntitiesOptions.value.push(data);
-};
+const formData = ref({ isFreelance: false });
 
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
@@ -58,15 +33,15 @@ function handleLocation(data, location) {
     data.countryFk = countryFk;
 }
 
-onMounted(async () => {
+onBeforeMount(async () => {
     const userInfo = await useUserConfig().fetch();
-    newWorkerForm.value = { companyFk: userInfo.companyFk };
+    formData.value.companyFk = userInfo.companyFk;
 });
 </script>
 <template>
     <FetchData
         url="WorkerConfigs/findOne"
-        @on-fetch="(data) => onFetchWorkerConfig(data)"
+        @on-fetch="(data) => (formData.payMethodFk = data.payMethodFk)"
         :filter="{ field: ['payMethodFk'] }"
         auto-load
     />
@@ -93,15 +68,21 @@ onMounted(async () => {
     <QPage>
         <VnSubToolbar>
             <template #st-data>
-                <QRadio v-model="isFreelancer" :val="false" :label="`${t('Internal')}`" />
-                <QRadio v-model="isFreelancer" :val="true" :label="`${t('External')}`" />
+                <VnRadio
+                    v-model="formData.isFreelance"
+                    :val="false"
+                    :label="`${t('Internal')}`"
+                    @update:model-value="state.set('worker', formData)"
+                />
+                <VnRadio
+                    v-model="formData.isFreelance"
+                    :val="true"
+                    :label="`${t('External')}`"
+                    @update:model-value="state.set('worker', formData)"
+                />
             </template>
         </VnSubToolbar>
-        <FormModel
-            url-create="Workers/new"
-            model="worker"
-            :form-initial-data="newWorkerForm"
-        >
+        <FormModel url-create="Workers/new" model="worker" :form-initial-data="formData">
             <template #form="{ data, validate }">
                 <VnRow>
                     <VnInput
@@ -169,19 +150,19 @@ onMounted(async () => {
                         v-model="data.fi"
                         :label="t('worker.create.fi')"
                         :rules="validate('Worker.fi')"
-                        :disable="isFreelancer"
+                        :disable="formData.isFreelance"
                     />
                     <VnInputDate
                         v-model="data.birth"
                         :label="t('worker.create.birth')"
                         :rules="validate('Worker.birth')"
-                        :disable="isFreelancer"
+                        :disable="formData.isFreelance"
                     />
                     <VnInput
                         v-model="data.phone"
                         :label="t('worker.create.phone')"
                         :rules="validate('Worker.phone')"
-                        :disable="isFreelancer"
+                        :disable="formData.isFreelance"
                     />
                 </VnRow>
                 <VnRow>
@@ -191,7 +172,7 @@ onMounted(async () => {
                         :options="postcodesOptions"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
-                        :disable="isFreelancer"
+                        :disable="formData.isFreelance"
                     >
                     </VnLocation>
                 </VnRow>
@@ -200,7 +181,7 @@ onMounted(async () => {
                         :label="t('worker.create.street')"
                         v-model="data.street"
                         :rules="validate('Worker.street')"
-                        :disable="isFreelancer"
+                        :disable="formData.isFreelance"
                     />
                 </VnRow>
                 <VnRow>
@@ -213,13 +194,13 @@ onMounted(async () => {
                         map-options
                         hide-selected
                         :rules="validate('Worker.payMethodFk')"
-                        :disable="isFreelancer"
+                        :disable="formData.isFreelance"
                     />
                     <VnInput
                         v-model="data.iban"
                         :label="t('worker.create.iban')"
                         :rules="validate('Worker.iban')"
-                        :disable="isFreelancer"
+                        :disable="formData.isFreelance"
                     >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
@@ -236,11 +217,11 @@ onMounted(async () => {
                         hide-selected
                         :roles-allowed-to-create="['salesAssistant', 'hr']"
                         :rules="validate('Worker.bankEntity')"
-                        :disable="isFreelancer"
+                        :disable="formData.isFreelance"
                     >
                         <template #form>
                             <CreateBankEntityForm
-                                @on-data-saved="onBankEntityCreated($event)"
+                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
                             />
                         </template>
                         <template #option="scope">

From 382591fb11dc7ce5c566f8eb500f15e6a0dca942 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 5 Jun 2024 17:13:52 +0200
Subject: [PATCH 17/32] fix: refs #6273 set paymethodFk to 0 if it is external

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

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 28ed9ee1c..6a52bc64d 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -13,10 +13,8 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import VnRadio from 'src/components/common/VnRadio.vue';
-import { useStateStore } from 'src/stores/useStateStore';
 
 const { t } = useI18n();
-const state = useStateStore();
 
 const companiesOptions = ref([]);
 const workersOptions = ref([]);
@@ -72,13 +70,12 @@ onBeforeMount(async () => {
                     v-model="formData.isFreelance"
                     :val="false"
                     :label="`${t('Internal')}`"
-                    @update:model-value="state.set('worker', formData)"
                 />
                 <VnRadio
                     v-model="formData.isFreelance"
                     :val="true"
                     :label="`${t('External')}`"
-                    @update:model-value="state.set('worker', formData)"
+                    @update:model-value="formData.payMethodFk = 0"
                 />
             </template>
         </VnSubToolbar>
@@ -150,7 +147,6 @@ onBeforeMount(async () => {
                         v-model="data.fi"
                         :label="t('worker.create.fi')"
                         :rules="validate('Worker.fi')"
-                        :disable="formData.isFreelance"
                     />
                     <VnInputDate
                         v-model="data.birth"

From 56af348fdd899fa804feefa791da8acb1ba9dbbd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 5 Jun 2024 17:29:40 +0200
Subject: [PATCH 18/32] feat: refs #6273  update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 250aa01a2..f1f911d62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
+-   (Worker) => Se añade la opción de crear un trabajador ajeno a la empresa
 
 ## [2418.01]
 

From 213ba4ba520a4eef6b91023452001fc2430175a4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 7 Jun 2024 12:24:48 +0200
Subject: [PATCH 19/32] chore: refs #6273 Add default pay method for internal

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

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 6a52bc64d..4167d7f5d 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import axios from 'axios';
 import { useUserConfig } from 'src/composables/useUserConfig';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -22,6 +23,7 @@ const payMethodsOptions = ref([]);
 const bankEntitiesOptions = ref([]);
 const postcodesOptions = ref([]);
 const formData = ref({ isFreelance: false });
+const defaultPayMethod = ref(0);
 
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
@@ -34,15 +36,15 @@ function handleLocation(data, location) {
 onBeforeMount(async () => {
     const userInfo = await useUserConfig().fetch();
     formData.value.companyFk = userInfo.companyFk;
+
+    const { data } = await axios.get('WorkerConfigs/findOne', {
+        params: { field: ['payMethodFk'] },
+    });
+    defaultPayMethod.value = data.payMethodFk;
+    formData.value.payMethodFk = defaultPayMethod.value;
 });
 </script>
 <template>
-    <FetchData
-        url="WorkerConfigs/findOne"
-        @on-fetch="(data) => (formData.payMethodFk = data.payMethodFk)"
-        :filter="{ field: ['payMethodFk'] }"
-        auto-load
-    />
     <FetchData
         url="Companies"
         @on-fetch="(data) => (companiesOptions = data)"
@@ -70,6 +72,7 @@ onBeforeMount(async () => {
                     v-model="formData.isFreelance"
                     :val="false"
                     :label="`${t('Internal')}`"
+                    @update:model-value="formData.payMethodFk = defaultPayMethod"
                 />
                 <VnRadio
                     v-model="formData.isFreelance"

From 290325b677823b89acf94ed19eff0ba9a06b8415 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 7 Jun 2024 12:45:22 +0200
Subject: [PATCH 20/32] refactor: refs #7003 changed order filter

---
 src/pages/Item/ItemFixedPrice.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index de85d2eae..b42aa2173 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -55,7 +55,7 @@ const params = reactive({});
 const arrayData = useArrayData('ItemFixedPrices', {
     url: 'FixedPrices/filter',
     userParams: params,
-    order: ['name ASC'],
+    order: ['name ASC', 'itemFk ASC'],
     exprBuilder: exprBuilder,
 });
 const store = arrayData.store;

From d6bd3de97191d10cd750e69ca21a4aca7b2c328f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 7 Jun 2024 12:47:18 +0200
Subject: [PATCH 21/32] refactor: refs #7003 fixed order param

---
 src/pages/Item/ItemFixedPrice.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index b42aa2173..0348c21bc 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -55,7 +55,7 @@ const params = reactive({});
 const arrayData = useArrayData('ItemFixedPrices', {
     url: 'FixedPrices/filter',
     userParams: params,
-    order: ['name ASC', 'itemFk ASC'],
+    order: ['name ASC', 'itemFk'],
     exprBuilder: exprBuilder,
 });
 const store = arrayData.store;

From 8d89fc2d90caadb0835bd11791d57793f910b29e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 7 Jun 2024 14:08:18 +0200
Subject: [PATCH 22/32] feat: refs #6273 set payMethod to 0

---
 src/pages/Worker/WorkerCreate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 4167d7f5d..0d0b7622c 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -194,6 +194,7 @@ onBeforeMount(async () => {
                         hide-selected
                         :rules="validate('Worker.payMethodFk')"
                         :disable="formData.isFreelance"
+                        @update:model-value="(val) => (formData.payMethodFk = val ?? 0)"
                     />
                     <VnInput
                         v-model="data.iban"

From 59b85f24ea15fc9dd03477081000a2cdbd67a512 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 7 Jun 2024 14:19:10 +0200
Subject: [PATCH 23/32] fix: refs #6273 console error

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

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index c0d129613..8c86c056a 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -18,7 +18,7 @@ onMounted(() => {
     const observer = new MutationObserver(
         () =>
             (hasContent.value =
-                actions.value.childNodes.length + data.value.childNodes.length)
+                actions.value?.childNodes?.length + data.value?.childNodes?.length)
     );
     if (actions.value) observer.observe(actions.value, opts);
     if (data.value) observer.observe(data.value, opts);

From d81ce9fe95de802e373303af48d6113ff36ad151 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 10 Jun 2024 13:54:02 +0200
Subject: [PATCH 24/32] feat: refs #6273 add test & improve form

---
 src/pages/Worker/WorkerCreate.vue             |  9 ++-
 .../integration/worker/workerCreate.spec.js   | 59 +++++++++++++++++++
 test/cypress/support/commands.js              | 38 +++++++++++-
 3 files changed, 102 insertions(+), 4 deletions(-)
 create mode 100644 test/cypress/integration/worker/workerCreate.spec.js

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 0d0b7622c..725c4d316 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -82,7 +82,12 @@ onBeforeMount(async () => {
                 />
             </template>
         </VnSubToolbar>
-        <FormModel url-create="Workers/new" model="worker" :form-initial-data="formData">
+        <FormModel
+            url-create="Workers/new"
+            model="worker"
+            :form-initial-data="formData"
+            @on-data-saved="({ id }) => $router.push({ path: `/worker/${id}` })"
+        >
             <template #form="{ data, validate }">
                 <VnRow>
                     <VnInput
@@ -194,7 +199,7 @@ onBeforeMount(async () => {
                         hide-selected
                         :rules="validate('Worker.payMethodFk')"
                         :disable="formData.isFreelance"
-                        @update:model-value="(val) => (formData.payMethodFk = val ?? 0)"
+                        @update:model-value="(val) => !val && delete formData.payMethodFk"
                     />
                     <VnInput
                         v-model="data.iban"
diff --git a/test/cypress/integration/worker/workerCreate.spec.js b/test/cypress/integration/worker/workerCreate.spec.js
new file mode 100644
index 000000000..6ace6a7f3
--- /dev/null
+++ b/test/cypress/integration/worker/workerCreate.spec.js
@@ -0,0 +1,59 @@
+describe('WorkerCreate', () => {
+    const externalRadio = '.q-toolbar .q-radio:nth-child(2)';
+    const notification = '.q-notification__message';
+    const developerBossId = 120;
+
+    const internal = {
+        Fi: { val: '78457139E' },
+        'Web user': { val: 'defaulterworker' },
+        Name: { val: 'DEFAULT' },
+        'Last name': { val: 'WORKER' },
+        'Personal email': { val: 'defaultWorker@mydomain.com' },
+        Street: { val: 'S/ DEFAULTWORKERSTREET' },
+        Location: { val: 1, type: 'select' },
+        Phone: { val: '123456789' },
+        'Worker code': { val: 'DWW' },
+        Boss: { val: developerBossId, type: 'select' },
+        Birth: { val: '2022-12-11T23:00:00.000Z', type: 'date', day: 11 },
+    };
+    const external = {
+        Fi: { val: 'Z4531219V' },
+        'Web user': { val: 'pepe' },
+        Name: { val: 'PEPE' },
+        'Last name': { val: 'GARCIA' },
+        'Personal email': { val: 'pepe@gmail.com' },
+        'Worker code': { val: 'PG' },
+        Boss: { val: developerBossId, type: 'select' },
+    };
+
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('hr');
+        cy.visit('/#/worker/create');
+    });
+
+    it('should throw an error if a pay method has not been selected', () => {
+        cy.fillInForm(internal);
+        cy.saveCard();
+        cy.get(notification).should(
+            'contains.text',
+            'That payment method requires an IBAN'
+        );
+    });
+
+    it('should create an internal', () => {
+        cy.fillInForm({
+            ...internal,
+            'Pay method': { val: 'PayMethod one', type: 'select' },
+        });
+        cy.saveCard();
+        cy.get(notification).should('contains.text', 'Data created');
+    });
+
+    it('should create an external', () => {
+        cy.get(externalRadio).click();
+        cy.fillInForm(external);
+        cy.saveCard();
+        cy.get(notification).should('contains.text', 'Data created');
+    });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index a237622e6..055cb8021 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -86,6 +86,36 @@ Cypress.Commands.add('selectOption', (selector, option) => {
     cy.get('.q-menu .q-item').contains(option).click();
 });
 
+Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
+    const days = '.q-date__calendar-days .q-date__calendar-item--in';
+    cy.waitForElement('.q-form > .q-card');
+    cy.get(`${form} input`).each(([el]) => {
+        cy.wrap(el)
+            .invoke('attr', 'aria-label')
+            .then((ariaLabel) => {
+                const field = obj[ariaLabel];
+                if (!field) return;
+
+                const { type, val, day } = field;
+                switch (type) {
+                    case 'select':
+                        cy.wrap(el).type(val);
+                        cy.get('.q-menu .q-item').contains(val).click();
+                        break;
+                    case 'date':
+                        cy.wrap(el).click();
+                        cy.get(days)
+                            .eq(day ? day - 1 : 0)
+                            .click();
+                        break;
+                    default:
+                        cy.wrap(el).type(val);
+                        break;
+                }
+            });
+    });
+});
+
 Cypress.Commands.add('checkOption', (selector) => {
     cy.get(selector).find('.q-checkbox__inner').click();
 });
@@ -198,11 +228,15 @@ Cypress.Commands.add('closeSideMenu', (element) => {
 
 Cypress.Commands.add('clearSearchbar', (element) => {
     if (element) cy.waitForElement(element);
-    cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').clear();
+    cy.get(
+        '#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input'
+    ).clear();
 });
 
 Cypress.Commands.add('writeSearchbar', (value) => {
-    cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').type(value);
+    cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').type(
+        value
+    );
 });
 Cypress.Commands.add('validateContent', (selector, expectedValue) => {
     cy.get(selector).should('have.text', expectedValue);

From 5e96ed3bd3497f47d68a345a60308360cb290ba0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 10 Jun 2024 14:03:57 +0200
Subject: [PATCH 25/32] fix: refs #6273 fix arrayData changed

---
 src/pages/InvoiceIn/Card/InvoiceInBasicData.vue  | 3 ++-
 src/pages/InvoiceIn/Card/InvoiceInCorrective.vue | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 6 +++---
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue  | 3 ++-
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue    | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 8dfb96eba..ede9af825 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -19,7 +19,8 @@ const { t } = useI18n();
 const dms = ref({});
 const route = useRoute();
 const editDownloadDisabled = ref(false);
-const invoiceIn = computed(() => useArrayData().store.data);
+const arrayData = useArrayData();
+const invoiceIn = computed(() => arrayData.store.data);
 const userConfig = ref(null);
 const invoiceId = computed(() => +route.params.id);
 
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
index dc62440c8..7735747f9 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
@@ -12,7 +12,7 @@ const { push, currentRoute } = useRouter();
 const { t } = useI18n();
 
 const invoiceId = +currentRoute.value.params.id;
-const arrayData = useArrayData(currentRoute.value.meta.moduleName);
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const invoiceInCorrectionRef = ref();
 const filter = {
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index c435bf368..68dc5be4b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -27,9 +27,9 @@ const quasar = useQuasar();
 const { hasAny } = useRole();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
-const { store } = useArrayData(currentRoute.value.meta.moduleName);
+const arrayData = useArrayData();
 
-const invoiceIn = computed(() => store.data);
+const invoiceIn = computed(() => arrayData.store.data);
 const cardDescriptorRef = ref();
 const correctionDialogRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
@@ -184,7 +184,7 @@ async function toUnbook() {
         : t('isNotLinked', { bookEntry });
 
     quasar.notify({ type, message });
-    if (!isLinked) store.data.isBooked = false;
+    if (!isLinked) arrayData.store.data.isBooked = false;
 }
 
 async function deleteInvoice() {
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 67c197636..a7b9110f5 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -11,7 +11,8 @@ import { useArrayData } from 'src/composables/useArrayData';
 const { t } = useI18n();
 
 const route = useRoute();
-const currency = computed(() => useArrayData().store.data?.currency?.code);
+const arrayData = useArrayData();
+const currency = computed(() => arrayData.store.data?.currency?.code);
 const invoceInIntrastat = ref([]);
 const rowsSelected = ref([]);
 const countries = ref([]);
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index b7f8adf50..428e7a7a1 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -14,9 +14,10 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 const props = defineProps({ id: { type: [Number, String], default: 0 } });
 const { t } = useI18n();
 const route = useRoute();
+const arrayData = useArrayData();
 
 const entityId = computed(() => props.id || +route.params.id);
-const invoiceIn = computed(() => useArrayData().store.data);
+const invoiceIn = computed(() => arrayData.store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
 const invoiceInUrl = ref();
 const amountsNotMatch = ref(null);

From 5869ad220c41be8e6016db5e244764edd5a4a045 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 10 Jun 2024 14:17:22 +0200
Subject: [PATCH 26/32] feat: refs #6273 wip: add locale

---
 src/pages/Entry/Card/EntryDescriptor.vue | 8 +++-----
 src/pages/Entry/locale/en.yml            | 2 ++
 src/pages/Entry/locale/es.yml            | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 656f8d5fd..807ccdae4 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -34,7 +34,7 @@ const entryFilter = {
         {
             relation: 'travel',
             scope: {
-                fields: ['id', 'landed', 'agencyModeFk', 'warehouseOutFk'],
+                fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'],
                 include: [
                     {
                         relation: 'agency',
@@ -125,10 +125,8 @@ watch;
                 :label="t('entry.descriptor.agency')"
                 :value="entity.travel?.agency?.name"
             />
-            <VnLv
-                :label="t('entry.descriptor.landed')"
-                :value="toDate(entity.travel?.landed)"
-            />
+            <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
+            <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
                 :label="t('entry.descriptor.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 1956140ed..9a476c80c 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -6,3 +6,5 @@ entryFilter:
     filter:
         search: General search
         reference: Reference
+landed: Landed
+shipped: Shipped
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 5d317a24a..fba6c5460 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -8,3 +8,6 @@ entryFilter:
     filter:
         search: Búsqueda general
         reference: Referencia
+
+landed: F. llegada
+shipped: F. salida

From 9c72597c2c855113b44adfe5173e960b1b57e688 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 10 Jun 2024 14:42:41 +0200
Subject: [PATCH 27/32] fix: refs #6273 tests

---
 test/cypress/integration/worker/workerCreate.spec.js | 8 ++++----
 test/cypress/integration/worker/workerList.spec.js   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/cypress/integration/worker/workerCreate.spec.js b/test/cypress/integration/worker/workerCreate.spec.js
index 6ace6a7f3..26ce899c8 100644
--- a/test/cypress/integration/worker/workerCreate.spec.js
+++ b/test/cypress/integration/worker/workerCreate.spec.js
@@ -5,10 +5,10 @@ describe('WorkerCreate', () => {
 
     const internal = {
         Fi: { val: '78457139E' },
-        'Web user': { val: 'defaulterworker' },
-        Name: { val: 'DEFAULT' },
-        'Last name': { val: 'WORKER' },
-        'Personal email': { val: 'defaultWorker@mydomain.com' },
+        'Web user': { val: 'manolo' },
+        Name: { val: 'Manolo' },
+        'Last name': { val: 'Hurtado' },
+        'Personal email': { val: 'manolo@mydomain.com' },
         Street: { val: 'S/ DEFAULTWORKERSTREET' },
         Location: { val: 1, type: 'select' },
         Phone: { val: '123456789' },
diff --git a/test/cypress/integration/worker/workerList.spec.js b/test/cypress/integration/worker/workerList.spec.js
index 1e9292626..9808fd157 100644
--- a/test/cypress/integration/worker/workerList.spec.js
+++ b/test/cypress/integration/worker/workerList.spec.js
@@ -8,13 +8,13 @@ describe('WorkerList', () => {
     });
 
     it('should load workers', () => {
-        cy.get(workerFieldNames).eq(0).should('have.text', 'jessicajones');
-        cy.get(workerFieldNames).eq(1).should('have.text', 'brucebanner');
-        cy.get(workerFieldNames).eq(2).should('have.text', 'charlesxavier');
+        cy.get(workerFieldNames).eq(2).should('have.text', 'jessicajones');
+        cy.get(workerFieldNames).eq(3).should('have.text', 'brucebanner');
+        cy.get(workerFieldNames).eq(4).should('have.text', 'charlesxavier');
     });
 
     it('should open the worker summary', () => {
-        cy.openListSummary(0);
+        cy.openListSummary(2);
         cy.get('.summaryHeader div').should('have.text', '1110 - Jessica Jones');
         cy.get('.summary .header-link')
             .eq(0)

From a64cd6fa73bac43b379433bcb5a5332796203470 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 10 Jun 2024 15:21:28 +0200
Subject: [PATCH 28/32] refactor: refs #6273 update locale

---
 src/pages/Entry/Card/EntrySummary.vue | 10 ++--------
 src/pages/Entry/EntryList.vue         |  5 +----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 5c56146b9..d47c0f69c 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -221,10 +221,7 @@ const fetchEntryBuys = async () => {
                     :value="entry.travel.agency.name"
                 />
 
-                <VnLv
-                    :label="t('entry.summary.travelShipped')"
-                    :value="toDate(entry.travel.shipped)"
-                />
+                <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
 
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
@@ -236,10 +233,7 @@ const fetchEntryBuys = async () => {
                     v-model="entry.travel.isDelivered"
                     :disable="true"
                 />
-                <VnLv
-                    :label="t('entry.summary.travelLanded')"
-                    :value="toDate(entry.travel.landed)"
-                />
+                <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
 
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 805b49190..e5d37900c 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -78,10 +78,7 @@ onMounted(async () => {
                             </QIcon>
                         </template>
                         <template #list-items>
-                            <VnLv
-                                :label="t('entry.list.landed')"
-                                :value="toDate(row.landed)"
-                            />
+                            <VnLv :label="t('landed')" :value="toDate(row.landed)" />
                             <VnLv
                                 :label="t('entry.list.booked')"
                                 :value="!!row.isBooked"

From a5b71ecebc9e7bb1a4b6717235535d714f5d45d7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 10 Jun 2024 15:32:38 +0200
Subject: [PATCH 29/32] feat: refs #6273 delete prop

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

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 725c4d316..ebde15b72 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -78,7 +78,7 @@ onBeforeMount(async () => {
                     v-model="formData.isFreelance"
                     :val="true"
                     :label="`${t('External')}`"
-                    @update:model-value="formData.payMethodFk = 0"
+                    @update:model-value="delete formData.payMethodFk"
                 />
             </template>
         </VnSubToolbar>

From c1df20a09b3fcdcecc3325ca0464f143b1e0fa26 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 10 Jun 2024 11:21:23 -0300
Subject: [PATCH 30/32] Worker descriptor menu

---
 src/components/common/VnInput.vue             |  9 ++
 .../Worker/Card/WorkerChangePasswordForm.vue  | 99 +++++++++++++++++++
 src/pages/Worker/Card/WorkerDescriptor.vue    | 68 +++++++++++++
 src/pages/Worker/locale/en.yml                |  1 +
 src/pages/Worker/locale/es.yml                |  1 +
 5 files changed, 178 insertions(+)
 create mode 100644 src/pages/Worker/Card/WorkerChangePasswordForm.vue
 create mode 100644 src/pages/Worker/locale/en.yml

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 6144f975d..c84a55122 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -13,6 +13,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    info: {
+        type: String,
+        default: '',
+    },
 });
 
 const { t } = useI18n();
@@ -83,6 +87,11 @@ const inputRules = [
                     v-if="hover && value && !$attrs.disabled"
                     @click="value = null"
                 ></QIcon>
+                <QIcon v-if="info" name="info">
+                    <QTooltip max-width="350px">
+                        {{ info }}
+                    </QTooltip>
+                </QIcon>
             </template>
         </QInput>
     </div>
diff --git a/src/pages/Worker/Card/WorkerChangePasswordForm.vue b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
new file mode 100644
index 000000000..ef75ba55a
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
@@ -0,0 +1,99 @@
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'src/components/FormPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const emit = defineEmits(['onSubmit']);
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const formData = reactive({
+    newPassword: null,
+    repeatPassword: null,
+});
+
+const passRequirements = ref([]);
+
+const setPassword = async () => {
+    try {
+        if (!formData.newPassword) {
+            notify(t('You must enter a new password'), 'negative');
+            return;
+        }
+
+        if (formData.newPassword != formData.repeatPassword) {
+            notify(t(`Passwords don't match`), 'negative');
+            return;
+        }
+
+        await axios.patch(`Workers/${$props.id}/setPassword`, {
+            newPass: formData.newPassword,
+        });
+        notify(t('Password changed!'), 'positive');
+        emit('onSubmit');
+    } catch (err) {
+        console.error('Error setting password', err);
+    }
+};
+
+const getPassRequirements = async () => {
+    const { data } = await axios.get('UserPasswords/findOne');
+    passRequirements.value = data;
+};
+
+onMounted(async () => await getPassRequirements());
+</script>
+
+<template>
+    <FormPopup :title="t('Reset password')" @on-submit="setPassword()">
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    :label="t('New password')"
+                    v-model="formData.newPassword"
+                    type="password"
+                    :required="true"
+                    :info="
+                        t('passwordRequirements', {
+                            length: passRequirements.length,
+                            nAlpha: passRequirements.nAlpha,
+                            nUpper: passRequirements.nUpper,
+                            nDigits: passRequirements.nDigits,
+                            nPunct: passRequirements.nPunct,
+                        })
+                    "
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    :label="t('Repeat password')"
+                    v-model="formData.repeatPassword"
+                    type="password"
+                />
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>
+
+<i18n>
+es:
+    Reset password: Restablecer contraseña
+    New password: Nueva contraseña
+    Repeat password: Repetir contraseña
+    You must enter a new password: Debes introducir la nueva contraseña
+    Passwords don't match: Las contraseñas no coinciden
+</i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index daa290ea1..86c846aca 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -6,8 +6,10 @@ import { useSession } from 'src/composables/useSession';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
+import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import { useState } from 'src/composables/useState';
+import axios from 'axios';
 
 const $props = defineProps({
     id: {
@@ -25,12 +27,16 @@ const route = useRoute();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const state = useState();
+const user = state.getUser();
+const changePasswordFormDialog = ref(null);
+const cardDescriptorRef = ref(null);
 
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
 const worker = ref();
+const workerExcluded = ref(false);
 const filter = {
     include: [
         {
@@ -71,14 +77,44 @@ function getWorkerAvatar() {
     const token = getTokenMultimedia();
     return `/api/Images/user/160x160/${entityId.value}/download?access_token=${token}`;
 }
+
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
     data.value = useCardDescription(entity.user.nickname, entity.id);
 };
+
+const openChangePasswordForm = () => changePasswordFormDialog.value.show();
+
+const getIsExcluded = async () => {
+    try {
+        const { data } = await axios.get(
+            `WorkerDisableExcludeds/${entityId.value}/exists`
+        );
+        if (!data) return;
+        workerExcluded.value = data.exists;
+    } catch (err) {
+        console.error('Error getting worker excluded: ', err);
+    }
+};
+
+const handleExcluded = async () => {
+    if (workerExcluded.value)
+        await axios.delete(`WorkerDisableExcludeds/${entityId.value}`);
+    else
+        await axios.post(`WorkerDisableExcludeds`, {
+            workerFk: entityId.value,
+            dated: new Date(),
+        });
+
+    workerExcluded.value = !workerExcluded.value;
+};
+
+const refetch = async () => await cardDescriptorRef.value.getData();
 </script>
 <template>
     <CardDescriptor
+        ref="cardDescriptorRef"
         module="Worker"
         data-key="workerData"
         :url="`Workers/${entityId}`"
@@ -90,9 +126,34 @@ const setData = (entity) => {
             (data) => {
                 worker = data;
                 setData(data);
+                getIsExcluded();
             }
         "
     >
+        <template #menu="{}">
+            <QItem v-ripple clickable @click="handleExcluded()">
+                <QItemSection>
+                    {{
+                        workerExcluded
+                            ? t('Click to allow the user to be disabled')
+                            : t('Click to exclude the user from getting disabled')
+                    }}
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="!worker.user.emailVerified && user.id != worker.id"
+                v-ripple
+                clickable
+                @click="openChangePasswordForm()"
+            >
+                <QItemSection>
+                    {{ t('Change password') }}
+                    <QDialog ref="changePasswordFormDialog">
+                        <WorkerChangePasswordForm @on-submit="refetch()" :id="entityId" />
+                    </QDialog>
+                </QItemSection>
+            </QItem>
+        </template>
         <template #before>
             <QImg :src="getWorkerAvatar()" class="photo">
                 <template #error>
@@ -139,3 +200,10 @@ const setData = (entity) => {
     height: 256px;
 }
 </style>
+
+<i18n>
+es:
+    Click to allow the user to be disabled: Marcar para deshabilitar
+    Click to exclude the user from getting disabled: Marcar para no deshabilitar
+    Change password: Cambiar contraseña
+</i18n>
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
new file mode 100644
index 000000000..f947b30e7
--- /dev/null
+++ b/src/pages/Worker/locale/en.yml
@@ -0,0 +1 @@
+passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index a960dffe6..646ee452e 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -1,3 +1,4 @@
 Search worker: Buscar trabajador
 You can search by worker id or name: Puedes buscar por id o nombre del trabajador
 Locker: Taquilla
+passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'

From 992249c63886be023111d7eeeeacc42c5aabda85 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 10 Jun 2024 17:06:28 +0200
Subject: [PATCH 31/32] fix: refs #6273 redirect

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

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index ebde15b72..5e81a3070 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -86,7 +86,7 @@ onBeforeMount(async () => {
             url-create="Workers/new"
             model="worker"
             :form-initial-data="formData"
-            @on-data-saved="({ id }) => $router.push({ path: `/worker/${id}` })"
+            @on-data-saved="(__, { id }) => $router.push({ path: `/worker/${id}` })"
         >
             <template #form="{ data, validate }">
                 <VnRow>

From d847b33def0b73d83f1fb8071452906eb0a35cc0 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 11 Jun 2024 08:03:35 +0200
Subject: [PATCH 32/32] minor change

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

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 0886383de..02f230c03 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -234,7 +234,7 @@ const showBalancePdf = (balance) => {
                 <template #body-cell-employee="{ row }">
                     <QTd auto-width @click.stop>
                         <QBtn color="blue" flat no-caps>{{ row.userName }}</QBtn>
-                        <WorkerDescriptorProxy :id="row.clientFk" />
+                        <WorkerDescriptorProxy :id="row.workerFk" />
                     </QTd>
                 </template>