From 40ecd6e3584a94627b714c9dd474975cc3d3187e Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 12 Nov 2024 08:28:02 +0100
Subject: [PATCH 1/3] refactor: refs #7950 Created cmr model

---
 src/pages/Route/Cmr/CmrList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index ede271960..b3eaf3b48 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -116,7 +116,7 @@ function getApiUrl() {
     return new URL(window.location).origin;
 }
 function getCmrUrl(value) {
-    return `${getApiUrl()}/api/Routes/${value}/cmr?access_token=${token}`;
+    return `${getApiUrl()}/api/Cmrs/${value}/print?access_token=${token}`;
 }
 function downloadPdfs() {
     if (!selectedRows.value.length) {
@@ -129,7 +129,7 @@ function downloadPdfs() {
     let cmrs = [];
     for (let value of selectedRows.value) cmrs.push(value.cmrFk);
     // prettier-ignore
-    return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
+    return window.open(`${getApiUrl()}/api/Cmrs/downloadZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
 </script>
 <template>
@@ -149,7 +149,7 @@ function downloadPdfs() {
     <VnTable
         ref="tableRef"
         data-key="CmrList"
-        url="Routes/cmrs"
+        url="Cmrs/filter"
         :columns="columns"
         :right-search="true"
         default-mode="table"

From 59b40fed45f18c0847c73f102fb409904583c03d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Nov 2024 15:57:01 +0100
Subject: [PATCH 2/3] feat: refs #7874 improve vn-notes ui

---
 src/components/ui/VnNotes.vue | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index b395b3934..2164f668e 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -65,15 +65,8 @@ onBeforeRouteLeave((to, from, next) => {
         auto-load
         @on-fetch="(data) => (observationTypes = data)"
     />
-    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
-        <QCardSection horizontal>
-            <VnAvatar :worker-id="currentUser.id" size="md" />
-            <div class="full-width row justify-between q-pa-xs">
-                <VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
-                {{ t('globals.now') }}
-            </div>
-        </QCardSection>
-        <QCardSection class="q-px-xs q-my-none q-py-none">
+    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
+        <QCardSection class="q-px-xs q-mt-sm q-py-none">
             <VnRow class="full-width">
                 <VnSelect
                     :label="t('Observation type')"
@@ -144,7 +137,7 @@ onBeforeRouteLeave((to, from, next) => {
                         <div class="full-width row justify-between q-pa-xs">
                             <div>
                                 <VnUserLink
-                                    :name="`${note.worker.user.nickname}`"
+                                    :name="`${note.worker.user.name}`"
                                     :worker-id="note.worker.id"
                                 />
                                 <QBadge

From 8e0b098756ecb29e3b0e4c6707dcb8a5588b0f51 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Nov 2024 16:01:09 +0100
Subject: [PATCH 3/3] fix: refs #7874 add title

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

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 2164f668e..dbcb2f3fe 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -66,7 +66,10 @@ onBeforeRouteLeave((to, from, next) => {
         @on-fetch="(data) => (observationTypes = data)"
     />
     <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
-        <QCardSection class="q-px-xs q-mt-sm q-py-none">
+        <QCardSection horizontal>
+            {{ t('New note') }}
+        </QCardSection>
+        <QCardSection class="q-px-xs q-my-none q-py-none">
             <VnRow class="full-width">
                 <VnSelect
                     :label="t('Observation type')"