From e2fbfdc8c713ef92da2aaea2b858bd2a02e8f7be Mon Sep 17 00:00:00 2001 From: provira Date: Mon, 24 Feb 2025 10:47:50 +0100 Subject: [PATCH 1/2] feat: refs #8115 created new function for adding new parkings massively --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Shelving/Parking/ParkingCreate.vue | 92 ++++++++++++++++++++ src/pages/Shelving/Parking/ParkingList.vue | 8 ++ src/pages/Shelving/Parking/locale/en.yml | 7 +- src/pages/Shelving/Parking/locale/es.yml | 7 +- src/router/modules/shelving.js | 10 +++ 7 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 src/pages/Shelving/Parking/ParkingCreate.vue diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 9a60e9da1..57f0626cb 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -338,6 +338,7 @@ globals: operator: Operator parking: Parking vehicleList: Vehicles + parkingCreate: New parking vehicle: Vehicle unsavedPopup: title: Unsaved changes will be lost diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 846c442ea..9a4eb0850 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -342,6 +342,7 @@ globals: parking: Parking vehicleList: Vehículos vehicle: Vehículo + parkingCreate: Nuevo parking unsavedPopup: title: Los cambios que no haya guardado se perderán subtitle: ¿Seguro que quiere salir sin guardar? diff --git a/src/pages/Shelving/Parking/ParkingCreate.vue b/src/pages/Shelving/Parking/ParkingCreate.vue new file mode 100644 index 000000000..855b0660a --- /dev/null +++ b/src/pages/Shelving/Parking/ParkingCreate.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Shelving/Parking/ParkingList.vue index fe6c93ba5..db96d6474 100644 --- a/src/pages/Shelving/Parking/ParkingList.vue +++ b/src/pages/Shelving/Parking/ParkingList.vue @@ -77,4 +77,12 @@ const filter = { + + + + + {{ $t('shelving.list.newShelving') }} + + + diff --git a/src/pages/Shelving/Parking/locale/en.yml b/src/pages/Shelving/Parking/locale/en.yml index 2076f38b4..fbc53704e 100644 --- a/src/pages/Shelving/Parking/locale/en.yml +++ b/src/pages/Shelving/Parking/locale/en.yml @@ -2,4 +2,9 @@ parking: pickingOrder: Picking order sector: Sector search: Search parking - searchInfo: You can search by parking code \ No newline at end of file + searchInfo: You can search by parking code + block: Block + streetFrom: Street from + streetTo: Street to + numberFrom: Number from + numberTo: Number to diff --git a/src/pages/Shelving/Parking/locale/es.yml b/src/pages/Shelving/Parking/locale/es.yml index 17fe3af53..51596a6ee 100644 --- a/src/pages/Shelving/Parking/locale/es.yml +++ b/src/pages/Shelving/Parking/locale/es.yml @@ -2,4 +2,9 @@ parking: pickingOrder: Orden de recogida sector: Sector search: Buscar parking - searchInfo: Puedes buscar por código de parking \ No newline at end of file + searchInfo: Puedes buscar por código de parking + block: Bloque + streetFrom: Calle desde + streetTo: Calle hasta + numberFrom: Número desde + numberTo: Número hasta diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js index c085dd8dc..1645e7562 100644 --- a/src/router/modules/shelving.js +++ b/src/router/modules/shelving.js @@ -137,6 +137,16 @@ export default { parkingCard, ], }, + { + path: 'parking/create', + name: 'ParkingCreate', + meta: { + title: 'parkingCreate', + icon: 'add', + + }, + component: () => import('src/pages/Shelving/Parking/ParkingCreate.vue'), + }, ], }, ], -- 2.40.1 From d66dda0b2e7b71ed37a688505a750398d13d8c0a Mon Sep 17 00:00:00 2001 From: provira Date: Mon, 14 Apr 2025 10:03:39 +0200 Subject: [PATCH 2/2] feat: refs #8115 added support for printing parkings --- src/pages/Shelving/Parking/ParkingList.vue | 56 ++++++++++++++++++++-- test/cypress/back/datasources.json | 11 +++++ 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Shelving/Parking/ParkingList.vue index d746b0d5b..dfd853e06 100644 --- a/src/pages/Shelving/Parking/ParkingList.vue +++ b/src/pages/Shelving/Parking/ParkingList.vue @@ -1,18 +1,25 @@ @@ -105,4 +153,4 @@ const columns = computed(() => [ - + \ No newline at end of file diff --git a/test/cypress/back/datasources.json b/test/cypress/back/datasources.json index fa7b81e1c..afdc3134a 100644 --- a/test/cypress/back/datasources.json +++ b/test/cypress/back/datasources.json @@ -145,5 +145,16 @@ "allowedContentTypes": [ "application/x-7z-compressed" ] + }, + "parkingStorage": { + "name": "parkingStorage", + "connector": "loopback-component-storage", + "provider": "filesystem", + "root": "./storage/pdfs/parking", + "maxFileSize": "52428800", + "allowedContentTypes": [ + "application/octet-stream", + "application/pdf" + ] } } \ No newline at end of file -- 2.40.1