From 97832a7da9cda632235cc29196af84cdd04e6bf0 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Tue, 25 Mar 2025 09:58:36 +0100
Subject: [PATCH 1/3] refactor: refs #8673 replace VnPopup with inline display
 of evaNotes in ExtraCommunity.vue

---
 src/pages/Travel/ExtraCommunity.vue | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index ac46caa44aa..38858aafe7d 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -18,7 +18,6 @@ import { usePrintService } from 'composables/usePrintService';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
-import VnPopup from 'src/components/common/VnPopup.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -637,18 +636,7 @@ watch(route, () => {
                     <QTd />
                     <QTd />
                     <QTd>
-                        <QBtn
-                            v-if="entry.evaNotes"
-                            icon="comment"
-                            size="md"
-                            flat
-                            color="primary"
-                        >
-                            <VnPopup
-                                :title="t('globals.observations')"
-                                :content="entry.evaNotes"
-                            />
-                        </QBtn>
+                        <span>{{ entry.evaNotes }}</span>
                     </QTd>
                 </QTr>
             </template>
@@ -721,4 +709,12 @@ watch(route, () => {
     white-space: normal;
     width: max-content;
 }
+
+.q-td {
+    &:nth-child(15) {
+        white-space: normal;
+        text-align: left;
+        word-break: break-word;
+    }
+}
 </style>

From 0d1f2f33e0bfd9bf8d389c1e85f9df4400e6c8b5 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Thu, 27 Mar 2025 12:27:42 +0100
Subject: [PATCH 2/3] refactor: refs #8673 enhance display of evaNotes in
 ExtraCommunity.vue with conditional rendering

---
 src/pages/Travel/ExtraCommunity.vue | 33 +++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index dcfbf0d4330..bff2ee20b7e 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -612,12 +612,27 @@ watch(route, () => {
                     <QTd class="text-right">
                         <span>{{ entry.volumeKg }}</span>
                     </QTd>
-                    <QTd />
-                    <QTd />
-                    <QTd />
-                    <QTd />
+                    <QTd :colspan="entry.showEvaNotes ? 4 : 1">
+                        <span
+                            v-if="entry.showEvaNotes"
+                            style="white-space: pre-wrap; word-break: break-word"
+                        >
+                            {{ entry.evaNotes }}
+                        </span>
+                    </QTd>
+                    <QTd v-if="!entry.showEvaNotes" />
+                    <QTd v-if="!entry.showEvaNotes" />
+                    <QTd v-if="!entry.showEvaNotes" />
                     <QTd>
-                        <span>{{ entry.evaNotes }}</span>
+                        <QBtn
+                            v-if="entry.evaNotes"
+                            icon="comment"
+                            size="md"
+                            flat
+                            color="primary"
+                            @click="entry.showEvaNotes = !entry.showEvaNotes"
+                        >
+                        </QBtn>
                     </QTd>
                 </QTr>
             </template>
@@ -691,12 +706,4 @@ watch(route, () => {
     white-space: normal;
     width: max-content;
 }
-
-.q-td {
-    &:nth-child(15) {
-        white-space: normal;
-        text-align: left;
-        word-break: break-word;
-    }
-}
 </style>

From c1536bd76283cd878d08ed09147c250cbc891296 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Thu, 27 Mar 2025 12:54:52 +0100
Subject: [PATCH 3/3] refactor: refs #8673 simplify evaNotes display logic in
 ExtraCommunity.vue

---
 src/pages/Travel/ExtraCommunity.vue | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index bff2ee20b7e..28ed334dcdb 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -612,28 +612,11 @@ watch(route, () => {
                     <QTd class="text-right">
                         <span>{{ entry.volumeKg }}</span>
                     </QTd>
-                    <QTd :colspan="entry.showEvaNotes ? 4 : 1">
-                        <span
-                            v-if="entry.showEvaNotes"
-                            style="white-space: pre-wrap; word-break: break-word"
-                        >
+                    <QTd :colspan="5" class="text-right">
+                        <span>
                             {{ entry.evaNotes }}
                         </span>
                     </QTd>
-                    <QTd v-if="!entry.showEvaNotes" />
-                    <QTd v-if="!entry.showEvaNotes" />
-                    <QTd v-if="!entry.showEvaNotes" />
-                    <QTd>
-                        <QBtn
-                            v-if="entry.evaNotes"
-                            icon="comment"
-                            size="md"
-                            flat
-                            color="primary"
-                            @click="entry.showEvaNotes = !entry.showEvaNotes"
-                        >
-                        </QBtn>
-                    </QTd>
                 </QTr>
             </template>
         </QTable>