diff --git a/CHANGELOG.md b/CHANGELOG.md index 119f702f7..47f2f49d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,169 @@ +# Version 24.28 - 2024-07-09 + +### Added 🆕 + +- Change header titles style by:wbuezas +- chore: refs #7436 fix e2e (origin/7436-showQCheckbox) by:jorgep +- feat: #7196 eslint (origin/7196-cjsToEsm) by:jgallego +- feat: adapt tu VnTable → CrudModel by:alexm +- feat(CustomerFIlter): use correct table by:alexm +- feat(customerList): add searchbar by:alexm +- feat: customerList is customerExtendedList by:alexm +- feat: fixes #7196 by:jgallego +- feat: refs #6739 transferInvoice new checkbox and functionality by:Jon +- feat: refs #6825 create vnTable and add in CustomerExtendedList by:alexm +- feat: refs #6825 create vnTableColumn, cardActions by:alexm +- feat: refs #6825 fix modes by:alexm +- feat: refs #6825 qchip color by:alexm +- feat: refs #6825 right filter panel (6825-vnTable) by:alexm +- feat: refs #6825 scroll for table mode by:alexm +- feat: refs #6825 share filters, create popup by:alexm +- feat: refs #6825 VnComponent mix component and attrs Form to create new row by:alexm +- feat: refs #6825 VnTableFilter and VnPanelFilter init by:alexm +- feat: refs #6826 added rol summary link by:Jon +- feat: refs #6896 created VnImg and added to order module by:Jon +- feat: refs #6896 new filters by:Jon +- feat: refs #7129 fix some code and add order by:pablone +- feat: refs #7436 show checkbox by:jorgep +- feat: refs #7545 Deleted hasIncoterms client column (origin/7545-hasIncoterms) by:guillermo +- feat(TicketService): use correct format by:alexm +- feat(url): sepate filters by:alexm +- feat(VnFilter): merge objects by:alexm +- feat(VnTable): is-editable and use-model. fix: checkbox by:alexm +- feat(VnTable): refs #6825 actions sticky by:alexm +- feat(VnTable): refs #6825 addInWhere by:alexm +- feat(VnTable): refs #6825 dinamic columns by:alexm +- feat(VnTable): refs #6825 execute function when create by:alexm +- feat(VnTable): refs #6825 fix ellipsis and add titles by:alexm +- feat(VnTable): refs #6825 merge where's by:alexm +- feat(VnTable): refs #6825 move to folder. fix checkboxs by:alexm +- feat(VnTable): refs #6825 remove field prop. Add actions in table by:alexm +- feat(VnTable): refs #6825 use checkbox if startsWith 'is' or 'has' by:alexm +- feat(VnTable): refs #6825 VnTableChip component by:alexm +- feat(vnTable): reload data when change url by:alexm +- feat(WorkerFormation): add columnFilter by:alexm +- feat(WorkerFormation): is-editable and use-model by:alexm +- fix: notify icon style by:Javier Segarra +- refactor: refs #6896 fixed styles by:Jon +- Revert "feat: fixes #7196" by:alexm +- style: refs #6464 changed checkbox and qbtn styles by:Jon + +### Changed 📦 + +- perf: Remove div.col by:Javier Segarra +- perf: remove ItemPicture by:Javier Segarra +- perf: replace ItemPicture in favour of VnImg by:Javier Segarra +- refactor by:wbuezas +- refactor: refs #5447 changed warehouse filter by:Jon +- refactor: refs #5447 changed warehouse out filter behavior by:Jon +- refactor: refs #5447 fixed filter if continent not selected by:Jon +- refactor: refs #5447 fix request by:Jon +- refactor: refs #5447 refactor filters by:Jon +- refactor: refs #6739 changed invoice functions' name by:Jon +- refactor: refs #6739 changed router.push by:Jon +- refactor: refs #6739 deleted useless const by:Jon +- refactor: refs #6739 fix redirect transferInvoice by:Jon +- refactor: refs #6739 new confirmation window by:Jon +- refactor: refs #6739 requested changes by:Jon +- refactor: refs #6739 updated transferInvoice function by:Jon +- refactor: refs #6896 changes requested in PR by:Jon +- refactor: refs #6896 end migration orders by:Jon +- refactor: refs #6896 fixed styles by:Jon +- refactor: refs #6896 fix qdrawer by:Jon +- refactor: refs #6896 refactor VnImg by:Jon +- refactor: refs #6896 requested changes by:Jon +- refactor: refs #6977 fix VnImg props (origin/6977-ClonedURL) by:Jon +- refactor: refs #6977 refactor VnImg by:Jon +- refactor: refs #6977 use VnImg by:Jon +- refactors by:alexm + +### Fixed 🛠️ + +- chore: refs #7436 fix e2e (origin/7436-showQCheckbox) by:jorgep +- feat: fixes #7196 by:jgallego +- feat: refs #6825 fix modes by:alexm +- feat: refs #7129 fix some code and add order by:pablone +- feat(VnTable): is-editable and use-model. fix: checkbox by:alexm +- feat(VnTable): refs #6825 fix ellipsis and add titles by:alexm +- feat(VnTable): refs #6825 move to folder. fix checkboxs by:alexm +- fix(ArrayData): refs #6825 router.replace and use filter.where by:alexm +- fix: bug replace by:alexm +- fix: column hidden v-if by:Javier Segarra +- fix: comment 4 by:Javier Segarra +- fix: comments by:Javier Segarra +- fix: cypress.config to mjs by:alexm +- fix(EntryBuys): fix VnSubtoolbar by:alexm +- fixes: fix vnFilter params and redirect by:alexm +- fix: fix warnings by:alexm +- fix: invoiceDueDay test by:alexm +- fix log view not refreshing when changing id param by:wbuezas +- fix: map selected by:Javier Segarra +- fix: merge dev by:Javier Segarra +- fix: notify icon style by:Javier Segarra +- fix: point 1 by:Javier Segarra +- fix: point 3 by:Javier Segarra +- fix: refs #5447 deleted console.log by:Jon +- fix: refs 6464 deleted useless class in checkbox by:Jon +- fix: refs #6464 fix error isLoading by:Jon +- fix: refs #6739 changed checkbox field by:Jon +- fix: refs #6825 css by:carlossa +- fix: refs #6826 fix redirect by:Jon +- fix: refs #6826 fix roleDescriptor by:Jon +- fix: refs #7129 fix e2e by:pablone +- fix: refs #7129 fix module routes by:pablone +- fix: refs #7129 fix some issues on load and tools by:pablone +- fix: refs #7129 remove consoleLog by:pablone +- fix: refs #7129 remove fix from claim lines by:pablone +- fix: refs #7274 fix duplicate rows by:jorgep +- fix: refs #7433 skeleton by:jorgep +- fix: refs #7623 bugs & tests by:jorgep +- fix: refs #7623 disable router update by:jorgep +- fix: refs #7623 redirect by:jorgep +- fix: refs #7623 test by:jorgep +- fix: refs #7623 update add updateRoute prop in VnPaginate by:jorgep +- fix: refs #7623 updating skip param by:jorgep +- fix: revert cypress mjs by:alexm +- fix: SkeletonTable by:alexm +- fix: state translations by:Javier Segarra +- fix: ticket order by:Javier Segarra +- fix(ticket router): typo by:alexm +- fix(TicketService): pay use selected by:alexm +- fix: TravelLog by:Javier Segarra +- fix(url): filter by:alexm +- fix(url): redirect by:alexm +- fix(VnFilter): filter with params by:alexm +- fix(VnFilterPanel): remove key by:alexm +- fix(VnTable): create scss by:alexm +- fix(VnTable): duplicate fetch by:alexm +- fix(VnTable): Qtable v-bind by:alexm +- fix(VnTable): refs #6825 checkbox align and color by:alexm +- fix(VnTable): refs #6825 fix click sticky column by:alexm +- fix(VnTable): refs #6825 fix events and css by:alexm +- fix(VnTable): refs #6825 VnInputDate by:alexm +- fix(VnTable): showLabel by:alexm +- fix(VnTable): warns by:alexm +- fix: WorkerNotificationsManager test by:alexm +- fix: WorkerSelect option format by:Javier Segarra +- refactor: refs #5447 fixed filter if continent not selected by:Jon +- refactor: refs #5447 fix request by:Jon +- refactor: refs #6739 fix redirect transferInvoice by:Jon +- refactor: refs #6896 fixed styles by:Jon +- refactor: refs #6896 fix qdrawer by:Jon +- refactor: refs #6977 fix VnImg props (origin/6977-ClonedURL) by:Jon +- refs #6504 fix formModel claimFilter claimCard (origin/6504-fixCardClaim) by:carlossa +- refs #7406 fix components by:carlossa +- refs #7406 fix pr by:carlossa +- refs #7406 fix props by:carlossa +- refs #7406 fix Tb components create by:carlossa +- refs #7406 fix trad by:carlossa +- refs #7406 fix url by:carlossa +- refs #7406 fix VnTable columns by:carlossa +- refs #7409 fix balance and formation by:carlossa +- refs #7409 fix trad by:carlossa +- Revert "feat: fixes #7196" by:alexm +- test: fix intermitent e2e by:alexm +- test: fix vnSearchbar adapt to vnTable (origin/7648_dev_customerEntries) by:alexm + # Version 24.24 - 2024-06-11 ### Added 🆕 diff --git a/package.json b/package.json index 71d80d401..0a66ddb4f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "24.30.1", + "version": "24.32.0", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue index da4687d32..3af58226f 100644 --- a/src/components/VnTable/VnColumn.vue +++ b/src/components/VnTable/VnColumn.vue @@ -78,7 +78,7 @@ const defaultComponents = { date: { component: markRaw(VnInputDate), attrs: { - readonly: true, + readonly: !$props.isEditable, disable: !$props.isEditable, style: 'min-width: 125px', class: 'fit', diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index dc5410e93..97053184a 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -407,7 +407,7 @@ defineExpose({ diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue index 72898483f..6e57a8a53 100644 --- a/src/components/common/VnInputDate.vue +++ b/src/components/common/VnInputDate.vue @@ -44,15 +44,18 @@ const formattedDate = computed({ let newDate; if (value) { // parse input - if (value.includes('/') && value.length >= 10) { - if (value.at(2) == '/') value = value.split('/').reverse().join('/'); - value = date.formatDate( - new Date(value).toISOString(), - 'YYYY-MM-DDTHH:mm:ss.SSSZ' - ); + if (value.includes('/')) { + if (value.length == 6) value = value + new Date().getFullYear(); + if (value.length >= 10) { + if (value.at(2) == '/') value = value.split('/').reverse().join('/'); + value = date.formatDate( + new Date(value).toISOString(), + 'YYYY-MM-DDTHH:mm:ss.SSSZ' + ); + } } - let ymd = value.split('-').map((e) => parseInt(e)); - newDate = new Date(ymd[0], ymd[1] - 1, ymd[2]); + const [year, month, day] = value.split('-').map((e) => parseInt(e)); + newDate = new Date(year, month - 1, day); if (model.value) { const orgDate = model.value instanceof Date ? model.value : new Date(model.value); @@ -107,7 +110,12 @@ watch( isPopupOpen = false; " /> - + - + + es: + Open date: Abrir fecha + diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue index def5dda51..adb6ef68c 100644 --- a/src/components/common/VnInputTime.vue +++ b/src/components/common/VnInputTime.vue @@ -1,5 +1,5 @@ - + @@ -114,3 +149,8 @@ watch( border-style: solid; } + + es: + Open time: Abrir tiempo + +, nextTick diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 8567a0409..50d620a34 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -18,7 +18,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { onMounted(() => { setOptions(); - arrayDataStore.reset(['skip']); + reset(['skip']); const query = route.query; const searchUrl = store.searchUrl; @@ -74,9 +74,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { }; let exprFilter; - let userParams = { ...store.userParams }; - if (store?.exprBuilder) { const where = buildFilter(userParams, (param, value) => { const res = store.exprBuilder(param, value); @@ -159,11 +157,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { if (filter) store.filter = filter; let userParams = { ...store.userParams, ...params }; - userParams = sanitizerParams(userParams, store?.exprBuilder); store.userParams = userParams; - arrayDataStore.reset(['skip', 'filter.skip', 'page']); + reset(['skip', 'filter.skip', 'page']); await fetch({}); return { filter, params }; @@ -190,6 +187,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { } store.order = order; + reset(['skip', 'filter.skip', 'page']); fetch({}); index++; diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue index fe530795c..b32dc70a9 100644 --- a/src/pages/Entry/Card/EntrySummary.vue +++ b/src/pages/Entry/Card/EntrySummary.vue @@ -183,15 +183,10 @@ const fetchEntryBuys = async () => { {{ t('globals.summary.basicData') }} - - - - - { {{ t('globals.summary.basicData') }} - @@ -214,31 +208,25 @@ const fetchEntryBuys = async () => { - - - - - - { diff --git a/src/pages/Monitor/MonitorList.vue b/src/pages/Monitor/MonitorList.vue index 1b1ccb5b3..4906247e8 100644 --- a/src/pages/Monitor/MonitorList.vue +++ b/src/pages/Monitor/MonitorList.vue @@ -14,10 +14,10 @@ const stateStore = useStateStore(); const expanded = ref(true); onMounted(async () => { - stateStore.rightDrawer = true; + stateStore.leftDrawer = false; }); -onUnmounted(() => (stateStore.rightDrawer = false)); +onUnmounted(() => (stateStore.leftDrawer = true)); @@ -63,13 +63,15 @@ onUnmounted(() => (stateStore.rightDrawer = false)); - + - + {{ t('salesMonitor.ticketsMonitor') }} - + + diff --git a/src/pages/Monitor/SalesClientsTable.vue b/src/pages/Monitor/SalesClientsTable.vue index 8008b1fda..2fb9e8e2f 100644 --- a/src/pages/Monitor/SalesClientsTable.vue +++ b/src/pages/Monitor/SalesClientsTable.vue @@ -3,14 +3,11 @@ import { ref, computed, reactive, watch } from 'vue'; import { useI18n } from 'vue-i18n'; import FetchData from 'components/FetchData.vue'; -import VnSelect from 'src/components/common/VnSelect.vue'; -import VnInputDate from 'src/components/common/VnInputDate.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue'; -import VnPaginate from 'components/ui/VnPaginate.vue'; import { toDateFormat } from 'src/filters/date.js'; -import { dashIfEmpty } from 'src/filters'; +import VnTable from 'src/components/VnTable/VnTable.vue'; const { t } = useI18n(); @@ -37,9 +34,11 @@ const filter = reactive({ }, }); +const refetch = async () => await paginateRef.value.fetch(); + watch(dateRange, (val) => { filter.where['v.stamp'].between = val; - paginateRef.value.fetch(); + refetch(); }); function exprBuilder(param, value) { @@ -53,25 +52,15 @@ function exprBuilder(param, value) { const params = reactive({}); -const applyColumnFilter = async (col) => { - try { - const paramKey = col.columnFilter?.filterParamKey || col.field; - params[paramKey] = col.columnFilter.filterValue; - await paginateRef.value.addFilter(null, params); - } catch (err) { - console.error('Error applying column filter', err); - } -}; - const columns = computed(() => [ { label: t('salesClientsTable.date'), - name: 'date', + name: 'dated', field: 'dated', align: 'left', columnFilter: null, sortable: true, - format: (val) => toDateFormat(val), + format: (row) => toDateFormat(row.dated), }, { label: t('salesClientsTable.hour'), @@ -86,19 +75,9 @@ const columns = computed(() => [ field: 'salesPerson', align: 'left', sortable: true, - columnFilter: { - component: VnSelect, - filterParamKey: 'salesPersonFk', - type: 'select', - filterValue: null, - attrs: { - options: workersActiveOptions.value, - 'option-value': 'id', - 'option-label': 'name', - dense: true, - }, + columnField: { + component: null, }, - format: (val) => dashIfEmpty(val), }, { label: t('salesClientsTable.client'), @@ -106,19 +85,9 @@ const columns = computed(() => [ name: 'client', align: 'left', sortable: true, - columnFilter: { - component: VnSelect, - filterParamKey: 'clientFk', - type: 'select', - filterValue: null, - attrs: { - options: clientsOptions.value, - 'option-value': 'id', - 'option-label': 'name', - dense: true, - }, + columnField: { + component: null, }, - format: (val) => dashIfEmpty(val), }, ]); @@ -144,7 +113,7 @@ const columns = computed(() => [ @on-fetch="(data) => (clientsOptions = data)" /> - [ :filter="filter" :offset="50" auto-load + :columns="columns" + :right-search="false" + default-mode="table" + dense + :without-header="true" > - - - - - - - - - - - - - - - - {{ row.salesPerson }} - - - - - - {{ row.clientName }} - - - - + + + {{ row.salesPerson }} + + - + + + {{ row.clientName }} + + + + diff --git a/src/pages/Monitor/SalesOrdersTable.vue b/src/pages/Monitor/SalesOrdersTable.vue index 0ba900393..f0c389aa6 100644 --- a/src/pages/Monitor/SalesOrdersTable.vue +++ b/src/pages/Monitor/SalesOrdersTable.vue @@ -5,7 +5,8 @@ import { useI18n } from 'vue-i18n'; import FetchData from 'components/FetchData.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue'; -import VnPaginate from 'components/ui/VnPaginate.vue'; +import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; +import VnTable from 'components/VnTable/VnTable.vue'; import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js'; import { toCurrency } from 'src/filters'; @@ -50,19 +51,22 @@ const columns = computed(() => [ name: 'date', field: 'dated', align: 'left', - columnFilter: null, + sortable: true, + cardVisible: true, }, { label: t('salesOrdersTable.client'), name: 'client', align: 'left', sortable: true, + cardVisible: true, }, { label: t('salesOrdersTable.salesPerson'), name: 'salesPerson', align: 'left', sortable: true, + cardVisible: true, }, ]); @@ -119,79 +123,78 @@ const redirectToOrderSummary = (orderId) => { @on-fetch="(data) => (clientsOptions = data)" /> + - redirectToOrderSummary(row.id)" + v-model:selected="selectedRows" > - - redirectToOrderSummary(row.id)" + + - - - {{ t('salesOrdersTable.delete') }} - - - - - - {{ toDateFormat(row.date_send) }} - - {{ toDateTimeFormat(row.date_make) }} - - - - - - {{ row.clientName }} - - - {{ row.agencyName }} - - - - - - {{ row.salesPerson }} - - - {{ toCurrency(row.import) }} - - - + {{ t('salesOrdersTable.delete') }} + - + + + + {{ toDateFormat(row.date_send) }} + + {{ toDateTimeFormat(row.date_make) }} + + + + + + {{ row.clientName }} + + + {{ row.agencyName }} + + + + + + + {{ row.salesPerson }} + + + {{ toCurrency(row.import) }} + + +