From 84dfd6d474a8d92c54f603e8fb964f41ebebbc0d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 18 Apr 2024 08:12:11 +0200
Subject: [PATCH 1/8] hotFix(workerDms): use undefined

---
 src/components/common/VnDmsList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index f70146c58..e3cb2874a 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -187,7 +187,7 @@ const columns = computed(() => [
                     downloadFile(
                         prop.row.id,
                         $props.downloadModel,
-                        null,
+                        undefined,
                         prop.row.download
                     ),
             },

From 69850d65e70c0c7bfb587b88790f358da4308040 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 18 Apr 2024 10:13:36 +0200
Subject: [PATCH 2/8] fix(VnNotes) refs #7226 use v-bind

---
 src/components/ui/VnNotes.vue | 164 ++++++++++++++++------------------
 1 file changed, 79 insertions(+), 85 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 44ef798ec..081c58f14 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -27,93 +27,87 @@ async function insert() {
 }
 </script>
 <template>
-    <div class="column items-center full-height full-width">
-        <VnPaginate
-            :data-key="$props.url"
-            :url="$props.url"
-            order="created DESC"
-            :limit="20"
-            :filter="$props.filter"
-            auto-load
-            ref="vnPaginateRef"
-        >
-            <template #body="{ rows }">
-                <div class="column items-center full-width">
-                    <QCard
-                        class="q-pa-xs q-mb-sm full-width"
-                        v-for="(note, index) in rows"
-                        :key="index"
-                    >
-                        <QCardSection horizontal>
-                            <slot name="picture">
-                                <VnAvatar
-                                    :descriptor="false"
-                                    :worker-id="note.workerFk"
-                                    size="md"
-                                />
-                            </slot>
-                            <div class="full-width row justify-between q-pa-xs">
-                                <VnUserLink
-                                    :name="`${note.worker.user.nickname}`"
-                                    :worker-id="note.worker.id"
-                                />
+    <VnPaginate
+        :data-key="$props.url"
+        :url="$props.url"
+        order="created DESC"
+        :limit="20"
+        :filter="$props.filter"
+        auto-load
+        ref="vnPaginateRef"
+        v-bind="$attrs"
+    >
+        <template #body="{ rows }">
+            <div class="column items-center full-width">
+                <QCard
+                    class="q-pa-xs q-mb-sm full-width"
+                    v-for="(note, index) in rows"
+                    :key="index"
+                >
+                    <QCardSection horizontal>
+                        <slot name="picture">
+                            <VnAvatar
+                                :descriptor="false"
+                                :worker-id="note.workerFk"
+                                size="md"
+                            />
+                        </slot>
+                        <div class="full-width row justify-between q-pa-xs">
+                            <VnUserLink
+                                :name="`${note.worker.user.nickname}`"
+                                :worker-id="note.worker.id"
+                            />
 
-                                <slot name="actions">
-                                    {{ toDateHour(note.created) }}
-                                </slot>
-                            </div>
-                        </QCardSection>
-                        <QCardSection class="q-pa-xs q-my-none q-py-none">
-                            <slot name="text">
-                                {{ note.text }}
+                            <slot name="actions">
+                                {{ toDateHour(note.created) }}
                             </slot>
-                        </QCardSection>
-                    </QCard>
-                </div>
-            </template>
-        </VnPaginate>
-        <QPageSticky position="bottom-right" :offset="[25, 25]" v-if="addNote">
-            <QBtn color="primary" icon="add" size="lg" round @click="noteModal = true" />
-        </QPageSticky>
-        <QDialog v-model="noteModal" @hide="newNote = ''">
-            <QCard>
-                <QCardSection>
-                    <QItem class="q-px-none">
-                        <span class="text-primary text-h6 full-width">
-                            <QIcon name="draft" class="q-mr-xs" />
-                            {{ t('Add note') }}
-                        </span>
-                        <QBtn icon="close" flat round dense v-close-popup />
-                    </QItem>
-                </QCardSection>
-                <QCardSection>
-                    <QInput
-                        autofocus
-                        type="textarea"
-                        :label="t('Add note here...')"
-                        filled
-                        size="lg"
-                        autogrow
-                        v-model="newNote"
-                    ></QInput>
-                </QCardSection>
-                <QCardActions class="justify-end q-mr-sm">
-                    <QBtn
-                        flat
-                        :label="t('globals.close')"
-                        color="primary"
-                        v-close-popup
-                    />
-                    <QBtn
-                        :label="t('globals.save')"
-                        color="primary"
-                        v-close-popup
-                        @click="insert"
-                    />
-                </QCardActions>
-            </QCard>
-        </QDialog>
-    </div>
+                        </div>
+                    </QCardSection>
+                    <QCardSection class="q-pa-xs q-my-none q-py-none">
+                        <slot name="text">
+                            {{ note.text }}
+                        </slot>
+                    </QCardSection>
+                </QCard>
+            </div>
+        </template>
+    </VnPaginate>
+    <QPageSticky position="bottom-right" :offset="[25, 25]" v-if="addNote">
+        <QBtn color="primary" icon="add" size="lg" round @click="noteModal = true" />
+    </QPageSticky>
+    <QDialog v-model="noteModal" @hide="newNote = ''">
+        <QCard>
+            <QCardSection>
+                <QItem class="q-px-none">
+                    <span class="text-primary text-h6 full-width">
+                        <QIcon name="draft" class="q-mr-xs" />
+                        {{ t('Add note') }}
+                    </span>
+                    <QBtn icon="close" flat round dense v-close-popup />
+                </QItem>
+            </QCardSection>
+            <QCardSection>
+                <QInput
+                    autofocus
+                    type="textarea"
+                    :label="t('Add note here...')"
+                    filled
+                    size="lg"
+                    autogrow
+                    v-model="newNote"
+                ></QInput>
+            </QCardSection>
+            <QCardActions class="justify-end q-mr-sm">
+                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
+                <QBtn
+                    :label="t('globals.save')"
+                    color="primary"
+                    v-close-popup
+                    @click="insert"
+                />
+            </QCardActions>
+        </QCard>
+    </QDialog>
 </template>
 <style lang="scss" scoped>
 .q-card {

From 3eb5041bf5d332fcaabdc2488bfa381f87c8cc5d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 22 Apr 2024 07:50:34 +0200
Subject: [PATCH 3/8] fix: refs #6590 remove unnecessary import

---
 src/components/LeftMenuItemGroup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/LeftMenuItemGroup.vue b/src/components/LeftMenuItemGroup.vue
index 741d58228..dfd0bf615 100644
--- a/src/components/LeftMenuItemGroup.vue
+++ b/src/components/LeftMenuItemGroup.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, defineExpose } from 'vue';
+import { computed, ref } from 'vue';
 import LeftMenuItem from './LeftMenuItem.vue';
 import { elementIsVisibleInViewport } from 'src/composables/elementIsVisibleInViewport';
 

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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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';