From dd0917a57daa6404570965dfb61ae3b06dd57cbd Mon Sep 17 00:00:00 2001 From: provira Date: Fri, 3 Jan 2025 07:37:47 +0100 Subject: [PATCH 001/188] refactor: refs #8322 changed Wagon component to use VnSection/VnCardBeta --- src/pages/Wagon/Card/WagonCard.vue | 4 +- src/pages/Wagon/WagonList.vue | 161 ++++++++++++++++------------- src/router/modules/wagon.js | 47 ++++++--- 3 files changed, 123 insertions(+), 89 deletions(-) diff --git a/src/pages/Wagon/Card/WagonCard.vue b/src/pages/Wagon/Card/WagonCard.vue index ed6c83778..8dadca85c 100644 --- a/src/pages/Wagon/Card/WagonCard.vue +++ b/src/pages/Wagon/Card/WagonCard.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue index f306c4c8d..9ee68bcf0 100644 --- a/src/pages/Wagon/WagonList.vue +++ b/src/pages/Wagon/WagonList.vue @@ -8,6 +8,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue'; import { computed, ref } from 'vue'; import VnSelect from 'src/components/common/VnSelect.vue'; import VnInput from 'src/components/common/VnInput.vue'; +import VnSection from 'src/components/common/VnSection.vue'; const quasar = useQuasar(); const arrayData = useArrayData('WagonList'); @@ -15,6 +16,7 @@ const store = arrayData.store; const router = useRouter(); const { t } = useI18n(); const tableRef = ref(); +const dataKey = 'WagonList'; const filter = { include: { relation: 'type', @@ -92,79 +94,90 @@ async function remove(row) { diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js index 4a322d305..d0f4b2281 100644 --- a/src/router/modules/wagon.js +++ b/src/router/modules/wagon.js @@ -1,34 +1,55 @@ import { RouterView } from 'vue-router'; +const wagonCard = { + + name: 'WagonCard', + path: ':id', + component: () => import('src/pages/Ticket/Card/WagonCard.vue'), + redirect: { name: 'WagonSummary' }, + meta: { + //main: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'], + menu: [], + }, + children: [ + {}, + ], +}; + export default { - path: '/wagon', name: 'Wagon', + path: '/wagon', meta: { title: 'wagons', icon: 'vn:trolley', moduleName: 'Wagon', + keyBinding: 'w', + menu: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'], }, component: RouterView, redirect: { name: 'WagonMain' }, - menus: { - main: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'], - card: [], - }, children: [ { - path: '/wagon', + path: '', name: 'WagonMain', component: () => import('src/components/common/VnModule.vue'), - redirect: { name: 'WagonList' }, + redirect: { name: 'WagonIndexMain' }, children: [ { - path: 'list', - name: 'WagonList', - meta: { - title: 'list', - icon: 'vn:trolley', - }, + path: '', + name: 'WagonIndexMain', + redirect: { name: 'WagonList' }, component: () => import('src/pages/Wagon/WagonList.vue'), + children: [ + { + name: 'WagonList', + path: 'list', + meta: { + title: 'list', + icon: 'view_list', + }, + }, + + ] }, { path: 'create', From 812d68e29505499a6d3c7b3e063bf3771c9385da Mon Sep 17 00:00:00 2001 From: jtubau Date: Thu, 6 Feb 2025 12:51:45 +0100 Subject: [PATCH 002/188] refactor: refs #8472 unified styling for the more-create-dialog slot to ensure consistency across all scenarios --- src/components/VnTable/VnTable.vue | 6 +++++- src/pages/Account/AccountList.vue | 2 -- src/pages/InvoiceOut/InvoiceOutList.vue | 3 ++- src/pages/Supplier/SupplierList.vue | 6 ++++-- src/pages/Wagon/WagonList.vue | 4 ---- src/pages/Worker/WorkerList.vue | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 04b7c0a46..3202b18b3 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -721,12 +721,16 @@ es: .grid-create { display: grid; - grid-template-columns: repeat(auto-fit, minmax(150px, max-content)); + grid-template-columns: 1fr 1fr; max-width: 100%; grid-gap: 20px; margin: 0 auto; } +.q-span-2 { + grid-column: span 2; +} + .flex-one { display: flex; flex-flow: row wrap; diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue index ea8daba0d..e1b55f150 100644 --- a/src/pages/Account/AccountList.vue +++ b/src/pages/Account/AccountList.vue @@ -167,14 +167,12 @@ function exprBuilder(param, value) { :right-search="false" > diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 9398ded64..3473574f3 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -232,7 +232,7 @@ watchEffect(selectedRows); diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue index e716686d1..7a84ae6cd 100644 --- a/src/pages/Wagon/WagonList.vue +++ b/src/pages/Wagon/WagonList.vue @@ -111,7 +111,6 @@ async function remove(row) { > diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue index 75700ef16..363c87cfb 100644 --- a/src/pages/Worker/WorkerList.vue +++ b/src/pages/Worker/WorkerList.vue @@ -223,7 +223,7 @@ async function autofillBic(worker) { :right-search="false" > + + + + + es: + shelving: + list: + parking: Estacionamiento + priority: Prioridad + + summary: + recyclable: Reciclable + en: + shelving: + list: + parking: Parking + priority: Priority + + summary: + recyclable: Recyclable + diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js index c085dd8dc..94ff274dc 100644 --- a/src/router/modules/shelving.js +++ b/src/router/modules/shelving.js @@ -111,15 +111,6 @@ export default { shelvingCard, ], }, - { - path: 'create', - name: 'ShelvingCreate', - meta: { - title: 'shelvingCreate', - icon: 'add', - }, - component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'), - }, { path: 'parking', name: 'ParkingMain', diff --git a/test/cypress/integration/parking/parkingBasicData.spec.js b/test/cypress/integration/shelving/parking/parkingBasicData.spec.js similarity index 100% rename from test/cypress/integration/parking/parkingBasicData.spec.js rename to test/cypress/integration/shelving/parking/parkingBasicData.spec.js diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/shelving/parking/parkingList.spec.js similarity index 100% rename from test/cypress/integration/parking/parkingList.spec.js rename to test/cypress/integration/shelving/parking/parkingList.spec.js diff --git a/test/cypress/integration/shelving/shelvingBasicData.spec.js b/test/cypress/integration/shelving/shelvingBasicData.spec.js new file mode 100644 index 000000000..54547463e --- /dev/null +++ b/test/cypress/integration/shelving/shelvingBasicData.spec.js @@ -0,0 +1,20 @@ +/// +describe('ShelvingList', () => { + + const parking = '.q-card > :nth-child(1) > .q-select > .q-field__inner > .q-field__control > .q-field__control-container'; + beforeEach(() => { + cy.viewport(1920, 1080); + cy.login('developer'); + cy.visit(`/#/shelving/1/basic-data`); + }); + + it('should edit the data and save', () => { + cy.selectOption(parking, 'P-01-1'); + cy.dataCy('Code_input').type('1'); + cy.dataCy('Priority_input').type('10'); + cy.get(':nth-child(2) > .q-checkbox > .q-checkbox__inner').click(); + cy.saveCard(); + cy.get('.q-notification__message').should('have.text', 'Data saved'); + + }); +}); \ No newline at end of file diff --git a/test/cypress/integration/shelving/shelvingList.spec.js b/test/cypress/integration/shelving/shelvingList.spec.js new file mode 100644 index 000000000..1a792c3d1 --- /dev/null +++ b/test/cypress/integration/shelving/shelvingList.spec.js @@ -0,0 +1,32 @@ +/// +describe('ShelvingList', () => { + beforeEach(() => { + cy.viewport(1920, 1080); + cy.login('developer'); + cy.visit(`/#/shelving/list`); + }); + + it('should redirect on clicking a shelving', () => { + cy.get('#searchbar input').type('{enter}'); + cy.get(':nth-child(2) > .q-card').click(); + cy.url().should('include', '/shelving/2/summary'); + }); + + it('should filter and redirect if only one result', () => { + cy.selectOption('[data-cy="Parking_select"]', 'P-02-2'); + cy.dataCy('Parking_select').type('{enter}'); + cy.url().should('match', /\/shelving\/\d+\/summary/); + }); + + it('should create a new shelving', () => { + cy.dataCy('vnTableCreateBtn').click(); + cy.dataCy('code-create-popup').type('Test'); + cy.dataCy('Priority_input').type('10'); + cy.selectOption( + '.grid-create > .q-select > .q-field__inner > .q-field__control > .q-field__control-container', '100-01' + ) + cy.dataCy('FormModelPopup_save').click(); + cy.checkNotification('Data created'); + cy.url().should('match', /\/shelving\/\d+\/basic-data/); + }); +}); From acc202386e2b96305c00ae861069aee5a1a20882 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 19 Feb 2025 13:53:47 +0100 Subject: [PATCH 006/188] fix: refs #8583 operator --- cypress.config.js | 2 +- src/pages/Worker/Card/WorkerOperator.vue | 11 ++++++++-- .../integration/worker/workerOperator.spec.js | 22 +++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 test/cypress/integration/worker/workerOperator.spec.js diff --git a/cypress.config.js b/cypress.config.js index a9e27fcfd..b902891f3 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -13,7 +13,7 @@ export default defineConfig({ videosFolder: 'test/cypress/videos', downloadsFolder: 'test/cypress/downloads', video: false, - specPattern: 'test/cypress/integration/**/*.spec.js', + specPattern: 'test/cypress/integration/worker/*.spec.js', experimentalRunAllSpecs: false, watchForFileChanges: false, reporter: 'cypress-mochawesome-reporter', diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue index 6faeefe67..1efb5479b 100644 --- a/src/pages/Worker/Card/WorkerOperator.vue +++ b/src/pages/Worker/Card/WorkerOperator.vue @@ -54,9 +54,8 @@ watch( selected.value = []; } }, - { immediate: true, deep: true } + { immediate: true, deep: true }, ); -