# HG changeset patch # User gernotbelger # Date 1532000367 -7200 # Node ID f48a8dc78529986659fb5b24ce0971f7b6aa1623 # Parent 7337034eb5d56817a44d85763fa75cce8c9debb4 uinfo.salix details diff -r 7337034eb5d5 -r f48a8dc78529 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/DistanceOnlyPartHistoricalSelect.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/DistanceOnlyPartHistoricalSelect.java Thu Jul 19 13:36:38 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/DistanceOnlyPartHistoricalSelect.java Thu Jul 19 13:39:27 2018 +0200 @@ -47,7 +47,7 @@ @Override protected String getTitle(final CallContext context) { // REMARK: that is how it should be: return Resources.getMsg(context.getMeta(), getID()); - return Resources.getMsg(context.getMeta(), "state.title.distance_part_state"); + return Resources.getMsg(context.getMeta(), "state.title.salix.historical.distance_part_state"); } @Override diff -r 7337034eb5d5 -r f48a8dc78529 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/ScenarioTypeState.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/ScenarioTypeState.java Thu Jul 19 13:36:38 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/ScenarioTypeState.java Thu Jul 19 13:39:27 2018 +0200 @@ -3,9 +3,15 @@ import java.util.LinkedHashMap; +import org.dive4elements.artifactdatabase.ProtocolUtils; +import org.dive4elements.artifactdatabase.data.StateData; import org.dive4elements.artifacts.Artifact; +import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; +import org.dive4elements.artifacts.common.utils.XMLUtils; +import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.artifacts.states.RadioSelect; +import org.w3c.dom.Element; /** * @author Ingo Weinzierl @@ -26,4 +32,22 @@ return entries; } + + @Override + protected Element createData(final XMLUtils.ElementCreator cr, final Artifact artifact, final StateData data, final CallContext context) { + final Element select = ProtocolUtils.createArtNode(cr, "select", null, null); + + cr.addAttr(select, "name", data.getName(), true); + + final Element label = ProtocolUtils.createArtNode(cr, "label", null, null); + + label.setTextContent(Resources.getMsg(context.getMeta(), "state.uinfo.load.scenario_type")); + + final Element description = ProtocolUtils.createArtNode(cr, "description", null, null); + description.setTextContent("TEST"); + select.appendChild(description); + select.appendChild(label); + + return select; + } } \ No newline at end of file diff -r 7337034eb5d5 -r f48a8dc78529 artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Thu Jul 19 13:36:38 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Thu Jul 19 13:39:27 2018 +0200 @@ -1063,7 +1063,8 @@ useScenario.inactive = Inactiv help.state.uinfo.use_scenario=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.use_scenario -state.uinfo.scenario_type=Auswahl des Szenariotyps +state.uinfo.scenario_type = Szenariotyp +state.uinfo.load.scenario_type=Auswahl des Szenariotyps scenarioType.option1 = Regional wirkende Eingriffe scenarioType.option2 = \u00dcberregional wirkende Eingriffe scenarioType.option3 = Historische Betrachtung @@ -1185,6 +1186,10 @@ state.bundu.fix.auto = Automatische Auswahl state.bundu.fix.manual = Manuelle Auswahl state.bundu.fixationchoice = Fixierungen +state.bundu.calc.auto = Automatische Auswahl +state.bundu.calc.manual = Manuelle Auswahl +state.bundu.wst.function = Auswahl der Ausgleichsfunktion +state.bundu.wst.missing_volume = Ermittlung von Fehlvolumina help.state.bundu.river=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.river help.state.bundu.calculation.mode=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.calculation.mode @@ -1203,6 +1208,8 @@ help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.compute state.bundu.wst.fix.year_length = L\u00e4nge der Abflusszeitreihe (Ausgehend vom Bezugsjahr in die Vergangenheit) +state.bundu.wst.fix.year_length_short = L\u00e4nge der Abflusszeitreihe +state.bundu.wst.calc_choice = Auswahl der Berechnungsgrundlagen common.client.ui.selection = Selection common.client.ui.from = from @@ -1212,5 +1219,6 @@ state.title.distance_state = Choose calculation range [km] state.title.location_distance_state = Choose calculation location(s) / range [km] -state.title.distance_part_state = Choose calculation subregion [km] +state.title.distance_part_state = state.title.distance_part_state +state.title.salix.historical.distance_part_state = Festlegen eines Teilabschnitts state.title.distance_only_inundationduration_state = Darstellungsbereich w\u00e4hlen [km] \ No newline at end of file diff -r 7337034eb5d5 -r f48a8dc78529 artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Thu Jul 19 13:36:38 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Thu Jul 19 13:39:27 2018 +0200 @@ -1063,7 +1063,8 @@ useScenario.inactive = Nein help.state.uinfo.use_scenario=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.use_scenario -state.uinfo.scenario_type=Auswahl des Szenariotyps +state.uinfo.scenario_type = Szenariotyp +state.uinfo.load.scenario_type=Auswahl des Szenariotyps scenarioType.option1 = Regional wirkende Eingriffe scenarioType.option2 = \u00dcberregional wirkende Eingriffe scenarioType.option3 = Historische Betrachtung @@ -1185,6 +1186,10 @@ state.bundu.fix.auto = Automatische Auswahl state.bundu.fix.manual = Manuelle Auswahl state.bundu.fixationchoice = Fixierungen +state.bundu.calc.auto = Automatische Auswahl +state.bundu.calc.manual = Manuelle Auswahl +state.bundu.wst.function = Auswahl der Ausgleichsfunktion +state.bundu.wst.missing_volume = Ermittlung von Fehlvolumina help.state.bundu.river=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.river help.state.bundu.calculation.mode=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.calculation.mode @@ -1203,6 +1208,8 @@ help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.compute state.bundu.wst.fix.year_length = L\u00e4nge der Abflusszeitreihe (Ausgehend vom Bezugsjahr in die Vergangenheit) +state.bundu.wst.fix.year_length_short = L\u00e4nge der Abflusszeitreihe +state.bundu.wst.calc_choice = Auswahl der Berechnungsgrundlagen common.client.ui.selection = Auswahl common.client.ui.from = von @@ -1212,5 +1219,6 @@ state.title.distance_state = Berechnungsstrecke w\u00e4hlen [km] state.title.location_distance_state = Berechnungsort(e) / strecke w\u00e4hlen [km] -state.title.distance_part_state = Teilstrecke w\u00e4hlen [km] +state.title.distance_part_state = Festlegen eines Teilabschnitts +state.title.salix.historical.distance_part_state = Festlegen eines Teilabschnitts state.title.distance_only_inundationduration_state = Darstellungsbereich w\u00e4hlen [km] \ No newline at end of file