src/components/TicketProblems.vue

@@ -1,22 +1,12 @@
 <script setup>
 import { toCurrency } from 'src/filters';
-import { getValueFromPath } from 'src/composables/getValueFromPath';
 
-const { row, visibleProblems = null } = defineProps({
+defineProps({ row: { type: Object, required: true } });
-    row: { type: Object, required: true },
-    visibleProblems: { type: Array },
-});
-
-function showProblem(problem) {
-    const val = getValueFromPath(row, problem);
-    if (!visibleProblems) return val;
-    return !!(visibleProblems?.includes(problem) && val);
-}
 </script>
 <template>
     <span class="q-gutter-x-xs">
         <router-link
-            v-if="showProblem('claim.claimFk')"
+            v-if="row.claim?.claimFk"
             :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
             class="link"
         >
@@ -28,7 +18,7 @@ function showProblem(problem) {
             </QIcon>
         </router-link>
         <QIcon
-            v-if="showProblem('isDeleted')"
+            v-if="row?.isDeleted"
             color="primary"
             name="vn:deletedTicket"
             size="xs"
@@ -39,7 +29,7 @@ function showProblem(problem) {
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="showProblem('hasRisk')"
+            v-if="row?.hasRisk"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
@@ -50,76 +40,51 @@ function showProblem(problem) {
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="showProblem('hasComponentLack')"
+            v-if="row?.hasComponentLack"
             name="vn:components"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
-            v-if="showProblem('hasItemDelay')"
-            color="primary"
-            size="xs"
-            name="vn:hasItemDelay"
-        >
             <QTooltip>
                 {{ $t('ticket.summary.hasItemDelay') }}
             </QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
-            v-if="showProblem('hasItemLost')"
-            color="primary"
-            size="xs"
-            name="vn:hasItemLost"
-        >
             <QTooltip>
                 {{ $t('salesTicketsTable.hasItemLost') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="showProblem('hasItemShortage')"
+            v-if="row?.hasItemShortage"
             name="vn:unavailable"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
-            v-if="showProblem('hasRounding')"
-            color="primary"
-            name="sync_problem"
-            size="xs"
-        >
             <QTooltip>
                 {{ $t('ticketList.rounding') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="showProblem('hasTicketRequest')"
+            v-if="row?.hasTicketRequest"
             name="vn:buyrequest"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
-            v-if="showProblem('isTaxDataChecked')"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
             <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
+        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
-            v-if="showProblem('isTooLittle')"
-            name="vn:isTooLittle"
-            color="primary"
-            size="xs"
-        >
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>

src/components/__tests__/UserPanel.spec.js

@@ -1,63 +1,65 @@
-import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import UserPanel from 'src/components/UserPanel.vue';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';
 
+vi.mock('src/utils/quasarLang', () => ({
+  default: vi.fn(),
+}));
+
 describe('UserPanel', () => {
-    let wrapper;
+  let wrapper;
-    let vm;
+  let vm;
-    let state;
+  let state;
 
-    beforeEach(() => {
+  beforeEach(() => {
-        wrapper = createWrapper(UserPanel, {});
+    wrapper = createWrapper(UserPanel, {});
-        state = useState();
+    state = useState();
-        state.setUser({
+    state.setUser({
-            id: 115,
+      id: 115,
-            name: 'itmanagement',
+      name: 'itmanagement',
-            nickname: 'itManagementNick',
+      nickname: 'itManagementNick',
-            lang: 'en',
+      lang: 'en',
-            darkMode: false,
+      darkMode: false,
-            companyFk: 442,
+      companyFk: 442,
-            warehouseFk: 1,
+      warehouseFk: 1,
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
     });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm;
+  });
 
-    afterEach(() => {
+  afterEach(() => {
-        vi.clearAllMocks();
+    vi.clearAllMocks();
-    });
+  });
 
-    it('should fetch warehouses data on mounted', async () => {
+  it('should fetch warehouses data on mounted', async () => {
-        const fetchData = wrapper.findComponent({ name: 'FetchData' });
+    const fetchData = wrapper.findComponent({ name: 'FetchData' });
-        expect(fetchData.props('url')).toBe('Warehouses');
+    expect(fetchData.props('url')).toBe('Warehouses');
-        expect(fetchData.props('autoLoad')).toBe(true);
+    expect(fetchData.props('autoLoad')).toBe(true);
-    });
+  });
 
-    it('should toggle dark mode correctly and update preferences', async () => {
+  it('should toggle dark mode correctly and update preferences', async () => {
-        await vm.saveDarkMode(true);
+    await vm.saveDarkMode(true);
-        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+    expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
-        expect(vm.user.darkMode).toBe(true);
+    expect(vm.user.darkMode).toBe(true);
-        vm.updatePreferences();
+    await vm.updatePreferences();
-        expect(vm.darkMode).toBe(true);
+    expect(vm.darkMode).toBe(true);
-    });
+  });
 
-    it('should change user language and update preferences', async () => {
+  it('should change user language and update preferences', async () => {
-        const userLanguage = 'es';
+    const userLanguage = 'es';
-        await vm.saveLanguage(userLanguage);
+    await vm.saveLanguage(userLanguage);
-        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+    expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
-        expect(vm.user.lang).toBe(userLanguage);
+    expect(vm.user.lang).toBe(userLanguage);
-        vm.updatePreferences();
+    await vm.updatePreferences();
-        expect(vm.locale).toBe(userLanguage);
+    expect(vm.locale).toBe(userLanguage);
-    });
+  });
 
-    it('should update user data', async () => {
+  it('should update user data', async () => {
-        const key = 'name';
+    const key = 'name';
-        const value = 'itboss';
+    const value = 'itboss';
-        await vm.saveUserData(key, value);
+    await vm.saveUserData(key, value);
-        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', {
+    expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
-            [key]: value,
+  });
-        });
+});
-    });
-});

src/components/ui/VnDescriptor.vue

@@ -6,7 +6,6 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
-import { getValueFromPath } from 'src/composables/getValueFromPath';
 
 const entity = defineModel({ type: Object, default: null });
 const $props = defineProps({
@@ -57,6 +56,18 @@ const routeName = computed(() => {
     return `${routeName}Summary`;
 });
 
+function getValueFromPath(path) {
+    if (!path) return;
+    const keys = path.toString().split('.');
+    let current = entity.value;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}
+
 function copyIdText(id) {
     copyText(id, {
         component: {
@@ -159,10 +170,10 @@ const toModule = computed(() => {
                         <div class="title">
                             <span
                                 v-if="title"
-                                :title="getValueFromPath(entity, title)"
+                                :title="getValueFromPath(title)"
                                 :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
                             >
-                                {{ getValueFromPath(entity, title) ?? title }}
+                                {{ getValueFromPath(title) ?? title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span
@@ -178,7 +189,7 @@ const toModule = computed(() => {
                             class="subtitle"
                             :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
                         >
-                            #{{ getValueFromPath(entity, subtitle) ?? entity.id }}
+                            #{{ getValueFromPath(subtitle) ?? entity.id }}
                         </QItemLabel>
                         <QBtn
                             round

src/composables/getValueFromPath.js

@@ -1,11 +0,0 @@
-export function getValueFromPath(root, path) {
-    if (!root || !path) return;
-    const keys = path.toString().split('.');
-    let current = root;
-
-    for (const key of keys) {
-        if (current[key] === undefined) return undefined;
-        else current = current[key];
-    }
-    return current;
-}

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -46,7 +46,7 @@ async function getClaims() {
     originalTicket.value = data[0]?.originalTicketFk;
 }
 async function getProblems() {
-    const { data } = await axios.get(`Tickets/getTicketProblems`, {params: { ids: [entityId.value] }});
+    const { data } = await axios.get(`Tickets/${entityId.value}/getTicketProblems`);
     if (!data) return;
     problems.value = data[0];
 }

src/pages/Ticket/TicketAdvance.vue

@@ -14,8 +14,6 @@ import { useState } from 'src/composables/useState';
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import { QTable } from 'quasar';
-import TicketProblems from 'src/components/TicketProblems.vue';
 
 const state = useState();
 const { t } = useI18n();
@@ -29,16 +27,6 @@ const selectedTickets = ref([]);
 const vnTableRef = ref({});
 const originElRef = ref(null);
 const destinationElRef = ref(null);
-const actions = {
-    advance: {
-        title: t('advanceTickets.advanceTickets'),
-        cb: moveTicketsAdvance,
-    },
-    advanceWithoutNegative: {
-        title: t('advanceTickets.advanceTicketsWithoutNegatives'),
-        cb: splitTickets,
-    },
-};
 let today = Date.vnNew().toISOString();
 const tomorrow = new Date(today);
 tomorrow.setDate(tomorrow.getDate() + 1);
@@ -90,15 +78,6 @@ const ticketColumns = computed(() => [
         headerClass: 'horizontal-separator',
         hidden: true,
     },
-    {
-        label: t('globals.agency'),
-        name: 'agency',
-        field: 'agency',
-        align: 'left',
-        sortable: true,
-        headerClass: 'horizontal-separator',
-        columnFilter: false,
-    },
     {
         label: t('advanceTickets.preparation'),
         name: 'preparation',
@@ -106,6 +85,7 @@ const ticketColumns = computed(() => [
         align: 'left',
         sortable: true,
         headerClass: 'horizontal-separator',
+        columnFilter: false,
     },
     {
         align: 'left',
@@ -128,19 +108,12 @@ const ticketColumns = computed(() => [
         headerClass: 'horizontal-separator',
         format: (row) => toCurrency(row.totalWithVat),
     },
-    {
-        align: 'left',
-        label: '',
-        name: 'problems',
-        headerClass: 'vertical-separator horizontal-separator',
-        columnClass: 'vertical-separator',
-        hidden: true,
-    },
     {
         align: 'left',
         label: t('advanceTickets.futureId'),
         name: 'futureId',
-        headerClass: 'horizontal-separator',
+        headerClass: 'vertical-separator horizontal-separator',
+        columnClass: 'vertical-separator',
     },
     {
         align: 'left',
@@ -269,7 +242,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
     return { query, params };
 };
 
-async function moveTicketsAdvance() {
+const moveTicketsAdvance = async () => {
     let ticketsToMove = [];
     for (const ticket of selectedTickets.value) {
         if (!ticket.id) {
@@ -294,7 +267,7 @@ async function moveTicketsAdvance() {
     vnTableRef.value.reload();
     selectedTickets.value = [];
     if (ticketsToMove.length) notify(t('advanceTickets.moveTicketSuccess'), 'positive');
-}
+};
 
 const progressLength = ref(0);
 const progressPercentage = computed(() => {
@@ -317,7 +290,7 @@ const progressAdd = () => {
     }
 };
 
-async function splitTickets() {
+const splitTickets = async () => {
     try {
         showProgressDialog.value = true;
         for (const ticket of selectedTickets.value) {
@@ -337,7 +310,7 @@ async function splitTickets() {
     } finally {
         vnTableRef.value.reload();
     }
-}
+};
 
 const resetProgressData = () => {
     if (cancelProgress.value) cancelProgress.value = false;
@@ -353,32 +326,6 @@ const handleCloseProgressDialog = () => {
 
 const handleCancelProgress = () => (cancelProgress.value = true);
 
-const confirmAction = (action) => {
-    openConfirmationModal(actions[action].title, false, actions[action].cb, null, {
-        component: QTable,
-        props: {
-            columns: [
-                {
-                    align: 'left',
-                    label: t('advanceTickets.destination'),
-                    name: 'id',
-                    field: (row) => row.id,
-                },
-                {
-                    align: 'left',
-                    label: t('advanceTickets.origin'),
-                    name: 'futureId',
-                    field: (row) => row.futureId,
-                },
-            ],
-            rows: selectedTickets.value,
-            class: 'full-width',
-            dense: true,
-            flat: true,
-        },
-    });
-};
-
 watch(
     () => vnTableRef.value.tableRef?.$el,
     ($el) => {
@@ -452,7 +399,15 @@ watch(
                 color="primary"
                 class="q-mr-sm"
                 :disable="!selectedTickets.length"
-                @click.stop="confirmAction('advance')"
+                @click.stop="
+                    openConfirmationModal(
+                        t('advanceTickets.advanceTicketTitle'),
+                        t(`advanceTickets.advanceTitleSubtitle`, {
+                            selectedTickets: selectedTickets.length,
+                        }),
+                        moveTicketsAdvance,
+                    )
+                "
             >
                 <QTooltip>
                     {{ t('advanceTickets.advanceTickets') }}
@@ -462,7 +417,15 @@ watch(
                 icon="alt_route"
                 color="primary"
                 :disable="!selectedTickets.length"
-                @click.stop="confirmAction('advanceWithoutNegative')"
+                @click.stop="
+                    openConfirmationModal(
+                        t('advanceTickets.advanceWithoutNegativeTitle'),
+                        t(`advanceTickets.advanceWithoutNegativeSubtitle`, {
+                            selectedTickets: selectedTickets.length,
+                        }),
+                        splitTickets,
+                    )
+                "
             >
                 <QTooltip>
                     {{ t('advanceTickets.advanceTicketsWithoutNegatives') }}
@@ -491,9 +454,9 @@ watch(
             }"
             v-model:selected="selectedTickets"
             :pagination="{ rowsPerPage: 0 }"
-            :no-data-label="$t('globals.noResults')"
+            :no-data-label="t('globals.noResults')"
             :right-search="false"
-            :order="['futureTotalWithVat ASC']"
+            :order="['futureTotalWithVat ASC']"            
             auto-load
             :disable-option="{ card: true }"
         >
@@ -559,9 +522,6 @@ watch(
                     {{ toCurrency(row.totalWithVat || 0) }}
                 </QBadge>
             </template>
-            <template #column-problems="{ row }">
-                <TicketProblems :row="row.problems" :visible-problems="['hasRisk']" />
-            </template>
             <template #column-futureId="{ row }">
                 <QBtn flat class="link" dense>
                     {{ row.futureId }}

src/pages/Ticket/TicketAdvanceFilter.vue

@@ -10,7 +10,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import axios from 'axios';
 import { onMounted } from 'vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-import VnCheckbox from 'src/components/common/VnCheckbox.vue';
+
 const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
@@ -122,20 +122,18 @@ onMounted(async () => await getItemPackingTypes());
                 <QItemSection>
                     <VnInputNumber
                         v-model="params.scopeDays"
-                        :label="t('globals.daysOnward')"
+                        :label="t('Days onward')"
                         filled
-                        :step="0"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnCheckbox
+                    <QCheckbox
                         :label="t('params.isFullMovable')"
                         v-model="params.isFullMovable"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
-                        dense
                     />
                 </QItemSection>
             </QItem>
@@ -168,12 +166,11 @@ onMounted(async () => await getItemPackingTypes());
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnCheckbox
+                    <QCheckbox
                         toggle-indeterminate
-                        :label="t('params.onlyWithDestination')"
+                        label="only with destination"
                         v-model="params.onlyWithDestination"
                         @update:model-value="searchFn()"
-                        dense
                     />
                 </QItemSection>
             </QItem>
@@ -197,8 +194,8 @@ es:
     Vertical: Vertical
     iptInfo: Encajado
     params:
-        dateFuture: F. origen
+        dateFuture: fecha origen
-        dateToAdvance: F. destino
+        dateToAdvance: Fecha destino
         futureIpt: IPT Origen
         ipt: IPT destino
         isFullMovable: 100% movible