StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

improved javascript

Browse Source
This commit is contained in:
Stephan Richter
2021-03-13 13:12:37 +01:00
parent 8a9aada83e
commit 5b2bf1ddc0
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId>
<version>1.3.60</version>
<version>1.3.61</version>
<name>Web4Rail</name>
<packaging>jar</packaging>
<description>Java Model Railway Control</description>

2
resources/js/plan.js
View File

@@ -48,7 +48,6 @@ function arrangeTabs(){
index = i;
target = this;
}
//if (fs.id == lastTab) target = this;
$(this).appendTo(tabs).click(fs.id,clickLegend);
if (id > 0) {
$(fs).hide();
@@ -71,6 +70,7 @@ function clickLegend(ev){
$(ev.target).addClass('front');
$('.window > fieldset').hide();
$('#'+lastTab).show();
$('#'+lastTab+" input:not([type=hidden])").first().focus().select();
if (!('no-update' in ev)) remember(lastTab);
}

31
src/main/java/de/srsoftware/web4rail/Plan.java
View File

@@ -676,19 +676,27 @@ public class Plan extends BaseClass{
}
public Window properties(HashMap<String, String> params) {
if (params.containsKey(ID)) {
Tile tile = get(Id.from(params), true);
if (isSet(tile)) return tile.properties();
}
}
Window win = new Window("plan-properties", t("Properties of {}",t("Plan")));
return properties();
}
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm, String... errorMessages) {
formInputs.add(null, new Input(REALM,REALM_PLAN));
formInputs.add(null, new Input(ACTION,ACTION_UPDATE));
formInputs.add(t("Length unit"),new Input(LENGTH_UNIT, lengthUnit));
formInputs.add(t("Speed unit"),new Input(SPEED_UNIT, speedUnit));
formInputs.add(t("Lower speed limit"),new Input(FINAL_SPEED, BrakeProcessor.defaultEndSpeed).attr("title", t("Final speed after breaking, before halting")));
formInputs.add(t("Free tiles behind train"),new Checkbox(FREE_BEHIND_TRAIN, t("If checked, tiles behind the train are freed according to the length of the train and the tiles. If it is unchecked, tiles will not get free before route is finished."), Route.freeBehindTrain));
editableProperties().addTo(win);
relayProperties().addTo(win);
routeProperties().addTo(win);
return win;
postForm.add(relayProperties());
postForm.add(routeProperties());
return super.properties(preForm, formInputs, postForm, errorMessages);
}
/**
@@ -790,7 +798,7 @@ public class Plan extends BaseClass{
}
private Tag routeProperties() {
private Fieldset routeProperties() {
Fieldset fieldset = new Fieldset(t("Routes"));
Table table = new Table();
table.addHead(t("Name"),t("Start"),t("End"),t("Actions"));
@@ -969,6 +977,11 @@ public class Plan extends BaseClass{
new Div(ACTION_PROPS).clazz(REALM_CAR).content(t("Manage cars")).addTo(tiles);
return tiles.addTo(tileMenu);
}
@Override
public String toString() {
return name;
}
/**
* updates a tile