From 78561c5f42e1660333c28a85618fbc199f2390b8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Apr 2024 08:34:38 -0300
Subject: [PATCH 01/18] Item types

---
 src/i18n/locale/en.yml                        |  19 ++++
 src/i18n/locale/es.yml                        |  24 +++++
 src/pages/Item/ItemTypeCreate.vue             |  91 ++++++++++++++++
 src/pages/Item/ItemTypeList.vue               |  86 +++++++++++++++
 src/pages/ItemType/Card/ItemTypeBasicData.vue |  79 ++++++++++++++
 src/pages/ItemType/Card/ItemTypeCard.vue      |  26 +++++
 .../ItemType/Card/ItemTypeDescriptor.vue      |  82 ++++++++++++++
 src/pages/ItemType/Card/ItemTypeSummary.vue   | 102 ++++++++++++++++++
 src/router/modules/index.js                   |   2 +
 src/router/modules/item.js                    |  21 +++-
 src/router/modules/itemType.js                |  45 ++++++++
 src/router/routes.js                          |   2 +
 12 files changed, 577 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Item/ItemTypeCreate.vue
 create mode 100644 src/pages/Item/ItemTypeList.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeBasicData.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeCard.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeDescriptor.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeSummary.vue
 create mode 100644 src/router/modules/itemType.js

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3ac3d18a0..2962bbe44 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1119,6 +1119,8 @@ item:
         tags: Tags
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        itemTypeCreate: New item type
+        family: Item Type
     descriptor:
         item: Item
         buyer: Buyer
@@ -1153,6 +1155,23 @@ item:
         type: Type
         intrastat: Intrastat
         origin: Origin
+itemType:
+    pageTitles:
+        itemType: Item type
+        basicData: Basic data
+        summary: Summary
+    shared:
+        code: Code
+        name: Name
+        worker: Worker
+        category: Category
+        temperature: Temperature
+    summary:
+        id: id
+        life: Life
+        promo: Promo
+        itemPackingType: Item packing type
+        isUnconventionalSize: Is unconventional size
 components:
     topbar: {}
     userPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4ecbcdbc0..d52240bf4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1118,6 +1118,8 @@ item:
         tags: Etiquetas
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        itemTypeCreate: Nueva familia
+        family: Familia
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -1152,6 +1154,28 @@ item:
         type: Tipo
         intrastat: Intrastat
         origin: Origen
+itemType:
+    pageTitles:
+        itemType: Familia
+        basicData: Datos básicos
+        summary: Resumen
+    shared:
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura
+    summary:
+        id: id
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura
+        life: Vida
+        promo: Promoción
+        itemPackingType: Tipo de embalaje
+        isUnconventionalSize: Es de tamaño no convencional
 components:
     topbar: {}
     userPanel:
diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue
new file mode 100644
index 000000000..3540fc5af
--- /dev/null
+++ b/src/pages/Item/ItemTypeCreate.vue
@@ -0,0 +1,91 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+
+const newItemTypeForm = reactive({});
+
+const workersOptions = ref([]);
+const categoriesOptions = ref([]);
+const temperaturesOptions = ref([]);
+
+const redirectToItemTypeBasicData = (_, { id }) => {
+    router.push({ name: 'ItemTypeBasicData', params: { id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="Workers"
+        @on-fetch="(data) => (workersOptions = data)"
+        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
+        auto-load
+    />
+    <FetchData
+        url="ItemCategories"
+        @on-fetch="(data) => (categoriesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['id', 'name'] }"
+        auto-load
+    />
+    <FetchData
+        url="Temperatures"
+        @on-fetch="(data) => (temperaturesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['code', 'name'] }"
+        auto-load
+    />
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            url-create="ItemTypes"
+            model="itemTypeCreate"
+            :form-initial-data="newItemTypeForm"
+            observe-form-changes
+            @on-data-saved="redirectToItemTypeBasicData"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
+                    <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        v-model="data.workerFk"
+                        :label="t('itemType.shared.worker')"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="firstName"
+                        hide-selected
+                    />
+                    <VnSelectFilter
+                        v-model="data.categoryFk"
+                        :label="t('itemType.shared.category')"
+                        :options="categoriesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        v-model="data.temperatureFk"
+                        :label="t('itemType.shared.temperature')"
+                        :options="temperaturesOptions"
+                        option-value="code"
+                        option-label="name"
+                        hide-selected
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
new file mode 100644
index 000000000..b0b4de540
--- /dev/null
+++ b/src/pages/Item/ItemTypeList.vue
@@ -0,0 +1,86 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+const stateStore = useStateStore();
+const router = useRouter();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+
+const redirectToItemTypeSummary = (id) => {
+    router.push({ name: 'ItemTypeSummary', params: { id } });
+};
+
+const redirectToCreateView = () => {
+    router.push({ name: 'ItemTypeCreate' });
+};
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="ItemTypeList"
+                url="ItemTypes"
+                custom-route-redirect-name="ItemTypeSummary"
+                :label="t('Search item type')"
+                :info="t('Search itemType by id, name or code')"
+            />
+        </Teleport>
+    </template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="ItemTypeList"
+                url="ItemTypes"
+                :order="['name']"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.code"
+                        @click="redirectToItemTypeSummary(row.id)"
+                        :id="row.id"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('Name')" :value="row.name" />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, ItemTypeSummary)"
+                                color="primary"
+                                type="submit"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+    <QPageSticky :offset="[20, 20]">
+        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+        <QTooltip>
+            {{ t('New item type') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+
+<i18n>
+es:
+    New item type: Nueva familia
+    Name: Nombre
+    Search item type: Buscar familia
+    Search itemType by id, name or code: Buscar familia por id, nombre o código
+</i18n>
diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
new file mode 100644
index 000000000..ff2719896
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -0,0 +1,79 @@
+<script setup>
+import { ref } 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 VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const workersOptions = ref([]);
+const categoriesOptions = ref([]);
+const temperaturesOptions = ref([]);
+</script>
+<template>
+    <FetchData
+        url="Workers"
+        @on-fetch="(data) => (workersOptions = data)"
+        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
+        auto-load
+    />
+    <FetchData
+        url="ItemCategories"
+        @on-fetch="(data) => (categoriesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['id', 'name'] }"
+        auto-load
+    />
+    <FetchData
+        url="Temperatures"
+        @on-fetch="(data) => (temperaturesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['code', 'name'] }"
+        auto-load
+    />
+    <FormModel
+        :url="`ItemTypes/${route.params.id}`"
+        :url-update="`ItemTypes/${route.params.id}`"
+        model="itemTypeBasicData"
+        auto-load
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
+                <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelectFilter
+                    v-model="data.workerFk"
+                    :label="t('itemType.shared.worker')"
+                    :options="workersOptions"
+                    option-value="id"
+                    option-label="firstName"
+                    hide-selected
+                />
+                <VnSelectFilter
+                    v-model="data.categoryFk"
+                    :label="t('itemType.shared.category')"
+                    :options="categoriesOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelectFilter
+                    v-model="data.temperatureFk"
+                    :label="t('itemType.shared.temperature')"
+                    :options="temperaturesOptions"
+                    option-value="code"
+                    option-label="name"
+                    hide-selected
+                />
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
new file mode 100644
index 000000000..bff91de06
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -0,0 +1,26 @@
+<script setup>
+import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <ItemTypeDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div class="q-pa-md column items-center">
+                <RouterView></RouterView>
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
new file mode 100644
index 000000000..cb0cb333b
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
@@ -0,0 +1,82 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import useCardDescription from 'src/composables/useCardDescription';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const itemTypeFilter = {
+    include: [
+        { relation: 'worker' },
+        { relation: 'category' },
+        { relation: 'itemPackingType' },
+        { relation: 'temperature' },
+    ],
+};
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
+</script>
+
+<template>
+    <CardDescriptor
+        module="ItemType"
+        :url="`ItemTypes/${entityId}`"
+        :filter="itemTypeFilter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+        data-key="entry"
+    >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                size="sm"
+                icon="vn:item"
+                color="white"
+                :to="{ name: 'ItemTypeList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('itemType.shared.code')" :value="entity.code" />
+            <VnLv :label="t('itemType.shared.name')" :value="entity.name" />
+            <VnLv
+                :label="t('itemType.shared.worker')"
+                :value="entity.worker?.firstName"
+            />
+            <VnLv :label="t('itemType.shared.category')" :value="entity.category?.name" />
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del módulo
+</i18n>
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
new file mode 100644
index 000000000..b71b2acf5
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -0,0 +1,102 @@
+<script setup>
+import { ref, computed, onUpdated } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+onUpdated(() => summaryRef.value.fetch());
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const itemTypeFilter = {
+    include: [
+        { relation: 'worker' },
+        { relation: 'category' },
+        { relation: 'itemPackingType' },
+        { relation: 'temperature' },
+    ],
+};
+
+const entityId = computed(() => $props.id || route.params.id);
+const summaryRef = ref();
+const itemType = ref();
+
+async function setItemTypeData(data) {
+    if (data) itemType.value = data;
+}
+</script>
+
+<template>
+    <CardSummary
+        ref="summaryRef"
+        :url="`ItemTypes/${entityId}`"
+        data-key="ItemTypeSummary"
+        :filter="itemTypeFilter"
+        @on-fetch="(data) => setItemTypeData(data)"
+        class="full-width"
+    >
+        <template #header-left>
+            <router-link
+                v-if="route.name !== 'ItemTypeSummary'"
+                :to="{ name: 'ItemTypeSummary', params: { id: entityId } }"
+                class="header link"
+            >
+                <QIcon name="open_in_new" color="white" size="sm" />
+            </router-link>
+        </template>
+        <template #header>
+            <span>
+                {{ itemType.id }} - {{ itemType.name }} -
+                {{ itemType.worker?.firstName }}
+                {{ itemType.worker?.lastName }}
+            </span>
+        </template>
+        <template #body>
+            <QCard class="vn-one">
+                <router-link
+                    :to="{ name: 'ItemTypeBasicData', params: { id: entityId } }"
+                    class="header header-link"
+                >
+                    {{ t('globals.summary.basicData') }}
+                    <QIcon name="open_in_new" />
+                </router-link>
+                <VnLv :label="t('itemType.summary.id')" :value="itemType.id" />
+                <VnLv :label="t('itemType.shared.code')" :value="itemType.code" />
+                <VnLv :label="t('itemType.shared.name')" :value="itemType.name" />
+                <VnLv
+                    :label="t('itemType.shared.worker')"
+                    :value="itemType.worker?.firstName"
+                />
+                <VnLv
+                    :label="t('itemType.shared.category')"
+                    :value="itemType.category?.name"
+                />
+                <VnLv
+                    :label="t('itemType.shared.temperature')"
+                    :value="itemType.temperature?.name"
+                />
+                <VnLv :label="t('itemType.summary.life')" :value="itemType.life" />
+                <VnLv :label="t('itemType.summary.promo')" :value="itemType.promo" />
+                <VnLv
+                    :label="t('itemType.summary.itemPackingType')"
+                    :value="itemType.itemPackingType?.description"
+                />
+                <VnLv
+                    :label="t('itemType.summary.isUnconventionalSize')"
+                    :value="itemType.isUnconventionalSize"
+                />
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 302ba7fe0..0b9d10d98 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -15,6 +15,7 @@ import Department from './department';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
+import ItemType from './itemType';
 
 export default [
     Item,
@@ -34,4 +35,5 @@ export default [
     Entry,
     roadmap,
     Parking,
+    ItemType,
 ];
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 41f3ec92a..17e9b7673 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ItemMain' },
     menus: {
-        main: ['ItemList', 'WasteBreakdown'],
+        main: ['ItemList', 'WasteBreakdown', 'ItemTypeList'],
         card: ['ItemBasicData'],
     },
     children: [
@@ -33,7 +33,7 @@ export default {
                     path: 'create',
                     name: 'ItemCreate',
                     meta: {
-                        title: 'create',
+                        title: 'itemCreate',
                     },
                     component: () => import('src/pages/Item/ItemCreate.vue'),
                 },
@@ -50,6 +50,23 @@ export default {
                             'https://grafana.verdnatura.es/d/TTNXQAxVk';
                     },
                 },
+                {
+                    path: 'item-type-list',
+                    name: 'ItemTypeList',
+                    meta: {
+                        title: 'family',
+                        icon: 'contact_support',
+                    },
+                    component: () => import('src/pages/Item/ItemTypeList.vue'),
+                },
+                {
+                    path: 'item-type-list/create',
+                    name: 'ItemTypeCreate',
+                    meta: {
+                        title: 'itemTypeCreate',
+                    },
+                    component: () => import('src/pages/Item/ItemTypeCreate.vue'),
+                },
             ],
         },
         {
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
new file mode 100644
index 000000000..0d966c32c
--- /dev/null
+++ b/src/router/modules/itemType.js
@@ -0,0 +1,45 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/item-type',
+    name: 'ItemType',
+    meta: {
+        title: 'itemType',
+        icon: 'contact_support',
+    },
+    component: RouterView,
+    redirect: { name: 'ItemTypeCard' },
+    menus: {
+        main: [],
+        card: ['ItemTypeBasicData'],
+    },
+    children: [
+        {
+            name: 'ItemTypeCard',
+            path: ':id',
+            component: () => import('src/pages/ItemType/Card/ItemTypeCard.vue'),
+            redirect: { name: 'ItemTypeSummary' },
+            children: [
+                {
+                    name: 'ItemTypeSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                    },
+                    component: () =>
+                        import('src/pages/ItemType/Card/ItemTypeSummary.vue'),
+                },
+                {
+                    name: 'ItemTypeBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/ItemType/Card/ItemTypeBasicData.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index 51e726a62..198f1d8f2 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -10,6 +10,7 @@ import supplier from './modules/Supplier';
 import route from './modules/route';
 import travel from './modules/travel';
 import department from './modules/department';
+import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
@@ -71,6 +72,7 @@ const routes = [
             roadmap,
             entry,
             parking,
+            ItemType,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

From 42fe189e9f6b222cb6a1c81d916dfd82cbec5601 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 23 Apr 2024 16:45:28 -0300
Subject: [PATCH 02/18] Add module name in Item router file

---
 src/router/modules/item.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 17e9b7673..70d49c56c 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'items',
         icon: 'vn:item',
+        moduleName: 'Item',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },

From e6c9a692f54b610016d32b68db20e1c42185bf6c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Apr 2024 14:33:10 +0200
Subject: [PATCH 03/18] feat moduleName

---
 src/router/modules/department.js | 1 +
 src/router/modules/itemType.js   | 1 +
 src/router/modules/roadmap.js    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/router/modules/department.js b/src/router/modules/department.js
index aaffc3460..dfd5e64ba 100644
--- a/src/router/modules/department.js
+++ b/src/router/modules/department.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'department',
         icon: 'vn:greuge',
+        moduleName: 'Department',
     },
     component: RouterView,
     redirect: { name: 'DepartmentCard' },
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 0d966c32c..32bd63690 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'itemType',
         icon: 'contact_support',
+        moduleName: 'ItemType',
     },
     component: RouterView,
     redirect: { name: 'ItemTypeCard' },
diff --git a/src/router/modules/roadmap.js b/src/router/modules/roadmap.js
index 02edf94be..6b2aa6a13 100644
--- a/src/router/modules/roadmap.js
+++ b/src/router/modules/roadmap.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'roadmap',
         icon: 'vn:troncales',
+        moduleName: 'Roadmap',
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },

From e1f50f5daf3d017c6b8a04470822f061368b1340 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Apr 2024 15:05:10 +0200
Subject: [PATCH 04/18] fix: minorchanges

---
 src/i18n/locale/es.yml                      | 2 +-
 src/pages/ItemType/Card/ItemTypeSummary.vue | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6d2e5c8c2..6634b6f07 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1234,7 +1234,7 @@ itemType:
         life: Vida
         promo: Promoción
         itemPackingType: Tipo de embalaje
-        isUnconventionalSize: Es de tamaño no convencional
+        isUnconventionalSize: Es de tamaño poco convencional
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
index b71b2acf5..393675a30 100644
--- a/src/pages/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -93,6 +93,7 @@ async function setItemTypeData(data) {
                     :value="itemType.itemPackingType?.description"
                 />
                 <VnLv
+                    class="large-label"
                     :label="t('itemType.summary.isUnconventionalSize')"
                     :value="itemType.isUnconventionalSize"
                 />
@@ -100,3 +101,9 @@ async function setItemTypeData(data) {
         </template>
     </CardSummary>
 </template>
+
+<style lang="scss">
+.large-label > div.label {
+    width: 15em !important;
+}
+</style>

From 127567898da40f416db6d3fcc3da7231dba59a3d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 13:27:58 +0200
Subject: [PATCH 05/18] fix: add filter panel

---
 src/pages/Item/ItemTypeList.vue       | 22 +++++++++++-
 src/pages/ItemType/ItemTypeFilter.vue | 49 +++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/ItemType/ItemTypeFilter.vue

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index b0b4de540..5b106916d 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -6,6 +6,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
+import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
@@ -31,12 +32,31 @@ const redirectToCreateView = () => {
             <VnSearchbar
                 data-key="ItemTypeList"
                 url="ItemTypes"
-                custom-route-redirect-name="ItemTypeSummary"
                 :label="t('Search item type')"
                 :info="t('Search itemType by id, name or code')"
             />
         </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
     </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ItemTypeFilter data-key="ItemTypes" />
+        </QScrollArea>
+    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
new file mode 100644
index 000000000..33238545f
--- /dev/null
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+const { t } = useI18n();
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        name: Name
+        code: Code
+es:
+    params:
+        name: Nombre
+        code: Código
+    Name: Nombre
+    Code: Código
+</i18n>

From c1ed4ab03280b8125c92e8587e9a8bd4ca626abd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 14:49:54 +0200
Subject: [PATCH 06/18] fix: add exprBuilder

---
 src/components/ui/VnFilterPanel.vue   |  3 ++-
 src/components/ui/VnSearchbar.vue     |  2 ++
 src/pages/Item/ItemTypeList.vue       | 17 +++++++++++++++--
 src/pages/ItemType/ItemTypeFilter.vue |  8 +++++++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 96d097191..cde48e9b3 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -145,7 +145,8 @@ const customTags = computed(() =>
 );
 
 async function remove(key) {
-    userParams.value[key] = null;
+    // userParams.value[key] = null;
+    if (userParams.value[key]) delete userParams.value[key];
     await search();
     emit('remove', key);
 }
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index fc8475ace..da8d43c95 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -81,8 +81,10 @@ async function search() {
     const staticParams = Object.entries(store.userParams).filter(
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
+    // const filter =props?.where? { where: JSON.parse(props.where) }: {}
     await arrayData.applyFilter({
         params: {
+            // filter ,
             ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 5b106916d..1e21c1719 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -24,6 +24,17 @@ const redirectToItemTypeSummary = (id) => {
 const redirectToCreateView = () => {
     router.push({ name: 'ItemTypeCreate' });
 };
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+        case 'code':
+        case 'search':
+            return {
+                name: { like: `%${value}%` },
+                code: { like: `%${value}%` },
+            };
+    }
+};
 </script>
 
 <template>
@@ -32,8 +43,10 @@ const redirectToCreateView = () => {
             <VnSearchbar
                 data-key="ItemTypeList"
                 url="ItemTypes"
-                :label="t('Search item type')"
+                :label="t('Search item  type')"
+                :redirect="false"
                 :info="t('Search itemType by id, name or code')"
+                :expr-builder="exprBuilder"
             />
         </Teleport>
         <Teleport to="#actions-append">
@@ -54,7 +67,7 @@ const redirectToCreateView = () => {
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <ItemTypeFilter data-key="ItemTypes" />
+            <ItemTypeFilter data-key="ItemTypeList" :expr-builder="exprBuilder" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
index 33238545f..2a86795c2 100644
--- a/src/pages/ItemType/ItemTypeFilter.vue
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -10,10 +10,16 @@ const props = defineProps({
         required: true,
     },
 });
+
+const emit = defineEmits(['search']);
 </script>
 
 <template>
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        @search="emit('search')"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>

From 0d50944c2d9b79da840deac5621e70dc1b64d29a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 15:24:44 +0200
Subject: [PATCH 07/18] fix: add exprBuilder

---
 src/components/ui/VnFilterPanel.vue   | 20 +++++++++++++++++++-
 src/pages/ItemType/ItemTypeFilter.vue | 14 ++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cde48e9b3..cd5a3caf1 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -81,6 +81,8 @@ const isLoading = ref(false);
 async function search() {
     isLoading.value = true;
     const params = { ...userParams.value };
+    if (Object.entries(params).length > 0) store.exprBuilder = props.exprBuilder;
+
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
@@ -144,9 +146,25 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
+watch(tags, (now, before) => {
+    if (now.length < before.length) {
+        const beforeMap = before.map(({ label }) => label);
+        const nowMap = now.map(({ label }) => label);
+        const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
+        remove(key ?? beforeMap[0]);
+    }
+    console.error('');
+});
+
 async function remove(key) {
     // userParams.value[key] = null;
-    if (userParams.value[key]) delete userParams.value[key];
+    delete userParams.value[key];
+    if (Object.entries(userParams.value).length === 0) {
+        store.exprBuilder = null;
+        delete store.filter.where;
+    } else {
+        store.exprBuilder = props.exprBuilder;
+    }
     await search();
     emit('remove', key);
 }
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
index 2a86795c2..176fca22a 100644
--- a/src/pages/ItemType/ItemTypeFilter.vue
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -29,12 +29,22 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                    <VnInput
+                        @update:model-value="emit('search')"
+                        :label="t('Name')"
+                        v-model="params.name"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
+                    <VnInput
+                        @update:model-value="emit('search')"
+                        v-model="params.code"
+                        :label="t('Code')"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
         </template>

From a03049a721a580afd127be354b47e6aa3addb25f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 17:26:18 +0200
Subject: [PATCH 08/18] fix: poc

---
 src/components/ui/VnFilterPanel.vue   | 47 +++++++++++++++++----------
 src/pages/Item/ItemTypeList.vue       | 15 +++------
 src/pages/ItemType/ItemTypeFilter.vue | 14 ++------
 3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cd5a3caf1..94b64c0db 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -78,11 +78,23 @@ watch(
 );
 
 const isLoading = ref(false);
+function eliminarPropiedadesNull(objeto) {
+    for (let clave in objeto) {
+        if (objeto[clave] === null) {
+            delete objeto[clave];
+        }
+    }
+    return objeto;
+}
+
 async function search() {
     isLoading.value = true;
+    const objetoSinNull = eliminarPropiedadesNull(userParams.value);
+    userParams.value = objetoSinNull;
     const params = { ...userParams.value };
     if (Object.entries(params).length > 0) store.exprBuilder = props.exprBuilder;
-
+    else delete store.filter.where;
+    store.userParams = userParams.value;
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
@@ -146,25 +158,26 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
-watch(tags, (now, before) => {
-    if (now.length < before.length) {
-        const beforeMap = before.map(({ label }) => label);
-        const nowMap = now.map(({ label }) => label);
-        const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
-        remove(key ?? beforeMap[0]);
-    }
-    console.error('');
-});
+// watch(tags, (now, before) => {
+//     if (now.length < before.length) {
+//         const beforeMap = before.map(({ label }) => label);
+//         const nowMap = now.map(({ label }) => label);
+//         const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
+//         remove(key ?? beforeMap[0]);
+//     }
+//     console.error('');
+// });
 
 async function remove(key) {
     // userParams.value[key] = null;
-    delete userParams.value[key];
-    if (Object.entries(userParams.value).length === 0) {
-        store.exprBuilder = null;
-        delete store.filter.where;
-    } else {
-        store.exprBuilder = props.exprBuilder;
-    }
+    if (userParams.value[key]) delete userParams.value[key];
+    // if (Object.entries(userParams.value).length === 0) {
+    //     store.exprBuilder = null;
+    //     delete store.filter.where;
+    // }
+    // else {
+    //     store.exprBuilder = props.exprBuilder;
+    // }
     await search();
     emit('remove', key);
 }
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 1e21c1719..6e31cdd25 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -24,17 +24,10 @@ const redirectToItemTypeSummary = (id) => {
 const redirectToCreateView = () => {
     router.push({ name: 'ItemTypeCreate' });
 };
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-        case 'code':
-        case 'search':
-            return {
-                name: { like: `%${value}%` },
-                code: { like: `%${value}%` },
-            };
-    }
-};
+const exprBuilder = (param, value) => ({
+    name: { like: `%${value}%` },
+    code: { like: `%${value}%` },
+});
 </script>
 
 <template>
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
index 176fca22a..2a86795c2 100644
--- a/src/pages/ItemType/ItemTypeFilter.vue
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -29,22 +29,12 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        @update:model-value="emit('search')"
-                        :label="t('Name')"
-                        v-model="params.name"
-                        is-outlined
-                    />
+                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        @update:model-value="emit('search')"
-                        v-model="params.code"
-                        :label="t('Code')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
                 </QItemSection>
             </QItem>
         </template>

From 955e196882d536d1a245a46716b6e11571d2a67e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 17:43:57 +0200
Subject: [PATCH 09/18] fix: filterPanelbug

---
 src/components/ui/VnFilterPanel.vue | 35 ++---------------------------
 src/pages/Item/ItemTypeList.vue     |  3 ++-
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 94b64c0db..eb0bbbe66 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -78,23 +78,10 @@ watch(
 );
 
 const isLoading = ref(false);
-function eliminarPropiedadesNull(objeto) {
-    for (let clave in objeto) {
-        if (objeto[clave] === null) {
-            delete objeto[clave];
-        }
-    }
-    return objeto;
-}
-
 async function search() {
+    store.filter.where = {};
     isLoading.value = true;
-    const objetoSinNull = eliminarPropiedadesNull(userParams.value);
-    userParams.value = objetoSinNull;
     const params = { ...userParams.value };
-    if (Object.entries(params).length > 0) store.exprBuilder = props.exprBuilder;
-    else delete store.filter.where;
-    store.userParams = userParams.value;
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
@@ -158,26 +145,8 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
-// watch(tags, (now, before) => {
-//     if (now.length < before.length) {
-//         const beforeMap = before.map(({ label }) => label);
-//         const nowMap = now.map(({ label }) => label);
-//         const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
-//         remove(key ?? beforeMap[0]);
-//     }
-//     console.error('');
-// });
-
 async function remove(key) {
-    // userParams.value[key] = null;
-    if (userParams.value[key]) delete userParams.value[key];
-    // if (Object.entries(userParams.value).length === 0) {
-    //     store.exprBuilder = null;
-    //     delete store.filter.where;
-    // }
-    // else {
-    //     store.exprBuilder = props.exprBuilder;
-    // }
+    userParams.value[key] = null;
     await search();
     emit('remove', key);
 }
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 6e31cdd25..17d1c0044 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -60,7 +60,7 @@ const exprBuilder = (param, value) => ({
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <ItemTypeFilter data-key="ItemTypeList" :expr-builder="exprBuilder" />
+            <ItemTypeFilter data-key="ItemTypeList" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
@@ -70,6 +70,7 @@ const exprBuilder = (param, value) => ({
                 url="ItemTypes"
                 :order="['name']"
                 auto-load
+                :expr-builder="exprBuilder"
             >
                 <template #body="{ rows }">
                     <CardList

From 19fcacebc9969bdec3107bffcd2cc78a0bdad4bc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:12:19 +0200
Subject: [PATCH 10/18] perf: VnSearchbar

---
 src/components/ui/VnSearchbar.vue | 1 +
 src/router/modules/itemType.js    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index da8d43c95..344267ef7 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -108,6 +108,7 @@ async function search() {
     let targetUrl;
 
     if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
+    if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`);
     else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
 
     await router.push({ path: targetUrl });
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 32bd63690..3609b6688 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -1,7 +1,7 @@
 import { RouterView } from 'vue-router';
 
 export default {
-    path: '/item-type',
+    path: '/item/item-type',
     name: 'ItemType',
     meta: {
         title: 'itemType',

From bdc5d7210f460909c6d3162732e49fe7ec6e28c8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:12:37 +0200
Subject: [PATCH 11/18] fix: remove redirect

---
 src/pages/Item/ItemTypeList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 17d1c0044..e362c6726 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -37,7 +37,6 @@ const exprBuilder = (param, value) => ({
                 data-key="ItemTypeList"
                 url="ItemTypes"
                 :label="t('Search item  type')"
-                :redirect="false"
                 :info="t('Search itemType by id, name or code')"
                 :expr-builder="exprBuilder"
             />

From 8c3d32ec8621a939f70cff216bfac81650cbfcd5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:12:50 +0200
Subject: [PATCH 12/18] fix: remove VnFilterPanel inside Summary

---
 src/pages/Shelving/Card/ShelvingSummary.vue | 47 ++++-----------------
 1 file changed, 8 insertions(+), 39 deletions(-)

diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 49470719e..649799b00 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -20,14 +20,14 @@ const router = useRouter();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-const isDialog = Boolean($props.id);
-const hideRightDrawer = () => {
-    if (!isDialog) {
-        stateStore.rightDrawer = false;
-    }
-};
-onMounted(hideRightDrawer);
-onUnmounted(hideRightDrawer);
+const isDialog = false;
+// const hideRightDrawer = () => {
+//     if (!isDialog) {
+//         stateStore.rightDrawer = false;
+//     }
+// };
+// onMounted(hideRightDrawer);
+// onUnmounted(hideRightDrawer);
 const filter = {
     include: [
         {
@@ -46,23 +46,6 @@ const filter = {
 </script>
 
 <template>
-    <template v-if="!isDialog && stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <div class="q-pa-md">
         <CardSummary ref="summary" :url="`Shelvings/${entityId}`" :filter="filter">
             <template #header="{ entity }">
@@ -102,18 +85,4 @@ const filter = {
             </template>
         </CardSummary>
     </div>
-    <QDrawer
-        v-if="!isDialog"
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-    >
-        <QScrollArea class="fit text-grey-8">
-            <ShelvingFilter
-                data-key="ShelvingList"
-                @search="router.push({ name: 'ShelvingList' })"
-            />
-        </QScrollArea>
-    </QDrawer>
 </template>

From 34c8874468fbb062117c5ee2ce1c7eaf0628cb3a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:17:18 +0200
Subject: [PATCH 13/18] fix: i18n

---
 src/i18n/locale/es.yml          | 2 +-
 src/pages/Item/ItemTypeList.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 9bafd7067..fc96adbf8 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1220,7 +1220,7 @@ item:
         achieved: 'Conseguido'
         concept: 'Concepto'
         state: 'Estado'
-itemType:
+item/itemType:
     pageTitles:
         itemType: Familia
         basicData: Datos básicos
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index e362c6726..c92385295 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -36,7 +36,7 @@ const exprBuilder = (param, value) => ({
             <VnSearchbar
                 data-key="ItemTypeList"
                 url="ItemTypes"
-                :label="t('Search item  type')"
+                :label="t('Search item type')"
                 :info="t('Search itemType by id, name or code')"
                 :expr-builder="exprBuilder"
             />

From 2f55272df77a8a0fe949d2f8588eb635b36f469c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:23:50 +0200
Subject: [PATCH 14/18] fix: WorkerDescriptor

---
 src/i18n/locale/en.yml                        | 14 +-------
 src/i18n/locale/es.yml                        | 17 ----------
 src/pages/Item/ItemTypeCreate.vue             |  8 ++---
 src/pages/ItemType/Card/ItemTypeBasicData.vue | 18 +++++------
 .../ItemType/Card/ItemTypeDescriptor.vue      | 17 ++++++----
 src/pages/ItemType/Card/ItemTypeSummary.vue   | 32 +++++++++----------
 src/pages/ItemType/locale/en.yml              | 12 +++++++
 src/pages/ItemType/locale/es.yml              | 17 ++++++++++
 8 files changed, 69 insertions(+), 66 deletions(-)
 create mode 100644 src/pages/ItemType/locale/en.yml
 create mode 100644 src/pages/ItemType/locale/es.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 482c0dc7d..2b71195d1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1221,23 +1221,11 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
-itemType:
+item/itemType:
     pageTitles:
         itemType: Item type
         basicData: Basic data
         summary: Summary
-    shared:
-        code: Code
-        name: Name
-        worker: Worker
-        category: Category
-        temperature: Temperature
-    summary:
-        id: id
-        life: Life
-        promo: Promo
-        itemPackingType: Item packing type
-        isUnconventionalSize: Is unconventional size
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fc96adbf8..d1823b387 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1225,23 +1225,6 @@ item/itemType:
         itemType: Familia
         basicData: Datos básicos
         summary: Resumen
-    shared:
-        code: Código
-        name: Nombre
-        worker: Trabajador
-        category: Reino
-        temperature: Temperatura
-    summary:
-        id: id
-        code: Código
-        name: Nombre
-        worker: Trabajador
-        category: Reino
-        temperature: Temperatura
-        life: Vida
-        promo: Promoción
-        itemPackingType: Tipo de embalaje
-        isUnconventionalSize: Es de tamaño poco convencional
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue
index 3540fc5af..af3dc34ea 100644
--- a/src/pages/Item/ItemTypeCreate.vue
+++ b/src/pages/Item/ItemTypeCreate.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -58,7 +58,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                     <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="data.workerFk"
                         :label="t('itemType.shared.worker')"
                         :options="workersOptions"
@@ -66,7 +66,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                         option-label="firstName"
                         hide-selected
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="data.categoryFk"
                         :label="t('itemType.shared.category')"
                         :options="categoriesOptions"
@@ -76,7 +76,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="data.temperatureFk"
                         :label="t('itemType.shared.temperature')"
                         :options="temperaturesOptions"
diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
index ff2719896..0bdfab951 100644
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.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';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -43,21 +43,21 @@ const temperaturesOptions = ref([]);
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
-                <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
+                <VnInput v-model="data.code" :label="t('shared.code')" />
+                <VnInput v-model="data.name" :label="t('shared.name')" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.workerFk"
-                    :label="t('itemType.shared.worker')"
+                    :label="t('shared.worker')"
                     :options="workersOptions"
                     option-value="id"
                     option-label="firstName"
                     hide-selected
                 />
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.categoryFk"
-                    :label="t('itemType.shared.category')"
+                    :label="t('shared.category')"
                     :options="categoriesOptions"
                     option-value="id"
                     option-label="name"
@@ -65,9 +65,9 @@ const temperaturesOptions = ref([]);
                 />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.temperatureFk"
-                    :label="t('itemType.shared.temperature')"
+                    :label="t('shared.temperature')"
                     :options="temperaturesOptions"
                     option-value="code"
                     option-label="name"
diff --git a/src/pages/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
index cb0cb333b..e565a791b 100644
--- a/src/pages/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 import useCardDescription from 'src/composables/useCardDescription';
 
@@ -65,13 +66,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
             </QBtn>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('itemType.shared.code')" :value="entity.code" />
-            <VnLv :label="t('itemType.shared.name')" :value="entity.name" />
-            <VnLv
-                :label="t('itemType.shared.worker')"
-                :value="entity.worker?.firstName"
-            />
-            <VnLv :label="t('itemType.shared.category')" :value="entity.category?.name" />
+            <VnLv :label="t('shared.code')" :value="entity.code" />
+            <VnLv :label="t('shared.name')" :value="entity.name" />
+            <VnLv :label="t('shared.worker')">
+                <template #value>
+                    <span class="link">{{ entity.worker?.firstName }}</span>
+                    <WorkerDescriptorProxy :id="entity.worker?.id" />
+                </template>
+            </VnLv>
+            <VnLv :label="t('shared.category')" :value="entity.category?.name" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
index 393675a30..62d1c74ab 100644
--- a/src/pages/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -2,6 +2,7 @@
 import { ref, computed, onUpdated } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
@@ -71,30 +72,29 @@ async function setItemTypeData(data) {
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" />
                 </router-link>
-                <VnLv :label="t('itemType.summary.id')" :value="itemType.id" />
-                <VnLv :label="t('itemType.shared.code')" :value="itemType.code" />
-                <VnLv :label="t('itemType.shared.name')" :value="itemType.name" />
+                <VnLv :label="t('summary.id')" :value="itemType.id" />
+                <VnLv :label="t('shared.code')" :value="itemType.code" />
+                <VnLv :label="t('shared.name')" :value="itemType.name" />
+                <VnLv :label="t('shared.worker')">
+                    <template #value>
+                        <span class="link">{{ itemType.worker?.firstName }}</span>
+                        <WorkerDescriptorProxy :id="itemType.worker?.id" />
+                    </template>
+                </VnLv>
+                <VnLv :label="t('shared.category')" :value="itemType.category?.name" />
                 <VnLv
-                    :label="t('itemType.shared.worker')"
-                    :value="itemType.worker?.firstName"
-                />
-                <VnLv
-                    :label="t('itemType.shared.category')"
-                    :value="itemType.category?.name"
-                />
-                <VnLv
-                    :label="t('itemType.shared.temperature')"
+                    :label="t('shared.temperature')"
                     :value="itemType.temperature?.name"
                 />
-                <VnLv :label="t('itemType.summary.life')" :value="itemType.life" />
-                <VnLv :label="t('itemType.summary.promo')" :value="itemType.promo" />
+                <VnLv :label="t('summary.life')" :value="itemType.life" />
+                <VnLv :label="t('summary.promo')" :value="itemType.promo" />
                 <VnLv
-                    :label="t('itemType.summary.itemPackingType')"
+                    :label="t('summary.itemPackingType')"
                     :value="itemType.itemPackingType?.description"
                 />
                 <VnLv
                     class="large-label"
-                    :label="t('itemType.summary.isUnconventionalSize')"
+                    :label="t('summary.isUnconventionalSize')"
                     :value="itemType.isUnconventionalSize"
                 />
             </QCard>
diff --git a/src/pages/ItemType/locale/en.yml b/src/pages/ItemType/locale/en.yml
new file mode 100644
index 000000000..7889418ea
--- /dev/null
+++ b/src/pages/ItemType/locale/en.yml
@@ -0,0 +1,12 @@
+shared:
+    code: Code
+    name: Name
+    worker: Worker
+    category: Category
+    temperature: Temperature
+summary:
+    id: id
+    life: Life
+    promo: Promo
+    itemPackingType: Item packing type
+    isUnconventionalSize: Is unconventional size
diff --git a/src/pages/ItemType/locale/es.yml b/src/pages/ItemType/locale/es.yml
new file mode 100644
index 000000000..9a94dceb6
--- /dev/null
+++ b/src/pages/ItemType/locale/es.yml
@@ -0,0 +1,17 @@
+shared:
+    code: Código
+    name: Nombre
+    worker: Trabajador
+    category: Reino
+    temperature: Temperatura
+summary:
+    id: id
+    code: Código
+    name: Nombre
+    worker: Trabajador
+    category: Reino
+    temperature: Temperatura
+    life: Vida
+    promo: Promoción
+    itemPackingType: Tipo de embalaje
+    isUnconventionalSize: Es de tamaño poco convencional

From 7e2ec588c5e0eef9f435fb5f43e8db1cdedc89f9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:24:20 +0200
Subject: [PATCH 15/18] fix: remove Warning

---
 src/components/ui/VnUserLink.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index 47287c12b..33836550a 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -1,6 +1,5 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import { useI18n } from 'vue-i18n';
 
 const $props = defineProps({

From 0fff6cd446f22d4410b830d21c8f13399f71822a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:46:33 +0200
Subject: [PATCH 16/18] perf: VnCard

---
 src/pages/ItemType/Card/ItemTypeCard.vue | 28 ++++++------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
index bff91de06..cb8adf7f6 100644
--- a/src/pages/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -1,26 +1,12 @@
 <script setup>
+import VnCard from 'components/common/VnCard.vue';
+
 import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <ItemTypeDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div class="q-pa-md column items-center">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="ItemTypeSummary"
+        base-url="ItemTypes"
+        :descriptor="ItemTypeDescriptor"
+    />
 </template>

From 761bc7724f3eba14137f3e51fc979f5eea8eeb20 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:46:40 +0200
Subject: [PATCH 17/18] fix: redirect

---
 src/router/modules/itemType.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 3609b6688..8064c41ff 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -9,7 +9,7 @@ export default {
         moduleName: 'ItemType',
     },
     component: RouterView,
-    redirect: { name: 'ItemTypeCard' },
+    redirect: { name: 'ItemTypeList' },
     menus: {
         main: [],
         card: ['ItemTypeBasicData'],

From 6276c433d13b9afea9e3e2726bd0dda469bdc14e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 29 Apr 2024 08:23:29 -0300
Subject: [PATCH 18/18] Fix exprBuilder

---
 src/pages/Item/ItemTypeList.vue | 38 +++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 17d1c0044..c6557dc79 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -24,10 +24,40 @@ const redirectToItemTypeSummary = (id) => {
 const redirectToCreateView = () => {
     router.push({ name: 'ItemTypeCreate' });
 };
-const exprBuilder = (param, value) => ({
-    name: { like: `%${value}%` },
-    code: { like: `%${value}%` },
-});
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        or: [
+                            {
+                                name: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                            {
+                                code: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                        ],
+                    };
+                }
+            }
+    }
+};
 </script>
 
 <template>