Merge branch 'test' into Warmfix-NegativeBasesUseNewVnTable

src/components/ui/CardDescriptor.vue

@@ -76,6 +76,15 @@ onBeforeMount(async () => {
     );
 });
 
+const routeName = computed(() => {
+    const DESCRIPTOR_PROXY = 'DescriptorProxy';
+
+    let name = $props.dataKey;
+    if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
+        name = name.split(DESCRIPTOR_PROXY)[0];
+    }
+    return `${name}Summary`;
+});
 async function getData() {
     store.url = $props.url;
     store.filter = $props.filter ?? {};
@@ -154,9 +163,7 @@ const toModule = computed(() =>
                         {{ t('components.smartCard.openSummary') }}
                     </QTooltip>
                 </QBtn>
-                <RouterLink
-                    :to="{ name: `${dataKey}Summary`, params: { id: entity.id } }"
-                >
+                <RouterLink :to="{ name: routeName, params: { id: entity.id } }">
                     <QBtn
                         class="link"
                         color="white"

src/pages/Worker/Card/WorkerBasicData.vue

@@ -17,6 +17,12 @@ const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
+async function setAdvancedSummary(data) {
+    const advanced = (await useAdvancedSummary('Workers', data.id)) ?? {};
+    Object.assign(form.value.formData, advanced);
+    await nextTick();
+    if (form.value) form.value.hasChanges = false;
+}
 </script>
 <template>
     <FetchData
@@ -36,13 +42,7 @@ const maritalStatus = [
         :url-update="`Workers/${$route.params.id}`"
         auto-load
         model="Worker"
-        @on-fetch="
-            async (data) => {
-                Object.assign(data, (await useAdvancedSummary('Workers', data.id)) ?? {});
-                await $nextTick();
-                if (form) form.hasChanges = false;
-            }
-        "
+        @on-fetch="setAdvancedSummary"
     >
         <template #form="{ data }">
             <VnRow>

src/pages/Worker/Card/WorkerDescriptorProxy.vue

@@ -12,6 +12,11 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" />
+        <WorkerDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="WorkerSummary"
+            data-key="WorkerDescriptorProxy"
+        />
     </QPopupProxy>
 </template>