# HG changeset patch # User gernotbelger # Date 1533215182 -7200 # Node ID 3d006afee054a8a573b2dc134d6fa0bf3baae892 # Parent ba1e2e8f05d1b9bbd86d4801f2cadcbded27b6f8 bundu.bezugswst workflow reviewed diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/doc/conf/artifacts/bundu.xml --- a/artifacts/doc/conf/artifacts/bundu.xml Thu Aug 02 15:02:27 2018 +0200 +++ b/artifacts/doc/conf/artifacts/bundu.xml Thu Aug 02 15:06:22 2018 +0200 @@ -309,33 +309,40 @@ + + + + + + + - + - - + + - + - - + + - + @@ -348,30 +355,36 @@ - + - + - - - + + + - - + + + + - - + + + + + + - + @@ -409,14 +422,14 @@ - + - + @@ -446,7 +459,7 @@ - + @@ -456,14 +469,14 @@ - + - + @@ -477,20 +490,20 @@ - + - + - + - - + + diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduAccess.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduAccess.java Thu Aug 02 15:02:27 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduAccess.java Thu Aug 02 15:06:22 2018 +0200 @@ -29,7 +29,7 @@ public boolean isAutoSelect() { final String fixChoice = this.artifact.getDataAsString("fix_choice"); - if (fixChoice != null && fixChoice.equals("state.bundu.fix.auto")) { + if (fixChoice != null && fixChoice.equals("state.bundu.wst.fix.auto")) { return true; } return false; diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/CalcChoice.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/CalcChoice.java Thu Aug 02 15:02:27 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/CalcChoice.java Thu Aug 02 15:06:22 2018 +0200 @@ -33,8 +33,8 @@ @Override protected LinkedHashMap makeEntries(final CallMeta meta, final Artifact artifact) { final LinkedHashMap entries = new LinkedHashMap<>(); - entries.put("state.bundu.calc.auto", null); - entries.put("state.bundu.calc.manual", null); + entries.put("state.bundu.wst.calc.auto", null); + entries.put("state.bundu.wst.calc.manual", null); return entries; } diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/FixationChoice.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/FixationChoice.java Thu Aug 02 15:02:27 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/FixationChoice.java Thu Aug 02 15:06:22 2018 +0200 @@ -34,8 +34,8 @@ @Override protected LinkedHashMap makeEntries(final CallMeta meta, final Artifact artifact) { final LinkedHashMap entries = new LinkedHashMap<>(); - entries.put("state.bundu.fix.auto", null); - entries.put("state.bundu.fix.manual", null); + entries.put("state.bundu.wst.fix.auto", null); + entries.put("state.bundu.wst.fix.manual", null); return entries; } diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Thu Aug 02 15:02:27 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Thu Aug 02 15:06:22 2018 +0200 @@ -1095,7 +1095,7 @@ scenarioType.option3 = Historische Betrachtung help.state.uinfo.scenario_type=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.scenario_type -state.bundu.load.distance_only_part= Teilabschnitt +state.bundu.wst.load.distance_only_part = Fehltiefenermittlung state.uinfo.distance_only_part.historical= Teilabschnitt state.uinfo.distance_only_part.from_regional= Teilabschnitt state.uinfo.distance_only_part = Teilabschnitt @@ -1213,32 +1213,40 @@ state.bundu.analysis.preprocessing = Outliers state.bundu.preprocess=use outlier test state.bundu.vollmer.function=Function -state.bundu.vollmer.preprocessing = Outliers -state.bundu.vollmer.qs = Input for W/Q data -state.bundu.yearselect = Bezugsjahr -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.vollmer.preprocessing = Ausrei\u00dfer +state.bundu.vollmer.qs = Eingabe f\u00fcr W/Q Daten +state.bundu.wst.gaugerange = Gaugerange +state.bundu.wst.eventselect = Event selection +state.bundu.wst.location = Distance +state.bundu.wst.yearselect = Bezugsjahr +state.bundu.wst.fix.auto = Automatische Auswahl +state.bundu.wst.fix.manual = Manuelle Auswahl +state.bundu.wst.fixationchoice = Fixierungen +state.bundu.wst.calc.auto = Automatische Auswahl +state.bundu.wst.calc.manual = Manuelle Auswahl state.bundu.wst.function = Auswahl der Ausgleichsfunktion state.bundu.wst.missing_volume.select = Ermittlung von Fehlvolumina durchf\u00fchren -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 -help.state.bundu.location=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.location -help.state.bundu.period=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.period -help.state.bundu.gaugerange=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.gaugerange -help.state.bundu.eventselect=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.eventselect -help.state.bundu.analysis.referenceperiod=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.referenceperiod -help.state.bundu.analysis.analysisperiods=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.analysisperiods -help.state.bundu.analysis.function=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.function -help.state.bundu.analysis.preprocessing=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.preprocessing -help.state.bundu.analysis.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.compute -help.state.bundu.vollmer.function=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.function -help.state.bundu.vollmer.preprocessing=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.preprocessing -help.state.bundu.vollmer.qs=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.qs -help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.compute +help.state.bundu.river=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.river +help.state.bundu.calculation.mode=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.calculation.mode +help.state.bundu.location=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.location +help.state.bundu.period=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.period +help.state.bundu.gaugerange=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.gaugerange +help.state.bundu.eventselect=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.eventselect +help.state.bundu.analysis.referenceperiod=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.referenceperiod +help.state.bundu.analysis.analysisperiods=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.analysisperiods +help.state.bundu.analysis.function=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.function +help.state.bundu.analysis.preprocessing=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.preprocessing +help.state.bundu.analysis.compute=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.compute +help.state.bundu.vollmer.function=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.function +help.state.bundu.vollmer.preprocessing=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.preprocessing +help.state.bundu.vollmer.qs=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.qs +help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.compute + +help.state.bundu.wst.yearselect = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.yearselect +help.state.bundu.wst.fixationchoice = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.fixationchoice +help.state.bundu.wst.fix.load.year_length = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.year_length +help.state.bundu.wst.function = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.function state.bundu.wst.fix.load.year_length = L\u00e4nge der Abflusszeitreihe state.bundu.wst.fix.year_length = L\u00e4nge der Abflusszeitreihe (Ausgehend vom Bezugsjahr in die Vergangenheit) diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Thu Aug 02 15:02:27 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Thu Aug 02 15:06:22 2018 +0200 @@ -1095,7 +1095,7 @@ scenarioType.option3 = Historische Betrachtung help.state.uinfo.scenario_type=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.scenario_type -state.bundu.load.distance_only_part= Berechnungsstrecke Fehltiefen +state.bundu.wst.load.distance_only_part= Berechnungsstrecke Fehltiefen state.uinfo.distance_only_part.historical= Teilabschnitt state.uinfo.distance_only_part.from_regional= Teilabschnitt state.uinfo.distance_only_part = Teilabschnitt @@ -1215,30 +1215,38 @@ state.bundu.vollmer.function= Ausgleichsfunktion state.bundu.vollmer.preprocessing = Ausrei\u00dfer state.bundu.vollmer.qs = Eingabe f\u00fcr W/Q Daten -state.bundu.yearselect = Bezugsjahr -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.gaugerange = Abflussklassen +state.bundu.wst.eventselect = Ereignisauswahl +state.bundu.wst.location = Strecke +state.bundu.wst.yearselect = Bezugsjahr +state.bundu.wst.fix.auto = Automatische Auswahl +state.bundu.wst.fix.manual = Manuelle Auswahl +state.bundu.wst.fixationchoice = Fixierungen +state.bundu.wst.calc.auto = Automatische Auswahl +state.bundu.wst.calc.manual = Manuelle Auswahl state.bundu.wst.function = Auswahl der Ausgleichsfunktion state.bundu.wst.missing_volume.select = Ermittlung von Fehlvolumina durchf\u00fchren -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 -help.state.bundu.location=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.location -help.state.bundu.period=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.period -help.state.bundu.gaugerange=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.gaugerange -help.state.bundu.eventselect=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.eventselect -help.state.bundu.analysis.referenceperiod=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.referenceperiod -help.state.bundu.analysis.analysisperiods=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.analysisperiods -help.state.bundu.analysis.function=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.function -help.state.bundu.analysis.preprocessing=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.preprocessing -help.state.bundu.analysis.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.compute -help.state.bundu.vollmer.function=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.function -help.state.bundu.vollmer.preprocessing=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.preprocessing -help.state.bundu.vollmer.qs=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.qs -help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.compute +help.state.bundu.river=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.river +help.state.bundu.calculation.mode=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.calculation.mode +help.state.bundu.location=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.location +help.state.bundu.period=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.period +help.state.bundu.gaugerange=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.gaugerange +help.state.bundu.eventselect=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.eventselect +help.state.bundu.analysis.referenceperiod=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.referenceperiod +help.state.bundu.analysis.analysisperiods=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.analysisperiods +help.state.bundu.analysis.function=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.function +help.state.bundu.analysis.preprocessing=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.preprocessing +help.state.bundu.analysis.compute=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.compute +help.state.bundu.vollmer.function=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.function +help.state.bundu.vollmer.preprocessing=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.preprocessing +help.state.bundu.vollmer.qs=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.qs +help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.compute + +help.state.bundu.wst.yearselect = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.yearselect +help.state.bundu.wst.fixationchoice = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.fixationchoice +help.state.bundu.wst.fix.load.year_length = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.year_length +help.state.bundu.wst.function = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.function state.bundu.wst.fix.load.year_length = L\u00e4nge der Abflusszeitreihe state.bundu.wst.fix.year_length = L\u00e4nge der Abflusszeitreihe (Ausgehend vom Bezugsjahr in die Vergangenheit) diff -r ba1e2e8f05d1 -r 3d006afee054 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/CustomFixationChoiceRadioPanel.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/CustomFixationChoiceRadioPanel.java Thu Aug 02 15:02:27 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/CustomFixationChoiceRadioPanel.java Thu Aug 02 15:06:22 2018 +0200 @@ -95,7 +95,7 @@ } @Override - protected Data[] getData() { // TODO: wild überschreiben :-( + protected Data[] getData() { final String value = this.form.getValueAsString("selection"); final List data = new ArrayList(); @@ -109,7 +109,7 @@ final DataItem item = new DefaultDataItem("fix_choice", "fix_choice", value); data.add(new DefaultData("fix_choice", null, null, new DataItem[] { item })); - if (value.equals("state.bundu.fix.auto")) { + if (value.equals("state.bundu.wst.fix.auto")) { // set gauges: (do not appear in create old, but need to be set for calculation purpose final LinkedHashMap map = FixGaugeSelectPanel.getMapValues(this.MSG); final String mnq = this.MSG.gauge_mnq();