Merge branch 'test' into solveConflicts_test_to_dev

2024-11-18 10:50:42 +01:00 · 2024-11-18 10:50:42 +01:00 · 0c36d385ec
parent 80770b1165 29239ef2cd
commit 0c36d385ec
32 changed files with 130 additions and 94 deletions
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@ -77,7 +77,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref();
+const formData = ref([]);
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@ -25,7 +25,7 @@ const $props = defineProps({
    },
    searchUrl: {
        type: String,
-        default: 'params',
+        default: 'table',
    },
 });

--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@ -17,7 +17,7 @@ const $props = defineProps({
    },
    searchUrl: {
        type: String,
-        default: 'params',
+        default: 'table',
    },
    vertical: {
        type: Boolean,
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@ -49,7 +49,7 @@ const $props = defineProps({
    },
    searchUrl: {
        type: String,
-        default: 'params',
+        default: 'table',
    },
    redirect: {
        type: Boolean,
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@ -44,7 +44,7 @@ const props = defineProps({
    },
    limit: {
        type: Number,
-        default: 10,
+        default: 20,
    },
    userParams: {
        type: Object,
@ -100,7 +100,7 @@ const arrayData = useArrayData(props.dataKey, {
 const store = arrayData.store;

 onMounted(async () => {
-    if (props.autoLoad) await fetch();
+    if (props.autoLoad && !store.data?.length) await fetch();
    mounted.value = true;
 });

@ -115,7 +115,11 @@ watch(

 watch(
    () => store.data,
-    (data) => emit('onChange', data)
+    (data) => {
+        if (!mounted.value) return;
+        emit('onChange', data);
+    },
+    { immediate: true }
 );

 watch(
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@ -45,7 +45,7 @@ const props = defineProps({
    },
    limit: {
        type: Number,
-        default: 10,
+        default: 20,
    },
    userParams: {
        type: Object,
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@ -271,7 +271,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                const pushUrl = { path: to };
                if (to.endsWith('/list') || to.endsWith('/'))
                    pushUrl.query = newUrl.query;
-                destroy();
+                else destroy();
                return router.push(pushUrl);
            }
        }
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -104,7 +104,7 @@ const exprBuilder = (param, value) => {

 <template>
    <VnSearchbar
-        data-key="AccountUsers"
+        data-key="AccountList"
        :expr-builder="exprBuilder"
        :label="t('account.search')"
        :info="t('account.searchInfo')"
@ -112,12 +112,12 @@ const exprBuilder = (param, value) => {
    />
    <RightMenu>
        <template #right-panel>
-            <AccountFilter data-key="AccountUsers" />
+            <AccountFilter data-key="AccountList" />
        </template>
    </RightMenu>
    <VnTable
        ref="tableRef"
-        data-key="AccountUsers"
+        data-key="AccountList"
        url="VnUsers/preview"
        :filter="filter"
        order="id DESC"
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@ -82,14 +82,14 @@ const exprBuilder = (param, value) => {

 <template>
    <VnSearchbar
-        data-key="Roles"
+        data-key="AccountRolesList"
        :expr-builder="exprBuilder"
        :label="t('role.searchRoles')"
        :info="t('role.searchInfo')"
    />
    <VnTable
        ref="tableRef"
-        data-key="Roles"
+        data-key="AccountRolesList"
        :url="`VnRoles`"
        :create="{
            urlCreate: 'VnRoles',
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@ -9,7 +9,7 @@ const { t } = useI18n();
    <VnCard
        data-key="Role"
        :descriptor="RoleDescriptor"
-        search-data-key="AccountRoles"
+        search-data-key="AccountRolesList"
        :searchbar-props="{
            url: 'VnRoles',
            label: t('role.searchRoles'),
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@ -37,6 +37,9 @@ const entityId = computed(() => {

 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
+const debtWarning = computed(() => {
+    return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
+});
 </script>

 <template>
@ -117,7 +120,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                    v-if="customer.debt > customer.credit"
                    name="vn:risk"
                    size="xs"
-                    color="primary"
+                    :color="debtWarning"
                >
                    <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                </QIcon>
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@ -11,10 +11,24 @@ defineProps({
        required: true,
    },
 });
+const handleSalesModelValue = (val) => ({
+    or: [
+        { id: val },
+        { name: val },
+        { nickname: { like: '%' + val + '%' } },
+        { code: { like: `${val}%` } },
+    ],
+});
+
+const exprBuilder = (param, value) => {
+    return {
+        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
+    };
+};
 </script>

 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
        <template #tags="{ tag, formatFn }">
            <div class="q-gutter-x-xs">
                <strong>{{ t(`params.${tag.label}`) }}: </strong>
@ -52,14 +66,18 @@ defineProps({
            <QItem class="q-mb-sm">
                <QItemSection>
                    <VnSelect
-                        url="Workers/activeWithInheritedRole"
-                        :where="{ role: 'salesPerson' }"
+                        url="Workers/search"
+                        :params="{
+                            departmentCodes: ['VT'],
+                        }"
                        auto-load
                        :label="t('Salesperson')"
+                        :expr-builder="exprBuilder"
                        v-model="params.salesPersonFk"
                        @update:model-value="searchFn()"
                        option-value="id"
                        option-label="name"
+                        sort-by="nickname ASC"
                        emit-value
                        map-options
                        use-input
@ -67,7 +85,19 @@ defineProps({
                        dense
                        outlined
                        rounded
-                    />
+                        :input-debounce="0"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }},{{ opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template></VnSelect
+                    >
                </QItemSection>
            </QItem>
            <QItem class="q-mb-sm">
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@ -394,16 +394,16 @@ function handleLocation(data, location) {
    <VnSearchbar
        :info="t('You can search by customer id or name')"
        :label="t('Search customer')"
-        data-key="Customer"
+        data-key="CustomerList"
    />
    <RightMenu>
        <template #right-panel>
-            <CustomerFilter data-key="Customer" />
+            <CustomerFilter data-key="CustomerList" />
        </template>
    </RightMenu>
    <VnTable
        ref="tableRef"
-        data-key="Customer"
+        data-key="CustomerList"
        url="Clients/filter"
        :create="{
            urlCreate: 'Clients/createWithUser',
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@ -23,6 +23,7 @@ const incoterms = ref([]);
 const customsAgents = ref([]);
 const observationTypes = ref([]);
 const notes = ref([]);
+let originalNotes = [];
 const deletes = ref([]);

 onBeforeMount(() => {
@ -42,7 +43,8 @@ const getData = async (observations) => {
        });

        if (data.length) {
-            notes.value = data
+            originalNotes = data;
+            notes.value = originalNotes
                .map((observation) => {
                    const type = observationTypes.value.find(
                        (type) => type.id === observation.observationTypeFk
@ -81,14 +83,24 @@ const deleteNote = (id, index) => {
 };

 const onDataSaved = async () => {
-    let payload = {};
-    const creates = notes.value.filter((note) => note.$isNew);
-    if (creates.length) {
-        payload.creates = creates;
-    }
-    if (deletes.value.length) {
-        payload.deletes = deletes.value;
-    }
+    let payload = {
+        creates: notes.value.filter((note) => note.$isNew),
+        deletes: deletes.value,
+        updates: notes.value
+            .filter((note) =>
+                originalNotes.some(
+                    (oNote) =>
+                        oNote.id === note.id &&
+                        (note.description !== oNote.description ||
+                            note.observationTypeFk !== oNote.observationTypeFk)
+                )
+            )
+            .map((note) => ({
+                data: note,
+                where: { id: note.id },
+            })),
+    };
+
    await axios.post('AddressObservations/crud', payload);
    notes.value = [];
    deletes.value = [];
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@ -122,7 +122,7 @@ const cols = computed(() => [
        :columns="cols"
        :right-search="false"
        :disable-option="{ card: true }"
-        :auto-load="!!$route.query.params"
+        :auto-load="!!$route.query.table"
    >
        <template #column-supplierFk="{ row }">
            <span class="link" @click.stop>
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@ -182,11 +182,11 @@ watchEffect(selectedRows);
    <VnSearchbar
        :info="t('youCanSearchByInvoiceReference')"
        :label="t('searchInvoice')"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
    />
    <RightMenu>
        <template #right-panel>
-            <InvoiceOutFilter data-key="invoiceOut" />
+            <InvoiceOutFilter data-key="invoiceOutList" />
        </template>
    </RightMenu>
    <VnSubToolbar>
@ -203,7 +203,7 @@ watchEffect(selectedRows);
    </VnSubToolbar>
    <VnTable
        ref="tableRef"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
        :url="`${MODEL}/filter`"
        :create="{
            urlCreate: 'InvoiceOuts/createManualInvoice',
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@ -64,8 +64,7 @@ const columns = computed(() => [
    },
    {
        label: t('globals.name'),
-        field: 'name',
-        name: 'description',
+        name: 'name',
        ...defaultColumnAttrs,
        create: true,
        cardVisible: true,
@ -426,7 +425,7 @@ function handleOnDataSave({ CrudModelRef }) {
            :default-save="false"
            data-key="ItemFixedPrices"
            url="FixedPrices/filter"
-            :order="['description DESC']"
+            :order="['itemFk DESC', 'name DESC']"
            save-url="FixedPrices/crud"
            :user-params="{ warehouseFk: user.warehouseFk }"
            ref="tableRef"
@ -480,7 +479,7 @@ function handleOnDataSave({ CrudModelRef }) {
                    </template>
                </VnSelect>
            </template>
-            <template #column-description="{ row }">
+            <template #column-name="{ row }">
                <span class="link">
                    {{ row.name }}
                </span>
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@ -17,21 +17,6 @@ const props = defineProps({
 });

 const itemTypeWorkersOptions = ref([]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return { 'i.name': { like: `%${value}%` } };
-        case 'itemFk':
-        case 'warehouseFk':
-        case 'rate2':
-        case 'rate3':
-            param = `fp.${param}`;
-            return { [param]: value };
-        case 'minPrice':
-            param = `i.${param}`;
-            return { [param]: value };
-    }
-};
 </script>

 <template>
@ -66,7 +51,7 @@ const exprBuilder = (param, value) => {
                        url="Warehouses"
                        auto-load
                        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-                        :label="t('components.itemsFilterPanel.warehouseFk')"
+                        :label="t('globals.warehouse')"
                        v-model="params.warehouseFk"
                        option-label="name"
                        option-value="id"
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@ -14,7 +14,6 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
-import { onMounted } from 'vue';
 import { useRoute } from 'vue-router';

 const { t } = useI18n();
@ -142,8 +141,13 @@ const columns = computed(() => [
        ],
    },
 ]);
-
-async function fetchClientAddress(id, formData) {
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk);
+});
+async function fetchClientAddress(id, formData = {}) {
    const { data } = await axios.get(`Clients/${id}`, {
        params: { filter: { include: { relation: 'addresses' } } },
    });
@ -170,13 +174,6 @@ const getDateColor = (date) => {
    if (comparation == 0) return 'bg-warning';
    if (comparation < 0) return 'bg-success';
 };
-
-onMounted(() => {
-    if (!route.query.createForm) return;
-    const clientId = route.query.createForm;
-    const id = JSON.parse(clientId);
-    fetchClientAddress(id.clientFk, id);
-});
 </script>
 <template>
    <OrderSearchbar />
@ -194,7 +191,7 @@ onMounted(() => {
            urlCreate: 'Orders/new',
            title: t('module.cerateOrder'),
            onDataSaved: (url) => {
-                tableRef.redirect(url);
+               tableRef.redirect(`${url}/catalog`);
            },
            formInitialData: {
                active: true,
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@ -158,7 +158,7 @@ onBeforeMount(async () => await getTicketData());
            <TicketBasicDataForm
                v-if="initialDataLoaded"
                @update-form="($event) => (formData = $event)"
-                :form-data="formData"
+                v-model="formData"
            />
        </QStep>
        <QStep :name="2" :title="t('basicData.priceDifference')">
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@ -47,7 +47,7 @@ const getGroupedStates = (data) => {
    />
    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
        <template #tags="{ tag, formatFn }">
            <div class="q-gutter-x-xs">
                <strong>{{ t(`params.${tag.label}`) }}: </strong>
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@ -205,6 +205,7 @@ const onThermographCreated = async (data) => {
                        }"
                        sort-by="thermographFk ASC"
                        option-label="thermographFk"
+                        option-filter-value="thermographFk"
                        :disable="viewAction === 'edit'"
                        :tooltip="t('New thermograph')"
                        :roles-allowed-to-create="['logistic']"
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@ -24,7 +24,7 @@ defineExpose({ states });

 <template>
    <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
        <template #tags="{ tag, formatFn }">
            <div class="q-gutter-x-xs">
                <strong>{{ t(`params.${tag.label}`) }}: </strong>
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@ -14,6 +14,7 @@ import WorkerFilter from '../WorkerFilter.vue';
            url: 'Workers/filter',
            label: 'Search worker',
            info: 'You can search by worker id or name',
+            order: 'id DESC',
        }"
        :redirect-on-error="true"
    />
--- a/src/pages/Worker/Card/WorkerNotificationsManager.vue
+++ b/src/pages/Worker/Card/WorkerNotificationsManager.vue
@ -70,7 +70,7 @@ function setNotifications(data) {
        :default-reset="false"
        :default-remove="false"
        :default-save="false"
-        @on-fetch="setNotifications"
+        @on-fetch="(data) => data && setNotifications(data)"
        search-url="notifications"
    >
        <template #body>
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@ -20,12 +20,13 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
 <template>
    <VnCard
        data-key="zone"
-        base-url="Zones"
+        :base-url="notIsLocations('Zones', undefined)"
        :descriptor="ZoneDescriptor"
-        :filter-panel="ZoneFilterPanel"
-        :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"
+        :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
+        :search-data-key="notIsLocations('ZoneList', undefined)"
+        :custom-url="`Zones/${route.params?.id}/getLeaves`"
        :searchbar-props="{
-            url: 'Zones',
+            url: notIsLocations('Zones', 'ZoneLocations'),
            label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
            info: t('list.searchInfo'),
            whereFilter: notIsLocations((value) => {
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@ -5,6 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';

 const props = defineProps({
    rootLabel: {
@ -33,22 +34,23 @@ const state = useState();
 const treeRef = ref();
 const expanded = ref([]);

-const arrayData = useArrayData('ZoneLocations', {
-    url: `Zones/${route.params.id}/getLeaves`,
+const datakey = 'ZoneLocations';
+const url = computed(() => `Zones/${route.params.id}/getLeaves`);
+const arrayData = useArrayData(datakey, {
+    url: url.value,
 });
 const { store } = arrayData;
 const storeData = computed(() => store.data);

-const nodes = ref([
-    {
-        id: null,
-        name: props.rootLabel,
-        sons: true,
-        tickable: false,
-        noTick: true,
-        children: [{}],
-    },
-]);
+const defaultNode = {
+    id: null,
+    name: props.rootLabel,
+    sons: true,
+    tickable: false,
+    noTick: true,
+    children: [{}],
+};
+const nodes = ref([defaultNode]);

 const _tickedNodes = computed({
    get: () => props.tickedNodes,
@ -128,6 +130,7 @@ function getNodeIds(node) {

 watch(storeData, async (val) => {
    // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
+    if (!nodes.value[0]) nodes.value = [defaultNode];
    nodes.value[0].childs = [...val];
    const fetchedNodeKeys = val.flatMap(getNodeIds);
    state.set('Tree', [...fetchedNodeKeys]);
@ -193,6 +196,7 @@ onUnmounted(() => {
            <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
        </template>
    </VnInput>
+    <VnSearchbar :data-key="datakey" :url="url" :redirect="false" />
    <QTree
        ref="treeRef"
        :nodes="nodes"
--- a/src/pages/Zone/Card/ZoneSearchbar.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@ -26,7 +26,7 @@ const exprBuilder = (param, value) => {

 <template>
    <VnSearchbar
-        data-key="Zones"
+        data-key="ZonesList"
        url="Zones"
        :filter="{
            include: { relation: 'agencyMode', scope: { fields: ['name'] } },
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@ -32,7 +32,6 @@ const agencies = ref([]);
        :data-key="props.dataKey"
        :search-button="true"
        :hidden-tags="['search']"
-        search-url="table"
    >
        <template #tags="{ tag }">
            <div class="q-gutter-x-xs">
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@ -139,12 +139,12 @@ onMounted(() => (stateStore.rightDrawer = true));
    <ZoneSearchbar />
    <RightMenu>
        <template #right-panel>
-            <ZoneFilterPanel data-key="Zones" />
+            <ZoneFilterPanel data-key="ZonesList" />
        </template>
    </RightMenu>
    <VnTable
        ref="tableRef"
-        data-key="Zones"
+        data-key="ZonesList"
        url="Zones"
        :create="{
            urlCreate: 'Zones',
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@ -8,7 +8,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
        userFilter: {},
        userParams: {},
        url: '',
-        limit: 10,
+        limit: 20,
        skip: 0,
        order: '',
        isLoading: false,
--- a/test/vitest/tests/composables/useArrayData.spec.js
+++ b/test/vitest/tests/composables/useArrayData.spec.js
@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';

 describe('useArrayData', () => {
-    const filter = '{"limit":10,"skip":0}';
+    const filter = '{"limit":20,"skip":0}';
    const params = { supplierFk: 2 };
    beforeEach(() => {
        vi.spyOn(useRouter(), 'replace');