From 99af402281799208a7d0fa4411977c276d6fc4c5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 22 Apr 2024 08:42:38 +0200
Subject: [PATCH 1/5] fix(VnNotes): refs #6336 fix v-for key

---
 src/components/ui/VnNotes.vue       | 4 ++--
 src/pages/Claim/Card/ClaimNotes.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index aeabcb96d..b9b70fd92 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -78,8 +78,8 @@ async function insert() {
             <TransitionGroup name="list" tag="div" class="column items-center full-width">
                 <QCard
                     class="q-pa-xs q-mb-sm full-width"
-                    v-for="note in rows"
-                    :key="note.id"
+                    v-for="(note, index) in rows"
+                    :key="note.id ?? index"
                 >
                     <QCardSection horizontal>
                         <VnAvatar
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 008b7e4d9..8aa6e1d62 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -16,7 +16,7 @@ const claimId = computed(() => $props.id || route.params.id);
 
 const claimFilter = {
     where: { claimFk: claimId.value },
-    fields: ['created', 'workerFk', 'text'],
+    fields: ['id', 'created', 'workerFk', 'text'],
     include: {
         relation: 'worker',
         scope: {

From 918ce0dc86fb324d79488bff5e5c4ab045efc9e1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 22 Apr 2024 09:38:38 +0200
Subject: [PATCH 2/5] fix(VnNotes): refs #6336 remove index in key

---
 src/components/ui/VnNotes.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index b9b70fd92..aeabcb96d 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -78,8 +78,8 @@ async function insert() {
             <TransitionGroup name="list" tag="div" class="column items-center full-width">
                 <QCard
                     class="q-pa-xs q-mb-sm full-width"
-                    v-for="(note, index) in rows"
-                    :key="note.id ?? index"
+                    v-for="note in rows"
+                    :key="note.id"
                 >
                     <QCardSection horizontal>
                         <VnAvatar

From 4a5285358cafbfe3d00d9c7a1df888b235435cd7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 22 Apr 2024 09:46:40 +0200
Subject: [PATCH 3/5] fix(VnNotes): refs #6336 restore index in key

---
 src/components/ui/VnNotes.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index aeabcb96d..b9b70fd92 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -78,8 +78,8 @@ async function insert() {
             <TransitionGroup name="list" tag="div" class="column items-center full-width">
                 <QCard
                     class="q-pa-xs q-mb-sm full-width"
-                    v-for="note in rows"
-                    :key="note.id"
+                    v-for="(note, index) in rows"
+                    :key="note.id ?? index"
                 >
                     <QCardSection horizontal>
                         <VnAvatar

From 64fc02e33b1c36b5bdbacd03c72d75c3da713411 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Apr 2024 09:00:57 -0300
Subject: [PATCH 4/5] Fix supplier consumption disabled buttons

---
 .../Supplier/Card/SupplierConsumption.vue     | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 33d235a5f..925c3cb3f 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,6 +1,6 @@
 <script setup>
+import { computed, onMounted, watch, ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 
@@ -33,20 +33,8 @@ const arrayData = useArrayData('SupplierConsumption', {
 const store = arrayData.store;
 
 const dateRanges = computed(() => {
-    const ranges = {
-        from: null,
-        to: null,
-    };
-
-    if (route.query && route.query.params) {
-        const params = JSON.parse(route.query.params);
-        if (params.from && params.to) {
-            ranges.from = params.from;
-            ranges.to = params.to;
-        }
-    }
-
-    return ranges;
+    const { from, to } = arrayData.store?.userParams || {};
+    return { from, to };
 });
 
 const reportParams = computed(() => ({
@@ -117,7 +105,7 @@ onMounted(async () => {
 <template>
     <Teleport to="#st-actions" v-if="stateStore.isSubToolbarShown()">
         <QBtn
-            :disabled="!dateRanges.from && !dateRanges.to"
+            :disabled="!dateRanges.from || !dateRanges.to || !rows.length"
             color="primary"
             icon-right="picture_as_pdf"
             no-caps
@@ -129,7 +117,7 @@ onMounted(async () => {
             </QTooltip>
         </QBtn>
         <QBtn
-            :disabled="!dateRanges.from && !dateRanges.to"
+            :disabled="!dateRanges.from || !dateRanges.to || !rows.length"
             color="primary"
             icon-right="email"
             no-caps
@@ -140,7 +128,6 @@ onMounted(async () => {
             </QTooltip>
         </QBtn>
     </Teleport>
-
     <QPage class="column items-center q-pa-md">
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
             <QScrollArea class="fit text-grey-8">

From 7dac6ba910fedb54445d4ce9d0c516a0bdf4a344 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Apr 2024 09:02:35 -0300
Subject: [PATCH 5/5] Remove unused imports

---
 src/pages/Supplier/Card/SupplierConsumption.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 925c3cb3f..8011741ef 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, onMounted, watch, ref } from 'vue';
+import { computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';