diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 8f834b426..03c4f346d 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -29,10 +29,6 @@ const $props = defineProps({ type: String, default: null, }, - module: { - type: String, - default: null, - }, summary: { type: Object, default: null, @@ -148,7 +144,9 @@ const toModule = computed(() => {{ t('components.smartCard.openSummary') }} </QTooltip> </QBtn> - <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }"> + <RouterLink + :to="{ name: `${dataKey}Summary`, params: { id: entity.id } }" + > <QBtn class="link" color="white" diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue index a5793407e..671ef7fbc 100644 --- a/src/pages/Account/Alias/Card/AliasDescriptor.vue +++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue @@ -51,7 +51,6 @@ const removeAlias = () => { <CardDescriptor ref="descriptor" :url="`MailAliases/${entityId}`" - module="Alias" data-key="Alias" title="alias" > diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue index 728d2ced3..49328fe87 100644 --- a/src/pages/Account/Card/AccountDescriptor.vue +++ b/src/pages/Account/Card/AccountDescriptor.vue @@ -24,7 +24,6 @@ onMounted(async () => { ref="descriptor" :url="`VnUsers/preview`" :filter="{ ...filter, where: { id: entityId } }" - module="Account" data-key="Account" title="nickname" > diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue index dfcc8efc8..517517af0 100644 --- a/src/pages/Account/Role/Card/RoleDescriptor.vue +++ b/src/pages/Account/Role/Card/RoleDescriptor.vue @@ -35,7 +35,6 @@ const removeRole = async () => { <CardDescriptor url="VnRoles" :filter="{ where: { id: entityId } }" - module="Role" data-key="Role" :summary="$props.summary" > diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index 3749b0c7c..4551c58fe 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -46,7 +46,6 @@ onMounted(async () => { <CardDescriptor :url="`Claims/${entityId}`" :filter="filter" - module="Claim" title="client.name" data-key="Claim" > diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue index a4da925fa..89f9d9449 100644 --- a/src/pages/Customer/Card/CustomerDescriptor.vue +++ b/src/pages/Customer/Card/CustomerDescriptor.vue @@ -55,7 +55,6 @@ const debtWarning = computed(() => { <template> <CardDescriptor - module="Customer" :url="`Clients/${entityId}/getCard`" :summary="$props.summary" data-key="Customer" diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue index 8779fa7f2..69b300cb2 100644 --- a/src/pages/Entry/Card/EntryDescriptor.vue +++ b/src/pages/Entry/Card/EntryDescriptor.vue @@ -147,7 +147,6 @@ async function deleteEntry() { <template> <CardDescriptor ref="entryDescriptorRef" - module="Entry" :url="`Entries/${entityId}`" :userFilter="entryFilter" title="supplier.nickname" diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue index acd55c0fa..3843f5bf7 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue @@ -90,7 +90,6 @@ async function setInvoiceCorrection(id) { <template> <CardDescriptor ref="cardDescriptorRef" - module="InvoiceIn" data-key="InvoiceIn" :url="`InvoiceIns/${entityId}`" :filter="filter" diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue index de614e9fc..dfaf6c109 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue @@ -36,7 +36,6 @@ function ticketFilter(invoice) { <template> <CardDescriptor ref="descriptor" - module="InvoiceOut" :url="`InvoiceOuts/${entityId}`" :filter="filter" title="ref" diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue index 69c38d612..a4c58ef4b 100644 --- a/src/pages/Item/Card/ItemDescriptor.vue +++ b/src/pages/Item/Card/ItemDescriptor.vue @@ -92,7 +92,6 @@ const updateStock = async () => { <template> <CardDescriptor data-key="Item" - module="Item" :summary="$props.summary" :url="`Items/${entityId}/getCard`" @on-fetch="setData" diff --git a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue index 0f71ad1f1..725fb30aa 100644 --- a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue +++ b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue @@ -26,7 +26,6 @@ const entityId = computed(() => { </script> <template> <CardDescriptor - module="ItemType" :url="`ItemTypes/${entityId}`" :filter="filter" title="code" diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue index 1752efe7b..0d18864dc 100644 --- a/src/pages/Order/Card/OrderDescriptor.vue +++ b/src/pages/Order/Card/OrderDescriptor.vue @@ -57,7 +57,6 @@ const total = ref(0); ref="descriptor" :url="`Orders/${entityId}`" :filter="filter" - module="Order" title="client.name" @on-fetch="setData" data-key="Order" diff --git a/src/pages/Route/Agency/Card/AgencyDescriptor.vue b/src/pages/Route/Agency/Card/AgencyDescriptor.vue index b9772037c..a0472c6c3 100644 --- a/src/pages/Route/Agency/Card/AgencyDescriptor.vue +++ b/src/pages/Route/Agency/Card/AgencyDescriptor.vue @@ -22,7 +22,6 @@ const card = computed(() => store.data); </script> <template> <CardDescriptor - module="Agency" data-key="Agency" :url="`Agencies/${entityId}`" :title="card?.name" diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue index a8c6cc18b..829cce444 100644 --- a/src/pages/Route/Card/RouteDescriptor.vue +++ b/src/pages/Route/Card/RouteDescriptor.vue @@ -23,7 +23,6 @@ const entityId = computed(() => { </script> <template> <CardDescriptor - module="Route" :url="`Routes/${entityId}`" :filter="filter" :title="null" diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue index 1f1e6d6ff..baa864a15 100644 --- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue +++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue @@ -26,12 +26,7 @@ const entityId = computed(() => { </script> <template> - <CardDescriptor - module="Roadmap" - :url="`Roadmaps/${entityId}`" - :filter="filter" - data-key="Roadmap" - > + <CardDescriptor :url="`Roadmaps/${entityId}`" :filter="filter" data-key="Roadmap"> <template #body="{ entity }"> <VnLv :label="t('Roadmap')" :value="entity?.name" /> <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" /> diff --git a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue index f31ffe847..d9a2434ab 100644 --- a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue +++ b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue @@ -9,7 +9,6 @@ const { notify } = useNotify(); <template> <CardDescriptor :url="`Vehicles/${$route.params.id}`" - module="Vehicle" data-key="Vehicle" title="numberPlate" :to-module="{ name: 'VehicleList' }" diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue index 9d491e36e..5e618aa7f 100644 --- a/src/pages/Shelving/Card/ShelvingDescriptor.vue +++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue @@ -25,7 +25,6 @@ const entityId = computed(() => { </script> <template> <CardDescriptor - module="Shelving" :url="`Shelvings/${entityId}`" :filter="filter" title="code" diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue index 0b7642c1c..46c9f8ea0 100644 --- a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue +++ b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue @@ -17,7 +17,6 @@ const entityId = computed(() => props.id || route.params.id); </script> <template> <CardDescriptor - module="Parking" data-key="Parking" :url="`Parkings/${entityId}`" title="code" diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue index 6a6feb9ef..462bdf853 100644 --- a/src/pages/Supplier/Card/SupplierDescriptor.vue +++ b/src/pages/Supplier/Card/SupplierDescriptor.vue @@ -62,7 +62,6 @@ const getEntryQueryParams = (supplier) => { <template> <CardDescriptor - module="Supplier" :url="`Suppliers/${entityId}`" :filter="filter" data-key="Supplier" diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue index 762db19bf..c5f3233b1 100644 --- a/src/pages/Ticket/Card/TicketDescriptor.vue +++ b/src/pages/Ticket/Card/TicketDescriptor.vue @@ -44,7 +44,6 @@ function ticketFilter(ticket) { @on-fetch="(data) => ([problems] = data)" /> <CardDescriptor - module="Ticket" :url="`Tickets/${entityId}`" :filter="filter" data-key="Ticket" diff --git a/src/pages/Ticket/Negative/TicketLackList.vue b/src/pages/Ticket/Negative/TicketLackList.vue index 851cf40f4..d1e8b823a 100644 --- a/src/pages/Ticket/Negative/TicketLackList.vue +++ b/src/pages/Ticket/Negative/TicketLackList.vue @@ -34,7 +34,7 @@ const redirectToCreateView = ({ itemFk }) => { const columns = computed(() => [ { name: 'date', - align: 'left', + align: 'center', label: t('negative.date'), format: ({ timed }) => toDate(timed), sortable: true, @@ -47,7 +47,7 @@ const columns = computed(() => [ { columnClass: 'shrink', name: 'timed', - align: 'left', + align: 'center', label: t('negative.timed'), format: ({ timed }) => toHour(timed), sortable: true, @@ -58,7 +58,7 @@ const columns = computed(() => [ }, { name: 'itemFk', - align: 'left', + align: 'center', label: t('negative.id'), format: ({ itemFk }) => itemFk, sortable: true, @@ -70,7 +70,7 @@ const columns = computed(() => [ }, { name: 'longName', - align: 'left', + align: 'center', label: t('negative.longName'), field: ({ longName }) => longName, @@ -81,7 +81,7 @@ const columns = computed(() => [ }, { name: 'producer', - align: 'left', + align: 'center', label: t('negative.supplier'), field: ({ producer }) => dashIfEmpty(producer), sortable: true, @@ -89,7 +89,7 @@ const columns = computed(() => [ }, { name: 'inkFk', - align: 'left', + align: 'center', label: t('negative.colour'), field: ({ inkFk }) => inkFk, sortable: true, @@ -97,7 +97,7 @@ const columns = computed(() => [ }, { name: 'size', - align: 'left', + align: 'center', label: t('negative.size'), field: ({ size }) => size, sortable: true, @@ -110,7 +110,7 @@ const columns = computed(() => [ }, { name: 'category', - align: 'left', + align: 'center', label: t('negative.origen'), field: ({ category }) => dashIfEmpty(category), sortable: true, @@ -118,7 +118,7 @@ const columns = computed(() => [ }, { name: 'lack', - align: 'left', + align: 'center', label: t('negative.lack'), field: ({ lack }) => lack, columnFilter: { @@ -127,12 +127,12 @@ const columns = computed(() => [ columnClass: 'shrink', }, sortable: true, - headerStyle: 'padding-left: 33px', + headerStyle: 'padding-center: 33px', cardVisible: true, }, { name: 'tableActions', - align: 'left', + align: 'center', actions: [ { title: t('Open details'), diff --git a/src/pages/Ticket/Negative/TicketLackTable.vue b/src/pages/Ticket/Negative/TicketLackTable.vue index c7f224c64..176e8f7ad 100644 --- a/src/pages/Ticket/Negative/TicketLackTable.vue +++ b/src/pages/Ticket/Negative/TicketLackTable.vue @@ -52,27 +52,26 @@ const route = useRoute(); const columns = computed(() => [ { name: 'status', - align: 'left', + align: 'center', sortable: false, - columnClass: 'expand', + columnClass: 'shrink', columnFilter: false, }, { name: 'ticketFk', label: t('negative.detail.ticketFk'), - align: 'left', + align: 'center', sortable: true, columnFilter: { component: 'input', type: 'number', }, - columnClass: 'shrink', }, { name: 'shipped', label: t('negative.detail.shipped'), field: 'shipped', - align: 'left', + align: 'center', format: ({ shipped }) => toDate(shipped), sortable: true, columnFilter: { @@ -84,11 +83,9 @@ const columns = computed(() => [ name: 'minTimed', label: t('negative.detail.theoreticalhour'), field: 'minTimed', - align: 'left', - format: ({ minTimed }) => toHour(minTimed), + align: 'center', sortable: true, component: 'time', - columnClass: 'shrink', columnFilter: {}, }, { @@ -104,29 +101,27 @@ const columns = computed(() => [ optionValue: 'code', }, }, - columnClass: 'expand', - align: 'left', + align: 'center', sortable: true, }, { name: 'zoneName', label: t('negative.detail.zoneName'), field: 'zoneName', - align: 'left', + align: 'center', sortable: true, }, { name: 'nickname', label: t('negative.detail.nickname'), field: 'nickname', - align: 'left', + align: 'center', sortable: true, }, { name: 'quantity', label: t('negative.detail.quantity'), field: 'quantity', - align: 'left', sortable: true, component: 'input', type: 'number', @@ -167,7 +162,6 @@ const saveChange = async (field, { row }) => { } }; -const hasToIgnore = (row) => row.hasToIgnore === 1; function onBuysFetched(data) { Object.assign(item.value, data[0]); } @@ -244,7 +238,7 @@ function onBuysFetched(data) { </template> <template #column-status="{ row }"> - <QTd style="width: 150px"> + <QTd style="min-width: 150px"> <div class="icon-container"> <QIcon v-if="row.isBasket" diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue index 8df19c0d9..88878076d 100644 --- a/src/pages/Ticket/TicketList.vue +++ b/src/pages/Ticket/TicketList.vue @@ -232,7 +232,7 @@ const columns = computed(() => [ function resetAgenciesSelector(formData) { agenciesOptions.value = []; - if(formData) formData.agencyModeId = null; + if (formData) formData.agencyModeId = null; } function redirectToLines(id) { @@ -240,7 +240,7 @@ function redirectToLines(id) { window.open(url, '_blank'); } -const onClientSelected = async (formData) => { +const onClientSelected = async (formData) => { resetAgenciesSelector(formData); await fetchClient(formData); await fetchAddresses(formData); @@ -248,14 +248,12 @@ const onClientSelected = async (formData) => { const fetchAvailableAgencies = async (formData) => { resetAgenciesSelector(formData); - const response= await getAgencies(formData, selectedClient.value); + const response = await getAgencies(formData, selectedClient.value); if (!response) return; - - const { options, agency } = response - if(options) - agenciesOptions.value = options; - if(agency) - formData.agencyModeId = agency; + + const { options, agency } = response; + if (options) agenciesOptions.value = options; + if (agency) formData.agencyModeId = agency; }; const fetchClient = async (formData) => { @@ -330,7 +328,7 @@ function openBalanceDialog(ticket) { const description = ref([]); const firstTicketClientId = checkedTickets[0].clientFk; const isSameClient = checkedTickets.every( - (ticket) => ticket.clientFk === firstTicketClientId + (ticket) => ticket.clientFk === firstTicketClientId, ); if (!isSameClient) { @@ -369,7 +367,7 @@ async function onSubmit() { description: dialogData.value.value.description, clientFk: dialogData.value.value.clientFk, email: email[0].email, - } + }, ); if (data) notify('globals.dataSaved', 'positive'); @@ -388,32 +386,32 @@ function setReference(data) { switch (data) { case 1: newDescription = `${t( - 'ticketList.creditCard' + 'ticketList.creditCard', )}, ${dialogData.value.value.description.replace( /^(Credit Card, |Cash, |Transfers, )/, - '' + '', )}`; break; case 2: newDescription = `${t( - 'ticketList.cash' + 'ticketList.cash', )}, ${dialogData.value.value.description.replace( /^(Credit Card, |Cash, |Transfers, )/, - '' + '', )}`; break; case 3: newDescription = `${newDescription.replace( /^(Credit Card, |Cash, |Transfers, )/, - '' + '', )}`; break; case 4: newDescription = `${t( - 'ticketList.transfers' + 'ticketList.transfers', )}, ${dialogData.value.value.description.replace( /^(Credit Card, |Cash, |Transfers, )/, - '' + '', )}`; break; case 3317: diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue index 72acf91b8..922f89f33 100644 --- a/src/pages/Travel/Card/TravelDescriptor.vue +++ b/src/pages/Travel/Card/TravelDescriptor.vue @@ -32,7 +32,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity. <template> <CardDescriptor - module="Travel" :url="`Travels/${entityId}`" :title="data.title" :subtitle="data.subtitle" diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue index 0828c2ba6..de3f634e2 100644 --- a/src/pages/Worker/Card/WorkerDescriptor.vue +++ b/src/pages/Worker/Card/WorkerDescriptor.vue @@ -50,7 +50,6 @@ const handlePhotoUpdated = (evt = false) => { <template> <CardDescriptor ref="cardDescriptorRef" - module="Worker" :data-key="dataKey" url="Workers/summary" :filter="{ where: { id: entityId } }" diff --git a/src/pages/Worker/Card/WorkerDescriptorProxy.vue b/src/pages/Worker/Card/WorkerDescriptorProxy.vue index 43deb7821..a142570f9 100644 --- a/src/pages/Worker/Card/WorkerDescriptorProxy.vue +++ b/src/pages/Worker/Card/WorkerDescriptorProxy.vue @@ -12,11 +12,6 @@ const $props = defineProps({ <template> <QPopupProxy> - <WorkerDescriptor - v-if="$props.id" - :id="$props.id" - :summary="WorkerSummary" - data-key="workerDescriptorProxy" - /> + <WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" /> </QPopupProxy> </template> diff --git a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue index ecd7fa36c..4b7dfd9b8 100644 --- a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue +++ b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue @@ -42,7 +42,6 @@ const { openConfirmationModal } = useVnConfirm(); <template> <CardDescriptor ref="DepartmentDescriptorRef" - module="Department" :url="`Departments/${entityId}`" :summary="$props.summary" :to-module="{ name: 'WorkerDepartment' }" diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue index 49237a02b..27676212e 100644 --- a/src/pages/Zone/Card/ZoneDescriptor.vue +++ b/src/pages/Zone/Card/ZoneDescriptor.vue @@ -25,12 +25,7 @@ const entityId = computed(() => { </script> <template> - <CardDescriptor - module="Zone" - :url="`Zones/${entityId}`" - :filter="filter" - data-key="Zone" - > + <CardDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone"> <template #menu="{ entity }"> <ZoneDescriptorMenuItems :zone="entity" /> </template>