diff --git a/CHANGELOG.md b/CHANGELOG.md
index c97c4181f..43bd6da77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- (Tickets) => Se añade la opción de clonar ticket. #6951
- (Parking) => Se añade la sección Parking. #5186
+- (Rutas) => Se añade el campo "servida" a la tabla y se añade también a los filtros. #7130
+
### Changed
### Fixed
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index ec836f2cd..96028862a 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -26,7 +26,7 @@ const value = computed({
emit('update:modelValue', value);
},
});
-
+const hover = ref(false);
const styleAttrs = computed(() => {
return $props.isOutlined
? {
@@ -41,6 +41,10 @@ const onEnterPress = () => {
emit('keyup.enter');
};
+const handleValue = (val = null) => {
+ value.value = val;
+};
+
const focus = () => {
vnInputRef.value.focus();
};
@@ -51,20 +55,33 @@ defineExpose({
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 66da9b7bf..2053eceb1 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -1,7 +1,6 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
en:
@@ -479,6 +504,7 @@ es:
Description: Descripción
Hour started: Hora inicio
Hour finished: Hora fin
+ Served: Servida
newRoute: Nueva Ruta
Clone Selected Routes: Clonar rutas seleccionadas
Select the starting date: Seleccione la fecha de inicio
@@ -490,4 +516,6 @@ es:
Add ticket: Añadir tickets
Preview: Vista previa
Summary: Resumen
+ Route is closed: La ruta está cerrada
+ Route is not served: La ruta no está servida
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 9d00ba8f7..4cd1f46f5 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -1,10 +1,9 @@
@@ -58,15 +55,10 @@ const isAdministrative = computed(() => {
-
- {{ t('globals.summary.basicData') }}
+
@@ -94,15 +86,10 @@ const isAdministrative = computed(() => {
/>
-
- {{ t('supplier.summary.billingData') }}
+
{
-
- {{ t('supplier.summary.fiscalData') }}
+
{
/>
-
- {{ t('supplier.summary.fiscalAddress') }}
+
diff --git a/src/pages/Travel/locale/en.yml b/src/pages/Travel/locale/en.yml
index 05ac98513..c67eddce0 100644
--- a/src/pages/Travel/locale/en.yml
+++ b/src/pages/Travel/locale/en.yml
@@ -1,6 +1,6 @@
travelFilter:
filter:
- warehouseOutFk: 'Warehouse Out'
- warehouseInFk: 'Warehouse In'
- agencyModeFk: 'Agency'
- scopeDays: 'Days onward'
+ warehouseOutFk: Warehouse Out
+ warehouseInFk: Warehouse In
+ agencyModeFk: Agency
+ scopeDays: Days onward
diff --git a/src/pages/Travel/locale/es.yml b/src/pages/Travel/locale/es.yml
index 4fbed920b..8e958c074 100644
--- a/src/pages/Travel/locale/es.yml
+++ b/src/pages/Travel/locale/es.yml
@@ -1,6 +1,6 @@
travelFilter:
filter:
- warehouseInFk: 'Alm. entrada'
- warehouseOutFk: 'Alm. salida'
- agencyModeFk: 'Agencia'
- scopeDays: 'Días adelante'
+ warehouseInFk: Alm. entrada
+ warehouseOutFk: Alm. salida
+ agencyModeFk: Agencia
+ scopeDays: Días adelante
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index d16022f79..41f3ec92a 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -10,8 +10,8 @@ export default {
component: RouterView,
redirect: { name: 'ItemMain' },
menus: {
- main: ['ItemList'],
- card: [],
+ main: ['ItemList', 'WasteBreakdown'],
+ card: ['ItemBasicData'],
},
children: [
{
@@ -37,6 +37,19 @@ export default {
},
component: () => import('src/pages/Item/ItemCreate.vue'),
},
+ {
+ path: 'waste-breakdown',
+ name: 'WasteBreakdown',
+ meta: {
+ title: 'wasteBreakdown',
+ icon: 'vn:claims',
+ },
+ beforeEnter: (to, from, next) => {
+ next({ name: 'ItemList' });
+ window.location.href =
+ 'https://grafana.verdnatura.es/d/TTNXQAxVk';
+ },
+ },
],
},
{
@@ -72,6 +85,15 @@ export default {
},
component: () => import('src/pages/Item/Card/ItemTags.vue'),
},
+ {
+ path: 'basic-data',
+ name: 'ItemBasicData',
+ meta: {
+ title: 'basicData',
+ icon: 'vn:settings',
+ },
+ component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
+ },
],
},
],
diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index 3a90afce9..f89a0f716 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -1,48 +1,64 @@
-const locationOptions ='[role="listbox"] > div.q-virtual-scroll__content > .q-item'
+const locationOptions = '[role="listbox"] > div.q-virtual-scroll__content > .q-item';
describe('VnLocation', () => {
- describe('Create',()=>{
- const inputLocation = ':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
+ describe('Create', () => {
+ const inputLocation =
+ '.q-form .q-card> :nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
beforeEach(() => {
cy.viewport(1280, 720);
cy.login('developer');
cy.visit('/#/worker/create');
cy.waitForElement('.q-card');
});
- it('Show all options', function() {
+ it('Show all options', function () {
cy.get(inputLocation).click();
- cy.get(locationOptions).should('have.length.at.least',5);
+ cy.get(locationOptions).should('have.length.at.least', 5);
});
- it('input filter location as "al"', function() {
+ it('input filter location as "al"', function () {
cy.get(inputLocation).click();
cy.get(inputLocation).clear();
cy.get(inputLocation).type('al');
- cy.get(locationOptions).should('have.length.at.least',3);
+ cy.get(locationOptions).should('have.length.at.least', 3);
});
- it('input filter location as "ecuador"', function() {
+ it('input filter location as "ecuador"', function () {
cy.get(inputLocation).click();
cy.get(inputLocation).clear();
cy.get(inputLocation).type('ecuador');
- cy.get(locationOptions).should('have.length.at.least',1);
+ cy.get(locationOptions).should('have.length.at.least', 1);
cy.get(`${locationOptions}:nth-child(1)`).click();
- cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click();
+ cy.get(inputLocation + '> :nth-child(2) > .q-icon').click();
});
});
- describe('Fiscal-data',()=>{
+ describe('Fiscal-data', () => {
beforeEach(() => {
cy.viewport(1280, 720);
cy.login('developer');
- cy.visit('/#/supplier/567/fiscal-data', {timeout: 2000});
+ cy.visit('/#/supplier/567/fiscal-data', { timeout: 2000 });
cy.waitForElement('.q-card');
});
- it('Create postCode', function() {
- cy.get(':nth-child(6) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon').click();
+ it('Create postCode', function () {
+ cy.get(
+ ':nth-child(6) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+ ).click();
cy.get(' .q-card > h1').should('have.text', 'New postcode');
- cy.get('.q-card > :nth-child(4) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(1) > input').clear('12');
- cy.get('.q-card > :nth-child(4) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(1) > input').type('1234453');
- cy.selectOption('.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ', 'Valencia');
- cy.selectOption('.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control ', 'Province one');
- cy.selectOption('.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ', 'España');
+ cy.get(
+ '.q-card > :nth-child(4) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(1) > input'
+ ).clear('12');
+ cy.get(
+ '.q-card > :nth-child(4) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(1) > input'
+ ).type('1234453');
+ cy.selectOption(
+ '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+ 'Valencia'
+ );
+ cy.selectOption(
+ '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control ',
+ 'Province one'
+ );
+ cy.selectOption(
+ '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+ 'España'
+ );
cy.get('.q-mt-lg > .q-btn--standard').click();
});
});
-})
+});
diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index 26c7ee196..903f58d4b 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -8,6 +8,7 @@ describe('ClaimDevelopment', () => {
cy.viewport(1920, 1080);
cy.login('developer');
cy.visit(`/#/claim/${claimId}/development`);
+ cy.waitForElement('tbody');
});
it('should reset line', () => {
diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index 20f137aeb..fc989d6c5 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -1,6 +1,6 @@
///
describe('InvoiceInBasicData', () => {
- const selects = ':nth-child(1) > :nth-child(1) > .q-field';
+ const selects = '.q-form .q-card>:nth-child(1) > :nth-child(1) > .q-field';
const appendBtns = 'label button';
const dialogAppendBtns = '.q-dialog label button';
const dialogInputs = '.q-dialog input';
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 544e7e6b5..28a8aa979 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -72,6 +72,7 @@ Cypress.Commands.add('getValue', (selector) => {
// Fill Inputs
Cypress.Commands.add('selectOption', (selector, option) => {
+ cy.waitForElement(selector);
cy.get(selector).find('.q-select__dropdown-icon').click();
cy.get('.q-menu .q-item').contains(option).click();
});
@@ -183,11 +184,11 @@ Cypress.Commands.add('closeSideMenu', (element) => {
Cypress.Commands.add('clearSearchbar', (element) => {
if (element) cy.waitForElement(element);
- cy.get('#searchbar > form > label > div:nth-child(1) input').clear();
+ cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').clear();
});
Cypress.Commands.add('writeSearchbar', (value) => {
- cy.get('#searchbar > form > label > div:nth-child(1) input').type(value);
+ cy.get('#searchbar > form > div:nth-child(1) > label > div:nth-child(1) input').type(value);
});
Cypress.Commands.add('validateContent', (selector, expectedValue) => {
cy.get(selector).should('have.text', expectedValue);
diff --git a/vitest.config.js b/vitest.config.js
index 748bbfe0a..ca9f6c1fe 100644
--- a/vitest.config.js
+++ b/vitest.config.js
@@ -27,7 +27,10 @@ export default defineConfig({
sassVariables: 'src/quasar-variables.scss',
}),
VueI18nPlugin({
- include: path.resolve(__dirname, 'src/i18n/**'),
+ include: [
+ path.resolve(__dirname, 'src/i18n/**'),
+ path.resolve(__dirname, 'src/pages/**/locale/**'),
+ ],
}),
jsconfigPaths(),
],