From 865ef8101201b7f655bb8daefa7003066c8eb8d7 Mon Sep 17 00:00:00 2001 From: "Torsten Schulz (local)" Date: Fri, 5 Dec 2025 13:07:31 +0100 Subject: [PATCH] Enhance FalukantService and UI components for improved product handling - Updated FalukantService to allow optional inclusion of productType in queries, enhancing flexibility in data retrieval. - Modified SaleSection.vue to conditionally display product information and size, improving user experience by handling cases with no product. - Added new German translation for 'runningNoProduct' to enhance localization support for users. --- backend/services/falukantService.js | 2 +- frontend/src/components/falukant/SaleSection.vue | 14 ++++++++++++-- frontend/src/i18n/locales/de/falukant.json | 3 ++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/backend/services/falukantService.js b/backend/services/falukantService.js index c3b20f6..fca8061 100644 --- a/backend/services/falukantService.js +++ b/backend/services/falukantService.js @@ -1014,7 +1014,7 @@ class FalukantService extends BaseService { include: [ { model: RegionData, as: 'sourceRegion', attributes: ['id', 'name'] }, { model: RegionData, as: 'targetRegion', attributes: ['id', 'name'] }, - { model: ProductType, as: 'productType', attributes: ['id', 'labelTr'] }, + { model: ProductType, as: 'productType', required: false, attributes: ['id', 'labelTr'] }, { model: Vehicle, as: 'vehicle', diff --git a/frontend/src/components/falukant/SaleSection.vue b/frontend/src/components/falukant/SaleSection.vue index 14591eb..624a0a5 100644 --- a/frontend/src/components/falukant/SaleSection.vue +++ b/frontend/src/components/falukant/SaleSection.vue @@ -146,8 +146,18 @@ ? $t('falukant.branch.sale.runningDirectionOut') : $t('falukant.branch.sale.runningDirectionIn') }} - {{ $t(`falukant.product.${t.product.labelTr}`) }} - {{ t.size }} + + + {{ $t(`falukant.product.${t.product.labelTr}`) }} + + + {{ $t('falukant.branch.sale.runningNoProduct') }} + + + + {{ t.size }} + + {{ t.sourceRegion?.name }} {{ t.targetRegion?.name }} {{ formatEta(t) }} diff --git a/frontend/src/i18n/locales/de/falukant.json b/frontend/src/i18n/locales/de/falukant.json index 2bf5c67..39c4a39 100644 --- a/frontend/src/i18n/locales/de/falukant.json +++ b/frontend/src/i18n/locales/de/falukant.json @@ -200,6 +200,7 @@ "runningDirection": "Richtung", "runningProduct": "Artikel", "runningQuantity": "Menge", + "runningNoProduct": "Fahrzeugtransport", "runningSource": "Quelle", "runningTarget": "Ziel", "runningEta": "Ankunft", @@ -299,7 +300,7 @@ "actions": "Aktionen" }, "status": { - "inUse": "In Benutzung (mit Transport verknüpft)", + "inUse": "In Benutzung", "building": "Im Bau", "free": "Verfügbar" },