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

updating tiles and conditions

Browse Source
This commit is contained in:
Stephan Richter
2020-12-02 22:30:43 +01:00
parent 85a1222851
commit a7f252de7f
5 changed files with 60 additions and 88 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.2.2</version>
<version>1.2.3</version>
<name>Web4Rail</name>
<packaging>jar</packaging>
<description>Java Model Railway Control</description>

85
src/main/java/de/srsoftware/web4rail/Route.java
View File

@@ -33,12 +33,9 @@ import de.srsoftware.web4rail.actions.SetSpeed;
import de.srsoftware.web4rail.conditions.Condition;
import de.srsoftware.web4rail.conditions.ConditionList;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Button;
import de.srsoftware.web4rail.tags.Checkbox;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
import de.srsoftware.web4rail.tags.Table;
import de.srsoftware.web4rail.tiles.Block;
import de.srsoftware.web4rail.tiles.Contact;
@@ -242,8 +239,8 @@ public class Route extends BaseClass implements Comparable<Route>{
return fieldset;
}
private void addBraketimesTo(Window win) {
new Tag("h4").content(t("Brake time table")).addTo(win);
private Fieldset brakeTimes() {
Fieldset fieldset = new Fieldset(t("Brake time table"));
Table table = new Table();
table.addHead(t("Train"),t("Brake time¹, forward"),t("Brake time¹, reverse"));
for (Train t : Train.list()) {
@@ -251,53 +248,34 @@ public class Route extends BaseClass implements Comparable<Route>{
Integer rTime = brakeTimes.get(t.brakeId(true));
table.addRow(t,isSet(fTime)? fTime+NBSP+"ms" : "–",isSet(rTime)? fTime+NBSP+"ms" : "–");
}
table.clazz("brake-times").addTo(win);
new Tag("p").content(t("1) Duration between 5 {} steps during brake process.",speedUnit)).addTo(win);
}
private Fieldset conditions() {
Fieldset fieldset = new Fieldset(t("Conditions"));
new Tag("div").content(t("Route will only be available, if all conditions are fulfilled.")).addTo(fieldset);
conditions.tag(REALM_ROUTE+":"+id()).addTo(fieldset);
table.clazz("brake-times").addTo(fieldset);
new Tag("p").content(t("1) Duration between 5 {} steps during brake process.",speedUnit)).addTo(fieldset);
return fieldset;
}
private void addContactsTo(Window win) {
if (!contacts.isEmpty()) {
new Tag("h4").content(t("Actions and contacts")).addTo(win);
Tag list = new Tag("ol");
private Fieldset contactsAndActions() {
Fieldset win = new Fieldset(t("Actions and contacts"));
Tag list = new Tag("ol");
Tag setup = new Tag("li").content(t("Setup actions")+NBSP);
setupActions.addTo(setup, context());
setup.addTo(list);
Tag setup = new Tag("li").content(t("Setup actions")+NBSP);
setupActions.addTo(setup, context());
setup.addTo(list);
Tag start = new Tag("li").content(t("Start actions")+NBSP);
startActions.addTo(start, context());
start.addTo(list);
Tag start = new Tag("li").content(t("Start actions")+NBSP);
startActions.addTo(start, context());
start.addTo(list);
for (Contact c : contacts) {
Tag link = Plan.addLink(c,c+NBSP,list);
ActionList actions = triggers.get(c.trigger());
if (isNull(actions)) {
actions = new ActionList();
triggers.put(c.trigger(), actions);
}
actions.addTo(link,context());
for (Contact c : contacts) {
Tag link = Plan.addLink(c,c+NBSP,list);
ActionList actions = triggers.get(c.trigger());
if (isNull(actions)) {
actions = new ActionList();
triggers.put(c.trigger(), actions);
}
list.addTo(win);
actions.addTo(link,context());
}
}
private void addFormTo(Window win, HashMap<String, String> params) {
Form form = new Form("route-"+id+"-props");
new Input(ACTION, ACTION_UPDATE).hideIn(form);
new Input(REALM,REALM_ROUTE).hideIn(form);
new Input(ID,id()).hideIn(form);
if (params.containsKey(CONTEXT)) new Input(CONTEXT,params.get(CONTEXT)).hideIn(form);
new Input(NAME, name()).style("width: 80%").addTo(new Label(t("name:")+NBSP)).addTo(form);
new Checkbox(DISABLED, t("disabled"), disabled).addTo(form);
new Button(t("Apply"),form).addTo(form).addTo(win);
list.addTo(win);
return win;
}
public void addPropertiesFrom(Route existingRoute) {
@@ -674,23 +652,14 @@ public class Route extends BaseClass implements Comparable<Route>{
formInputs.add(t("Name"),new Input(NAME, name()));
formInputs.add(t("disabled"),new Checkbox(DISABLED, t("disabled"), disabled));
preForm.add(basicProperties());
if (!turnouts.isEmpty()) preForm.add(turnouts());
preForm.add(conditions());
postForm.add(basicProperties());
if (!turnouts.isEmpty()) postForm.add(turnouts());
preForm.add(conditions.list(t("Route will only be available, if all conditions are fulfilled.")));
preForm.add(contactsAndActions());
postForm.add(brakeTimes());
return super.properties(preForm, formInputs, postForm);
}
private Window properties(HashMap<String, String> params) {
Window win = new Window("route-properties",t("Properties of {}",this));
addFormTo(win,params);
//basicProperties();
//addTurnoutsTo(win);
//addConditionsTo(win);
addContactsTo(win);
addBraketimesTo(win);
return win;
}
public Route remove(Condition condition) {
conditions.remove(condition);
return this;

47
src/main/java/de/srsoftware/web4rail/conditions/ConditionList.java
View File

@@ -12,6 +12,7 @@ import de.srsoftware.web4rail.BaseClass.Context;
import de.srsoftware.web4rail.BaseClass.Id;
import de.srsoftware.web4rail.Constants;
import de.srsoftware.web4rail.tags.Button;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tags.Input;
@@ -32,6 +33,30 @@ public class ConditionList extends Vector<Condition> implements Constants{
return json;
}
public Fieldset list() {
return list(null);
}
public Fieldset list(String caption) {
Fieldset fieldset = new Fieldset(t("Conditions"));
if (caption != null) new Tag("p").content(caption).addTo(fieldset);
Tag list = new Tag("ul");
newConditionForm().addTo(new Tag("li")).addTo(list);
forEach(condition -> condition.link("li", condition).addTo(list));
list.addTo(fieldset);
return fieldset;
}
private Form newConditionForm() {
Form form = new Form("add-condition-form");
new Input(REALM, REALM_CONDITION).hideIn(form);
new Input(ACTION,ACTION_ADD).hideIn(form);
// new Input(CONTEXT,context).hideIn(form); TODO: add context
Condition.selector().addTo(form);
new Button(t("Add condition"), form).addTo(form);
return form;
}
public void load(JSONArray arr) {
for (int i=0; i<arr.length(); i++) {
JSONObject json = arr.getJSONObject(i);
@@ -49,28 +74,6 @@ public class ConditionList extends Vector<Condition> implements Constants{
}
}
public Tag tag(String context) {
if (context != null) {
Tag list = new Tag("ul");
for (Condition condition : this) {
condition.link(condition.toString(),"li",context).addTo(list);
}
Tag div = list.addTo(new Tag("div"));
Form form = new Form("add-condition-form");
new Input(REALM, REALM_CONDITION).hideIn(form);
new Input(ACTION,ACTION_ADD).hideIn(form);
new Input(CONTEXT,context).hideIn(form);
Condition.selector().addTo(form);
new Button(t("Add condition"), form).addTo(form).addTo(div);
return div;
}
return null;
}
private static String t(String tx, Object...fills) {
return Translation.get(Application.class, tx, fills);
}

2
src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java
View File

@@ -26,7 +26,7 @@ public class TrainSelect extends Condition {
public Condition load(JSONObject json) {
super.load(json);
train(Train.get(new Id(json.getString(REALM_TRAIN))));
train(Train.get(new Id(""+json.get(REALM_TRAIN))));
return this;
}

2
src/main/java/de/srsoftware/web4rail/tiles/Block.java
View File

@@ -327,7 +327,7 @@ public abstract class Block extends StretchableTile implements Comparable<Block>
}
public Fieldset waitTimeForm() {
Fieldset win = new Fieldset("Wait times");
Fieldset win = new Fieldset(t("Wait times"));
Form form = new Form("train-wait-form");
new Tag("h4").content(t("Stop settings")).addTo(win);
new Input(REALM,REALM_PLAN).hideIn(form);