Mercurial > dive4elements > river

changeset 9271:f48a8dc78529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uinfo.salix details
author gernotbelger
date Thu, 19 Jul 2018 13:39:27 +0200
parents 7337034eb5d5
children 1d59da89b00d
files artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/DistanceOnlyPartHistoricalSelect.java artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/ScenarioTypeState.java artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties
diffstat 4 files changed, 45 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
@@ -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
--- 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
--- 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
http://dive4elements.wald.intevation.org