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

src/components/FormModel.vue

@@ -262,7 +262,7 @@ defineExpose({
 <template>
     <div class="column items-center full-width">
         <QForm
-            v-if="formData"
+            
             @submit="save"
             @reset="reset"
             class="q-pa-md"
@@ -270,11 +270,13 @@ defineExpose({
         >
             <QCard>
                 <slot
+                    v-if="formData"
                     name="form"
                     :data="formData"
                     :validate="validate"
                     :filter="filter"
                 />
+                <SkeletonForm v-else/>
             </QCard>
         </QForm>
     </div>
@@ -337,7 +339,7 @@ defineExpose({
             </QBtnGroup>
         </div>
     </Teleport>
-    <SkeletonForm v-if="!formData" />
+    
     <QInnerLoading
         :showing="isLoading"
         :label="t('globals.pleaseWait')"

src/components/ui/SkeletonForm.vue

@@ -1,20 +1,14 @@
 <template>
-    <div class="q-pa-md">
+    <div class="row q-gutter-md q-mb-md">
-        <div class="row q-gutter-md q-mb-md">
+        <QSkeleton type="QInput" class="col" square />
-            <QSkeleton type="QInput" square />
+        <QSkeleton type="QInput" class="col" square />       
-            <QSkeleton type="QInput" square />
-        </div>
-        <div class="row q-gutter-md q-mb-md">
-            <QSkeleton type="QInput" square />
-            <QSkeleton type="QInput" square />
-        </div>
-        <div class="row q-gutter-md q-mb-md">
-            <QSkeleton type="QInput" square />
-            <QSkeleton type="QInput" square />
-        </div>
-        <div class="row q-gutter-md">
-            <QSkeleton type="QBtn" />
-            <QSkeleton type="QBtn" />
-        </div>
     </div>
-</template>
+    <div class="row q-gutter-md q-mb-md">
+        <QSkeleton type="QInput" class="col" square />
+        <QSkeleton type="QInput" class="col" square />       
+    </div>
+    <div class="row q-gutter-md q-mb-md">
+        <QSkeleton type="QInput" class="col" square />
+        <QSkeleton type="QInput" class="col" square />       
+    </div>
+</template>

src/pages/Account/Role/Card/RoleDescriptor.vue

@@ -15,6 +15,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -60,14 +64,14 @@ const removeRole = () => {
 
 <template>
     <CardDescriptor
-        ref="descriptor"
+        :url="`VnRoles/${entityId}`"
-        :url="`VnRoles`"
         :filter="filter"
         module="Role"
         @on-fetch="setData"
         data-key="accountData"
         :title="data.title"
         :subtitle="data.subtitle"
+        :summary="$props.summary"
     >
         <template #menu>
             <QItem v-ripple clickable @click="removeRole()">

src/pages/Account/Role/Card/RoleDescriptorProxy.vue

@@ -0,0 +1,17 @@
+<script setup>
+import RoleDescriptor from './RoleDescriptor.vue';
+import RoleSummary from './RoleSummary.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <RoleDescriptor v-if="$props.id" :id="$props.id" :summary="RoleSummary" />
+    </QPopupProxy>
+</template>

src/pages/Account/Role/Card/RoleSummary.vue

@@ -30,6 +30,7 @@ const filter = {
         :url="`VnRoles`"
         :filter="filter"
         @on-fetch="(data) => (role = data)"
+        data-key="RoleSummary"
     >
         <template #header> {{ role.id }} - {{ role.name }} </template>
         <template #body>

src/pages/Travel/ExtraCommunityFilter.vue

@@ -7,6 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import axios from 'axios';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -20,6 +21,7 @@ const warehousesOptions = ref([]);
 const continentsOptions = ref([]);
 const agenciesOptions = ref([]);
 const suppliersOptions = ref([]);
+const warehousesByContinent = ref({});
 
 const add = (paramsObj, key) => {
     if (paramsObj[key] === undefined) {
@@ -34,6 +36,28 @@ const decrement = (paramsObj, key) => {
 
     paramsObj[key]--;
 };
+
+const warehouses = async () => {
+    const warehousesResponse = await axios.get('Warehouses');
+    const countriesResponse = await axios.get('Countries');
+    const continentsResponse = await axios.get('Continents');
+
+    const countryContinentMap = countriesResponse.data.reduce((acc, country) => {
+        acc[country.id] = country.continentFk;
+        return acc;
+    }, {});
+
+    continentsResponse.data.forEach((continent) => {
+        const countriesInContinent = Object.keys(countryContinentMap).filter(
+            (countryId) => countryContinentMap[countryId] === continent.id.toString()
+        );
+
+        warehousesByContinent.value[continent.code] = warehousesResponse.data.filter(
+            (warehouse) => countriesInContinent.includes(warehouse.countryFk.toString())
+        );
+    });
+};
+warehouses();
 </script>
 
 <template>
@@ -116,7 +140,6 @@ const decrement = (paramsObj, key) => {
                     <VnSelect
                         :label="t('params.agencyModeFk')"
                         v-model="params.agencyModeFk"
-                        @update:model-value="searchFn()"
                         :options="agenciesOptions"
                         option-value="agencyFk"
                         option-label="name"
@@ -147,12 +170,26 @@ const decrement = (paramsObj, key) => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
+            <QItem v-if="warehousesByContinent[params.continent]">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.warehouseOutFk')"
+                        v-model="params.warehouseOutFk"
+                        :options="warehousesByContinent[params.continent]"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-else>
                 <QItemSection>
                     <VnSelect
                         :label="t('params.warehouseOutFk')"
                         v-model="params.warehouseOutFk"
-                        @update:model-value="searchFn()"
                         :options="warehousesOptions"
                         option-value="id"
                         option-label="name"
@@ -168,7 +205,6 @@ const decrement = (paramsObj, key) => {
                     <VnSelect
                         :label="t('params.warehouseInFk')"
                         v-model="params.warehouseInFk"
-                        @update:model-value="searchFn()"
                         :options="warehousesOptions"
                         option-value="id"
                         option-label="name"
@@ -184,7 +220,6 @@ const decrement = (paramsObj, key) => {
                     <VnSelect
                         :label="t('supplier.pageTitles.supplier')"
                         v-model="params.cargoSupplierFk"
-                        @update:model-value="searchFn()"
                         :options="suppliersOptions"
                         option-value="id"
                         option-label="name"
@@ -200,7 +235,6 @@ const decrement = (paramsObj, key) => {
                     <VnSelect
                         :label="t('params.continent')"
                         v-model="params.continent"
-                        @update:model-value="searchFn()"
                         :options="continentsOptions"
                         option-value="code"
                         option-label="name"

src/pages/Worker/Card/WorkerSummary.vue

@@ -9,6 +9,7 @@ import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 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';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -161,7 +162,14 @@ const filter = {
                 <VnTitle :text="t('worker.summary.userData')" />
                 <VnLv :label="t('worker.summary.userId')" :value="worker.user.id" />
                 <VnLv :label="t('worker.card.name')" :value="worker.user.nickname" />
-                <VnLv :label="t('worker.summary.role')" :value="worker.user.role.name" />
+                <VnLv :label="t('worker.summary.role')">
+                    <template #value>
+                        <span class="link">
+                            {{ worker.user.role.name }}
+                            <RoleDescriptorProxy :id="worker.user.role.id" />
+                        </span>
+                    </template>
+                </VnLv>
                 <VnLv :value="worker?.sip?.extension">
                     <template #label>
                         {{ t('worker.summary.sipExtension') }}