From 08ed134b1281d07ccd05198ca10aeeb8c6c342fd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 7 Aug 2024 11:57:27 +0200
Subject: [PATCH 1/7] fix: refs #7323 wrong css

---
 src/components/ui/QCalendarMonthWrapper.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index 07ca18bef..fc383ed81 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@@ -73,8 +73,7 @@ const containerClasses = computed(() => {
 .q-calendar-month__head--workweek,
 .q-calendar-month__head--weekday,
 // .q-calendar-month__workweek.q-past-day,
-.q-calendar-month__week :nth-child(6),
-:nth-child(7) {
+.q-calendar-month__week :nth-child(n+6):nth-child(-n+7) {
     color: var(--vn-label-color);
 }
 

From 017d5382bb8562cfc0f674f44ba7aca0c38de7f9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 7 Aug 2024 12:19:26 +0200
Subject: [PATCH 2/7] fix: refs #7323 data-key & add select

---
 src/pages/Worker/Card/WorkerBasicData.vue | 18 +++++++-----------
 src/pages/Worker/Card/WorkerCard.vue      |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 62ca9dad9..82203fc2a 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -139,23 +139,19 @@ const maritalStatus = [
 
             <VnRow>
                 <VnInput v-model="data.SSN" :label="t('SSN')" clearable />
-                <VnInput
-                    v-model="data.locker"
-                    type="number"
-                    :label="t('Locker')"
-                    clearable
-                />
-            </VnRow>
-            <VnRow>
                 <VnInputDate :label="t('fiDueDate')" v-model="data.fiDueDate" />
-
-                <VnInput v-model="data.sex" :label="t('sex')" clearable />
             </VnRow>
             <VnRow>
+                <VnSelect
+                    :label="t('sex')"
+                    :options="['M', 'F']"
+                    hide-selected
+                    v-model="data.sex"
+                />
                 <VnInputDate :label="t('seniority')" v-model="data.seniority" />
-                <VnInput v-model="data.fi" :label="t('fi')" />
             </VnRow>
             <VnRow>
+                <VnInput v-model="data.fi" :label="t('fi')" />
                 <VnInputDate :label="t('birth')" v-model="data.birth" />
             </VnRow>
             <VnRow>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 1a5bacf2f..fb9ab9666 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -5,7 +5,7 @@ import WorkerFilter from '../WorkerFilter.vue';
 </script>
 <template>
     <VnCard
-        data-key="Workers"
+        data-key="Worker"
         base-url="Workers"
         :descriptor="WorkerDescriptor"
         :filter-panel="WorkerFilter"

From 98656aa2c88fb1a98cd9997bb2374420133c3ac0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 7 Aug 2024 12:29:19 +0200
Subject: [PATCH 3/7] fix: refs #7323 add department popup

---
 src/pages/Worker/Card/WorkerSummary.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 11c36c22d..5c6261b94 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -11,6 +11,7 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
+import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -84,10 +85,14 @@ const filter = {
                     :text="t('worker.summary.basicData')"
                 />
                 <VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
-                <VnLv
-                    :label="t('worker.list.department')"
-                    :value="worker.department?.department?.name"
-                />
+                <VnLv :label="t('worker.list.department')">
+                    <template #value>
+                        <span class="link" v-text="worker.department?.department?.name" />
+                        <DepartmentDescriptorProxy
+                            :id="worker.department?.department?.id"
+                        />
+                    </template>
+                </VnLv>
                 <VnLv :label="t('worker.list.email')" :value="worker.user.email" copy />
                 <VnLv :label="t('worker.summary.boss')" link>
                     <template #value>

From 06eac739cdc9766916a42be1244b3461b03126d5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 7 Aug 2024 12:57:00 +0200
Subject: [PATCH 4/7] chore: refs #7323 fix test

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

diff --git a/test/cypress/integration/worker/workerLocker.spec.js b/test/cypress/integration/worker/workerLocker.spec.js
index 9a4a19c7a..9a4066f54 100644
--- a/test/cypress/integration/worker/workerLocker.spec.js
+++ b/test/cypress/integration/worker/workerLocker.spec.js
@@ -2,7 +2,7 @@ describe('WorkerLocker', () => {
     const workerId = 1109;
     const lockerCode = '2F';
     const input = '.q-card input';
-    const thirdOpt = '[role="listbox"] .q-item:nth-child(3)';
+    const thirdOpt = '[role="listbox"] .q-item:nth-child(1)';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('productionBoss');

From 4ee6c7436f292367f68b410f31b09ebcf9aaa028 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 7 Aug 2024 13:18:13 +0200
Subject: [PATCH 5/7] fix: refs #7323 righ menu bug

---
 src/pages/Worker/Card/WorkerCalendar.vue | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index ea6e62683..e9cb793f4 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -171,18 +171,16 @@ watch([year, businessFk], () => refreshData());
         ref="WorkerFreelanceRef"
         auto-load
     />
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <WorkerCalendarFilter
-                ref="workerCalendarFilterRef"
-                v-model:business-fk="businessFk"
-                v-model:year="year"
-                v-model:absence-type="absenceType"
-                :contract-holidays="contractHolidays"
-                :year-holidays="yearHolidays"
-            />
-        </QScrollArea>
-    </QDrawer>
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+        <WorkerCalendarFilter
+            ref="workerCalendarFilterRef"
+            v-model:business-fk="businessFk"
+            v-model:year="year"
+            v-model:absence-type="absenceType"
+            :contract-holidays="contractHolidays"
+            :year-holidays="yearHolidays"
+        />
+    </Teleport>
     <QPage class="column items-center">
         <QCard v-if="workerIsFreelance">
             <QCardSection class="text-center">

From 855483cefd3526959b90abae6b086de73b479efc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 7 Aug 2024 13:37:01 +0200
Subject: [PATCH 6/7] fix: refs #7323 css righ menu

---
 src/components/common/RightMenu.vue         |  2 +-
 src/pages/Worker/Card/WorkerTimeControl.vue | 31 +++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/components/common/RightMenu.vue b/src/components/common/RightMenu.vue
index f0a95b0df..732e5367d 100644
--- a/src/components/common/RightMenu.vue
+++ b/src/components/common/RightMenu.vue
@@ -46,7 +46,7 @@ const stateStore = useStateStore();
         </div>
     </Teleport>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+        <QScrollArea class="fit">
             <div id="right-panel"></div>
             <slot v-if="!hasContent" name="right-panel" />
         </QScrollArea>
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 7bce5983c..5b337a5c6 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -489,7 +489,7 @@ onMounted(async () => {
             </QBtnGroup>
         </div>
     </Teleport>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="260" class="q-pa-md">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <div class="q-pa-md q-mb-md" style="border: 2px solid #222">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
@@ -515,7 +515,34 @@ onMounted(async () => {
             @click-date="onInputChange"
             @on-moved="getMailStates"
         />
-    </QDrawer>
+    </Teleport>
+    <!-- <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>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('Hours') }}
+                </span>
+            </QCardSection>
+            <QCardSection class="column items-center" horizontal>
+                <div>
+                    <span class="details-label">{{ t('Total semana') }} </span>
+                    <span>: {{ formattedWeekTotalHours }}</span>
+                </div>
+                <div>
+                    <span class="details-label">{{ t('Termina a las') }}: </span>
+                    <span>{{ dashIfEmpty(getFinishTime()) }}</span>
+                </div>
+            </QCardSection>
+        </div>
+        <WorkerTimeControlCalendar
+            v-model:model-value="selectedDateFormatted"
+            :selected-dates="selectedCalendarDates"
+            :active-date="false"
+            :worker-time-control-mails="workerTimeControlMails"
+            @click-date="onInputChange"
+            @on-moved="getMailStates"
+        />
+    </QDrawer> -->
     <QPage class="column items-center">
         <QTable :columns="columns" :rows="['']" hide-bottom class="full-width">
             <template #header="props">

From baf0981233a2777817a0b3b7fe3ba256e5247cb8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 7 Aug 2024 13:37:37 +0200
Subject: [PATCH 7/7] chore: refs #7323drop commented code

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 27 ---------------------
 1 file changed, 27 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 5b337a5c6..87ff44e63 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -516,33 +516,6 @@ onMounted(async () => {
             @on-moved="getMailStates"
         />
     </Teleport>
-    <!-- <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>
-                <span class="text-weight-bold text-subtitle1 text-center full-width">
-                    {{ t('Hours') }}
-                </span>
-            </QCardSection>
-            <QCardSection class="column items-center" horizontal>
-                <div>
-                    <span class="details-label">{{ t('Total semana') }} </span>
-                    <span>: {{ formattedWeekTotalHours }}</span>
-                </div>
-                <div>
-                    <span class="details-label">{{ t('Termina a las') }}: </span>
-                    <span>{{ dashIfEmpty(getFinishTime()) }}</span>
-                </div>
-            </QCardSection>
-        </div>
-        <WorkerTimeControlCalendar
-            v-model:model-value="selectedDateFormatted"
-            :selected-dates="selectedCalendarDates"
-            :active-date="false"
-            :worker-time-control-mails="workerTimeControlMails"
-            @click-date="onInputChange"
-            @on-moved="getMailStates"
-        />
-    </QDrawer> -->
     <QPage class="column items-center">
         <QTable :columns="columns" :rows="['']" hide-bottom class="full-width">
             <template #header="props">