# HG changeset patch # User gernotbelger # Date 1533728245 -7200 # Node ID 402ba554d747e948615822ead0a08961e3c07eb1 # Parent 87601b43f15be50757df84988152a1b957c0551c bundu workflow review diff -r 87601b43f15b -r 402ba554d747 artifacts/doc/conf/artifacts/bundu.xml --- a/artifacts/doc/conf/artifacts/bundu.xml Wed Aug 08 11:19:06 2018 +0200 +++ b/artifacts/doc/conf/artifacts/bundu.xml Wed Aug 08 13:37:25 2018 +0200 @@ -425,7 +425,8 @@ - + + @@ -437,7 +438,7 @@ - + diff -r 87601b43f15b -r 402ba554d747 artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Wed Aug 08 11:19:06 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Wed Aug 08 13:37:25 2018 +0200 @@ -1248,10 +1248,10 @@ help.state.bundu.calculation_mode = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.calculation_mode help.state.bundu.wst.location = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.location -help.state.bundu.wst.yearselect = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.bezugswst.yearselect -help.state.bundu.wst.fixationchoice = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.bezugswst.fixationchoice -help.state.bundu.wst.fix.load.year_length = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.bezugswst.year_length -help.state.bundu.wst.function = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.bezugswst.function +help.state.bundu.wst.yearselect = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.yearselect +help.state.bundu.wst.fixationchoice = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.fixationchoice +help.state.bundu.wst.fix.load.year_length = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.year_length +help.state.bundu.wst.function = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.function help.state.bundu.wst.qs = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.qs help.state.bundu.wst.load.preprocessing = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.load.preprocessing help.state.bundu.wst.load.missing_volume = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.load.missing_volume diff -r 87601b43f15b -r 402ba554d747 artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Wed Aug 08 11:19:06 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Wed Aug 08 13:37:25 2018 +0200 @@ -1248,10 +1248,10 @@ help.state.bundu.calculation_mode = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.calculation_mode help.state.bundu.wst.location = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.location -help.state.bundu.wst.yearselect = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.bezugswst.yearselect -help.state.bundu.wst.fixationchoice = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.bezugswst.fixationchoice -help.state.bundu.wst.fix.load.year_length = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.bezugswst.year_length -help.state.bundu.wst.function = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.bezugswst.function +help.state.bundu.wst.yearselect = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.yearselect +help.state.bundu.wst.fixationchoice = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.fixationchoice +help.state.bundu.wst.fix.load.year_length = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.year_length +help.state.bundu.wst.function = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.function help.state.bundu.wst.qs = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.qs help.state.bundu.wst.load.preprocessing = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.load.preprocessing help.state.bundu.wst.load.missing_volume = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.load.missing_volume diff -r 87601b43f15b -r 402ba554d747 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java Wed Aug 08 11:19:06 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java Wed Aug 08 13:37:25 2018 +0200 @@ -29,11 +29,14 @@ final DataItem item = new DefaultDataItem("label_irrelevant", "description_irrelevant", value); final DefaultData selection = new DefaultData(getDatakey(), "label_no_effect", "description_no_effect", new DataItem[] { item }); - if (value.equals("state.bundu.calc.auto")) { - final Data[] data = new Data[2]; + if (value.equals("state.bundu.wst.calc.auto")) { + final Data[] data = new Data[3]; data[0] = selection; - data[1] = new DefaultData("function", "label_no_effect", "description_no_effect", + data[1] = new DefaultData("function", "", "", new DataItem[] { new DefaultDataItem("", "", org.dive4elements.river.client.client.ui.fixation.FixFunctionSelect.funcDesc.get("log")) }); + data[2] = new DefaultData("preprocessing", "", "", // + new DataItem[] { new DefaultDataItem("", "", "true") }); + return data; } else { return new Data[] { selection };