From 9899d73566c74ef121fdbda817a700fd9f24eb9d Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 29 Aug 2024 14:45:47 +0200 Subject: [PATCH 01/10] refs #7355 fix accounts, vnTable --- src/components/VnTable/VnTable.vue | 10 ++++++---- src/pages/Account/AccountAcls.vue | 1 + src/pages/Account/AccountAliasList.vue | 17 +++++++++++------ src/pages/Account/AccountList.vue | 22 +++++++++++++++++++--- src/pages/Account/Card/AccountCard.vue | 1 - src/pages/Account/Role/AccountRoles.vue | 15 ++++++++++++--- 6 files changed, 49 insertions(+), 17 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 6c77d44df..14f925281 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -107,7 +107,7 @@ const orders = ref(parseOrder(routeQuery.filter?.order)); const CrudModelRef = ref({}); const showForm = ref(false); const splittedColumns = ref({ columns: [] }); -const columnsVisibilitySkiped = ref(); +const columnsVisibilitySkipped = ref(); const createForm = ref(); const tableModes = [ @@ -116,12 +116,14 @@ const tableModes = [ title: t('table view'), value: TABLE_MODE, disable: $props.disableOption?.table, + visible: $props.disableOption?.table, }, { icon: 'grid_view', title: t('grid view'), value: CARD_MODE, disable: $props.disableOption?.card, + visible: $props.disableOption?.card, }, ]; onBeforeMount(() => { @@ -135,7 +137,7 @@ onMounted(() => { ? CARD_MODE : $props.defaultMode; stateStore.rightDrawer = true; - columnsVisibilitySkiped.value = [ + columnsVisibilitySkipped.value = [ ...splittedColumns.value.columns .filter((c) => c.visible == false) .map((c) => c.name), @@ -380,14 +382,14 @@ defineExpose({ v-if="isTableMode" v-model="splittedColumns.columns" :table-code="tableCode ?? route.name" - :skip="columnsVisibilitySkiped" + :skip="columnsVisibilitySkipped" /> { formInitialData: {}, }" order="id DESC" + :disable-option="{ card: true }" :columns="columns" default-mode="table" :right-search="true" diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue index b6f7b219c..c67283297 100644 --- a/src/pages/Account/AccountAliasList.vue +++ b/src/pages/Account/AccountAliasList.vue @@ -21,24 +21,21 @@ const columns = computed(() => [ { align: 'left', name: 'id', - label: t('id'), + label: t('Id'), isId: true, - field: 'id', cardVisible: true, }, { align: 'left', name: 'alias', - label: t('alias'), - field: 'alias', + label: t('Alias'), cardVisible: true, create: true, }, { align: 'left', name: 'description', - label: t('description'), - field: 'description', + label: t('Description'), cardVisible: true, create: true, }, @@ -69,9 +66,17 @@ const columns = computed(() => [ }" order="id DESC" :columns="columns" + :disable-option="{ card: true }" default-mode="table" redirect="account/alias" :is-editable="true" :use-model="true" /> + + + es: + Id: Id + Alias: Alias + Description: Descripción + diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue index cdd88551b..d698596b9 100644 --- a/src/pages/Account/AccountList.vue +++ b/src/pages/Account/AccountList.vue @@ -14,15 +14,23 @@ const columns = computed(() => [ { align: 'left', name: 'id', - label: t('id'), + label: t('Id'), isId: true, field: 'id', cardVisible: true, + columnFilter: { + component: 'select', + name: 'search', + attrs: { + url: 'VnUsers/preview', + fields: ['id', 'name'], + }, + }, }, { align: 'left', name: 'username', - label: t('nickname'), + label: t('Nickname'), isTitle: true, component: 'input', columnField: { @@ -37,7 +45,7 @@ const columns = computed(() => [ { align: 'left', name: 'name', - label: t('name'), + label: t('Name'), component: 'input', columnField: { component: null, @@ -65,6 +73,7 @@ const columns = computed(() => [ title: t('View Summary'), icon: 'preview', action: (row) => viewSummary(row.id, AccountSummary), + isPrimary: true, }, ], }, @@ -108,3 +117,10 @@ const exprBuilder = (param, value) => { :use-model="true" /> + + + es: + Id: Id + Nickname: Nickname + Name: Nombre + diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue index a9857b283..67fa15898 100644 --- a/src/pages/Account/Card/AccountCard.vue +++ b/src/pages/Account/Card/AccountCard.vue @@ -15,7 +15,6 @@ const { t } = useI18n(); url: 'VnUsers/preview', label: t('account.search'), info: t('account.searchInfo'), - searchUrl: 'table', }" /> diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue index 8f3372a6d..bbe21689a 100644 --- a/src/pages/Account/Role/AccountRoles.vue +++ b/src/pages/Account/Role/AccountRoles.vue @@ -21,7 +21,7 @@ const columns = computed(() => [ { align: 'left', name: 'id', - label: t('id'), + label: t('Id'), isId: true, columnFilter: { inWhere: true, @@ -31,14 +31,14 @@ const columns = computed(() => [ { align: 'left', name: 'name', - label: t('name'), + label: t('Name'), cardVisible: true, create: true, }, { align: 'left', name: 'description', - label: t('description'), + label: t('Description'), cardVisible: true, create: true, }, @@ -51,6 +51,7 @@ const columns = computed(() => [ title: t('View Summary'), icon: 'preview', action: (row) => viewSummary(row.id, RoleSummary), + isPrimary: true, }, ], }, @@ -93,8 +94,16 @@ const exprBuilder = (param, value) => { }, }" order="id ASC" + :disable-option="{ card: true }" :columns="columns" default-mode="table" redirect="account/role" /> + + + es: + Id: Id + Description: Descripción + Name: Nombre + From 691c9a8e81867bd745105b8e4aa2908f187cd039 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 29 Aug 2024 14:57:27 +0200 Subject: [PATCH 02/10] refs #7355 fix roles filters --- src/pages/Account/Role/AccountRoles.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue index bbe21689a..ea175d913 100644 --- a/src/pages/Account/Role/AccountRoles.vue +++ b/src/pages/Account/Role/AccountRoles.vue @@ -25,6 +25,12 @@ const columns = computed(() => [ isId: true, columnFilter: { inWhere: true, + component: 'select', + name: 'search', + attrs: { + url: 'VnRoles', + fields: ['id', 'name'], + }, }, cardVisible: true, }, From 36a7618ef520896e6705296b306d1ff58ad5f2c5 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 29 Aug 2024 15:06:09 +0200 Subject: [PATCH 03/10] refs #7355 previews --- src/pages/Claim/ClaimList.vue | 5 +++-- src/pages/Customer/CustomerList.vue | 3 ++- src/pages/InvoiceOut/InvoiceOutList.vue | 3 ++- src/pages/Route/RouteList.vue | 3 ++- src/pages/Worker/WorkerList.vue | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue index b03dfb226..911e38138 100644 --- a/src/pages/Claim/ClaimList.vue +++ b/src/pages/Claim/ClaimList.vue @@ -79,7 +79,7 @@ const columns = computed(() => [ align: 'left', label: t('claim.state'), format: ({ stateCode }) => - claimFilterRef.value?.states.find(({code}) => code === stateCode) + claimFilterRef.value?.states.find(({ code }) => code === stateCode) ?.description, name: 'stateCode', chip: { @@ -100,7 +100,7 @@ const columns = computed(() => [ name: 'tableActions', actions: [ { - title: t('Client ticket list'), + title: t('View summary'), icon: 'preview', action: (row) => viewSummary(row.id, ClaimSummary), }, @@ -155,6 +155,7 @@ es: You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente params: stateCode: Estado + View summary: Ver resumen en: params: stateCode: State diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue index 82ad559ad..30181ebe4 100644 --- a/src/pages/Customer/CustomerList.vue +++ b/src/pages/Customer/CustomerList.vue @@ -357,7 +357,7 @@ const columns = computed(() => [ isPrimary: true, }, { - title: t('Client ticket list'), + title: t('View Summary'), icon: 'preview', action: (row) => viewSummary(row.id, CustomerSummary), }, @@ -432,6 +432,7 @@ function handleLocation(data, location) { es: Web user: Usuario Web + View Summary: Ver resumen diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue index b0b8e5fb5..738f51340 100644 --- a/src/pages/Worker/WorkerList.vue +++ b/src/pages/Worker/WorkerList.vue @@ -77,7 +77,7 @@ const columns = computed(() => [ name: 'tableActions', actions: [ { - title: t('View Summary'), + title: t('component.smartCard.viewSummary'), icon: 'preview', action: (row) => viewSummary(row.id, WorkerSummary), }, @@ -342,5 +342,4 @@ async function autofillBic(worker) { es: Search worker: Buscar trabajador You can search by worker id or name: Puedes buscar por id o nombre del trabajador - View Summary: Ver resumen From d555b895981f8013cf6986e616599e039d6e9554 Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 30 Aug 2024 09:53:42 +0200 Subject: [PATCH 05/10] refs #7355 remove bad code --- src/components/VnTable/VnTable.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 1f0223aa6..4e847e913 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -116,14 +116,12 @@ const tableModes = [ title: t('table view'), value: TABLE_MODE, disable: $props.disableOption?.table, - // visible: $props.disableOption?.table, }, { icon: 'grid_view', title: t('grid view'), value: CARD_MODE, - disable: $props.disableOption?.card, - // visible: $props.disableOption?.card, + disable: $props.disableOption?.card,¡ }, ]; onBeforeMount(() => { From 76cb8c6b2859315db1514d0347b514d4b01fbf99 Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 30 Aug 2024 09:54:16 +0200 Subject: [PATCH 06/10] refs #7355 remove bug --- src/components/VnTable/VnTable.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 4e847e913..af56cf942 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -121,7 +121,7 @@ const tableModes = [ icon: 'grid_view', title: t('grid view'), value: CARD_MODE, - disable: $props.disableOption?.card,¡ + disable: $props.disableOption?.card, }, ]; onBeforeMount(() => { From 1544513a3e75ab787e3e6e64f81027ad4dbde97c Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 30 Aug 2024 11:18:48 +0200 Subject: [PATCH 07/10] refs #7355 #7366 fix account, summary, list, travelList, tooltip --- src/components/VnTable/VnTable.vue | 3 +++ src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 2 ++ src/pages/Claim/ClaimList.vue | 2 +- src/pages/Customer/CustomerList.vue | 2 +- src/pages/Entry/EntryList.vue | 2 +- src/pages/InvoiceOut/InvoiceOutList.vue | 2 +- src/pages/Route/RouteList.vue | 2 +- src/pages/Travel/TravelList.vue | 12 ++++++++---- src/pages/Worker/WorkerList.vue | 2 +- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index af56cf942..83886991c 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -408,6 +408,9 @@ defineExpose({ class="row items-center no-wrap" style="height: 30px" > + {{ + col.toolTip + }} [ name: 'tableActions', actions: [ { - title: t('component.smartCard.viewSummary'), + title: t('components.smartCard.viewSummary'), icon: 'preview', action: (row) => viewSummary(row.id, ClaimSummary), }, diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue index 0a6234f21..0dc7f09be 100644 --- a/src/pages/Customer/CustomerList.vue +++ b/src/pages/Customer/CustomerList.vue @@ -357,7 +357,7 @@ const columns = computed(() => [ isPrimary: true, }, { - title: t('component.smartCard.viewSummary'), + title: t('components.smartCard.viewSummary'), icon: 'preview', action: (row) => viewSummary(row.id, CustomerSummary), }, diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index efb603d25..2fddc4d64 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -176,7 +176,7 @@ const columns = computed(() => [ name: 'tableActions', actions: [ { - title: t('component.smartCard.viewSummary'), + title: t('components.smartCard.viewSummary'), icon: 'preview', action: (row) => viewSummary(row.id, EntrySummary), isPrimary: true, diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index c45ac86c1..d4c544c7d 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -122,7 +122,7 @@ const columns = computed(() => [ name: 'tableActions', actions: [ { - title: t('component.smartCard.viewSummary'), + title: t('components.smartCard.viewSummary'), icon: 'preview', action: (row) => viewSummary(row.id, InvoiceOutSummary), }, diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue index 88961dfab..02b030145 100644 --- a/src/pages/Route/RouteList.vue +++ b/src/pages/Route/RouteList.vue @@ -185,7 +185,7 @@ const columns = computed(() => [ action: (row) => openTicketsDialog(row?.id), }, { - title: t('component.smartCard.viewSummary'), + title: t('components.smartCard.viewSummary'), icon: 'preview', action: (row) => viewSummary(row?.id, RouteSummary), }, diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue index f503ec90a..96e619e5c 100644 --- a/src/pages/Travel/TravelList.vue +++ b/src/pages/Travel/TravelList.vue @@ -139,6 +139,8 @@ const columns = computed(() => [ name: 'totalEntries', label: t('travel.travelList.tableVisibleColumns.totalEntries'), component: 'input', + attrs: {}, + toolTip: t('travel.travelList.tableVisibleColumns.totalEntriesTooltip'), columnField: { component: null, }, @@ -158,12 +160,12 @@ const columns = computed(() => [ }, { title: t('Add entry'), - icon: 'contact_support', + icon: 'vn:ticket', action: redirectCreateEntryView, isPrimary: true, }, { - title: t('View Summary'), + title: t('components.smartCard.viewSummary'), icon: 'preview', action: (row) => viewSummary(row.id, TravelSummary), isPrimary: true, @@ -233,7 +235,7 @@ const columns = computed(() => [ en: - addEntry: Add entry + Add entry: Add entry searchByIdOrReference: Search by ID or reference es: @@ -241,10 +243,12 @@ es: searchByIdOrReference: Buscar por ID o por referencia You can search by travel id or name: Buscar por envio por id o nombre Search travel: Buscar envio + Clone: Clonar + Add entry: Añadir Entrada diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue index 738f51340..91d96a162 100644 --- a/src/pages/Worker/WorkerList.vue +++ b/src/pages/Worker/WorkerList.vue @@ -77,7 +77,7 @@ const columns = computed(() => [ name: 'tableActions', actions: [ { - title: t('component.smartCard.viewSummary'), + title: t('components.smartCard.viewSummary'), icon: 'preview', action: (row) => viewSummary(row.id, WorkerSummary), }, From f33733c7f2d34097aa01733122836f45a03ebd78 Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 30 Aug 2024 11:25:00 +0200 Subject: [PATCH 08/10] refs #7355 fix total --- src/i18n/locale/es.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 9b5fdc99b..a52565fd2 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -1104,7 +1104,7 @@ travel: landed: F.entrega warehouseIn: Alm.salida warehouseOut: Alm.entrada - totalEntries: Ent.totales + totalEntries: ∑ totalEntriesTooltip: Entradas totales summary: confirmed: Confirmado From 859eb918cd6a5fc6b785faa91bb2917bf9c3d427 Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 30 Aug 2024 11:50:05 +0200 Subject: [PATCH 09/10] refs #6897 fix entry --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Entry/EntryList.vue | 26 +++++++++++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index ffa92c08d..d9b8911fd 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -455,6 +455,7 @@ entry: travelFk: Travel isExcludedFromAvailable: Inventory isRaid: Raid + invoiceAmount: Import summary: commission: Commission currency: Currency diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index a52565fd2..153dfa840 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -454,6 +454,7 @@ entry: travelFk: Envio isExcludedFromAvailable: Inventario isRaid: Redada + invoiceAmount: Importe summary: commission: Comisión currency: Moneda diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index 2fddc4d64..c03c67edb 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -9,6 +9,11 @@ import RightMenu from 'src/components/common/RightMenu.vue'; import { toDate } from 'src/filters'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import EntrySummary from './Card/EntrySummary.vue'; +import VnUserLink from 'components/ui/VnUserLink.vue'; +import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; +import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue'; +import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue'; +import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue'; const stateStore = useStateStore(); const { t } = useI18n(); @@ -145,6 +150,12 @@ const columns = computed(() => [ create: true, format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef), }, + { + align: 'left', + label: t('entry.list.tableVisibleColumns.invoiceAmount'), + name: 'invoiceAmount', + cardVisible: true, + }, { align: 'left', label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'), @@ -216,7 +227,20 @@ onMounted(async () => { redirect="entry" auto-load :right-search="false" - /> + > + + + From 874cbfea9b47231d41b0c84053aba955f3195dfc Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 30 Aug 2024 12:31:42 +0200 Subject: [PATCH 10/10] refs #7366 fix travel hours --- src/i18n/locale/en.yml | 2 ++ src/i18n/locale/es.yml | 2 ++ src/pages/Travel/TravelList.vue | 13 ++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index d9b8911fd..30d92f0c1 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -1124,6 +1124,8 @@ travel: agency: Agency shipped: Shipped landed: Landed + shipHour: Shipment Hour + landHour: Landing Hour warehouseIn: Warehouse in warehouseOut: Warehouse out totalEntries: Total entries diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 153dfa840..6a9c3294c 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -1102,6 +1102,8 @@ travel: ref: Referencia agency: Agencia shipped: F.envío + shipHour: Hora de envío + landHour: Hora de llegada landed: F.entrega warehouseIn: Alm.salida warehouseOut: Alm.entrada diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue index 96e619e5c..c7ad908f9 100644 --- a/src/pages/Travel/TravelList.vue +++ b/src/pages/Travel/TravelList.vue @@ -106,6 +106,12 @@ const columns = computed(() => [ create: true, format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)), }, + { + align: 'left', + name: 'shipmentHour', + label: t('travel.travelList.tableVisibleColumns.shipHour'), + cardVisible: true, + }, { align: 'left', name: 'warehouseOutFk', @@ -134,12 +140,17 @@ const columns = computed(() => [ create: true, format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landed)), }, + { + align: 'left', + name: 'landingHour', + label: t('travel.travelList.tableVisibleColumns.landHour'), + cardVisible: true, + }, { align: 'left', name: 'totalEntries', label: t('travel.travelList.tableVisibleColumns.totalEntries'), component: 'input', - attrs: {}, toolTip: t('travel.travelList.tableVisibleColumns.totalEntriesTooltip'), columnField: { component: null,