From b3f27d9a84970050963f2b7598ae9fc1ad751087 Mon Sep 17 00:00:00 2001 From: jgallego Date: Wed, 18 Sep 2024 17:51:49 +0200 Subject: [PATCH 1/4] feat: translations fixed --- src/pages/Route/Roadmap/RoadmapBasicData.vue | 4 ++-- src/pages/Route/Roadmap/RoadmapFilter.vue | 8 ++++---- src/pages/Route/Roadmap/RoadmapSummary.vue | 4 ++-- src/pages/Route/RouteRoadmap.vue | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue index e1611ed612..eeefaca2c2 100644 --- a/src/pages/Route/Roadmap/RoadmapBasicData.vue +++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue @@ -103,8 +103,8 @@ es: Roadmap: Troncal ETD date: Fecha ETD ETD hour: Hora ETD - Tractor plate: Matrícula tractor - Trailer plate: Matrícula trailer + Tractor plate: Matrícula tractora + Trailer plate: Matrícula remolque Carrier: Transportista Price: Precio Driver name: Nombre del conductor diff --git a/src/pages/Route/Roadmap/RoadmapFilter.vue b/src/pages/Route/Roadmap/RoadmapFilter.vue index 04c5c96960..ecf8d39fc3 100644 --- a/src/pages/Route/Roadmap/RoadmapFilter.vue +++ b/src/pages/Route/Roadmap/RoadmapFilter.vue @@ -164,8 +164,8 @@ en: to: To es: params: - tractorPlate: Matrícula del tractor - trailerPlate: Matrícula del trailer + tractorPlate: Matrícula tractora + trailerPlate: Matrícula remolque supplierFk: Transportista price: Precio driverName: Nombre del conductor @@ -174,8 +174,8 @@ es: to: Hasta From: Desde To: Hasta - Tractor Plate: Matrícula del tractor - Trailer Plate: Matrícula del trailer + Tractor Plate: Matrícula tractora + Trailer Plate: Matrícula remolque Carrier: Transportista Price: Precio Driver name: Nombre del conductor diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue index 7f8b7107ba..3fb36b4f7c 100644 --- a/src/pages/Route/Roadmap/RoadmapSummary.vue +++ b/src/pages/Route/Roadmap/RoadmapSummary.vue @@ -149,8 +149,8 @@ const filter = { es: Carrier: Transportista - Tractor Plate: Matrícula tractor - Trailer Plate: Matrícula trailer + Tractor Plate: Matrícula tractora + Trailer Plate: Matrícula remolque Phone: Teléfono Worker: Trabajador Observations: Observaciones diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue index 306387cbec..d921dab1f4 100644 --- a/src/pages/Route/RouteRoadmap.vue +++ b/src/pages/Route/RouteRoadmap.vue @@ -237,4 +237,5 @@ es: Price: Precio Observations: Observaciones Preview: Vista previa + Select the estimated date of departure (ETD): Selecciona la fecha estimada de salida From 1cb2981f97e42d4d678d26800e1a9a28fbefb0ad Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 18 Sep 2024 16:26:56 +0000 Subject: [PATCH 2/4] feat: apply color when today --- src/css/app.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/css/app.scss b/src/css/app.scss index 3c51dc8afd..905934d4c4 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -268,6 +268,7 @@ input::-webkit-inner-spin-button { max-width: 400px; } } + .edit-photo-btn { position: absolute; right: 12px; @@ -280,3 +281,10 @@ input::-webkit-inner-spin-button { color: var(--vn-label-color); text-transform: uppercase; } + +.q-date { + &__today { + border: 2px solid $info; + color: $info; + } +} From 08bec59a37cc97ac321924569f03f56d27a2f492 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Thu, 19 Sep 2024 00:02:45 +0200 Subject: [PATCH 3/4] add_circle --- src/components/ItemsFilterPanel.vue | 7 +++--- src/pages/Item/Card/ItemBarcode.vue | 9 ++++---- src/pages/Order/Card/OrderCatalogFilter.vue | 6 +++-- src/pages/Ticket/Card/TicketNotes.vue | 9 ++++---- src/pages/Ticket/Card/TicketPackage.vue | 25 ++++++++++++--------- src/pages/Worker/Card/WorkerTimeControl.vue | 9 ++++---- 6 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue index 8449f93542..e89d32da49 100644 --- a/src/components/ItemsFilterPanel.vue +++ b/src/components/ItemsFilterPanel.vue @@ -297,11 +297,12 @@ const removeTag = (index, params, search) => { /> - diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue index b353d67c76..197e9142f0 100644 --- a/src/pages/Item/Card/ItemBarcode.vue +++ b/src/pages/Item/Card/ItemBarcode.vue @@ -65,17 +65,18 @@ const focusLastInput = () => { - {{ t('Add barcode') }} - + diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue index 938cc4fe28..354c447476 100644 --- a/src/pages/Order/Card/OrderCatalogFilter.vue +++ b/src/pages/Order/Card/OrderCatalogFilter.vue @@ -374,8 +374,10 @@ function addOrder(value, field, params) { /> - diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue index cfc0c24310..1b9d98a8b1 100644 --- a/src/pages/Ticket/Card/TicketNotes.vue +++ b/src/pages/Ticket/Card/TicketNotes.vue @@ -87,17 +87,18 @@ watch( - {{ t('ticketNotes.addNote') }} - + diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue index a76fce2b69..c071d4f7f9 100644 --- a/src/pages/Ticket/Card/TicketPackage.vue +++ b/src/pages/Ticket/Card/TicketPackage.vue @@ -114,17 +114,20 @@ watch( - - - {{ t('package.addPackage') }} - - + + + + {{ t('package.addPackage') }} + + + diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue index 9ae91f8cee..fbfd4b28da 100644 --- a/src/pages/Worker/Card/WorkerTimeControl.vue +++ b/src/pages/Worker/Card/WorkerTimeControl.vue @@ -561,15 +561,16 @@ onMounted(async () => { {{ secondsToHoursMinutes(day.dayData?.workedHours) }} - {{ t('Add time') }} - + From 1550d79160421e7faeb177a9897be7a98a506cb6 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Thu, 19 Sep 2024 00:10:28 +0200 Subject: [PATCH 4/4] feat: add shortcut more buttons --- src/components/common/VnDmsList.vue | 9 ++++++++- src/pages/Account/Role/Card/SubRoles.vue | 8 +++++++- src/pages/Claim/Card/ClaimLines.vue | 2 +- src/pages/Claim/Card/ClaimPhoto.vue | 8 +++++++- src/pages/Customer/Card/CustomerFileManagement.vue | 1 + src/pages/Customer/Card/CustomerSamples.vue | 8 +++++++- src/pages/Entry/Card/EntryNotes.vue | 8 +++++++- src/pages/InvoiceIn/Card/InvoiceInBasicData.vue | 1 + src/pages/InvoiceIn/Card/InvoiceInDueDay.vue | 2 +- src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 1 + src/pages/InvoiceIn/Card/InvoiceInVat.vue | 1 + src/pages/Item/ItemRequestFilter.vue | 1 + src/pages/Route/Agency/Card/AgencyWorkcenter.vue | 2 +- src/pages/Route/RouteTickets.vue | 2 +- src/pages/Ticket/Card/TicketSale.vue | 3 ++- src/pages/Ticket/Card/TicketService.vue | 8 +++++++- src/pages/Travel/ExtraCommunityFilter.vue | 1 + src/pages/Zone/Delivery/ZoneDeliveryList.vue | 2 +- src/pages/Zone/Upcoming/ZoneUpcomingList.vue | 2 +- 19 files changed, 57 insertions(+), 13 deletions(-) diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue index 16e3c641f8..52dd6ef791 100644 --- a/src/components/common/VnDmsList.vue +++ b/src/components/common/VnDmsList.vue @@ -400,7 +400,14 @@ defineExpose({ /> - + {{ t('Upload file') }} diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue index 7a0088bac7..d17f96dd89 100644 --- a/src/pages/Account/Role/Card/SubRoles.vue +++ b/src/pages/Account/Role/Card/SubRoles.vue @@ -142,7 +142,13 @@ const redirectToRoleSummary = (id) => - + {{ t('warehouses.add') }} diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue index 77c7dacf17..60c470d22b 100644 --- a/src/pages/Claim/Card/ClaimLines.vue +++ b/src/pages/Claim/Card/ClaimLines.vue @@ -317,7 +317,7 @@ async function saveWhenHasChanges() { - + diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue index 21f1be6ed7..ec619cc7d4 100644 --- a/src/pages/Claim/Card/ClaimPhoto.vue +++ b/src/pages/Claim/Card/ClaimPhoto.vue @@ -246,7 +246,13 @@ function onDrag() {