From 01125fc875e6424226261750bf2a8c013d12352b Mon Sep 17 00:00:00 2001
From: Jan <jan.weber@avatic.de>
Date: Sun, 28 Sep 2025 18:05:56 +0200
Subject: [PATCH] fixed Reportingstruktur angleichen #25

---
 .../src/components/UI/ReportRoute.vue         |  1 +
 .../layout/bulkedit/BulkEditRow.vue           |  4 ++--
 .../src/components/layout/report/Report.vue   | 21 ++++++++++++-------
 src/frontend/src/store/propertySets.js        |  3 ++-
 src/frontend/src/store/validityPeriod.js      |  3 ++-
 .../PreCalculationCheckService.java           |  5 +++++
 .../transformer/report/ReportTransformer.java |  2 +-
 7 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/frontend/src/components/UI/ReportRoute.vue b/src/frontend/src/components/UI/ReportRoute.vue
index 6cf8693..c252401 100644
--- a/src/frontend/src/components/UI/ReportRoute.vue
+++ b/src/frontend/src/components/UI/ReportRoute.vue
@@ -73,6 +73,7 @@ export default {
 <style scoped>
 .route-container {
   padding: 20px;
+  min-height: 20rem;
 }
 
 .route {
diff --git a/src/frontend/src/components/layout/bulkedit/BulkEditRow.vue b/src/frontend/src/components/layout/bulkedit/BulkEditRow.vue
index e3adc9d..6d7902a 100644
--- a/src/frontend/src/components/layout/bulkedit/BulkEditRow.vue
+++ b/src/frontend/src/components/layout/bulkedit/BulkEditRow.vue
@@ -176,10 +176,10 @@ export default {
       return (this.hu.width && this.hu.length && this.hu.height && this.hu.weight && this.hu.content_unit_count)
     },
     showPrice() {
-      return (this.premise.material_cost)
+      return !(this.premise.material_cost === null) || (this.premise.material_cost === 0)
     },
     showPriceIncomplete() {
-      return !(this.premise.oversea_share)
+      return (this.premise.oversea_share === null)
     },
     isSelected() {
       return this.premise.selected;
diff --git a/src/frontend/src/components/layout/report/Report.vue b/src/frontend/src/components/layout/report/Report.vue
index 19a7dc0..f2e42b9 100644
--- a/src/frontend/src/components/layout/report/Report.vue
+++ b/src/frontend/src/components/layout/report/Report.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="report-container">
     <div class="box-gap">
-    <div class="report-header">{{ report.supplier.name }}</div></div>
+    <div class="report-header">{{ shorten(report.supplier.name, 35) }}</div></div>
     <div class="report-chart">
       <report-chart
           title=""
@@ -180,7 +180,7 @@
           </div>
 
           <div class="report-content-row">
-            <div>Safety stock [days]</div>
+            <div>Safety stock [w-days]</div>
             <div class="report-content-data-cell">{{ premise.safety_stock }}</div>
           </div>
 
@@ -206,12 +206,12 @@
           </div>
 
           <div class="report-content-row">
-            <div>Mixable HU</div>
-            <div class="report-content-data-cell">{{ premise.mixed ? 'yes' : 'no' }} </div>
+            <div>Mixed container</div>
+            <div class="report-content-data-cell">{{ premise.mixed ? 'Yes' : 'No' }} </div>
           </div>
 
           <div class="report-content-row">
-            <div>Stacking factor</div>
+            <div>Stacked layers</div>
             <div class="report-content-data-cell">{{ premise.layer }} </div>
           </div>
 
@@ -227,7 +227,7 @@
 
           <div class="report-content-row">
             <div>Limiting factor</div>
-            <div class="report-content-data-cell">{{ premise.weight_exceeded ? 'weight' : 'volume' }} </div>
+            <div class="report-content-data-cell">{{ premise.weight_exceeded ? 'Weight' : 'Volume' }} </div>
           </div>
 
         </div>
@@ -261,6 +261,13 @@ export default {
     }
   },
   methods: {
+    shorten(text, length) {
+      if(text !== null && text !== undefined && text.length > length) {
+        return `${text.substring(0, length - 3)} …` ;
+      }
+
+      return text;
+    },
     getContainerTypeName(text) {
       switch (text) {
         case 'FEU':
@@ -274,7 +281,7 @@ export default {
     },
     toFixedDimension(value, unit) {
       if(unit === 'm') {
-        return value.toFixed(4);
+        return value.toFixed(2);
       } else if(unit === 'cm') {
         return value.toFixed(2);
       } else if(unit === 'mm') {
diff --git a/src/frontend/src/store/propertySets.js b/src/frontend/src/store/propertySets.js
index 2b8103b..82dbe50 100644
--- a/src/frontend/src/store/propertySets.js
+++ b/src/frontend/src/store/propertySets.js
@@ -56,7 +56,8 @@ export const usePropertySetsStore = defineStore('propertySets', {
         async loadPeriods() {
             this.loading = true;
             const url = `${config.backendUrl}/properties/periods`;
-            this.periods = await performRequest(this, 'GET', url, null);
+            const data = await performRequest(this, 'GET', url, null);
+            this.periods = data.data;
             this.selectedPeriod = this.getCurrentPeriodId;
             this.loading = false;
         }
diff --git a/src/frontend/src/store/validityPeriod.js b/src/frontend/src/store/validityPeriod.js
index f0add89..8bfb329 100644
--- a/src/frontend/src/store/validityPeriod.js
+++ b/src/frontend/src/store/validityPeriod.js
@@ -51,7 +51,8 @@ export const useValidityPeriodStore = defineStore('validityPeriod', {
         async loadPeriods() {
             this.loading = true;
             const url = `${config.backendUrl}/rates/periods`;
-            this.periods = await performRequest(this,'GET', url, null);
+            const data = await performRequest(this,'GET', url, null);
+            this.periods = data.data;
             this.selectedPeriod = this.getCurrentPeriodId;
             this.loading = false;
         }
diff --git a/src/main/java/de/avatic/lcc/service/precalculation/PreCalculationCheckService.java b/src/main/java/de/avatic/lcc/service/precalculation/PreCalculationCheckService.java
index 38316de..58b56b4 100644
--- a/src/main/java/de/avatic/lcc/service/precalculation/PreCalculationCheckService.java
+++ b/src/main/java/de/avatic/lcc/service/precalculation/PreCalculationCheckService.java
@@ -215,6 +215,11 @@ public class PreCalculationCheckService {
             throw new PremiseValidationError("HU dimensions too large. Review entered length, width, height and selected dimension unit [mm, cm, m].");
         }
 
+
+        if((hu.getLength() * hu.getWidth()) < 20000) {
+            throw new PremiseValidationError("HU dimensions too small. Review entered length, width, height and selected dimension unit [mm, cm, m].");
+        }
+
     }
 
     private void materialCheck(Premise premise) {
diff --git a/src/main/java/de/avatic/lcc/service/transformer/report/ReportTransformer.java b/src/main/java/de/avatic/lcc/service/transformer/report/ReportTransformer.java
index 5224476..5c48931 100644
--- a/src/main/java/de/avatic/lcc/service/transformer/report/ReportTransformer.java
+++ b/src/main/java/de/avatic/lcc/service/transformer/report/ReportTransformer.java
@@ -296,7 +296,7 @@ public class ReportTransformer {
         var disposalValues = annualAmount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : destination.stream().map(CalculationJobDestination::getAnnualDisposalCost).reduce(BigDecimal.ZERO, BigDecimal::add).divide(annualAmount, 4, RoundingMode.HALF_UP);
         var customValues = annualAmount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : destination.stream().map(CalculationJobDestination::getAnnualCustomCost).reduce(BigDecimal.ZERO, BigDecimal::add).divide(annualAmount, 4, RoundingMode.HALF_UP);
 
-        var noTransportSplit = weightedTotalCost.totalPreRunCost.compareTo(BigDecimal.ZERO) == 0 && weightedTotalCost.totalMainRunCost.compareTo(BigDecimal.ZERO) == 0 && weightedTotalCost.totalPostRunCost.compareTo(BigDecimal.ZERO) == 0;
+        var noTransportSplit = true; //= weightedTotalCost.totalPreRunCost.compareTo(BigDecimal.ZERO) == 0 && weightedTotalCost.totalMainRunCost.compareTo(BigDecimal.ZERO) == 0 && weightedTotalCost.totalPostRunCost.compareTo(BigDecimal.ZERO) == 0;
 
 
         var preRunValues = weightedTotalCost.totalPreRunCost.divide(annualAmount, 4, RoundingMode.HALF_UP);