Merge branch 'dev' into vnCard-unify-searchbarParams

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>

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),
+.q-calendar-month__week :nth-child(n+6):nth-child(-n+7) {
-:nth-child(7) {
     color: var(--vn-label-color);
 }
 

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>

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>
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
-        <QScrollArea class="fit text-grey-8">
+        <WorkerCalendarFilter
-            <WorkerCalendarFilter
+            ref="workerCalendarFilterRef"
-                ref="workerCalendarFilterRef"
+            v-model:business-fk="businessFk"
-                v-model:business-fk="businessFk"
+            v-model:year="year"
-                v-model:year="year"
+            v-model:absence-type="absenceType"
-                v-model:absence-type="absenceType"
+            :contract-holidays="contractHolidays"
-                :contract-holidays="contractHolidays"
+            :year-holidays="yearHolidays"
-                :year-holidays="yearHolidays"
+        />
-            />
+    </Teleport>
-        </QScrollArea>
-    </QDrawer>
     <QPage class="column items-center">
         <QCard v-if="workerIsFreelance">
             <QCardSection class="text-center">

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"

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
+                <VnLv :label="t('worker.list.department')">
-                    :label="t('worker.list.department')"
+                    <template #value>
-                    :value="worker.department?.department?.name"
+                        <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>

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,7 @@ onMounted(async () => {
             @click-date="onInputChange"
             @on-moved="getMailStates"
         />
-    </QDrawer>
+    </Teleport>
     <QPage class="column items-center">
         <QTable :columns="columns" :rows="['']" hide-bottom class="full-width">
             <template #header="props">

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');