Merge branch 'master' into hotFix_vnJsonValue_showHours

src/pages/Worker/Card/WorkerCalendarFilter.vue

@@ -166,9 +166,7 @@ const yearList = ref(generateYears());
             }}
         </QCardSection>
     </div>
-    <QList dense class="list q-gutter-y-sm q-my-lg">
-        <QItem>
-            <QItemSection>
+    <div dense class="column q-gutter-y-sm q-px-md">
         <VnSelect
             :label="t('Year')"
             v-model="selectedYear"
@@ -178,8 +176,6 @@ const yearList = ref(generateYears());
             use-input
             :is-clearable="false"
         />
-            </QItemSection>
-            <QItemSection>
         <VnSelect
             :label="t('Contract')"
             v-model="selectedBusinessFk"
@@ -207,9 +203,7 @@ const yearList = ref(generateYears());
                 </QItem>
             </template>
         </VnSelect>
-            </QItemSection>
-        </QItem>
-    </QList>
+    </div>
     <QList dense class="list q-gutter-y-xs q-my-md">
         <QItem v-for="type in absenceTypeList" :key="type.id">
             <WorkerEventLabel

src/pages/Worker/Card/WorkerPda.vue

@@ -20,6 +20,7 @@ const { notify } = useNotify();
 const loadingDocuware = ref(true);
 const tableRef = ref();
 const dialog = ref();
+const getAvailablePdaRef = ref();
 const route = useRoute();
 const { openConfirmationModal } = useVnConfirm();
 const routeId = computed(() => route.params.id);
@@ -84,6 +85,7 @@ function reloadData() {
     initialData.value.deviceProductionFk = null;
     initialData.value.simFk = null;
     tableRef.value.reload();
+    getAvailablePdaRef.value.fetch();
 }
 
 async function fetchDocuware() {
@@ -135,6 +137,7 @@ async function deallocatePDA(deviceProductionFk) {
     );
     delete tableRef.value.CrudModelRef.formData[index];
     notify(t('PDA deallocated'), 'positive');
+    await getAvailablePdaRef.value.fetch();
 }
 
 function isSigned(row) {
@@ -144,6 +147,7 @@ function isSigned(row) {
 
 <template>
     <FetchData
+        ref="getAvailablePdaRef"
         url="workers/getAvailablePda"
         @on-fetch="(data) => (deviceProductions = data)"
         auto-load