Compare commits

..

10 Commits

Author SHA1 Message Date
Javier Segarra 126cbd3151 fix: refs #7793 restore vnselect 2025-02-12 14:27:53 +01:00
Javier Segarra ea5ef91fcc feat: refs #7793 move name as first param to sort 2025-02-12 14:27:15 +01:00
Javier Segarra 022ced3116 Merge branch 'dev' into 7793_sortByWeight 2025-02-12 14:26:33 +01:00
Javier Segarra fb340d1f27 perf: refs #7793 sort when filter without fetch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-16 15:51:54 +02:00
Javier Segarra d7b0b8b356 Merge branch 'dev' into 7793_sortByWeight
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 20:57:04 +00:00
Javier Segarra 8f963ab78a perf: refs #7793 imrpove sort data method
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-09 01:45:38 +02:00
Javier Segarra ad76d81908 perf: refs #7793 remove variable 2024-10-09 01:45:26 +02:00
Javier Segarra 0e05e2c7f8 Merge branch 'dev' into 7793_sortByWeight 2024-10-09 00:51:55 +02:00
Javier Segarra 2d55013a90 feat: refs #7793 perf sortByWeight 2024-09-25 22:51:05 +02:00
Javier Segarra 3476b4807f feat: refs #7793 sortByWeight
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 15:25:43 +02:00
29 changed files with 89 additions and 43 deletions

View File

@ -51,7 +51,7 @@ const url = computed(() => {
option-value="id" option-value="id"
option-label="nickname" option-label="nickname"
:fields="['id', 'name', 'nickname', 'code']" :fields="['id', 'name', 'nickname', 'code']"
:filter-options="['id', 'name', 'nickname', 'code']" :filter-options="['name','id', 'nickname', 'code']"
sort-by="nickname ASC" sort-by="nickname ASC"
data-cy="vnWorkerSelect" data-cy="vnWorkerSelect"
> >

View File

@ -29,6 +29,10 @@ const $props = defineProps({
type: String, type: String,
default: null, default: null,
}, },
module: {
type: String,
default: null,
},
summary: { summary: {
type: Object, type: Object,
default: null, default: null,
@ -144,9 +148,7 @@ const toModule = computed(() =>
{{ t('components.smartCard.openSummary') }} {{ t('components.smartCard.openSummary') }}
</QTooltip> </QTooltip>
</QBtn> </QBtn>
<RouterLink <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }">
:to="{ name: `${dataKey}Summary`, params: { id: entity.id } }"
>
<QBtn <QBtn
class="link" class="link"
color="white" color="white"

View File

@ -51,6 +51,7 @@ const removeAlias = () => {
<CardDescriptor <CardDescriptor
ref="descriptor" ref="descriptor"
:url="`MailAliases/${entityId}`" :url="`MailAliases/${entityId}`"
module="Alias"
data-key="Alias" data-key="Alias"
title="alias" title="alias"
> >

View File

@ -24,6 +24,7 @@ onMounted(async () => {
ref="descriptor" ref="descriptor"
:url="`VnUsers/preview`" :url="`VnUsers/preview`"
:filter="{ ...filter, where: { id: entityId } }" :filter="{ ...filter, where: { id: entityId } }"
module="Account"
data-key="Account" data-key="Account"
title="nickname" title="nickname"
> >

View File

@ -35,6 +35,7 @@ const removeRole = async () => {
<CardDescriptor <CardDescriptor
url="VnRoles" url="VnRoles"
:filter="{ where: { id: entityId } }" :filter="{ where: { id: entityId } }"
module="Role"
data-key="Role" data-key="Role"
:summary="$props.summary" :summary="$props.summary"
> >

View File

@ -46,6 +46,7 @@ onMounted(async () => {
<CardDescriptor <CardDescriptor
:url="`Claims/${entityId}`" :url="`Claims/${entityId}`"
:filter="filter" :filter="filter"
module="Claim"
title="client.name" title="client.name"
data-key="Claim" data-key="Claim"
> >

View File

@ -55,6 +55,7 @@ const debtWarning = computed(() => {
<template> <template>
<CardDescriptor <CardDescriptor
module="Customer"
:url="`Clients/${entityId}/getCard`" :url="`Clients/${entityId}/getCard`"
:summary="$props.summary" :summary="$props.summary"
data-key="Customer" data-key="Customer"

View File

@ -147,6 +147,7 @@ async function deleteEntry() {
<template> <template>
<CardDescriptor <CardDescriptor
ref="entryDescriptorRef" ref="entryDescriptorRef"
module="Entry"
:url="`Entries/${entityId}`" :url="`Entries/${entityId}`"
:userFilter="entryFilter" :userFilter="entryFilter"
title="supplier.nickname" title="supplier.nickname"

View File

@ -90,6 +90,7 @@ async function setInvoiceCorrection(id) {
<template> <template>
<CardDescriptor <CardDescriptor
ref="cardDescriptorRef" ref="cardDescriptorRef"
module="InvoiceIn"
data-key="InvoiceIn" data-key="InvoiceIn"
:url="`InvoiceIns/${entityId}`" :url="`InvoiceIns/${entityId}`"
:filter="filter" :filter="filter"

View File

@ -36,6 +36,7 @@ function ticketFilter(invoice) {
<template> <template>
<CardDescriptor <CardDescriptor
ref="descriptor" ref="descriptor"
module="InvoiceOut"
:url="`InvoiceOuts/${entityId}`" :url="`InvoiceOuts/${entityId}`"
:filter="filter" :filter="filter"
title="ref" title="ref"

View File

@ -92,6 +92,7 @@ const updateStock = async () => {
<template> <template>
<CardDescriptor <CardDescriptor
data-key="Item" data-key="Item"
module="Item"
:summary="$props.summary" :summary="$props.summary"
:url="`Items/${entityId}/getCard`" :url="`Items/${entityId}/getCard`"
@on-fetch="setData" @on-fetch="setData"

View File

@ -26,6 +26,7 @@ const entityId = computed(() => {
</script> </script>
<template> <template>
<CardDescriptor <CardDescriptor
module="ItemType"
:url="`ItemTypes/${entityId}`" :url="`ItemTypes/${entityId}`"
:filter="filter" :filter="filter"
title="code" title="code"

View File

@ -57,6 +57,7 @@ const total = ref(0);
ref="descriptor" ref="descriptor"
:url="`Orders/${entityId}`" :url="`Orders/${entityId}`"
:filter="filter" :filter="filter"
module="Order"
title="client.name" title="client.name"
@on-fetch="setData" @on-fetch="setData"
data-key="Order" data-key="Order"

View File

@ -22,6 +22,7 @@ const card = computed(() => store.data);
</script> </script>
<template> <template>
<CardDescriptor <CardDescriptor
module="Agency"
data-key="Agency" data-key="Agency"
:url="`Agencies/${entityId}`" :url="`Agencies/${entityId}`"
:title="card?.name" :title="card?.name"

View File

@ -23,6 +23,7 @@ const entityId = computed(() => {
</script> </script>
<template> <template>
<CardDescriptor <CardDescriptor
module="Route"
:url="`Routes/${entityId}`" :url="`Routes/${entityId}`"
:filter="filter" :filter="filter"
:title="null" :title="null"

View File

@ -26,7 +26,12 @@ const entityId = computed(() => {
</script> </script>
<template> <template>
<CardDescriptor :url="`Roadmaps/${entityId}`" :filter="filter" data-key="Roadmap"> <CardDescriptor
module="Roadmap"
:url="`Roadmaps/${entityId}`"
:filter="filter"
data-key="Roadmap"
>
<template #body="{ entity }"> <template #body="{ entity }">
<VnLv :label="t('Roadmap')" :value="entity?.name" /> <VnLv :label="t('Roadmap')" :value="entity?.name" />
<VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" /> <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />

View File

@ -9,6 +9,7 @@ const { notify } = useNotify();
<template> <template>
<CardDescriptor <CardDescriptor
:url="`Vehicles/${$route.params.id}`" :url="`Vehicles/${$route.params.id}`"
module="Vehicle"
data-key="Vehicle" data-key="Vehicle"
title="numberPlate" title="numberPlate"
:to-module="{ name: 'VehicleList' }" :to-module="{ name: 'VehicleList' }"

View File

@ -25,6 +25,7 @@ const entityId = computed(() => {
</script> </script>
<template> <template>
<CardDescriptor <CardDescriptor
module="Shelving"
:url="`Shelvings/${entityId}`" :url="`Shelvings/${entityId}`"
:filter="filter" :filter="filter"
title="code" title="code"

View File

@ -17,6 +17,7 @@ const entityId = computed(() => props.id || route.params.id);
</script> </script>
<template> <template>
<CardDescriptor <CardDescriptor
module="Parking"
data-key="Parking" data-key="Parking"
:url="`Parkings/${entityId}`" :url="`Parkings/${entityId}`"
title="code" title="code"

View File

@ -62,6 +62,7 @@ const getEntryQueryParams = (supplier) => {
<template> <template>
<CardDescriptor <CardDescriptor
module="Supplier"
:url="`Suppliers/${entityId}`" :url="`Suppliers/${entityId}`"
:filter="filter" :filter="filter"
data-key="Supplier" data-key="Supplier"

View File

@ -44,6 +44,7 @@ function ticketFilter(ticket) {
@on-fetch="(data) => ([problems] = data)" @on-fetch="(data) => ([problems] = data)"
/> />
<CardDescriptor <CardDescriptor
module="Ticket"
:url="`Tickets/${entityId}`" :url="`Tickets/${entityId}`"
:filter="filter" :filter="filter"
data-key="Ticket" data-key="Ticket"

View File

@ -34,7 +34,7 @@ const redirectToCreateView = ({ itemFk }) => {
const columns = computed(() => [ const columns = computed(() => [
{ {
name: 'date', name: 'date',
align: 'center', align: 'left',
label: t('negative.date'), label: t('negative.date'),
format: ({ timed }) => toDate(timed), format: ({ timed }) => toDate(timed),
sortable: true, sortable: true,
@ -47,7 +47,7 @@ const columns = computed(() => [
{ {
columnClass: 'shrink', columnClass: 'shrink',
name: 'timed', name: 'timed',
align: 'center', align: 'left',
label: t('negative.timed'), label: t('negative.timed'),
format: ({ timed }) => toHour(timed), format: ({ timed }) => toHour(timed),
sortable: true, sortable: true,
@ -58,7 +58,7 @@ const columns = computed(() => [
}, },
{ {
name: 'itemFk', name: 'itemFk',
align: 'center', align: 'left',
label: t('negative.id'), label: t('negative.id'),
format: ({ itemFk }) => itemFk, format: ({ itemFk }) => itemFk,
sortable: true, sortable: true,
@ -70,7 +70,7 @@ const columns = computed(() => [
}, },
{ {
name: 'longName', name: 'longName',
align: 'center', align: 'left',
label: t('negative.longName'), label: t('negative.longName'),
field: ({ longName }) => longName, field: ({ longName }) => longName,
@ -81,7 +81,7 @@ const columns = computed(() => [
}, },
{ {
name: 'producer', name: 'producer',
align: 'center', align: 'left',
label: t('negative.supplier'), label: t('negative.supplier'),
field: ({ producer }) => dashIfEmpty(producer), field: ({ producer }) => dashIfEmpty(producer),
sortable: true, sortable: true,
@ -89,7 +89,7 @@ const columns = computed(() => [
}, },
{ {
name: 'inkFk', name: 'inkFk',
align: 'center', align: 'left',
label: t('negative.colour'), label: t('negative.colour'),
field: ({ inkFk }) => inkFk, field: ({ inkFk }) => inkFk,
sortable: true, sortable: true,
@ -97,7 +97,7 @@ const columns = computed(() => [
}, },
{ {
name: 'size', name: 'size',
align: 'center', align: 'left',
label: t('negative.size'), label: t('negative.size'),
field: ({ size }) => size, field: ({ size }) => size,
sortable: true, sortable: true,
@ -110,7 +110,7 @@ const columns = computed(() => [
}, },
{ {
name: 'category', name: 'category',
align: 'center', align: 'left',
label: t('negative.origen'), label: t('negative.origen'),
field: ({ category }) => dashIfEmpty(category), field: ({ category }) => dashIfEmpty(category),
sortable: true, sortable: true,
@ -118,7 +118,7 @@ const columns = computed(() => [
}, },
{ {
name: 'lack', name: 'lack',
align: 'center', align: 'left',
label: t('negative.lack'), label: t('negative.lack'),
field: ({ lack }) => lack, field: ({ lack }) => lack,
columnFilter: { columnFilter: {
@ -127,12 +127,12 @@ const columns = computed(() => [
columnClass: 'shrink', columnClass: 'shrink',
}, },
sortable: true, sortable: true,
headerStyle: 'padding-center: 33px', headerStyle: 'padding-left: 33px',
cardVisible: true, cardVisible: true,
}, },
{ {
name: 'tableActions', name: 'tableActions',
align: 'center', align: 'left',
actions: [ actions: [
{ {
title: t('Open details'), title: t('Open details'),

View File

@ -52,26 +52,27 @@ const route = useRoute();
const columns = computed(() => [ const columns = computed(() => [
{ {
name: 'status', name: 'status',
align: 'center', align: 'left',
sortable: false, sortable: false,
columnClass: 'shrink', columnClass: 'expand',
columnFilter: false, columnFilter: false,
}, },
{ {
name: 'ticketFk', name: 'ticketFk',
label: t('negative.detail.ticketFk'), label: t('negative.detail.ticketFk'),
align: 'center', align: 'left',
sortable: true, sortable: true,
columnFilter: { columnFilter: {
component: 'input', component: 'input',
type: 'number', type: 'number',
}, },
columnClass: 'shrink',
}, },
{ {
name: 'shipped', name: 'shipped',
label: t('negative.detail.shipped'), label: t('negative.detail.shipped'),
field: 'shipped', field: 'shipped',
align: 'center', align: 'left',
format: ({ shipped }) => toDate(shipped), format: ({ shipped }) => toDate(shipped),
sortable: true, sortable: true,
columnFilter: { columnFilter: {
@ -83,9 +84,11 @@ const columns = computed(() => [
name: 'minTimed', name: 'minTimed',
label: t('negative.detail.theoreticalhour'), label: t('negative.detail.theoreticalhour'),
field: 'minTimed', field: 'minTimed',
align: 'center', align: 'left',
format: ({ minTimed }) => toHour(minTimed),
sortable: true, sortable: true,
component: 'time', component: 'time',
columnClass: 'shrink',
columnFilter: {}, columnFilter: {},
}, },
{ {
@ -101,27 +104,29 @@ const columns = computed(() => [
optionValue: 'code', optionValue: 'code',
}, },
}, },
align: 'center', columnClass: 'expand',
align: 'left',
sortable: true, sortable: true,
}, },
{ {
name: 'zoneName', name: 'zoneName',
label: t('negative.detail.zoneName'), label: t('negative.detail.zoneName'),
field: 'zoneName', field: 'zoneName',
align: 'center', align: 'left',
sortable: true, sortable: true,
}, },
{ {
name: 'nickname', name: 'nickname',
label: t('negative.detail.nickname'), label: t('negative.detail.nickname'),
field: 'nickname', field: 'nickname',
align: 'center', align: 'left',
sortable: true, sortable: true,
}, },
{ {
name: 'quantity', name: 'quantity',
label: t('negative.detail.quantity'), label: t('negative.detail.quantity'),
field: 'quantity', field: 'quantity',
align: 'left',
sortable: true, sortable: true,
component: 'input', component: 'input',
type: 'number', type: 'number',
@ -162,6 +167,7 @@ const saveChange = async (field, { row }) => {
} }
}; };
const hasToIgnore = (row) => row.hasToIgnore === 1;
function onBuysFetched(data) { function onBuysFetched(data) {
Object.assign(item.value, data[0]); Object.assign(item.value, data[0]);
} }
@ -238,7 +244,7 @@ function onBuysFetched(data) {
</template> </template>
<template #column-status="{ row }"> <template #column-status="{ row }">
<QTd style="min-width: 150px"> <QTd style="width: 150px">
<div class="icon-container"> <div class="icon-container">
<QIcon <QIcon
v-if="row.isBasket" v-if="row.isBasket"

View File

@ -251,9 +251,11 @@ const fetchAvailableAgencies = async (formData) => {
const response= await getAgencies(formData, selectedClient.value); const response= await getAgencies(formData, selectedClient.value);
if (!response) return; if (!response) return;
const { options, agency } = response; const { options, agency } = response
if (options) agenciesOptions.value = options; if(options)
if (agency) formData.agencyModeId = agency; agenciesOptions.value = options;
if(agency)
formData.agencyModeId = agency;
}; };
const fetchClient = async (formData) => { const fetchClient = async (formData) => {
@ -328,7 +330,7 @@ function openBalanceDialog(ticket) {
const description = ref([]); const description = ref([]);
const firstTicketClientId = checkedTickets[0].clientFk; const firstTicketClientId = checkedTickets[0].clientFk;
const isSameClient = checkedTickets.every( const isSameClient = checkedTickets.every(
(ticket) => ticket.clientFk === firstTicketClientId, (ticket) => ticket.clientFk === firstTicketClientId
); );
if (!isSameClient) { if (!isSameClient) {
@ -367,7 +369,7 @@ async function onSubmit() {
description: dialogData.value.value.description, description: dialogData.value.value.description,
clientFk: dialogData.value.value.clientFk, clientFk: dialogData.value.value.clientFk,
email: email[0].email, email: email[0].email,
}, }
); );
if (data) notify('globals.dataSaved', 'positive'); if (data) notify('globals.dataSaved', 'positive');
@ -386,32 +388,32 @@ function setReference(data) {
switch (data) { switch (data) {
case 1: case 1:
newDescription = `${t( newDescription = `${t(
'ticketList.creditCard', 'ticketList.creditCard'
)}, ${dialogData.value.value.description.replace( )}, ${dialogData.value.value.description.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'', ''
)}`; )}`;
break; break;
case 2: case 2:
newDescription = `${t( newDescription = `${t(
'ticketList.cash', 'ticketList.cash'
)}, ${dialogData.value.value.description.replace( )}, ${dialogData.value.value.description.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'', ''
)}`; )}`;
break; break;
case 3: case 3:
newDescription = `${newDescription.replace( newDescription = `${newDescription.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'', ''
)}`; )}`;
break; break;
case 4: case 4:
newDescription = `${t( newDescription = `${t(
'ticketList.transfers', 'ticketList.transfers'
)}, ${dialogData.value.value.description.replace( )}, ${dialogData.value.value.description.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'', ''
)}`; )}`;
break; break;
case 3317: case 3317:

View File

@ -32,6 +32,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
<template> <template>
<CardDescriptor <CardDescriptor
module="Travel"
:url="`Travels/${entityId}`" :url="`Travels/${entityId}`"
:title="data.title" :title="data.title"
:subtitle="data.subtitle" :subtitle="data.subtitle"

View File

@ -50,6 +50,7 @@ const handlePhotoUpdated = (evt = false) => {
<template> <template>
<CardDescriptor <CardDescriptor
ref="cardDescriptorRef" ref="cardDescriptorRef"
module="Worker"
:data-key="dataKey" :data-key="dataKey"
url="Workers/summary" url="Workers/summary"
:filter="{ where: { id: entityId } }" :filter="{ where: { id: entityId } }"

View File

@ -12,6 +12,11 @@ const $props = defineProps({
<template> <template>
<QPopupProxy> <QPopupProxy>
<WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" /> <WorkerDescriptor
v-if="$props.id"
:id="$props.id"
:summary="WorkerSummary"
data-key="workerDescriptorProxy"
/>
</QPopupProxy> </QPopupProxy>
</template> </template>

View File

@ -42,6 +42,7 @@ const { openConfirmationModal } = useVnConfirm();
<template> <template>
<CardDescriptor <CardDescriptor
ref="DepartmentDescriptorRef" ref="DepartmentDescriptorRef"
module="Department"
:url="`Departments/${entityId}`" :url="`Departments/${entityId}`"
:summary="$props.summary" :summary="$props.summary"
:to-module="{ name: 'WorkerDepartment' }" :to-module="{ name: 'WorkerDepartment' }"

View File

@ -25,7 +25,12 @@ const entityId = computed(() => {
</script> </script>
<template> <template>
<CardDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone"> <CardDescriptor
module="Zone"
:url="`Zones/${entityId}`"
:filter="filter"
data-key="Zone"
>
<template #menu="{ entity }"> <template #menu="{ entity }">
<ZoneDescriptorMenuItems :zone="entity" /> <ZoneDescriptorMenuItems :zone="entity" />
</template> </template>