From af1f35bae91639ecb06fd035166d5828d4bd7bc7 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Sat, 14 Nov 2020 15:10:53 +0100 Subject: [PATCH] slight improvement in car and loco manager --- pom.xml | 2 +- src/main/java/de/srsoftware/web4rail/moving/Train.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 623c9f4..e3b7860 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 0.11.29 + 0.11.30 Web4Rail jar Java Model Railway Control diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java index 1df32f0..3094fdc 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Train.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java @@ -217,7 +217,7 @@ public class Train extends BaseClass implements Comparable { new Input(ID,id).hideIn(addCarForm); Select select = new Select(CAR_ID); for (Car car : Car.list()) { - if (!this.cars.contains(car)) select.addOption(car.id(), car); + if (!this.cars.contains(car)) select.addOption(car.id(), car+(car.stockId.isEmpty()?"":" ("+car.stockId+")")); } if (!select.children().isEmpty()) { select.addTo(addCarForm); @@ -380,7 +380,7 @@ public class Train extends BaseClass implements Comparable { loco.link("span").addTo(li); Map props = Map.of(REALM,REALM_LOCO,ID,loco.id(),ACTION,ACTION_TURN); new Button(t("turn within train"),props).addTo(li).addTo(locoList); - Map params = Map.of(REALM,REALM_TRAIN,ID,id,ACTION,ACTION_DROP,LOCO_ID,loco.id()); + Map params = Map.of(REALM,REALM_TRAIN,ID,id,ACTION,ACTION_DROP,LOCO_ID,loco.id()+(loco.stockId.isEmpty()?"":" ("+loco.stockId+")")); new Button(t("delete"),params).addTo(li); }