Merge branch 'master' into 7404-fixFilterIsssues

Merge pull request 'feat: add city name' (!925 ) from 7354-hotfix-showCity into master
Reviewed-on: #925 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-13 11:24:25 +00:00 · 2024-11-13 11:23:17 +00:00 · 2024-11-13 12:11:15 +01:00 · 2024-11-13 09:22:15 +00:00 · 2024-11-13 10:11:14 +01:00 · 2024-11-13 10:00:04 +01:00
3 changed files with 15 additions and 6 deletions
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@ -105,11 +105,14 @@ watch(
                <template #option="{ itemProps, opt }">
                    <QItem v-bind="itemProps">
                        <QItemSection v-if="opt.code">
-                            <QItemLabel>{{ opt.code }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ opt.town?.province?.name }},
-                                {{ opt.town?.province?.country?.name }}</QItemLabel
-                            >
+                            <QItemLabel>
+                                {{ `${opt.code}, ${opt.town?.name}` }}
+                            </QItemLabel>
+                            <QItemLabel caption>
+                                {{
+                                    `${opt.town?.province?.name}, ${opt.town?.province?.country?.name}`
+                                }}
+                            </QItemLabel>
                        </QItemSection>
                    </QItem>
                </template>
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@ -22,7 +22,12 @@ const agencies = ref([]);
 </script>

 <template>
-    <FetchData url="agencies" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (agencies = data)"
+        auto-load
+    />
    <VnFilterPanel
        :data-key="props.dataKey"
        :search-button="true"
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@ -73,6 +73,7 @@ const columns = computed(() => [
            inWhere: true,
            attrs: {
                url: 'AgencyModes',
+                fields: ['id', 'name'],
            },
        },
        columnField: {
Author	SHA1	Message	Date
Pablo Natek	bccfb161e6	Merge branch 'master' into 7404-fixFilterIsssues gitea/salix-front/pipeline/pr-master This commit looks good Details	2024-11-13 11:24:25 +00:00
Jorge Penadés	76187f00a1	Merge pull request 'feat: add city name' (!925 ) from 7354-hotfix-showCity into master gitea/salix-front/pipeline/head This commit looks good Details Reviewed-on: #925 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 11:23:17 +00:00
Jorge Penadés	b68868e103	feat: add city name gitea/salix-front/pipeline/pr-master This commit looks good Details	2024-11-13 12:11:15 +01:00
Pablo Natek	f93532d5b7	Merge pull request 'hotfixZoneFilter' (!922 ) from hotfixZoneFilter into master gitea/salix-front/pipeline/head This commit looks good Details Reviewed-on: #922 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 09:22:15 +00:00
Pablo Natek	178753ddcc	fix: add scope fields on filter gitea/salix-front/pipeline/pr-master This commit looks good Details	2024-11-13 10:11:14 +01:00
Pablo Natek	8eb76cd0fc	fix: url name gitea/salix-front/pipeline/pr-master This commit looks good Details	2024-11-13 10:00:04 +01:00
Pablo Natek	81927c5af5	fix: zoneFilter	2024-11-13 09:58:41 +01:00