From 9c8aaf65d1495dace0ad8d72f1558eae1644276c Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 5 Feb 2025 13:32:01 +0100
Subject: [PATCH] feat: refs #7248 modify VnNotes

---
 src/components/ui/VnNotes.vue             | 10 +++---
 src/pages/Claim/Card/ClaimNotes.vue       | 14 +++------
 src/pages/Customer/Card/CustomerNotes.vue | 18 +++++++++--
 src/pages/Worker/Card/WorkerNotes.vue     | 38 +++++++++++++----------
 4 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 1690a94ba..3c0f37c77 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -131,15 +131,15 @@ onBeforeRouteLeave((to, from, next) => {
                     <QCardSection horizontal>
                         <VnAvatar
                             :descriptor="false"
-                            :worker-id="note.workerFk"
+                            :worker-id="note.user?.id"
                             size="md"
-                            :title="note.worker?.user.nickname"
+                            :title="note.user?.nickname"
                         />
                         <div class="full-width row justify-between q-pa-xs">
                             <div>
                                 <VnUserLink
-                                    :name="`${note.worker.user.name}`"
-                                    :worker-id="note.worker.id"
+                                    :name="`${note.user?.name}`"
+                                    :worker-id="note.user?.id"
                                 />
                                 <QBadge
                                     class="q-ml-xs"
@@ -149,7 +149,7 @@ onBeforeRouteLeave((to, from, next) => {
                                 >
                                     {{
                                         observationTypes.find(
-                                            (ot) => ot.id === note.observationTypeFk
+                                            (ot) => ot.id === note.observationTypeFk,
                                         )?.description
                                     }}
                                 </QBadge>
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 134ee33ab..510bed51a 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -17,17 +17,11 @@ const claimId = computed(() => $props.id || route.params.id);
 const claimFilter = computed(() => {
     return {
         where: { claimFk: claimId.value },
-        fields: ['id', 'created', 'workerFk', 'text'],
+        fields: ['id', 'created', 'userFk', 'text'],
         include: {
-            relation: 'worker',
+            relation: 'user',
             scope: {
-                fields: ['id', 'firstName', 'lastName'],
-                include: {
-                    relation: 'user',
-                    scope: {
-                        fields: ['id', 'nickname', 'name'],
-                    },
-                },
+                fields: ['id', 'nickname', 'name'],
             },
         },
     };
@@ -35,7 +29,7 @@ const claimFilter = computed(() => {
 
 const body = {
     claimFk: claimId.value,
-    workerFk: user.value.id,
+    userFk: user.value.id,
 };
 </script>
 <template>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index b85174696..f00132a95 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -1,18 +1,30 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
+import { useState } from 'src/composables/useState';
 import VnNotes from 'src/components/ui/VnNotes.vue';
 
 const route = useRoute();
+const state = useState();
+const user = state.getUser();
 
 const noteFilter = computed(() => {
     return {
         order: 'created DESC',
-        where: {
-            clientFk: `${route.params.id}`,
+        where: { clientFk: `${route.params.id}` },
+        include: {
+            relation: 'user',
+            scope: {
+                fields: ['id', 'nickname', 'name'],
+            },
         },
     };
 });
+
+const body = {
+    clientFk: route.params.id,
+    userFk: user.value.id,
+};
 </script>
 
 <template>
@@ -20,7 +32,7 @@ const noteFilter = computed(() => {
         url="clientObservations"
         :add-note="true"
         :filter="noteFilter"
-        :body="{ clientFk: route.params.id }"
+        :body="body"
         style="overflow-y: auto"
         :select-type="true"
     />
diff --git a/src/pages/Worker/Card/WorkerNotes.vue b/src/pages/Worker/Card/WorkerNotes.vue
index 4f123206b..f94ed04f8 100644
--- a/src/pages/Worker/Card/WorkerNotes.vue
+++ b/src/pages/Worker/Card/WorkerNotes.vue
@@ -1,32 +1,38 @@
 <script setup>
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-
+import { useState } from 'src/composables/useState';
 import VnNotes from 'src/components/ui/VnNotes.vue';
 
 const route = useRoute();
+const state = useState();
+const user = state.getUser();
 
-const filter = {
-    order: 'created DESC',
-    where: { workerFk: route.params.id },
-    include: {
-        relation: 'worker',
-        scope: {
-            fields: ['id', 'firstName', 'lastName'],
-            include: {
-                relation: 'user',
-                scope: {
-                    fields: ['id', 'nickname', 'name'],
-                },
+const filter = computed(() => {
+    return {
+        order: 'created DESC',
+        where: { workerFk: route.params.id },
+        include: {
+            relation: 'user',
+            scope: {
+                fields: ['id', 'nickname', 'name'],
             },
         },
-    },
-};
+    };
+});
 
 const body = {
     workerFk: route.params.id,
+    userFk: user.value.id,
 };
 </script>
 
 <template>
-    <VnNotes :add-note="true" url="WorkerObservations" :filter="filter" :body="body" />
+    <VnNotes
+        url="WorkerObservations"
+        :add-note="true"
+        :filter="filter"
+        :body="body"
+        style="overflow-y: auto"
+    />
 </template>
-- 
2.40.1