Author: sletellier Date: 2009-03-09 16:55:55 +0000 (Mon, 09 Mar 2009) New Revision: 1923 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx Log: Bug esp?\195?\168ce capturable fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-03-09 16:52:41 UTC (rev 1922) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-03-09 16:55:55 UTC (rev 1923) @@ -37,6 +37,7 @@ <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/> <Boolean id='metierSeasonSelected' javaBean='false'/> + <Boolean id='targetSpeciesSelected' javaBean='false'/> <script><![CDATA[ @@ -206,11 +207,16 @@ } protected void metierSeasonChanged(){ setMetierSeasonSelected(fieldMetierSeasonInfo.getSelectedItem() != null); + if (isMetierSeasonSelected()){ + getVerifier().addCurrentEntity((TopiaEntity)((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue()); + } setTargetSpeciesModel(); + setTableTargetSpeciesModel(); setAddButton(); } protected void targetSpeciesChanged(){ setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() != null); + setTableTargetSpeciesModel(); setAddButton(); } protected void setAddButton(){ @@ -241,7 +247,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='targetFactor' constructorParams='this' lblText='{_("isisfish.metierSeasonInfoSpecies.targetFactor")}' - bean='{null}' nameEquation='TargetFactor' + bean='{getBean()}' nameEquation='TargetFactor' clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}' decorator='boxed' _bean='{MetierImpl.class}' _method='""'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-03-09 16:52:41 UTC (rev 1922) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-03-09 16:55:55 UTC (rev 1923) @@ -185,7 +185,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='selectivityEquation' constructorParams='this' lblText='{_("isisfish.selectivity.equation")}' - bean='{null}' nameEquation='Selectivity' + bean='{getBean()}' nameEquation='Selectivity' clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}' decorator='boxed' _bean='{GearImpl.class}' _method='""'/> </cell>