Assecutor/votianlt
3
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix: highlight pickup station when all tasks are completed

Browse Source
This commit is contained in:
Sven Carstensen
2026-03-10 11:29:19 +01:00
parent ba99bb29c6
commit 5a23671ae2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/assecutor/votianlt/pages/view/JobSummaryView.java
View File

@@ -374,7 +374,7 @@ public class JobSummaryView extends Main implements HasUrlParameter<String>, Has
stationGrid.getStyle().set("gap", "var(--lumo-space-m)"); stationGrid.getStyle().set("gap", "var(--lumo-space-m)");
stationGrid.setWidthFull(); stationGrid.setWidthFull();
stationGrid.add(createPickupSummaryTile(job, cargoItems)); stationGrid.add(createPickupSummaryTile(job, cargoItems, tasks));
List<DeliveryStation> stations = job.getDeliveryStations(); List<DeliveryStation> stations = job.getDeliveryStations();
if (stations != null && !stations.isEmpty()) { if (stations != null && !stations.isEmpty()) {
@@ -388,7 +388,7 @@ public class JobSummaryView extends Main implements HasUrlParameter<String>, Has
return stationGrid; return stationGrid;
} }
private StationTile createPickupSummaryTile(Job job, List<CargoItem> cargoItems) { private StationTile createPickupSummaryTile(Job job, List<CargoItem> cargoItems, List<BaseTask> tasks) {
String title = getTranslation("jobsummary.section.pickup") + " " String title = getTranslation("jobsummary.section.pickup") + " "
+ formatDateWithTime(job.getPickupDate(), job.getPickupTime()); + formatDateWithTime(job.getPickupDate(), job.getPickupTime());
List<String> additionalLines = buildPickupSummaryDetails(job, cargoItems); List<String> additionalLines = buildPickupSummaryDetails(job, cargoItems);
@@ -396,10 +396,12 @@ public class JobSummaryView extends Main implements HasUrlParameter<String>, Has
additionalLines.add(getTranslation("jobsummary.station.phone") + ": " + job.getPickupPhone()); additionalLines.add(getTranslation("jobsummary.station.phone") + ": " + job.getPickupPhone());
} }
return createSummaryTile(StationTile.StationType.PICKUP, 0, title, job.getPickupCompany(), StationTile tile = createSummaryTile(StationTile.StationType.PICKUP, 0, title, job.getPickupCompany(),
buildDisplayName(job.getPickupSalutation(), job.getPickupFirstName(), job.getPickupLastName()), buildDisplayName(job.getPickupSalutation(), job.getPickupFirstName(), job.getPickupLastName()),
job.getPickupStreet(), job.getPickupHouseNumber(), job.getPickupZip(), job.getPickupCity(), job.getPickupStreet(), job.getPickupHouseNumber(), job.getPickupZip(), job.getPickupCity(),
additionalLines); additionalLines);
tile.setAddressValidated(areAllTasksCompleted(sortVisibleTasks(tasks)));
return tile;
} }
private StationTile createDeliverySummaryTile(DeliveryStation station, int index, int stationCount, private StationTile createDeliverySummaryTile(DeliveryStation station, int index, int stationCount,