From 823351f76dc5dcd192d3db88c4070be682e3501f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 25 Apr 2024 10:55:48 -0300
Subject: [PATCH 1/4] Item botanical

---
 src/i18n/locale/en.yml                   |   1 +
 src/i18n/locale/es.yml                   |   1 +
 src/pages/Item/Card/CreateGenusForm.vue  |  50 ++++++++++
 src/pages/Item/Card/CreateSpecieForm.vue |  50 ++++++++++
 src/pages/Item/Card/ItemBotanical.vue    | 111 +++++++++++++++++++++++
 src/router/modules/item.js               |  11 ++-
 6 files changed, 223 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Item/Card/CreateGenusForm.vue
 create mode 100644 src/pages/Item/Card/CreateSpecieForm.vue
 create mode 100644 src/pages/Item/Card/ItemBotanical.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ff57bf968..6ccb1a177 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1122,6 +1122,7 @@ item:
         fixedPrice: Fixed prices
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        botanical: Botanical
     descriptor:
         item: Item
         buyer: Buyer
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f9278a9b0..4bcf01400 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1121,6 +1121,7 @@ item:
         fixedPrice: Precios fijados
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        botanical: Botánico
     descriptor:
         item: Artículo
         buyer: Comprador
diff --git a/src/pages/Item/Card/CreateGenusForm.vue b/src/pages/Item/Card/CreateGenusForm.vue
new file mode 100644
index 000000000..637a1137e
--- /dev/null
+++ b/src/pages/Item/Card/CreateGenusForm.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { reactive, ref, onMounted, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+const { t } = useI18n();
+const emit = defineEmits(['onDataSaved']);
+
+const genusInputRef = ref(null);
+const genusFormData = reactive({});
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
+
+onMounted(async () => {
+    await nextTick();
+    genusInputRef.value.focus();
+});
+</script>
+
+<template>
+    <FormModelPopup
+        url-create="genera"
+        model="itemGenus"
+        :title="t('New genus')"
+        :form-initial-data="genusFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    ref="genusInputRef"
+                    :label="t('Latin genus name')"
+                    v-model="data.name"
+                    :required="true"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New genus: Nuevo genus
+    Latin genus name: Nombre del genus en latín
+</i18n>
diff --git a/src/pages/Item/Card/CreateSpecieForm.vue b/src/pages/Item/Card/CreateSpecieForm.vue
new file mode 100644
index 000000000..2731820ba
--- /dev/null
+++ b/src/pages/Item/Card/CreateSpecieForm.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { reactive, ref, onMounted, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+const { t } = useI18n();
+const emit = defineEmits(['onDataSaved']);
+
+const specieInputRef = ref(null);
+const specieFormData = reactive({});
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
+
+onMounted(async () => {
+    await nextTick();
+    specieInputRef.value.focus();
+});
+</script>
+
+<template>
+    <FormModelPopup
+        url-create="species"
+        model="itemSpecie"
+        :title="t('New species')"
+        :form-initial-data="specieFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    ref="specieInputRef"
+                    :label="t('Latin species name')"
+                    v-model="data.name"
+                    :required="true"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New species: Nueva especie
+    Latin species name: Nombre de la especie en latín
+</i18n>
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
new file mode 100644
index 000000000..0a28b05b8
--- /dev/null
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -0,0 +1,111 @@
+<script setup>
+import { ref, onMounted, reactive } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
+import CreateGenusForm from './CreateGenusForm.vue';
+import CreateSpecieForm from './CreateSpecieForm.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const itemBotanicalsRef = ref(null);
+const itemGenusOptions = ref([]);
+const itemSpeciesOptions = ref([]);
+const itemBotanicals = ref([]);
+let itemBotanicalsForm = reactive({});
+
+const onGenusCreated = (response, formData) => {
+    itemGenusOptions.value = [...itemGenusOptions.value, response];
+    formData.genusFk = response.id;
+};
+
+const onSpecieCreated = (response, formData) => {
+    itemSpeciesOptions.value = [...itemSpeciesOptions.value, response];
+    formData.specieFk = response.id;
+};
+
+onMounted(async () => {
+    itemBotanicals.value = await itemBotanicalsRef.value.fetch();
+    if (itemBotanicals.value.length > 0)
+        Object.assign(itemBotanicalsForm, itemBotanicals.value[0]);
+});
+</script>
+<template>
+    <FetchData
+        ref="itemBotanicalsRef"
+        url="ItemBotanicals"
+        :filter="{
+            where: { itemFk: route.params.id },
+        }"
+        @on-fetch="(data) => (itemBotanicals = data)"
+    />
+    <FetchData
+        url="Genera"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (itemGenusOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Species"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (itemSpeciesOptions = data)"
+        auto-load
+    />
+    <FormModel
+        url-update="ItemBotanicals"
+        model="entry"
+        auto-load
+        :form-initial-data="itemBotanicalsForm"
+        :clear-store-on-unmount="false"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelectDialog
+                    :label="t('Genus')"
+                    v-model="data.genusFk"
+                    :options="itemGenusOptions"
+                    option-label="name"
+                    option-value="id"
+                    hide-selected
+                >
+                    <template #form>
+                        <CreateGenusForm
+                            @on-data-saved="
+                                (_, requestResponse) =>
+                                    onGenusCreated(requestResponse, data)
+                            "
+                        />
+                    </template>
+                </VnSelectDialog>
+                <VnSelectDialog
+                    :label="t('Species')"
+                    v-model="data.specieFk"
+                    :options="itemSpeciesOptions"
+                    option-label="name"
+                    option-value="id"
+                    hide-selected
+                >
+                    <template #form>
+                        <CreateSpecieForm
+                            @on-data-saved="
+                                (_, requestResponse) =>
+                                    onSpecieCreated(requestResponse, data)
+                            "
+                        />
+                    </template>
+                </VnSelectDialog>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    Genus: Genus
+    Species: Especies
+</i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 2a8e87194..c787d05f2 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'ItemMain' },
     menus: {
         main: ['ItemList', 'WasteBreakdown', 'ItemFixedPrice'],
-        card: ['ItemBasicData'],
+        card: ['ItemBasicData', 'ItemBotanical'],
     },
     children: [
         {
@@ -103,6 +103,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
                 },
+                {
+                    path: 'botanical',
+                    name: 'ItemBotanical',
+                    meta: {
+                        title: 'botanical',
+                        icon: 'vn:botanical',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
+                },
             ],
         },
     ],

From 7f4155cde9a535662033e379052ae42d9d7eb914 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 08:54:26 +0200
Subject: [PATCH 2/4] fix: replace VnSelectFilter by VnSelect

---
 src/components/ItemsFilterPanel.vue     | 10 +++++-----
 src/pages/Item/ItemFixedPrice.vue       | 10 +++++-----
 src/pages/Item/ItemFixedPriceFilter.vue |  6 +++---
 src/pages/Item/ItemRequestFilter.vue    | 12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index f7f07a5b0..94adfe0ff 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 import axios from 'axios';
@@ -207,7 +207,7 @@ const removeTag = (index, params, search) => {
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.typeFk')"
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
@@ -235,7 +235,7 @@ const removeTag = (index, params, search) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QSeparator />
@@ -246,7 +246,7 @@ const removeTag = (index, params, search) => {
                 class="q-mt-md filter-value"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
@@ -261,7 +261,7 @@ const removeTag = (index, params, search) => {
                     />
                 </QItemSection>
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="!value?.selectedTag?.isFree && value.valueOptions"
                         :label="t('components.itemsFilterPanel.value')"
                         v-model="value.value"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 0dd7ca07d..2a753a3a5 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
 import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
@@ -178,7 +178,7 @@ const columns = computed(() => [
         name: 'warehouse',
         ...defaultColumnAttrs,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getColumnInputEvents,
@@ -434,7 +434,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
             <template #body-cell-itemId="props">
                 <QTd>
-                    <VnSelectFilter
+                    <VnSelect
                         :options="itemsWithNameOptions"
                         hide-selected
                         option-label="id"
@@ -450,7 +450,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QTd>
             </template>
             <template #body-cell-description="{ row }">
@@ -531,7 +531,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-warehouse="props">
                 <QTd class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :options="warehousesOptions"
                         hide-selected
                         option-label="name"
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index cd86b5f71..6c847ece8 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
 const { t } = useI18n();
@@ -35,7 +35,7 @@ const itemTypeWorkersOptions = ref([]);
         <template #body="{ params, searchFn }">
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.buyerFk')"
                         v-model="params.buyerFk"
                         :options="itemTypeWorkersOptions"
@@ -51,7 +51,7 @@ const itemTypeWorkersOptions = ref([]);
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehousesOptions"
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 8b0b34e62..e142c28d3 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -126,7 +126,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="params.attenderFk"
                         :label="t('params.attenderFk')"
                         @update:model-value="searchFn()"
@@ -151,7 +151,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         @update:model-value="searchFn()"
@@ -167,7 +167,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.requesterFk')"
                         v-model="params.requesterFk"
                         @update:model-value="searchFn()"
@@ -190,7 +190,7 @@ const decrement = (paramsObj, key) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QCard bordered>
@@ -261,7 +261,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.state')"
                         v-model="params.state"
                         @update:model-value="searchFn()"

From 3c033458d3c1dd75dbc4baf14b4dc8a512b6f4b3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 09:02:51 +0200
Subject: [PATCH 3/4] fix: minor changes

---
 src/i18n/locale/en.yml                | 2 ++
 src/pages/Item/Card/ItemBotanical.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index a07e35f30..68f1b3db3 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1126,6 +1126,8 @@ item:
         wasteBreakdown: Waste breakdown
         itemCreate: New item
         log: Log
+        tax: Tax
+        barcode: Barcode
         botanical: Botanical
     descriptor:
         item: Item
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 0a28b05b8..0dd1d1a19 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -107,5 +107,5 @@ onMounted(async () => {
 <i18n>
 es:
     Genus: Genus
-    Species: Especies
+    Species: Especie
 </i18n>

From 36e99e2c6cc267c146dff230184ea9c62d5c8658 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 09:28:32 +0200
Subject: [PATCH 4/4] fix: bug when save

---
 src/pages/Item/Card/ItemBotanical.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 0dd1d1a19..15492de9f 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, reactive } from 'vue';
+import { ref, onMounted, reactive, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -17,7 +17,7 @@ const itemBotanicalsRef = ref(null);
 const itemGenusOptions = ref([]);
 const itemSpeciesOptions = ref([]);
 const itemBotanicals = ref([]);
-let itemBotanicalsForm = reactive({});
+let itemBotanicalsForm = reactive({ itemFk: null });
 
 const onGenusCreated = (response, formData) => {
     itemGenusOptions.value = [...itemGenusOptions.value, response];
@@ -28,8 +28,11 @@ const onSpecieCreated = (response, formData) => {
     itemSpeciesOptions.value = [...itemSpeciesOptions.value, response];
     formData.specieFk = response.id;
 };
-
+const entityId = computed(() => {
+    return route.params.id;
+});
 onMounted(async () => {
+    itemBotanicalsForm.itemFk = entityId.value;
     itemBotanicals.value = await itemBotanicalsRef.value.fetch();
     if (itemBotanicals.value.length > 0)
         Object.assign(itemBotanicalsForm, itemBotanicals.value[0]);
@@ -40,7 +43,7 @@ onMounted(async () => {
         ref="itemBotanicalsRef"
         url="ItemBotanicals"
         :filter="{
-            where: { itemFk: route.params.id },
+            where: { itemFk: entityId },
         }"
         @on-fetch="(data) => (itemBotanicals = data)"
     />