Mercurial > dive4elements > river
changeset 9386:402ba554d747
bundu workflow review
| author | gernotbelger |
|---|---|
| date | Wed, 08 Aug 2018 13:37:25 +0200 |
| parents | 87601b43f15b |
| children | 6a98fe930274 |
| files | artifacts/doc/conf/artifacts/bundu.xml artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java |
| diffstat | 4 files changed, 17 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ <state id="state.bundu.wst.load.calc_choice" helpText="help.state.bundu.wst.load.calc_choice" description="state.bundu.wst.load.calc_choice" state="org.dive4elements.river.artifacts.bundu.bezugswst.CalcChoice"> <data name="calc_choice" type="String" /> - <data name="function" type="String" /> <!-- will be set, if auto is selected --> + <data name="function" type="String" /> <!-- function, preprocessing will be set, if auto is selected --> + <data name="preprocessing" type="Boolean" /> </state> <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> @@ -437,7 +438,7 @@ <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> <from state="state.bundu.wst.load.calc_choice" /> - <to state="state.bundu.wst.load.preprocessing" /> + <to state="state.bundu.wst.load.missing_volume" /> <condition data="calc_choice" value="state.bundu.wst.calc.auto" operator="equal" /> </transition>
--- 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
--- 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
--- 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 };