Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker

src/components/common/VnInput.vue

@@ -53,10 +53,12 @@ defineExpose({
     focus,
 });
 
-const inputRules = (val) => {
+const inputRules = [
+    (val) => {
         const { min } = vnInputRef.value.$attrs;
         if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
-};
+    },
+];
 </script>
 
 <template>
@@ -73,8 +75,9 @@ const inputRules = (val) => {
             :class="{ required: $attrs.required }"
             @keyup.enter="onEnterPress()"
             :clearable="false"
-            :rules="[inputRules]"
+            :rules="inputRules"
             :lazy-rules="true"
+            hide-bottom-space
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />

src/pages/Customer/CustomerMain.vue

@@ -15,10 +15,3 @@ const stateStore = useStateStore();
         <RouterView></RouterView>
     </QPageContainer>
 </template>
-
-<style lang="scss">
-#searchbar,
-.search-panel {
-    width: 400px;
-}
-</style>

src/pages/Worker/Card/WorkerCalendar.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch } from 'vue';
+import { nextTick, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -10,10 +10,13 @@ import WorkerCalendarItem from 'pages/Worker/Card/WorkerCalendarItem.vue';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 
+import { useRouter } from 'vue-router';
+const router = useRouter();
 const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
-
+const workerIsFreelance = ref();
+const WorkerFreelanceRef = ref();
 const workerCalendarFilterRef = ref(null);
 const workerCalendarRef = ref(null);
 const absenceType = ref(null);
@@ -128,6 +131,7 @@ const refreshData = () => {
     updateYearHolidays();
     updateContractHolidays();
     getAbsences();
+    WorkerFreelanceRef.value.fetch();
 };
 
 const onDeletedEvent = (timestamp) => {
@@ -136,12 +140,21 @@ const onDeletedEvent = (timestamp) => {
     if (festiveEventsMap.value[timestamp])
         eventsMap.value[timestamp] = festiveEventsMap.value[timestamp];
 };
+const activeContractRef = ref(null);
 
+watch(
+    () => router.currentRoute.value.params.id,
+    async () => {
+        await nextTick();
+        await activeContractRef.value.fetch();
+    }
+);
 watch([year, businessFk], () => refreshData());
 </script>
 
 <template>
     <FetchData
+        ref="activeContractRef"
         :url="`Workers/${route.params.id}/activeContract`"
         @on-fetch="onFetchActiveContract"
         auto-load
@@ -151,6 +164,12 @@ watch([year, businessFk], () => refreshData());
         @on-fetch="(data) => (isSubordinate = data)"
         auto-load
     />
+    <FetchData
+        :url="`Workers/${route.params.id}`"
+        @on-fetch="(data) => (workerIsFreelance = data.isFreelance)"
+        ref="WorkerFreelanceRef"
+        auto-load
+    />
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
@@ -181,7 +200,7 @@ watch([year, businessFk], () => refreshData());
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center">
-        <QCard v-if="!hasWorkCenter">
+        <QCard v-if="workerIsFreelance">
             <QCardSection class="text-center">
                 {{ t('Autonomous worker') }}
             </QCardSection>

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -56,7 +56,6 @@ const filter = {
 };
 
 const sip = ref(null);
-
 watch(
     () => [worker.value?.sip?.extension, state.get('extension')],
     ([newWorkerSip, newStateExtension], [oldWorkerSip, oldStateExtension]) => {