From 14910c5899f437b32295cd9ba3bbbbc5edb6d255 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 13 May 2024 12:46:25 +0200
Subject: [PATCH 1/7] feat: refs #7271 basicData and Log

---
 src/pages/Zone/Card/ZoneBasicData.vue  | 58 +++++++-------------------
 src/pages/Zone/Card/ZoneDescriptor.vue |  6 +--
 src/router/modules/zone.js             | 11 ++++-
 3 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 5d57b920e..00f34b431 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -1,34 +1,23 @@
 <script setup>
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { QCheckbox } from 'quasar';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const zoneFilter = {
-    include: [
-        {
-            relation: 'agency',
-            scope: {
-                fields: ['name'],
-                include: { relation: 'agencyModeFk', scope: { fields: ['id'] } },
-            },
-        },
-        { relation: 'sip', scope: { fields: ['extension', 'secret'] } },
-        { relation: 'department', scope: { include: { relation: 'department' } } },
-        { relation: 'client', scope: { fields: ['phone'] } },
-    ],
-};
+
 const agencyFilter = {
     fields: ['id', 'name'],
     order: 'name ASC',
     limit: 30,
 };
+const agencyOptions = ref([]);
 </script>
 
 <template>
@@ -36,53 +25,38 @@ const agencyFilter = {
         :filter="agencyFilter"
         @on-fetch="(data) => (agencyOptions = data)"
         auto-load
-        url="agencies"
-    />
-    <FetchData
-        :filter="zoneFilter"
-        @on-fetch="(data) => (zoneOptions = data)"
-        auto-load
-        url="zones"
+        url="AgencyModes"
     />
 
-    <FormModel
-        :filter="zoneFilter"
-        :url="`zone/${route.params.id}/basic-data`"
-        auto-load
-        model="Zone"
-    >
+    <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput :label="t('Name')" clearable v-model="data.zone.name" />
+                <VnInput :label="t('Name')" clearable v-model="data.name" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.agency.name" :label="t('Agency')" clearable />
-                <VnInput v-model="data.zone.itemMaxSize" :label="t('Max m³')" clearable />
-                <VnInput v-model="data.zone.m3Max" :label="t('Maximum m³')" clearable />
+                <VnInput v-model="data.agencyModeFk" :label="t('Agency')" clearable />
+                <VnInput v-model="data.itemMaxSize" :label="t('Max m³')" clearable />
+                <VnInput v-model="data.m3Max" :label="t('Maximum m³')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
-                    v-model="data.zone.travelingDays"
+                    v-model="data.travelingDays"
                     :label="t('Traveling days')"
                     clearable
                 />
-                <VnInput v-model="data.zone.hour" :label="t('Closing')" clearable />
+                <VnInputTime v-model="data.hour" :label="t('Closing')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.zone.price" :label="t('Price')" clearable />
-                <VnInput v-model="data.zone.bonus" :label="t('Bonus')" clearable />
+                <VnInput v-model="data.price" :label="t('Price')" clearable />
+                <VnInput v-model="data.bonus" :label="t('Bonus')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput
-                    v-model="data.zone.inflation"
-                    :label="t('Inflation')"
-                    clearable
-                />
-                <QCheckbox v-model="data.zone.isVolumetric" :label="t('Volumetric')" />
+                <VnInput v-model="data.inflation" :label="t('Inflation')" clearable />
+                <QCheckbox v-model="data.isVolumetric" :label="t('Volumetric')" />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 8f0aa9e07..f257a3159 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -9,6 +9,7 @@ import { toTimeFormat } from 'src/filters/date';
 import { toCurrency } from 'filters/index';
 
 import useCardDescription from 'src/composables/useCardDescription';
+import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
 
 const $props = defineProps({
     id: {
@@ -69,11 +70,10 @@ const setData = (entity) => {
                 </QTooltip>
             </QBtn>
         </template>
-        <!-- <template #menu="{ entity }">
+        <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
-        </template> -->
+        </template>
         <template #body="{ entity }">
-            {{ console.log('entity', entity) }}
             <VnLv :label="t('summary.agency')" :value="entity.agencyMode.name" />
             <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(entity.hour)" />
             <VnLv :label="t('summary.travelingDays')" :value="entity.travelingDays" />
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index d39ed82d0..01c23c499 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'ZoneMain' },
     menus: {
         main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'],
-        card: ['ZoneBasicData'],
+        card: ['ZoneBasicData', 'ZoneHistory'],
     },
     children: [
         {
@@ -83,6 +83,15 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
                 },
+                {
+                    name: 'ZoneHistory',
+                    path: 'history',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
+                },
                 // {
                 //     path: '/zone/delivery',
                 //     name: 'ZoneDeliveryMain',

From a94c1a32e10ff80484b4884ef7e0f591e5335a30 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 13 May 2024 14:13:41 +0200
Subject: [PATCH 2/7] fix: show label agency instead id

---
 src/pages/Zone/Card/ZoneBasicData.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 00f34b431..819fec7e3 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -8,6 +8,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { QCheckbox } from 'quasar';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -29,13 +30,21 @@ const agencyOptions = ref([]);
     />
 
     <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
-        <template #form="{ data }">
+        <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput :label="t('Name')" clearable v-model="data.name" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.agencyModeFk" :label="t('Agency')" clearable />
+                <VnSelect
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.agencyModeFk"
+                    :rules="validate('zone.agencyModeFk')"
+                    :options="agencyOptions"
+                    :label="t('Agency')"
+                    clearable
+                />
                 <VnInput v-model="data.itemMaxSize" :label="t('Max m³')" clearable />
                 <VnInput v-model="data.m3Max" :label="t('Maximum m³')" clearable />
             </VnRow>

From 289bdeecae0645252b5c811b5117429c3861ee58 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 10:41:07 +0200
Subject: [PATCH 3/7] fix: Workers/isActive

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

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 819fec7e3..19fbe49d3 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -26,7 +26,7 @@ const agencyOptions = ref([]);
         :filter="agencyFilter"
         @on-fetch="(data) => (agencyOptions = data)"
         auto-load
-        url="AgencyModes"
+        url="AgencyModes/isActive"
     />
 
     <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">

From fa82efe5d25a4f7a2dce4c94b0f044511c1e07af Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 10:41:28 +0200
Subject: [PATCH 4/7] fix: limit width some fields

---
 quasar.config.js                      |  2 +-
 src/pages/Zone/Card/ZoneBasicData.vue | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/quasar.config.js b/quasar.config.js
index dd7a91002..b59c62eeb 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 19fbe49d3..d5b727112 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -43,10 +43,23 @@ const agencyOptions = ref([]);
                     :rules="validate('zone.agencyModeFk')"
                     :options="agencyOptions"
                     :label="t('Agency')"
+                    emit-value
+                    map-options
+                    use-input
+                    hide-bottom-space
+                />
+                <VnInput
+                    class="mw-10"
+                    v-model="data.itemMaxSize"
+                    :label="t('Max m³')"
+                    clearable
+                />
+                <VnInput
+                    class="mw-10"
+                    v-model="data.m3Max"
+                    :label="t('Maximum m³')"
                     clearable
                 />
-                <VnInput v-model="data.itemMaxSize" :label="t('Max m³')" clearable />
-                <VnInput v-model="data.m3Max" :label="t('Maximum m³')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
@@ -70,7 +83,11 @@ const agencyOptions = ref([]);
         </template>
     </FormModel>
 </template>
-
+<style lang="scss" scoped>
+.mw-10 {
+    max-width: 10vw;
+}
+</style>
 <i18n>
 es:
     Name: Nombre

From c443b0a00f29c870323a3ba475ac4bed9ae3afae Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 10:50:29 +0200
Subject: [PATCH 5/7] feat: input validations

---
 src/pages/Zone/Card/ZoneBasicData.vue | 28 ++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index d5b727112..7a2c505fa 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -53,12 +53,16 @@ const agencyOptions = ref([]);
                     v-model="data.itemMaxSize"
                     :label="t('Max m³')"
                     clearable
+                    type="number"
+                    min="0"
                 />
                 <VnInput
                     class="mw-10"
                     v-model="data.m3Max"
                     :label="t('Maximum m³')"
                     clearable
+                    type="number"
+                    min="0"
                 />
             </VnRow>
 
@@ -67,18 +71,36 @@ const agencyOptions = ref([]);
                     v-model="data.travelingDays"
                     :label="t('Traveling days')"
                     clearable
+                    type="number"
+                    min="0"
                 />
                 <VnInputTime v-model="data.hour" :label="t('Closing')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.price" :label="t('Price')" clearable />
-                <VnInput v-model="data.bonus" :label="t('Bonus')" clearable />
+                <VnInput
+                    v-model="data.price"
+                    :label="t('Price')"
+                    type="number"
+                    min="0"
+                    clearable
+                />
+                <VnInput
+                    v-model="data.bonus"
+                    :label="t('Bonus')"
+                    type="number"
+                    min="0"
+                    clearable
+                />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput v-model="data.inflation" :label="t('Inflation')" clearable />
-                <QCheckbox v-model="data.isVolumetric" :label="t('Volumetric')" />
+                <QCheckbox
+                    v-model="data.isVolumetric"
+                    :label="t('Volumetric')"
+                    :toggle-indeterminate="false"
+                />
             </VnRow>
         </template>
     </FormModel>

From cb40505f82c90be4d29a742bc6d939e55d957a7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 11:11:28 +0200
Subject: [PATCH 6/7] fix: VnLocation > workercreate

---
 test/cypress/integration/VnLocation.spec.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index f373bad8a..008594642 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -1,13 +1,13 @@
 const locationOptions = '[role="listbox"] > div.q-virtual-scroll__content > .q-item';
 describe('VnLocation', () => {
     const dialogInputs = '.q-dialog label input';
-    describe('Create', () => {
+    describe('Worker Create', () => {
         const inputLocation =
-            '.q-form .q-card> :nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
+            '.q-form .q-card > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/worker/create');
+            cy.visit('/#/worker/create', { timeout: 5000 });
             cy.waitForElement('.q-card');
         });
         it('Show all options', function () {
@@ -25,8 +25,9 @@ describe('VnLocation', () => {
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('ecuador');
             cy.get(locationOptions).should('have.length.at.least', 1);
-            cy.get(`${locationOptions}:nth-child(1)`).click();
-            cy.get(inputLocation + '> :nth-child(2) > .q-icon').click();
+            cy.get(
+                '.q-form .q-card > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+            ).click();
         });
     });
     describe('Fiscal-data', () => {

From f4dd9b84fd5c4be44ae856aaa8f645beb9b402ae Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 11:42:34 +0200
Subject: [PATCH 7/7] fix: VnLocation > fiscal-data

---
 src/components/CreateNewPostcodeForm.vue    |  7 ++++---
 test/cypress/integration/VnLocation.spec.js | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index fd8570176..064ad1631 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -127,9 +127,10 @@ const onProvinceCreated = async ({ name }, formData) => {
                         <CreateNewProvinceForm
                             @on-data-saved="onProvinceCreated($event, data)"
                         />
-                    </template>
-                </VnSelectDialog>
-                <VnSelect
+                    </template> </VnSelectDialog
+            ></VnRow>
+            <VnRow class="row q-gutter-md q-mb-xl"
+                ><VnSelect
                     :label="t('Country')"
                     :options="countriesOptions"
                     hide-selected
diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index 008594642..d1cddd0e7 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -34,26 +34,26 @@ describe('VnLocation', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/supplier/567/fiscal-data', { timeout: 2000 });
-            cy.waitForElement('.q-card');
+            cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
+            cy.waitForElement('.q-form');
         });
         it('Create postCode', function () {
             cy.get(
-                ':nth-child(6) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+                ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
             ).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.get(dialogInputs).eq(0).clear('12');
             cy.get(dialogInputs).eq(0).type('1234453');
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4)   > .q-select > .q-field__inner > .q-field__control ',
                 'Valencia'
             );
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5)   > .q-select > .q-field__inner > .q-field__control ',
                 'Province one'
             );
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(6)  > .q-select > .q-field__inner > .q-field__control ',
                 'España'
             );
             cy.get('.q-mt-lg > .q-btn--standard').click();