From 2ca7c44caede88852d8fd5ff5aed3e4ea4d6661d Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 21 Jun 2024 14:30:39 +0200 Subject: [PATCH 01/18] feat(AccountConnections): use VnToken --- src/pages/Account/AccountConnections.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue index 98208e5f2..4d16d1ecd 100644 --- a/src/pages/Account/AccountConnections.vue +++ b/src/pages/Account/AccountConnections.vue @@ -29,15 +29,15 @@ const filter = { order: 'created DESC', }; -const urlPath = 'AccessTokens'; +const urlPath = 'VnTokens'; const refresh = () => paginateRef.value.fetch(); const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } }); -const killSession = async (id) => { +const killSession = async ({ userId, created }) => { try { - await axios.delete(`${urlPath}/${id}`); + await axios.post(`${urlPath}/killSession`, { userId, created }); paginateRef.value.fetch(); notify(t('Session killed'), 'positive'); } catch (error) { @@ -86,7 +86,7 @@ const killSession = async (id) => { openConfirmationModal( t('Session will be killed'), t('Are you sure you want to continue?'), - () => killSession(row.id) + () => killSession(row) ) " outline From 1cdbc0fcc1b4f690ab64eb5941da9c3dcd0c1f7a Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 30 Aug 2024 12:51:25 +0200 Subject: [PATCH 02/18] fix: refs #7831 add locale & hide table params --- src/components/ui/VnFilterPanel.vue | 7 +++++-- src/pages/Item/Card/ItemCard.vue | 2 +- src/pages/Item/Card/ItemLastEntries.vue | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index ab4e2e0da..65cd32a37 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -201,8 +201,11 @@ function formatValue(value) { function sanitizer(params) { for (const [key, value] of Object.entries(params)) { - if (typeof value == 'object') - params[key] = Object.values(value)[0].replaceAll('%', ''); + if (typeof value === 'object' && value !== null) { + sanitizer(value); + } else if (typeof value === 'string') { + params[key] = value.replaceAll('%', ''); + } } return params; } diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue index 1162327c1..2412f2bf9 100644 --- a/src/pages/Item/Card/ItemCard.vue +++ b/src/pages/Item/Card/ItemCard.vue @@ -12,7 +12,7 @@ import ItemListFilter from '../ItemListFilter.vue'; search-data-key="ItemList" :searchbar-props="{ url: 'Items/filter', - label: 'searchbar.labelr', + label: 'searchbar.label', info: 'searchbar.info', }" /> diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue index b211790ca..4a84fdb55 100644 --- a/src/pages/Item/Card/ItemLastEntries.vue +++ b/src/pages/Item/Card/ItemLastEntries.vue @@ -42,6 +42,7 @@ const to = ref(); const arrayData = useArrayData('ItemLastEntries', { url: 'Items/lastEntriesFilter', order: ['landed DESC', 'buyFk DESC'], + searchUrl: 'itemLastEntries', exprBuilder: exprBuilder, userFilter: { where: { From 84076309a564764f0a9e0da69a6e3c41bc6c986f Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 3 Sep 2024 08:04:42 +0200 Subject: [PATCH 03/18] feat: update changelog.md --- CHANGELOG.md | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86ffce3fd..e23465173 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,149 @@ +# Version 24.36 - 2024-09-03 + +### Added 🆕 + +- feat(FormModel): trim data by default by:alexm +- feat(orderBasicData): add notes by:alexm +- feat(orderList): correct create order by:alexm +- feat(orderList): use orderFilter and fixed this by:alexm +- feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra +- feat: add recover password and reset password by:alexm +- feat: refs #7346 add seriaType option by:jgallego +- feat: refs #7346 elimino === by:jgallego +- feat: refs #7346 formdata uses serialType by:jgallego +- feat: refs #7346 refactor by:jgallego +- feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego +- feat: refs #7710 uses cloneAll by:jgallego +- fix: refs #7717 fix OrderList table filters' and summary table style by:Jon + +### Changed 📦 + +- feat: refs #7346 refactor by:jgallego +- perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra +- perf: refs #7717 right menu filter by:Jon +- perf: use ref at component start by:Javier Segarra +- refactor: refs #7717 delete useless function and import by:Jon +- refactor: refs #7717 deleted useless code by:Jon + +### Fixed 🛠️ + +- feat(orderList): use orderFilter and fixed this by:alexm +- fix(VnTable): orderBy v-model by:alexm +- fix(account_card): redirection by:carlossa +- fix(orderLines): reload when delete and redirect when confirm by:alexm +- fix: #6336 ClaimListStates by:Javier Segarra +- fix: account subsections cards by:carlossa +- fix: duplicate key by:Jon +- fix: order description to vnTable by:alexm +- fix: orderCatalogFilter order by:alexm +- fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra +- fix: refs #7524 add sort-by (origin/7524-useLimit) by:jorgep +- fix: refs #7524 dynamic fetching by:jorgep +- fix: refs #7524 use id by:jorgep +- fix: refs #7524 use limit entry Section wip by:jorgep +- fix: refs #7524 use limit item Section by:jorgep +- fix: refs #7524 use limit shelving Section by:jorgep +- fix: refs #7524 use limit ticket section by:jorgep +- fix: refs #7524 use limit travels section by:jorgep +- fix: refs #7717 fix OrderList table filters' and summary table style by:Jon +- fix: refs #7717 fix basic data form & minor errors by:Jon +- fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon +- fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon +- fix: refs #7717 fix order sections by:Jon +- fix: refs #7717 fix volume and lines redirect by:Jon +- fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon +- fix: test by:alexm +- fix: ticketDescriptorMenu by:Javier Segarra +- refs #7355 account fixes by:carlossa + +# Version 24.34 - 2024-08-20 + +### Added 🆕 + +- chore: #6900 order params by:jorgep +- chore: refs #6900 drop console log by:jorgep +- chore: refs #6900 drop vnCurrency by:jorgep +- chore: refs #6900 fix e2e tests by:jorgep +- chore: refs #6900 mv rectificative logic by:jorgep +- chore: refs #6900 responsive code by:jorgep +- chore: refs #7283 drop array types by:jorgep +- chore: refs #7283 drop import by:jorgep +- chore: refs #7283 fix e2e logout by:jorgep +- chore: refs #7283 update VnAvatar title handling by:jorgep +- chore: refs #7323 fix test by:jorgep +- chore: refs #7323 remove unused import by:jorgep +- chore: refs #7323drop commented code by:jorgep +- feat(VnCard): use props searchbar by:alexm +- feat(customer): improve basicData to balance by:alexm +- feat(customer_balance): refs #6943 add functionality from salix by:alexm +- feat(customer_balance): refs #6943 translations by:alexm +- feat: refs #6130 husky commitLint config by:pablone +- feat: refs #6130 husky hooks by:pablone +- feat: refs #6900 add InvoiceInSerial by:jorgep +- feat: refs #6900 add locale by:jorgep +- feat: refs #6900 use VnTable & sort filter fields by:jorgep +- feat: refs #7323 add flex-wrap by:jorgep +- feat: refs #7323 add my account" btn & fix models log selectable by:jorgep +- feat: refs #7323 improve test by:jorgep + +### Changed 📦 + +- refactor(customer_log: use VnLog by:alexm +- refactor(customer_recovery): to vnTable by:alexm +- refactor(customer_webAccess): FormModel by:alexm +- refactor: refs #7283 update avatar size and color by:jorgep + +### Fixed 🛠️ + +- chore: refs #6900 fix e2e tests by:jorgep +- chore: refs #7283 fix e2e logout by:jorgep +- chore: refs #7323 fix test by:jorgep +- feat: refs #7323 add my account" btn & fix models log selectable by:jorgep +- fix #7355 fix acls list by:carlossa +- fix(VnFilterPanel): emit userParams better by:alexm +- fix(claim_summary): url links (HEAD -> 7864_testToMaster_2434, origin/test, origin/7864_testToMaster_2434, test) by:alexm +- fix(customer_sms: fix reload by:alexm +- fix(twoFactor): unify code login and twoFactor by:alexm +- fix: VnCard VnSearchbar props by:alexm +- fix: accountMailAlias by:alexm +- fix: refs #6130 add commit lint modules by:pablone +- fix: refs #6130 pnpm-lock.yml by:pablone +- fix: refs #6900 improve loading by:jorgep +- fix: refs #6900 improve logic (origin/6900-addSerial) by:jorgep +- fix: refs #6900 improve logic by:jorgep +- fix: refs #6900 rectificative btn reactivity by:jorgep +- fix: refs #6900 use type number by:jorgep +- fix: refs #6900 vat & dueday by:jorgep +- fix: refs #6900 vat, dueday & intrastat by:jorgep +- fix: refs #6989 show entity name & default time from config table by:jorgep +- fix: refs #7283 basicData locale by:jorgep +- fix: refs #7283 itemLastEntries filter by:jorgep +- fix: refs #7283 itemTags & VnImg by:jorgep +- fix: refs #7283 locale by:jorgep +- fix: refs #7283 min-width vnImg by:jorgep +- fix: refs #7283 use vnAvatar & add optional zoom by:jorgep +- fix: refs #7283 userPanel pic by:jorgep +- fix: refs #7323 add department popup by:jorgep +- fix: refs #7323 add locale by:jorgep +- fix: refs #7323 css righ menu by:jorgep +- fix: refs #7323 data-key & add select by:jorgep +- fix: refs #7323 load all opts by:jorgep +- fix: refs #7323 righ menu bug by:jorgep +- fix: refs #7323 use global locale by:jorgep +- fix: refs #7323 use workerFilter (origin/7323-warmfix-fixErrors) by:jorgep +- fix: refs #7323 vnsubtoolbar css by:jorgep +- fix: refs #7323 wrong css by:jorgep +- refs #7355 fix Rol, alias by:carlossa +- refs #7355 fix accountAlias by:carlossa +- refs #7355 fix alias summary by:carlossa +- refs #7355 fix conflicts by:carlossa +- refs #7355 fix create Rol by:carlossa +- refs #7355 fix list by:carlossa +- refs #7355 fix lists redirects summary by:carlossa +- refs #7355 fix roles by:carlossa +- refs #7355 fix search exprBuilder by:carlossa +- refs #7355 fix vnTable by:carlos + # Version 24.32 - 2024-08-06 ### Added 🆕 From c4c4285b4b7035041f9f402b8bf6d6567af47492 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 3 Sep 2024 08:16:01 +0200 Subject: [PATCH 04/18] fix: remove unnecessary console.log --- src/pages/Login/ResetPassword.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Login/ResetPassword.vue b/src/pages/Login/ResetPassword.vue index eff718e97..2751f1ceb 100644 --- a/src/pages/Login/ResetPassword.vue +++ b/src/pages/Login/ResetPassword.vue @@ -33,7 +33,6 @@ async function onSubmit() { }; try { - console.log('newPassword: ', newPassword); await axios.post( 'VnUsers/reset-password', { newPassword: newPassword.value }, From ecba084f8be0995c4987318b6be10520d67863a8 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 3 Sep 2024 08:31:27 +0200 Subject: [PATCH 05/18] feat: reduce changelog.md lines --- CHANGELOG.md | 65 +++++++++++++++------------------------------------- 1 file changed, 18 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e23465173..6a973777a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,64 +2,35 @@ ### Added 🆕 -- feat(FormModel): trim data by default by:alexm -- feat(orderBasicData): add notes by:alexm -- feat(orderList): correct create order by:alexm -- feat(orderList): use orderFilter and fixed this by:alexm -- feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra -- feat: add recover password and reset password by:alexm -- feat: refs #7346 add seriaType option by:jgallego -- feat: refs #7346 elimino === by:jgallego -- feat: refs #7346 formdata uses serialType by:jgallego -- feat: refs #7346 refactor by:jgallego -- feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego -- feat: refs #7710 uses cloneAll by:jgallego -- fix: refs #7717 fix OrderList table filters' and summary table style by:Jon +- Cesta → Se añaden notas +- Trabajadore → Se puede modificar la foto +- General → Recuperar y restaurar contraseña ### Changed 📦 -- feat: refs #7346 refactor by:jgallego -- perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra -- perf: refs #7717 right menu filter by:Jon -- perf: use ref at component start by:Javier Segarra -- refactor: refs #7717 delete useless function and import by:Jon -- refactor: refs #7717 deleted useless code by:Jon +- (General) Modificado filtro lateral ### Fixed 🛠️ -- feat(orderList): use orderFilter and fixed this by:alexm -- fix(VnTable): orderBy v-model by:alexm -- fix(account_card): redirection by:carlossa -- fix(orderLines): reload when delete and redirect when confirm by:alexm -- fix: #6336 ClaimListStates by:Javier Segarra -- fix: account subsections cards by:carlossa -- fix: duplicate key by:Jon -- fix: order description to vnTable by:alexm -- fix: orderCatalogFilter order by:alexm -- fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra -- fix: refs #7524 add sort-by (origin/7524-useLimit) by:jorgep -- fix: refs #7524 dynamic fetching by:jorgep -- fix: refs #7524 use id by:jorgep -- fix: refs #7524 use limit entry Section wip by:jorgep -- fix: refs #7524 use limit item Section by:jorgep -- fix: refs #7524 use limit shelving Section by:jorgep -- fix: refs #7524 use limit ticket section by:jorgep -- fix: refs #7524 use limit travels section by:jorgep -- fix: refs #7717 fix OrderList table filters' and summary table style by:Jon -- fix: refs #7717 fix basic data form & minor errors by:Jon -- fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon -- fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon -- fix: refs #7717 fix order sections by:Jon -- fix: refs #7717 fix volume and lines redirect by:Jon -- fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon -- fix: test by:alexm -- fix: ticketDescriptorMenu by:Javier Segarra -- refs #7355 account fixes by:carlossa +- Cesta → Mejoras varias +- Reclamaciones → Mejoras varias +- Usuarios → Mejoras varias # Version 24.34 - 2024-08-20 ### Added 🆕 +## Changed 📦 + +- General → Trabajadores: Migrado de Salix a Lilium + +## Fixed 🛠️ + +- Artículos → General: Arreglados fallos de interfaz +- Fact. Recibidas → General: Arreglados fallos de interfaz +- Trabajadores → General: Arreglados fallos de interfaz +- Usuarios → General: Arreglados fallos de interfaz + - chore: #6900 order params by:jorgep - chore: refs #6900 drop console log by:jorgep - chore: refs #6900 drop vnCurrency by:jorgep From 64eeeb67fadcf8b1298c2423a55d26d0d8b83c7c Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 3 Sep 2024 10:00:44 +0200 Subject: [PATCH 06/18] refs #6899 fix InvoiceOut --- src/pages/InvoiceOut/Card/InvoiceOutSummary.vue | 2 +- src/pages/InvoiceOut/InvoiceOutList.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue index e9d5a2f1f..5db802065 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -176,7 +176,7 @@ const ticketsColumns = ref([ {{ value }} - + diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 9423c28f6..f6dc0c674 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -205,7 +205,7 @@ watchEffect(selectedRows); }, }" v-model:selected="selectedRows" - order="id DESC" + order="issued DESC, id DESC" :columns="columns" redirect="invoice-out" auto-load From 1f9d1b79ab0acadbba0922f186b8fe5624ecae52 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 4 Sep 2024 10:17:57 +0200 Subject: [PATCH 07/18] refs #7283 refactor ItexDescriptor --- src/pages/Item/Card/ItemDescriptor.vue | 2 ++ src/pages/Item/Card/ItemDescriptorImage.vue | 6 +++++- src/pages/Item/Card/ItemDescriptorProxy.vue | 5 +++++ src/pages/Ticket/Card/TicketSummary.vue | 6 +++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue index 8381f0624..e649b8c45 100644 --- a/src/pages/Item/Card/ItemDescriptor.vue +++ b/src/pages/Item/Card/ItemDescriptor.vue @@ -52,6 +52,7 @@ const available = ref(null); const visible = ref(null); const _warehouseFk = ref(null); const salixUrl = ref(); +console.log('warehouseItemDescriptor', _warehouseFk.value); const warehouseFk = computed({ get() { return _warehouseFk.value; @@ -82,6 +83,7 @@ const updateStock = async () => { warehouseFk: warehouseFk.value, dated: $props.dated, }; + console.log('params', params); const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, { params, diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue index d83f534b8..71977fb24 100644 --- a/src/pages/Item/Card/ItemDescriptorImage.vue +++ b/src/pages/Item/Card/ItemDescriptorImage.vue @@ -48,7 +48,11 @@ const getWarehouseName = async (warehouseFk) => { where: { id: warehouseFk }, }; - const { data } = await axios.get('Warehouses/findOne', { filter }); + const { data } = await axios.get('Warehouses/findOne', { + params: { + filter: JSON.stringify(filter), + }, + }); if (!data) return; warehouseName.value = data.name; }; diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue index 2b7b39a65..2ffc9080f 100644 --- a/src/pages/Item/Card/ItemDescriptorProxy.vue +++ b/src/pages/Item/Card/ItemDescriptorProxy.vue @@ -15,6 +15,10 @@ const $props = defineProps({ type: Number, default: null, }, + warehouseFk: { + type: Number, + default: null, + }, }); @@ -26,6 +30,7 @@ const $props = defineProps({ :summary="ItemSummary" :dated="dated" :sale-fk="saleFk" + :warehouse-fk="warehouseFk" /> diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue index 177384663..2d02ad5ed 100644 --- a/src/pages/Ticket/Card/TicketSummary.vue +++ b/src/pages/Ticket/Card/TicketSummary.vue @@ -383,7 +383,11 @@ async function changeState(value) { {{ props.row.itemFk }} - + {{ props.row.visible }} From 95b19b5cce6939e655193213ddff9574e7a60303 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 5 Sep 2024 10:04:58 +0200 Subject: [PATCH 08/18] refs #7283 refactor fix ItemDescriptor --- src/pages/Item/Card/ItemDescriptor.vue | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue index e649b8c45..5d7f1481f 100644 --- a/src/pages/Item/Card/ItemDescriptor.vue +++ b/src/pages/Item/Card/ItemDescriptor.vue @@ -35,6 +35,10 @@ const $props = defineProps({ type: Number, default: null, }, + warehouseFk: { + type: Number, + default: null, + }, }); const quasar = useQuasar(); @@ -47,24 +51,14 @@ const user = state.getUser(); const entityId = computed(() => { return $props.id || route.params.id; }); + const regularizeStockFormDialog = ref(null); const available = ref(null); const visible = ref(null); -const _warehouseFk = ref(null); const salixUrl = ref(); -console.log('warehouseItemDescriptor', _warehouseFk.value); -const warehouseFk = computed({ - get() { - return _warehouseFk.value; - }, - set(val) { - _warehouseFk.value = val; - if (val) updateStock(); - }, -}); onMounted(async () => { - warehouseFk.value = user.value.warehouseFk; + updateStock(); salixUrl.value = await getUrl(''); }); @@ -80,10 +74,12 @@ const updateStock = async () => { visible.value = null; const params = { - warehouseFk: warehouseFk.value, + warehouseFk: $props.warehouseFk, dated: $props.dated, }; - console.log('params', params); + if (!params.warehouseFk) { + params.warehouseFk = user.value.warehouseFk; + } const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, { params, From 83969f1d576f20ebcd765f6c7070c57d621e6464 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 5 Sep 2024 12:05:53 +0200 Subject: [PATCH 09/18] fix traduction --- 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 0159abd63..5a8edf226 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -83,7 +83,7 @@ globals: description: Descripción id: Id order: Orden - original: Original + original: Doc. física file: Fichero selectFile: Seleccione un fichero copyClipboard: Copiar en portapapeles From fc7cc8636265b0fe49fab5bf1252d9fe4f29d004 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 5 Sep 2024 12:39:55 +0200 Subject: [PATCH 10/18] fix branch --- CHANGELOG.md | 62 ++++++++++++++++++++----------- src/pages/Login/ResetPassword.vue | 1 + 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31b8831f0..8e1d4c433 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,36 +1,57 @@ -# Version 24.36 - 2024-09-03 +# Version 24.36 - 2024-08-27 ### Added 🆕 -- Cesta → Se añaden notas -- Trabajadore → Se puede modificar la foto -- General → Recuperar y restaurar contraseña +- feat(FormModel): trim data by default by:alexm +- feat(orderBasicData): add notes by:alexm +- feat(orderList): correct create order by:alexm +- feat(orderList): use orderFilter and fixed this by:alexm +- feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra +- feat: add recover password and reset password by:alexm +- feat: refs #7346 add seriaType option by:jgallego +- feat: refs #7346 elimino === by:jgallego +- feat: refs #7346 formdata uses serialType by:jgallego +- feat: refs #7346 refactor by:jgallego +- feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego +- feat: refs #7710 uses cloneAll by:jgallego +- fix: refs #7717 fix OrderList table filters' and summary table style by:Jon ### Changed 📦 -- (General) Modificado filtro lateral +- feat: refs #7346 refactor by:jgallego +- perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra +- perf: refs #7717 right menu filter by:Jon +- perf: use ref at component start by:Javier Segarra +- refactor: refs #7717 delete useless function and import by:Jon +- refactor: refs #7717 deleted useless code by:Jon ### Fixed 🛠️ -- Cesta → Mejoras varias -- Reclamaciones → Mejoras varias -- Usuarios → Mejoras varias +- feat(orderList): use orderFilter and fixed this by:alexm +- fix(VnTable): orderBy v-model by:alexm +- fix(account_card): redirection by:carlossa +- fix(orderLines): reload when delete and redirect when confirm by:alexm +- fix: #6336 ClaimListStates by:Javier Segarra +- fix: account subsections cards by:carlossa +- fix: duplicate key by:Jon +- fix: order description to vnTable by:alexm +- fix: orderCatalogFilter order by:alexm +- fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra +- fix: refs #7717 fix OrderList table filters' and summary table style by:Jon +- fix: refs #7717 fix basic data form & minor errors by:Jon +- fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon +- fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon +- fix: refs #7717 fix order sections by:Jon +- fix: refs #7717 fix volume and lines redirect by:Jon +- fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon +- fix: test by:alexm +- fix: ticketDescriptorMenu by:Javier Segarra +- refs #7355 account fixes by:carlossa # Version 24.34 - 2024-08-20 ### Added 🆕 -## Changed 📦 - -- General → Trabajadores: Migrado de Salix a Lilium - -## Fixed 🛠️ - -- Artículos → General: Arreglados fallos de interfaz -- Fact. Recibidas → General: Arreglados fallos de interfaz -- Trabajadores → General: Arreglados fallos de interfaz -- Usuarios → General: Arreglados fallos de interfaz - - chore: #6900 order params by:jorgep - chore: refs #6900 drop console log by:jorgep - chore: refs #6900 drop vnCurrency by:jorgep @@ -113,10 +134,7 @@ - refs #7355 fix lists redirects summary by:carlossa - refs #7355 fix roles by:carlossa - refs #7355 fix search exprBuilder by:carlossa - <<<<<<< HEAD -- # refs #7355 fix vnTable by:carlos - refs #7355 fix vnTable by:carlossa - > > > > > > > 1b8a72175cc1dbae0590217b03d855bf2ff6d07d # Version 24.32 - 2024-08-06 diff --git a/src/pages/Login/ResetPassword.vue b/src/pages/Login/ResetPassword.vue index 2751f1ceb..eff718e97 100644 --- a/src/pages/Login/ResetPassword.vue +++ b/src/pages/Login/ResetPassword.vue @@ -33,6 +33,7 @@ async function onSubmit() { }; try { + console.log('newPassword: ', newPassword); await axios.post( 'VnUsers/reset-password', { newPassword: newPassword.value }, From 99b65c564c8c8cda9b08f60050b2caeb62d6fb1c Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 5 Sep 2024 12:41:21 +0200 Subject: [PATCH 11/18] fix branch --- src/pages/InvoiceOut/InvoiceOutList.vue | 2 +- src/pages/Item/Card/ItemCard.vue | 2 +- src/pages/Item/Card/ItemLastEntries.vue | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 63d93e074..915b58b15 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -204,7 +204,7 @@ watchEffect(selectedRows); }, }" v-model:selected="selectedRows" - order="issued DESC, id DESC" + order="id DESC" :columns="columns" redirect="invoice-out" auto-load diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue index 2412f2bf9..1162327c1 100644 --- a/src/pages/Item/Card/ItemCard.vue +++ b/src/pages/Item/Card/ItemCard.vue @@ -12,7 +12,7 @@ import ItemListFilter from '../ItemListFilter.vue'; search-data-key="ItemList" :searchbar-props="{ url: 'Items/filter', - label: 'searchbar.label', + label: 'searchbar.labelr', info: 'searchbar.info', }" /> diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue index 4a84fdb55..b211790ca 100644 --- a/src/pages/Item/Card/ItemLastEntries.vue +++ b/src/pages/Item/Card/ItemLastEntries.vue @@ -42,7 +42,6 @@ const to = ref(); const arrayData = useArrayData('ItemLastEntries', { url: 'Items/lastEntriesFilter', order: ['landed DESC', 'buyFk DESC'], - searchUrl: 'itemLastEntries', exprBuilder: exprBuilder, userFilter: { where: { From d4da8fc69f9097b83095295be4d3c2aa9717a454 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 5 Sep 2024 12:48:31 +0200 Subject: [PATCH 12/18] fix branch --- src/components/ui/VnFilterPanel.vue | 7 +++---- src/pages/InvoiceOut/Card/InvoiceOutSummary.vue | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index 998211c39..931767516 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -204,10 +204,9 @@ function formatValue(value) { function sanitizer(params) { for (const [key, value] of Object.entries(params)) { - if (typeof value === 'object' && value !== null) { - sanitizer(value); - } else if (typeof value === 'string') { - params[key] = value.replaceAll('%', ''); + if (value && typeof value === 'object') { + const param = Object.values(value)[0]; + if (typeof param == 'string') params[key] = param.replaceAll('%', ''); } } return params; diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue index 5db802065..e9d5a2f1f 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -176,7 +176,7 @@ const ticketsColumns = ref([ {{ value }} - + From c8d6a6701120679f7f599d50344371cb14ddd0f6 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 5 Sep 2024 12:49:17 +0200 Subject: [PATCH 13/18] fix tootltip --- src/components/common/VnDmsList.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue index c42de6690..134297f59 100644 --- a/src/components/common/VnDmsList.vue +++ b/src/components/common/VnDmsList.vue @@ -135,6 +135,7 @@ const columns = computed(() => [ field: 'hasFile', label: t('globals.original'), name: 'hasFile', + toolTip: t('the documentation is available in paper form'), component: QCheckbox, props: (prop) => ({ disable: true, @@ -297,6 +298,14 @@ defineExpose({ row-key="clientFk" :grid="$q.screen.lt.sm" > +