diff --git a/cypress.config.js b/cypress.config.js index a9e27fcfdcb..26b7725a52a 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -34,6 +34,17 @@ export default defineConfig({ const plugin = await import('cypress-mochawesome-reporter/plugin'); plugin.default(on); + const fs = await import('fs'); + on('task', { + deleteFile(filePath) { + if (fs.existsSync(filePath)) { + fs.unlinkSync(filePath); + return true; + } + return false; + }, + }); + return config; }, viewportWidth: 1280, diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue index 2dad8fe52ef..0de3834eadb 100644 --- a/src/components/VnTable/VnFilter.vue +++ b/src/components/VnTable/VnFilter.vue @@ -152,7 +152,7 @@ const onTabPressed = async () => { }; </script> <template> - <div v-if="showFilter" class="full-width flex-center" style="overflow: hidden"> + <div v-if="showFilter" class="full-width" style="overflow: hidden"> <VnColumn :column="$props.column" default="input" diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue index e3795cc4ba8..47ed9acf4ff 100644 --- a/src/components/VnTable/VnOrder.vue +++ b/src/components/VnTable/VnOrder.vue @@ -23,6 +23,10 @@ const $props = defineProps({ type: Boolean, default: false, }, + align: { + type: String, + default: 'end', + }, }); const hover = ref(); const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl }); @@ -46,16 +50,27 @@ async function orderBy(name, direction) { } defineExpose({ orderBy }); + +function textAlignToFlex(textAlign) { + return `justify-content: ${ + { + 'text-center': 'center', + 'text-left': 'start', + 'text-right': 'end', + }[textAlign] || 'start' + };`; +} </script> <template> <div @mouseenter="hover = true" @mouseleave="hover = false" @click="orderBy(name, model?.direction)" - class="row items-center no-wrap cursor-pointer title" + class="items-center no-wrap cursor-pointer title" + :style="textAlignToFlex(align)" > <span :title="label">{{ label }}</span> - <sup v-if="name && model?.index"> + <div v-if="name && model?.index"> <QChip :label="!vertical ? model?.index : ''" :icon=" @@ -92,20 +107,16 @@ defineExpose({ orderBy }); /> </div> </QChip> - </sup> + </div> </div> </template> <style lang="scss" scoped> .title { display: flex; - justify-content: center; align-items: center; height: 30px; width: 100%; color: var(--vn-label-color); -} -sup { - vertical-align: super; /* Valor predeterminado */ - /* TambiƩn puedes usar otros valores como "baseline", "top", "text-top", etc. */ + white-space: nowrap; } </style> diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 805a6fbd54e..2cce5d05c4f 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -551,9 +551,8 @@ function formatColumnValue(col, row, dashIfEmpty) { return dashIfEmpty(row[urlRelation][col?.attrs.optionLabel ?? 'name']); } if (typeof row[urlRelation] == 'string') return dashIfEmpty(row[urlRelation]); - } else { - return dashIfEmpty(row[col?.name]); } + return dashIfEmpty(row[col?.name]); } function cardClick(_, row) { if ($props.redirect) router.push({ path: `/${$props.redirect}/${row.id}` }); @@ -648,15 +647,14 @@ function cardClick(_, row) { v-bind:class="col.headerClass" class="body-cell" :style="col?.width ? `max-width: ${col?.width}` : ''" - style="padding: inherit" > <div class="no-padding" - :style=" - withFilters && $props.columnSearch ? 'height: 75px' : '' - " + :style="[ + withFilters && $props.columnSearch ? 'height: 75px' : '', + ]" > - <div class="text-center" style="height: 30px"> + <div style="height: 30px"> <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip> <VnTableOrder v-model="orders[col.orderBy ?? col.name]" @@ -664,6 +662,7 @@ function cardClick(_, row) { :label="col?.labelAbbreviation ?? col?.label" :data-key="$attrs['data-key']" :search-url="searchUrl" + :align="getColAlign(col)" /> </div> <VnFilter @@ -1045,8 +1044,8 @@ es: } .body-cell { - padding-left: 2px !important; - padding-right: 2px !important; + padding-left: 4px !important; + padding-right: 4px !important; position: relative; } .bg-chip-secondary { diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue index d9d1ea26b4a..a9e1c8cffc9 100644 --- a/src/components/common/VnComponent.vue +++ b/src/components/common/VnComponent.vue @@ -48,7 +48,8 @@ function toValueAttrs(attrs) { <span v-for="toComponent of componentArray" :key="toComponent.name" - class="column flex-center fit" + class="column fit" + :class="toComponent?.component == 'checkbox' ? 'flex-center' : ''" > <component v-if="toComponent?.component" diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue index 73c825e1e26..1f4705faa15 100644 --- a/src/components/common/VnInputDate.vue +++ b/src/components/common/VnInputDate.vue @@ -107,6 +107,7 @@ const manageDate = (date) => { @click="isPopupOpen = !isPopupOpen" @keydown="isPopupOpen = false" hide-bottom-space + :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDate'" > <template #append> <QIcon diff --git a/src/composables/getColAlign.js b/src/composables/getColAlign.js index 6e963b43706..a930fd7d86c 100644 --- a/src/composables/getColAlign.js +++ b/src/composables/getColAlign.js @@ -1,14 +1,14 @@ export function getColAlign(col) { let align; switch (col.component) { + case 'time': + case 'date': case 'select': align = 'left'; break; case 'number': align = 'right'; break; - case 'time': - case 'date': case 'checkbox': align = 'center'; break; diff --git a/src/filters/toDate.js b/src/filters/toDate.js index 8fe8f383662..002797af528 100644 --- a/src/filters/toDate.js +++ b/src/filters/toDate.js @@ -3,6 +3,8 @@ import { useI18n } from 'vue-i18n'; export default function (value, options = {}) { if (!value) return; + if (!isValidDate(value)) return null; + if (!options.dateStyle && !options.timeStyle) { options.day = '2-digit'; options.month = '2-digit'; @@ -10,7 +12,12 @@ export default function (value, options = {}) { } const { locale } = useI18n(); - const date = new Date(value); + const newDate = new Date(value); - return new Intl.DateTimeFormat(locale.value, options).format(date); + return new Intl.DateTimeFormat(locale.value, options).format(newDate); +} +// handle 0000-00-00 +function isValidDate(date) { + const parsedDate = new Date(date); + return parsedDate instanceof Date && !isNaN(parsedDate.getTime()); } diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue index f3b73cb0474..81578c609e1 100644 --- a/src/pages/Entry/Card/EntryBuys.vue +++ b/src/pages/Entry/Card/EntryBuys.vue @@ -16,7 +16,6 @@ import ItemDescriptor from 'src/pages/Item/Card/ItemDescriptor.vue'; import axios from 'axios'; import VnSelectEnum from 'src/components/common/VnSelectEnum.vue'; import { checkEntryLock } from 'src/composables/checkEntryLock'; -import SkeletonDescriptor from 'src/components/ui/SkeletonDescriptor.vue'; const $props = defineProps({ id: { @@ -103,7 +102,7 @@ const columns = [ name: 'itemFk', component: 'number', isEditable: false, - width: '40px', + width: '35px', }, { labelAbbreviation: '', @@ -111,7 +110,7 @@ const columns = [ name: 'hex', columnSearch: false, isEditable: false, - width: '5px', + width: '9px', component: 'select', attrs: { url: 'Inks', @@ -181,6 +180,7 @@ const columns = [ url: 'packagings', fields: ['id'], optionLabel: 'id', + optionValue: 'id', }, create: true, width: '40px', @@ -192,7 +192,7 @@ const columns = [ component: 'number', create: true, width: '35px', - format: (row, dashIfEmpty) => parseFloat(row['weight']).toFixed(1), + format: (row) => parseFloat(row['weight']).toFixed(1), }, { labelAbbreviation: 'P', @@ -330,6 +330,25 @@ const columns = [ create: true, format: (row) => parseFloat(row['price3']).toFixed(2), }, + { + align: 'center', + labelAbbreviation: 'CM', + label: t('Check min price'), + toolTip: t('Check min price'), + name: 'hasMinPrice', + attrs: { + toggleIndeterminate: false, + }, + component: 'checkbox', + cellEvent: { + 'update:modelValue': async (value, oldValue, row) => { + await axios.patch(`Items/${row['itemFk']}`, { + hasMinPrice: value, + }); + }, + }, + width: '25px', + }, { align: 'center', labelAbbreviation: 'Min.', @@ -350,25 +369,6 @@ const columns = [ }, format: (row) => parseFloat(row['minPrice']).toFixed(2), }, - { - align: 'center', - labelAbbreviation: 'CM', - label: t('Check min price'), - toolTip: t('Check min price'), - name: 'hasMinPrice', - attrs: { - toggleIndeterminate: false, - }, - component: 'checkbox', - cellEvent: { - 'update:modelValue': async (value, oldValue, row) => { - await axios.patch(`Items/${row['itemFk']}`, { - hasMinPrice: value, - }); - }, - }, - width: '25px', - }, { align: 'center', labelAbbreviation: t('P.Sen'), @@ -378,6 +378,9 @@ const columns = [ component: 'number', isEditable: false, width: '40px', + style: () => { + return { color: 'var(--vn-label-color)' }; + }, }, { align: 'center', @@ -417,6 +420,9 @@ const columns = [ component: 'input', isEditable: false, width: '35px', + style: () => { + return { color: 'var(--vn-label-color)' }; + }, }, ]; @@ -644,8 +650,8 @@ onMounted(() => { :is-editable="editableMode" :without-header="!editableMode" :with-filters="editableMode" - :right-search="false" - :right-search-icon="false" + :right-search="true" + :right-search-icon="true" :row-click="false" :columns="columns" :beforeSaveFn="beforeSave" diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index d50f6b219ec..3c96a230286 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -199,7 +199,6 @@ const columns = computed(() => [ optionValue: 'code', optionLabel: 'description', }, - cardVisible: true, width: '65px', format: (row, dashIfEmpty) => dashIfEmpty(row.entryTypeDescription), }, diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue index da855782879..4bd0fe6408d 100644 --- a/src/pages/Entry/EntryStockBought.vue +++ b/src/pages/Entry/EntryStockBought.vue @@ -57,7 +57,7 @@ const columns = computed(() => [ create: true, component: 'number', summation: true, - width: '60px', + width: '50px', }, { align: 'center', @@ -286,7 +286,7 @@ function round(value) { justify-content: center; } .column { - min-width: 30%; + min-width: 40%; margin-top: 5%; display: flex; flex-direction: column; diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue index 9d382f23a3a..1a37994d908 100644 --- a/src/pages/Entry/EntryStockBoughtDetail.vue +++ b/src/pages/Entry/EntryStockBoughtDetail.vue @@ -101,7 +101,8 @@ const columns = [ </template> <style lang="css" scoped> .container { - max-width: 50vw; + max-width: 100%; + width: 50%; overflow: auto; justify-content: center; align-items: center; @@ -109,9 +110,6 @@ const columns = [ background-color: var(--vn-section-color); padding: 2%; } -.container > div > div > .q-table__top.relative-position.row.items-center { - background-color: red !important; -} </style> <i18n> es: diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue index af48f7f5c6b..c2a63ddd9b3 100644 --- a/src/pages/Item/ItemRequestFilter.vue +++ b/src/pages/Item/ItemRequestFilter.vue @@ -8,6 +8,7 @@ import VnInput from 'src/components/common/VnInput.vue'; import FetchData from 'components/FetchData.vue'; import { useArrayData } from 'src/composables/useArrayData'; import VnSelectWorker from 'src/components/common/VnSelectWorker.vue'; +import VnInputDate from 'src/components/common/VnInputDate.vue'; const { t } = useI18n(); const props = defineProps({ @@ -52,7 +53,7 @@ onMounted(async () => { name: key, value, selectedField: { name: key, label: t(`params.${key}`) }, - }) + }), ); } exprBuilder('state', arrayData.store?.userParams?.state); @@ -157,6 +158,32 @@ onMounted(async () => { /> </QItemSection> </QItem> + <QItem> + <QItemSection> + <VnInputDate + v-model="params.from" + :label="t('params.from')" + is-outlined + /> + </QItemSection> + <QItemSection> + <VnInputDate + v-model="params.to" + :label="t('params.to')" + is-outlined + /> + </QItemSection> + </QItem> + <QItem> + <QItemSection> + <VnInput + :label="t('params.daysOnward')" + v-model="params.daysOnward" + lazy-rules + is-outlined + /> + </QItemSection> + </QItem> <QItem> <QItemSection> <VnSelect @@ -175,11 +202,10 @@ onMounted(async () => { </QItem> <QItem> <QItemSection> - <VnInput - :label="t('params.daysOnward')" - v-model="params.daysOnward" - lazy-rules - is-outlined + <QCheckbox + :label="t('params.mine')" + v-model="params.mine" + :toggle-indeterminate="false" /> </QItemSection> </QItem> diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue index 46bc1a69080..a8d8477115e 100644 --- a/src/pages/Route/RouteExtendedList.vue +++ b/src/pages/Route/RouteExtendedList.vue @@ -280,7 +280,7 @@ const openTicketsDialog = (id) => { </QCardSection> <QCardSection class="q-pt-none"> <VnInputDate - :label="t('route.Stating date')" + :label="t('route.Starting date')" v-model="startingDate" autofocus /> @@ -335,6 +335,7 @@ const openTicketsDialog = (id) => { <QBtn icon="vn:clone" color="primary" + flat class="q-mr-sm" :disable="!selectedRows?.length" @click="confirmationDialog = true" @@ -344,6 +345,7 @@ const openTicketsDialog = (id) => { <QBtn icon="cloud_download" color="primary" + flat class="q-mr-sm" :disable="!selectedRows?.length" @click="showRouteReport" @@ -353,6 +355,7 @@ const openTicketsDialog = (id) => { <QBtn icon="check" color="primary" + flat class="q-mr-sm" :disable="!selectedRows?.length" @click="markAsServed()" diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue index b3a599af78c..c04f6496b9f 100644 --- a/src/pages/Worker/Card/WorkerMedical.vue +++ b/src/pages/Worker/Card/WorkerMedical.vue @@ -3,6 +3,7 @@ import { ref, computed } from 'vue'; import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; import VnTable from 'components/VnTable/VnTable.vue'; +import { dashIfEmpty } from 'src/filters'; const tableRef = ref(); const { t } = useI18n(); const route = useRoute(); @@ -44,9 +45,12 @@ const columns = [ create: true, component: 'select', attrs: { - url: 'centers', + url: 'medicalCenters', fields: ['id', 'name'], }, + format: (row, dashIfEmpty) => { + return dashIfEmpty(row.center?.name); + }, }, { align: 'left', diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js new file mode 100644 index 00000000000..34d3d3a29f0 --- /dev/null +++ b/test/cypress/integration/route/routeExtendedList.spec.js @@ -0,0 +1,205 @@ +describe('Route extended list', () => { + const getSelector = (colField) => `tr:last-child > [data-col-field="${colField}"]`; + + const selectors = { + worker: getSelector('workerFk'), + agency: getSelector('agencyModeFk'), + vehicle: getSelector('vehicleFk'), + date: getSelector('dated'), + description: getSelector('description'), + served: getSelector('isOk'), + lastRowSelectCheckBox: 'tbody > tr:last-child > :nth-child(1) .q-checkbox__inner', + removeBtn: '[title="Remove"]', + resetBtn: '[title="Reset"]', + confirmBtn: 'VnConfirm_confirm', + saveBtn: 'crudModelDefaultSaveBtn', + saveFormBtn: 'FormModelPopup_save', + cloneBtn: '#st-actions > .q-btn-group > :nth-child(1)', + downloadBtn: '#st-actions > .q-btn-group > :nth-child(2)', + markServedBtn: '#st-actions > .q-btn-group > :nth-child(3)', + searchbar: 'searchbar', + firstTicketsRowSelectCheckBox: + '.q-card > :nth-child(2) > .q-table__container > .q-table__middle > .q-table > tbody > :nth-child(1) > .q-table--col-auto-width > .q-checkbox > .q-checkbox__inner > .q-checkbox__bg > .q-checkbox__svg', + }; + + const checkboxState = { + check: 'check', + uncheck: 'close', + }; + const url = '/#/route/extended-list'; + const dataCreated = 'Data created'; + const dataSaved = 'Data saved'; + + const originalFields = [ + { selector: selectors.worker, type: 'select', value: 'logistic' }, + { selector: selectors.agency, type: 'select', value: 'Super-Man delivery' }, + { selector: selectors.vehicle, type: 'select', value: '3333-IMK' }, + { selector: selectors.date, type: 'date', value: '01/02/2024' }, + { selector: selectors.description, type: 'input', value: 'Test route' }, + { selector: selectors.served, type: 'checkbox', value: checkboxState.uncheck }, + ]; + + const updateFields = [ + { selector: selectors.worker, type: 'select', value: 'salesperson' }, + { selector: selectors.agency, type: 'select', value: 'inhouse pickup' }, + { selector: selectors.vehicle, type: 'select', value: '1111-IMK' }, + { selector: selectors.date, type: 'date', value: '01/01/2001' }, + { selector: selectors.description, type: 'input', value: 'Description updated' }, + { selector: selectors.served, type: 'checkbox', value: checkboxState.check }, + ]; + + function fillField(selector, type, value) { + switch (type) { + case 'select': + cy.get(selector).should('be.visible').click(); + cy.dataCy('null_select').clear().type(value); + cy.get('.q-item').contains(value).click(); + break; + case 'input': + cy.get(selector).should('be.visible').click(); + cy.dataCy('null_input').clear().type(`${value}{enter}`); + break; + case 'date': + cy.get(selector).should('be.visible').click(); + cy.dataCy('null_inputDate').clear().type(`${value}{enter}`); + break; + case 'checkbox': + cy.get(selector).should('be.visible').click().click(); + break; + } + } + + beforeEach(() => { + cy.viewport(1920, 1080); + cy.login('developer'); + cy.visit(url); + cy.typeSearchbar('{enter}'); + }); + + after(() => { + cy.visit(url); + cy.typeSearchbar('{enter}'); + cy.get(selectors.lastRowSelectCheckBox).click(); + + cy.get(selectors.removeBtn).click(); + cy.dataCy(selectors.confirmBtn).click(); + }); + + it('Should list routes', () => { + cy.get('.q-table') + .children() + .should('be.visible') + .should('have.length.greaterThan', 0); + }); + + it('Should create new route', () => { + cy.addBtnClick(); + + const data = { + Worker: { val: 'logistic', type: 'select' }, + Agency: { val: 'Super-Man delivery', type: 'select' }, + Vehicle: { val: '3333-IMK', type: 'select' }, + Date: { val: '02-01-2024', type: 'date' }, + From: { val: '01-01-2024', type: 'date' }, + To: { val: '10-01-2024', type: 'date' }, + 'Km start': { val: 1000 }, + 'Km end': { val: 1200 }, + Description: { val: 'Test route' }, + }; + + cy.fillInForm(data); + + cy.dataCy(selectors.saveFormBtn).click(); + cy.checkNotification(dataCreated); + cy.url().should('include', '/summary'); + }); + + it('Should reset changed values when click reset button', () => { + updateFields.forEach(({ selector, type, value }) => { + fillField(selector, type, value); + }); + + cy.get('[title="Reset"]').click(); + + originalFields.forEach(({ selector, value }) => { + cy.validateContent(selector, value); + }); + }); + + it('Should clone selected route', () => { + cy.get(selectors.lastRowSelectCheckBox).click(); + cy.get(selectors.cloneBtn).click(); + cy.dataCy('route.Starting date_inputDate').type('10-05-2001{enter}'); + cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click(); + cy.validateContent(selectors.date, '05/10/2001'); + }); + + it('Should download selected route', () => { + const downloadsFolder = Cypress.config('downloadsFolder'); + cy.get(selectors.lastRowSelectCheckBox).click(); + cy.get(selectors.downloadBtn).click(); + cy.wait(5000); + + const fileName = 'download.zip'; + cy.readFile(`${downloadsFolder}/${fileName}`).should('exist'); + + cy.task('deleteFile', `${downloadsFolder}/${fileName}`).then((deleted) => { + expect(deleted).to.be.true; + }); + }); + + it('Should mark as served the selected route', () => { + cy.get(selectors.lastRowSelectCheckBox).click(); + cy.get(selectors.markServedBtn).click(); + + cy.typeSearchbar('{enter}'); + cy.validateContent(selectors.served, checkboxState.check); + }); + + it('Should delete the selected route', () => { + cy.get(selectors.lastRowSelectCheckBox).click(); + + cy.get(selectors.removeBtn).click(); + cy.dataCy(selectors.confirmBtn).click(); + + cy.checkNotification(dataSaved); + }); + + it('Should save changes in route', () => { + updateFields.forEach(({ selector, type, value }) => { + fillField(selector, type, value); + }); + + cy.dataCy(selectors.saveBtn).should('not.be.disabled').click(); + cy.checkNotification(dataSaved); + + cy.typeSearchbar('{enter}'); + + updateFields.forEach(({ selector, value }) => { + cy.validateContent(selector, value); + }); + }); + + it('Should add ticket to route', () => { + cy.dataCy('tableAction-0').last().click(); + cy.get(selectors.firstTicketsRowSelectCheckBox).click(); + cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click(); + cy.checkNotification(dataSaved); + }); + + it('Should open summary pop-up when click summuary icon', () => { + cy.dataCy('tableAction-1').last().click(); + cy.get('.summaryHeader > :nth-child(2').should('contain', updateFields[4].value); + }); + + it('Should redirect to the summary from the route summary pop-up', () => { + cy.dataCy('tableAction-1').last().click(); + cy.get('.header > .q-icon').should('be.visible').click(); + cy.url().should('include', '/summary'); + }); + + it('Should redirect to the summary when click go to summary icon', () => { + cy.dataCy('tableAction-2').last().click(); + cy.url().should('include', '/summary'); + }); +});