From 4e8f524f49cc234e128af6c93af9297112c9310d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 9 May 2024 22:47:13 +0200
Subject: [PATCH 1/9] feat: add new list form with popup

---
 src/pages/Worker/Card/WorkerPda.vue | 264 ++++++++++++++++------------
 1 file changed, 155 insertions(+), 109 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 5e7c89326..c903cd6cc 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -1,140 +1,186 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { onMounted, ref, computed } from 'vue';
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import useNotify from 'src/composables/useNotify.js';
-import axios from 'axios';
+import { ref, computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+import FetchData from 'components/FetchData.vue';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
-const route = useRoute();
 const { t } = useI18n();
 const { notify } = useNotify();
-const { hasAny } = useRole();
 
-const fetchCurrentDeviceRef = ref(null);
-const deviceProductionsFilter = {
-    fields: ['id', 'serialNumber', 'modelFk'],
-    where: { stateFk: 'idle' },
-    order: 'id',
-};
-const deviceProductionsOptions = ref([]);
-const newPDA = ref({});
-const currentPDA = ref(null);
+const paginate = ref();
+const dialog = ref();
+const route = useRoute();
+const routeId = computed(() => route.params.id);
 
-const isAllowedToEdit = computed(() => hasAny(['hr', 'productionAssi']));
+const initialData = computed(() => {
+    return {
+        userFk: routeId.value,
+        deviceProductionFk: null,
+        simSerialNumber: null,
+    };
+});
 
-const setCurrentPDA = (data) => {
-    currentPDA.value = data;
-    currentPDA.value.description = `ID: ${currentPDA.value.deviceProductionFk} ${t(
-        'worker.pda.model'
-    )}: ${currentPDA.value.deviceProduction.modelFk} ${t('worker.pda.serialNumber')}: ${
-        currentPDA.value.deviceProduction.serialNumber
-    }`;
-};
-
-const deallocatePDA = async (data) => {
+const deallocatePDA = async (deviceProductionFk) => {
     try {
         await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
-            pda: currentPDA.value.deviceProductionFk,
+            pda: deviceProductionFk,
         });
-        data.pda = null;
-        currentPDA.value = null;
-        await fetchCurrentDeviceRef.value.fetch();
         notify(t('PDA deallocated'), 'positive');
     } catch (err) {
         console.error('Error deallocating PDA');
     }
+    paginate.value.fetch();
 };
-
-onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
 </script>
 
 <template>
-    <FetchData
-        url="DeviceProductions"
-        :filter="deviceProductionsFilter"
-        auto-load
-        @on-fetch="(data) => (deviceProductionsOptions = data)"
-    />
-    <FetchData
-        ref="fetchCurrentDeviceRef"
-        url="DeviceProductionUsers"
-        :filter="{
-            where: { userFk: route.params.id },
-            include: { relation: 'deviceProduction' },
-        }"
-        auto-load
-        @on-fetch="(data) => setCurrentPDA(data[0])"
-    />
-    <QPage class="column items-center q-pa-md">
-        <FormModel
-            url="DeviceProductionUsers"
-            :url-create="`Workers/${route.params.id}/allocatePDA`"
-            model="DeviceProductionUser"
-            :form-initial-data="newPDA"
+    <QPage class="column items-center q-pa-md centerCard">
+        <FetchData
+            url="deviceProductions"
+            :filter="{ where: { stateFk: 'idle' } }"
+            @on-fetch="(data) => (deviceProductions = data)"
+            auto-load
+        />
+        <VnPaginate
+            ref="paginate"
+            data-key="WorkerPda"
+            url="DeviceProductionUsers"
+            :filter="{ where: { userFk: routeId } }"
+            order="id"
             auto-load
-            :default-buttons="{ save: { label: 'globals.assign', color: 'primary' } }"
-            @on-data-saved="(_, data) => setCurrentPDA(data)"
         >
-            <template #form="{ data }">
-                <QField
-                    v-if="currentPDA && currentPDA.description"
-                    :label="t('worker.pda.currentPDA')"
-                    :model-value="currentPDA.description"
-                    :editable="false"
-                    class="full-width"
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-pt-xs q-mb-sm"
                 >
-                    <template #control>
-                        <div tabindex="0">
-                            {{ currentPDA.description }}
-                        </div>
-                    </template>
-                    <template v-if="isAllowedToEdit" #append>
-                        <QIcon
-                            name="delete"
-                            size="sm"
-                            class="cursor-pointer"
-                            color="primary"
-                            @click="deallocatePDA(data)"
-                        >
-                            <QTooltip>
-                                {{ t('worker.pda.removePDA') }}
-                            </QTooltip>
-                        </QIcon>
-                    </template>
-                </QField>
-
-                <VnSelect
-                    v-else
-                    :label="t('worker.pda.newPDA')"
-                    v-model="data.pda"
-                    :options="deviceProductionsOptions"
-                    option-label="serialNumber"
-                    option-value="id"
-                    hide-selected
-                    :disable="!isAllowedToEdit"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>ID: {{ scope.opt?.id }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ scope.opt?.modelFk }},
-                                    {{ scope.opt?.serialNumber }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                    <QItem>
+                        <QItemSection side-left>
+                            <VnRow>
+                                <QField
+                                    :label="t('worker.pda.currentPDA')"
+                                    :model-value="row?.deviceProductionFk"
+                                    disable
+                                >
+                                    <template #control>
+                                        <div tabindex="0">
+                                            {{
+                                                row?.deviceProductionFk +
+                                                ' - ' +
+                                                row?.deviceProduction?.modelFk
+                                            }}
+                                        </div>
+                                    </template>
+                                </QField>
+                                <QField
+                                    :label="t('Current SIM')"
+                                    :model-value="row?.simSerialNumber"
+                                    disable
+                                >
+                                    <template #control>
+                                        <div tabindex="0">{{ row?.simSerialNumber }}</div>
+                                    </template>
+                                </QField>
+                            </VnRow>
+                        </QItemSection>
+                        <QItemSection side>
+                            <QIcon
+                                name="delete"
+                                size="sm"
+                                class="cursor-pointer"
+                                color="primary"
+                                @click="deallocatePDA(row.deviceProductionFk)"
+                            >
+                                <QTooltip>
+                                    {{ t('worker.pda.removePDA') }}
+                                </QTooltip>
+                            </QIcon>
+                        </QItemSection>
+                    </QItem>
+                </QCard>
             </template>
-        </FormModel>
+        </VnPaginate>
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+                <QDialog ref="dialog">
+                    <FormModelPopup
+                        :title="t('Add new device')"
+                        url-create="DeviceProductionUsers"
+                        model="DeviceProductionUser"
+                        :form-initial-data="initialData"
+                        @on-data-saved="paginate.fetch()"
+                    >
+                        <template #form-inputs="{ data }">
+                            <VnRow class="row q-gutter-md q-mb-md">
+                                <VnSelect
+                                    :label="t('worker.pda.newPDA')"
+                                    v-model="data.deviceProductionFk"
+                                    :options="deviceProductions"
+                                    option-label="id"
+                                    option-value="id"
+                                    hide-selected
+                                >
+                                    <template #option="scope">
+                                        <QItem v-bind="scope.itemProps">
+                                            <QItemSection>
+                                                <QItemLabel
+                                                    >ID: {{ scope.opt?.id }}</QItemLabel
+                                                >
+                                                <QItemLabel caption>
+                                                    {{ scope.opt?.modelFk }},
+                                                    {{ scope.opt?.serialNumber }}
+                                                </QItemLabel>
+                                            </QItemSection>
+                                        </QItem>
+                                    </template>
+                                </VnSelect>
+                                <VnInput
+                                    v-model="data.simSerialNumber"
+                                    :label="t('SIM serial number')"
+                                    use-input
+                                />
+                            </VnRow>
+                        </template>
+                    </FormModelPopup>
+                </QDialog>
+            </QBtn>
+            <QTooltip>
+                {{ t('globals.new') }}
+            </QTooltip>
+        </QPageSticky>
     </QPage>
 </template>
-
+<style lang="scss" scoped>
+.centerCard {
+    padding: 5%;
+    width: 100%;
+    max-width: 60%;
+    margin: 0 auto;
+}
+.label {
+    color: red;
+}
+.q-field {
+    margin-bottom: 0px;
+    padding-bottom: 0px;
+}
+</style>
 <i18n>
 es:
     PDA deallocated: PDA desasignada
+    Current SIM: SIM actual
 </i18n>

From bc9c1fdf8e5b70a6d14c865d9704688fca9fd6fb Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 15 May 2024 22:17:40 +0200
Subject: [PATCH 2/9] feat: pda duplicates

---
 src/pages/Customer/Card/CustomerBasicData.vue |  1 +
 src/pages/Worker/Card/WorkerPda.vue           | 39 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index d646b810e..9048bc4ee 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -135,6 +135,7 @@ const filterOptions = {
                         :rules="validate('client.mobile')"
                         clearable
                         v-model="data.mobile"
+                        type="number"
                     />
                 </div>
             </VnRow>
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index c903cd6cc..435502ee9 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -2,16 +2,14 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { ref, computed } from 'vue';
-import { useRole } from 'src/composables/useRole';
+
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-
 import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import FormModelPopup from 'src/components/FormModelPopup.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -47,8 +45,7 @@ const deallocatePDA = async (deviceProductionFk) => {
 <template>
     <QPage class="column items-center q-pa-md centerCard">
         <FetchData
-            url="deviceProductions"
-            :filter="{ where: { stateFk: 'idle' } }"
+            url="workers/getAvailablePDAs"
             @on-fetch="(data) => (deviceProductions = data)"
             auto-load
         />
@@ -77,12 +74,21 @@ const deallocatePDA = async (deviceProductionFk) => {
                                     disable
                                 >
                                     <template #control>
-                                        <div tabindex="0">
-                                            {{
-                                                row?.deviceProductionFk +
-                                                ' - ' +
-                                                row?.deviceProduction?.modelFk
-                                            }}
+                                        <div tabindex="0" style="padding: none">
+                                            <span>Id: </span>
+                                            <span>
+                                                {{ row?.deviceProductionFk }}&nbsp;
+                                            </span>
+                                            <span>{{ t('Model') }}: </span>
+                                            <span>
+                                                {{ row?.deviceProduction?.modelFk }}&nbsp;
+                                            </span>
+                                            <span>{{ t('Serial number') }}: </span>
+                                            <span>
+                                                {{
+                                                    row?.deviceProduction?.serialNumber
+                                                }}&nbsp;
+                                            </span>
                                         </div>
                                     </template>
                                 </QField>
@@ -168,19 +174,22 @@ const deallocatePDA = async (deviceProductionFk) => {
 .centerCard {
     padding: 5%;
     width: 100%;
-    max-width: 60%;
+    max-width: 70%;
     margin: 0 auto;
 }
 .label {
     color: red;
 }
 .q-field {
-    margin-bottom: 0px;
-    padding-bottom: 0px;
+    height: 65px;
 }
 </style>
 <i18n>
 es:
     PDA deallocated: PDA desasignada
     Current SIM: SIM actual
+    Model: Modelo
+    Serial number: Número de serie
+    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+    Add new device: Añadir nuevo dispositivo
 </i18n>

From 108533d4751298f32683abed2df1e73cec68638b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 16 May 2024 12:57:35 +0200
Subject: [PATCH 3/9] fix: delete translates

---
 src/pages/Worker/Card/WorkerPda.vue           |  9 ++++----
 .../integration/worker/workerPda.spec.js      | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 test/cypress/integration/worker/workerPda.spec.js

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 435502ee9..fceaaf1d7 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -45,7 +45,7 @@ const deallocatePDA = async (deviceProductionFk) => {
 <template>
     <QPage class="column items-center q-pa-md centerCard">
         <FetchData
-            url="workers/getAvailablePDAs"
+            url="workers/getAvailablePda"
             @on-fetch="(data) => (deviceProductions = data)"
             auto-load
         />
@@ -83,7 +83,7 @@ const deallocatePDA = async (deviceProductionFk) => {
                                             <span>
                                                 {{ row?.deviceProduction?.modelFk }}&nbsp;
                                             </span>
-                                            <span>{{ t('Serial number') }}: </span>
+                                            <span>{{ t('SIM serial number') }}: </span>
                                             <span>
                                                 {{
                                                     row?.deviceProduction?.serialNumber
@@ -138,6 +138,7 @@ const deallocatePDA = async (deviceProductionFk) => {
                                     :options="deviceProductions"
                                     option-label="id"
                                     option-value="id"
+                                    id="deviceProductionFk"
                                     hide-selected
                                 >
                                     <template #option="scope">
@@ -157,6 +158,7 @@ const deallocatePDA = async (deviceProductionFk) => {
                                 <VnInput
                                     v-model="data.simSerialNumber"
                                     :label="t('SIM serial number')"
+                                    id="simSerialNumber"
                                     use-input
                                 />
                             </VnRow>
@@ -187,9 +189,8 @@ const deallocatePDA = async (deviceProductionFk) => {
 <i18n>
 es:
     PDA deallocated: PDA desasignada
-    Current SIM: SIM actual
+    SIM serial number: Número de serie de la SIM
     Model: Modelo
-    Serial number: Número de serie
     This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
     Add new device: Añadir nuevo dispositivo
 </i18n>
diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
new file mode 100644
index 000000000..3b3eff290
--- /dev/null
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -0,0 +1,21 @@
+describe('AgencyWorkCenter', () => {
+    const deviceProductionField =
+        '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/worker/1110/pda`);
+    });
+
+    it('assign pda', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(deviceProductionField).type('{downArrow}{enter}');
+        cy.get('.vn-row > #simSerialNumber').type('123{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
+
+    it('delete pda', () => {
+        cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+        cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
+    });
+});

From e8ba975be2142543e6418fe4c1985bd9efe42937 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 17 May 2024 08:55:07 +0200
Subject: [PATCH 4/9] fix: spec name

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

diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
index 3b3eff290..79940232b 100644
--- a/test/cypress/integration/worker/workerPda.spec.js
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -1,4 +1,4 @@
-describe('AgencyWorkCenter', () => {
+describe('WorkerPda', () => {
     const deviceProductionField =
         '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
     beforeEach(() => {

From 9468e409ea43f3fa5747d89562db56e25400f598 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 21 May 2024 00:34:03 +0200
Subject: [PATCH 5/9] fix: refs #7187 fix reload

---
 src/pages/Worker/Card/WorkerPda.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index fceaaf1d7..06f1e0e80 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -40,6 +40,12 @@ const deallocatePDA = async (deviceProductionFk) => {
     }
     paginate.value.fetch();
 };
+
+function reloadData() {
+    initialData.value.deviceProductionFk = null;
+    initialData.value.simSerialNumber = null;
+    paginate.value.fetch();
+}
 </script>
 
 <template>
@@ -128,7 +134,7 @@ const deallocatePDA = async (deviceProductionFk) => {
                         url-create="DeviceProductionUsers"
                         model="DeviceProductionUser"
                         :form-initial-data="initialData"
-                        @on-data-saved="paginate.fetch()"
+                        @on-data-saved="reloadData()"
                     >
                         <template #form-inputs="{ data }">
                             <VnRow class="row q-gutter-md q-mb-md">

From 45f56078d7939bc793b764d5dae5536fff1be0a4 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 21 May 2024 01:04:52 +0200
Subject: [PATCH 6/9] feat: refs #7187 add vnconfirm on delete

---
 src/pages/Worker/Card/WorkerPda.vue               | 12 +++++++++++-
 test/cypress/integration/worker/workerPda.spec.js |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 06f1e0e80..976469476 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -7,6 +7,7 @@ import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'components/FetchData.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -19,6 +20,7 @@ const { notify } = useNotify();
 const paginate = ref();
 const dialog = ref();
 const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
 const routeId = computed(() => route.params.id);
 
 const initialData = computed(() => {
@@ -115,7 +117,13 @@ function reloadData() {
                                 size="sm"
                                 class="cursor-pointer"
                                 color="primary"
-                                @click="deallocatePDA(row.deviceProductionFk)"
+                                @click="
+                                    openConfirmationModal(
+                                        t(`Remove PDA`),
+                                        t('Do you want to remove this PDA?'),
+                                        () => deallocatePDA(row.deviceProductionFk)
+                                    )
+                                "
                             >
                                 <QTooltip>
                                     {{ t('worker.pda.removePDA') }}
@@ -194,6 +202,8 @@ function reloadData() {
 </style>
 <i18n>
 es:
+    Remove PDA: Eliminar PDA
+    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
     PDA deallocated: PDA desasignada
     SIM serial number: Número de serie de la SIM
     Model: Modelo
diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
index 79940232b..9af994a70 100644
--- a/test/cypress/integration/worker/workerPda.spec.js
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -16,6 +16,9 @@ describe('WorkerPda', () => {
 
     it('delete pda', () => {
         cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+        cy.get(
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+        ).click();
         cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
     });
 });

From a8fef3fa84a1b937f5dd9aa737198194fbc62028 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 21 May 2024 11:30:00 +0200
Subject: [PATCH 7/9] deploy: init version

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

diff --git a/package.json b/package.json
index 7be20a842..38a1d06a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.22.0",
+    "version": "24.24.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From bacc07a4cac76b2a3a30d26a7eb1eaeca958ce08 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 21 May 2024 12:04:56 +0200
Subject: [PATCH 8/9] remove right

---
 src/pages/Worker/Card/WorkerCalendar.vue    | 17 -----------------
 src/pages/Worker/Card/WorkerTimeControl.vue | 17 -----------------
 2 files changed, 34 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 2e525aa30..cfde97f93 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -170,23 +170,6 @@ watch([year, businessFk], () => refreshData());
         ref="WorkerFreelanceRef"
         auto-load
     />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <WorkerCalendarFilter
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index d0b91e3a7..d9a650d9a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -489,23 +489,6 @@ onMounted(async () => {
             </QBtnGroup>
         </div>
     </Teleport>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="260" class="q-pa-md">
         <div class="q-pa-md q-mb-md" style="border: 2px solid #222">
             <QCardSection horizontal>

From f3c334b82637d5b7823b3e460de3a6bedce195c2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 22 May 2024 08:02:59 +0200
Subject: [PATCH 9/9] hotFix(VnDmsList): downloadModel default undefined

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

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index e3cb2874a..769ba9959 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -35,7 +35,7 @@ const $props = defineProps({
     downloadModel: {
         type: String,
         required: false,
-        default: null,
+        default: undefined,
     },
     defaultDmsCode: {
         type: String,