From 02e29c167a38a4ef1c391d25f378f238fdf36285 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 26 Mar 2025 07:46:39 +0100 Subject: [PATCH 1/6] feat: add rounded CC field to travel summary and translations --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Travel/Card/TravelSummary.vue | 25 +++++++++++++++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index d0911d41d..09431dce0 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -841,6 +841,7 @@ travel: availabledHour: Availabled hour thermographs: Thermographs hb: HB + roundedCc: Rounded CC basicData: daysInForward: Automatic movement (Raid) isRaid: Raid diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index ac441d28d..10ff812df 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -924,6 +924,7 @@ travel: availabled: F. Disponible availabledHour: Hora Disponible hb: HB + roundedCc: CC redondeado basicData: daysInForward: Desplazamiento automatico (redada) isRaid: Redada diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue index 9f9552611..5a824ddc3 100644 --- a/src/pages/Travel/Card/TravelSummary.vue +++ b/src/pages/Travel/Card/TravelSummary.vue @@ -91,6 +91,13 @@ const entriesTableColumns = computed(() => { showValue: true, }, { label: 'CC', field: 'cc', name: 'cc', align: 'left', showValue: true }, + { + label: t('travel.summary.roundedCc'), + field: 'cc', + name: 'roundedCc', + align: 'left', + showValue: true, + }, { label: 'Pallet', field: 'pallet', @@ -193,13 +200,18 @@ const entriesTotals = computed(() => { freightValue: 0, packageValue: 0, cc: 0, + roundedCc: 0, pallet: 0, m3: 0, }; entriesTableRows.value.forEach((row) => { for (const key in totals) { - totals[key] += row[key] || 0; + if (key === 'roundedCc') { + totals['roundedCc'] += Math.ceil(row['cc'] || 0); + } else { + totals[key] += row[key] || 0; + } } }); @@ -208,6 +220,7 @@ const entriesTotals = computed(() => { freight: toCurrency(totals.freightValue), packageValue: toCurrency(totals.packageValue), cc: totals.cc.toFixed(2), + roundedCc: totals.roundedCc, pallet: totals.pallet.toFixed(2), m3: totals.m3.toFixed(2), }; @@ -337,9 +350,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; @@ -376,6 +387,11 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; + From bbc03ddcad713bce6fbcb14c26bf283bca12ff56 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 26 Mar 2025 08:30:20 +0100 Subject: [PATCH 2/6] fix: remove duplicated department selection from MonitorTicketFilter --- src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue index 447dd35b8..258a90583 100644 --- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue +++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue @@ -209,20 +209,6 @@ const getLocale = (label) => { /> - - - - - Date: Wed, 26 Mar 2025 09:55:26 +0100 Subject: [PATCH 3/6] test: mark specific tests as skipped for tasks 8814 and 8779 --- test/cypress/integration/route/routeExtendedList.spec.js | 3 ++- test/cypress/integration/ticket/ticketList.spec.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js index fb2885f35..2d59b5514 100644 --- a/test/cypress/integration/route/routeExtendedList.spec.js +++ b/test/cypress/integration/route/routeExtendedList.spec.js @@ -146,7 +146,8 @@ describe('Route extended list', () => { cy.readFile(`${downloadsFolder}/${fileName}`).should('exist'); }); - it('Should mark as served the selected route', () => { + // task https://redmine.verdnatura.es/issues/8814 + xit('Should mark as served the selected route', () => { cy.get(selectors.lastRowSelectCheckBox).click(); cy.get(selectors.markServedBtn).click(); diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js index 5613a5854..85356ed15 100644 --- a/test/cypress/integration/ticket/ticketList.spec.js +++ b/test/cypress/integration/ticket/ticketList.spec.js @@ -35,7 +35,8 @@ describe('TicketList', () => { cy.get('.summaryBody').should('exist'); }); - it('filter client and create ticket', () => { + // task https://redmine.verdnatura.es/issues/8779 + xit('filter client and create ticket', () => { cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar'); searchResults(); cy.wait('@ticketSearchbar'); From 1a1b39960694139e855a03ec8f068cc3a9365297 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 26 Mar 2025 09:57:40 +0100 Subject: [PATCH 4/6] fix: move warning badge condition to the correct position in getBadgeAttrs function --- src/pages/Entry/EntryList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index 5ebad3144..556f89b0e 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -249,7 +249,6 @@ function getBadgeAttrs(row) { let timeDiff = today - timeTicket; if (timeDiff > 0) return { color: 'info', 'text-color': 'black' }; - if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' }; switch (row.entryTypeCode) { case 'regularization': case 'life': @@ -274,6 +273,7 @@ function getBadgeAttrs(row) { default: break; } + if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' }; return { color: 'transparent' }; } From ef2ce0500e7e81bb15d254f2f06baa856438a280 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 26 Mar 2025 12:05:32 +0100 Subject: [PATCH 5/6] test: mark route cloning test as skipped for task 8814 --- test/cypress/integration/route/routeExtendedList.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js index 2d59b5514..fee8369e3 100644 --- a/test/cypress/integration/route/routeExtendedList.spec.js +++ b/test/cypress/integration/route/routeExtendedList.spec.js @@ -118,8 +118,8 @@ describe('Route extended list', () => { cy.validateContent(selector, value); }); }); - - it('Should clone selected route and add ticket', () => { + // task https://redmine.verdnatura.es/issues/8814 + xit('Should clone selected route and add ticket', () => { cy.get(selectors.firstRowSelectCheckBox).click(); cy.get(selectors.cloneBtn).click(); cy.dataCy('Starting date_inputDate').type('01-01-2001'); From dcc45cf3d4a4b173ea18a9b7ddab3a6cb17e4e95 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 26 Mar 2025 12:38:53 +0100 Subject: [PATCH 6/6] test: skip TicketList test suite --- test/cypress/integration/ticket/ticketList.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js index 85356ed15..fb6a1a641 100644 --- a/test/cypress/integration/ticket/ticketList.spec.js +++ b/test/cypress/integration/ticket/ticketList.spec.js @@ -1,5 +1,5 @@ /// -describe('TicketList', () => { +describe.skip('TicketList', () => { const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)'; beforeEach(() => {