Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 793b6911 by Tony Chemit at 2020-07-10T15:19:26+02:00 Amélioration accéssibilité des menu navigations pour accéder aux sous reéférentiels - - - - - 780acacd by Tony Chemit at 2020-07-10T15:34:12+02:00 Fix some names... (See #1534) - - - - - 4 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenuHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jcss Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenuHandler.java ===================================== @@ -82,13 +82,13 @@ public class DataSourceEditorNavigationMenuHandler implements UIHandler<DataSour public void propertyChange(PropertyChangeEvent evt) { NavigationTreeConfigBean config = ui.getUiModel().getConfig(); boolean withConfig = config != null; - boolean withSeine = withConfig &&config.isShowSeineTrip(); - boolean withLongline = withConfig &&config.isShowLonglineTrip(); - - ui.getMenuNavigationSeine().setEnabled(withSeine && seineEditModel.isEnabled()); - ui.getMenuNavigationLongline().setEnabled(withLongline && longlineEditModel.isEnabled()); + boolean withSeine = withConfig && config.isShowSeineTrip(); + boolean withLongline = withConfig && config.isShowLonglineTrip(); boolean showReferential = withConfig && config.isShowReferential(); + ui.getMenuNavigationSeine().setEnabled(withSeine && (showReferential || seineEditModel.isEnabled())); + ui.getMenuNavigationLongline().setEnabled(withLongline && (showReferential || longlineEditModel.isEnabled())); + ui.getSelectCommonReferential().setEnabled(showReferential); boolean seineNewValue = showReferential && withSeine; ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUI.jcss ===================================== @@ -39,7 +39,7 @@ layout:{new GridLayout(0,1)}; } -#acquisitionModeIndividualal { +#acquisitionModeIndividual { buttonGroup:acquisitionModeGroup; value:{CatchAcquisitionMode.INDIVIDUAL}; text:{CatchAcquisitionMode.INDIVIDUAL.toString()}; ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jaxx ===================================== @@ -138,7 +138,7 @@ <cell columns="2"> <!-- acquisition Mode --> <JPanel id='acquisitionModePanel'> - <JRadioButton id='acquisitionModeIndividualal'/> + <JRadioButton id='acquisitionModeIndividual'/> <JRadioButton id='acquisitionModeGrouped'/> </JPanel> </cell> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jcss ===================================== @@ -41,7 +41,7 @@ layout:{new GridLayout(0,1)}; } -#acquisitionModeIndividualal { +#acquisitionModeIndividual { buttonGroup:acquisitionModeGroup; value:{CatchAcquisitionMode.INDIVIDUAL}; text:{CatchAcquisitionMode.INDIVIDUAL.toString()}; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ccd9702cdf11f53730dfc591... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ccd9702cdf11f53730dfc591... You're receiving this email because of your account on gitlab.com.