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

updating tiles

Browse Source
This commit is contained in:
Stephan Richter
2020-12-02 18:17:37 +01:00
parent e8d79b71d9
commit 28ba778a64
6 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,9 +212,8 @@ public abstract class Block extends StretchableTile implements Comparable<Block>
return super.load(json);
}
@Override
public Form propForm(String id) {
Form form = super.propForm(id);
Form form = new Form("test");
new Tag("h4").content(t("Block properties")).addTo(form);
new Input(NAME, name).addTo(new Label(t("name:")+NBSP)).addTo(new Tag("p")).addTo(form);

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

@@ -153,7 +153,7 @@ public class Contact extends Tile{
Tag span = new Tag("span");
new Input(ADDRESS, addr).numeric().addTo(span).content(NBSP);
button(t("learn"),Map.of(ACTION,ACTION_ANALYZE)).addTo(span);
formInputs.add(t("Hardware settings"),span);
formInputs.add(t("Address"),span);
postForm.add(actions.properties());
return super.properties(preForm, formInputs, postForm);

16
src/main/java/de/srsoftware/web4rail/tiles/StretchableTile.java
View File

@@ -1,14 +1,15 @@
package de.srsoftware.web4rail.tiles;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
public abstract class StretchableTile extends Tile {
private static final String STRETCH_LENGTH = "stretch";
@@ -34,13 +35,10 @@ public abstract class StretchableTile extends Tile {
return super.load(json);
}
public Form propForm(String id) {
Form form = new Form(id);
new Tag("h4").content(stretchType()).addTo(form);
new Input(STRETCH_LENGTH, stretch).numeric().addTo(new Label(stretchType()+":"+NBSP)).addTo(new Tag("p")).addTo(form);
return form;
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
formInputs.add(stretchType(),new Input(STRETCH_LENGTH, stretch).addTo(new Tag("span")).content(NBSP+t("Tile(s)")));
return super.properties(preForm, formInputs, postForm);
}
private void stretch(String value) {

18
src/main/java/de/srsoftware/web4rail/tiles/TextDisplay.java
View File

@@ -3,16 +3,17 @@ package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.Map.Entry;
import java.util.Vector;
import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
import de.srsoftware.web4rail.tags.Select;
public class TextDisplay extends StretchableTile {
@@ -38,14 +39,9 @@ public class TextDisplay extends StretchableTile {
}
@Override
public Form propForm(String id) {
noTrack();
Form form = super.propForm(id);
new Tag("h4").content(t("Text")).addTo(form);
new Input(TEXT, text).addTo(new Label(t("Text")+":"+NBSP)).addTo(new Tag("p")).addTo(form);
return form;
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
formInputs.add(t("Text"),new Input(TEXT, text));
return super.properties(preForm, formInputs, postForm);
}
public static Select selector(TextDisplay preselected,Collection<TextDisplay> exclude) {

17
src/main/java/de/srsoftware/web4rail/tiles/Tile.java
View File

@@ -194,10 +194,18 @@ public abstract class Tile extends BaseClass{
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
Fieldset fieldset = new Fieldset(t("Route and Train"));
Fieldset fieldset = null;
if (isSet(route)) {
fieldset = new Fieldset(t("Route"));
route.link("p",t("Locked by {}",route)).addTo(fieldset);
}
if (isSet(train)) {
train.link("span", train+NBSP).addTo(fieldset);
if (isSet(fieldset)) {
fieldset.children().firstElement().content(" / "+t("Train"));
} else fieldset = new Fieldset(t("Train"));
train.link("span", t("Train")+":"+NBSP+train+NBSP).addTo(fieldset);
if (isSet(train.route)) {
train.button(t("stop"), contextAction(ACTION_STOP)).addTo(fieldset);
} else {
@@ -210,10 +218,7 @@ public abstract class Tile extends BaseClass{
}
}
if (isSet(route)) {
route.link("span",t("Locked by {}",route)).addTo(fieldset);
}
preForm.add(fieldset);
if (isSet(fieldset)) preForm.add(fieldset);
if (isTrack) {
formInputs.add(t("Length"),new Input(LENGTH,length).numeric().addTo(new Tag("span")).content(NBSP+lengthUnit));