From 1f5dc0e6ffa22a11e9185dfd29c98ac9fd7219d8 Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 8 Dec 2025 10:35:26 +0100 Subject: [PATCH] Bugfix: user supplier with d2d routing, Bugfix: indeterminate in Destination Manager, Removed Azure maps dependency in frontend, adjusted logmessage (memory, startup) --- src/frontend/package.json | 1 - .../layout/edit/destination/mass/DestMassCreate.vue | 13 ++++++++----- src/main/java/de/avatic/lcc/LccApplication.java | 4 ++-- .../steps/RouteSectionCostCalculationService.java | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/frontend/package.json b/src/frontend/package.json index 07c28f8..07fa02b 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -14,7 +14,6 @@ "dependencies": { "@phosphor-icons/vue": "^2.2.1", "@vueuse/core": "^13.6.0", - "azure-maps-control": "^3.6.1", "chart.js": "^4.5.0", "leaflet": "^1.9.4", "loglevel": "^1.9.2", diff --git a/src/frontend/src/components/layout/edit/destination/mass/DestMassCreate.vue b/src/frontend/src/components/layout/edit/destination/mass/DestMassCreate.vue index 6da3388..4726dac 100644 --- a/src/frontend/src/components/layout/edit/destination/mass/DestMassCreate.vue +++ b/src/frontend/src/components/layout/edit/destination/mass/DestMassCreate.vue @@ -14,7 +14,7 @@ :key="`${dest.id}-${dest.overallCheck}-${dest.overallIndeterminate}`" v-for="dest in destPool"> + @checkbox-changed="setOverallCheck($event, dest.id)"> {{ toNode(dest, 6) }} @@ -115,8 +115,7 @@ export default { const totalCount = this.destMatrix.length; dest.overallCheck = selectedCount === totalCount; - dest.overallIndeterminate = selectedCount > 0 && selectedCount < totalCount; - + dest.overallIndeterminate = selectedCount > 0 && !dest.overallCheck; this.$forceUpdate(); }, @@ -131,9 +130,13 @@ export default { this.destMatrix.forEach(p => p.destinations.push({...destination, selected: false})); } }, - updateOverallCheck(newValue, id) { - this.destPool.find(d => d.id === id).overallCheck = newValue; + setOverallCheck(newValue, id) { + const header = this.destPool.find(d => d.id === id); + header.overallCheck = newValue; + header.overallIndeterminate = false; + this.destMatrix.forEach(r => r.destinations.find(d => d.id === id).selected = newValue); + this.$forceUpdate(); }, async fetch(query) { const supplierQuery = {searchTerm: query, includeUserNode: true, nodeType: "DESTINATION"}; diff --git a/src/main/java/de/avatic/lcc/LccApplication.java b/src/main/java/de/avatic/lcc/LccApplication.java index 00195e9..ffb7bd6 100644 --- a/src/main/java/de/avatic/lcc/LccApplication.java +++ b/src/main/java/de/avatic/lcc/LccApplication.java @@ -14,12 +14,12 @@ public class LccApplication { Runtime runtime = Runtime.getRuntime(); long usedMemory = (runtime.totalMemory() - runtime.freeMemory()) / 1024 / 1024; - logger.info("LCC Start - Memory: {} used, {} total, {} free, {} max ", usedMemory, runtime.totalMemory() / 1024 / 1024, runtime.freeMemory() / 1024 / 1024, runtime.maxMemory() / 1024 / 1024); + logger.info("LCC Launcher (start) - Memory: {} used, {} total, {} free, {} max ", usedMemory, runtime.totalMemory() / 1024 / 1024, runtime.freeMemory() / 1024 / 1024, runtime.maxMemory() / 1024 / 1024); SpringApplication.run(LccApplication.class, args); usedMemory = (runtime.totalMemory() - runtime.freeMemory()) / 1024 / 1024; - logger.info("LCC End - Memory: {} used, {} total, {} free, {} max ", usedMemory, runtime.totalMemory() / 1024 / 1024, runtime.freeMemory() / 1024 / 1024, runtime.maxMemory() / 1024 / 1024); + logger.info("LCC Launcher (finished) - Memory: {} used, {} total, {} free, {} max ", usedMemory, runtime.totalMemory() / 1024 / 1024, runtime.freeMemory() / 1024 / 1024, runtime.maxMemory() / 1024 / 1024); } diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java index 257751c..ae22e04 100644 --- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java +++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java @@ -67,7 +67,7 @@ public class RouteSectionCostCalculationService { result.setUnmixedPrice(premise.getHuMixable()); // Get nodes and distance - Node fromNode = nodeRepository.getById(premise.getSupplierNodeId()).orElseThrow(); + Node fromNode = premise.getSupplierNodeId() != null ? nodeRepository.getById(premise.getSupplierNodeId()).orElseThrow() : userNodeRepository.getById(premise.getUserSupplierNodeId()).orElseThrow(); Node toNode = nodeRepository.getById(destination.getDestinationNodeId()).orElseThrow(); double distance = distanceService.getDistance(fromNode, toNode, false);