Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f7687614 by Tony Chemit at 2020-07-06T10:21:36+02:00 [PS] Pratiques de remises à l'eau : le mode de libération n'est pas supprimé si on change d'espèce - Closes #1575 - - - - - 1 changed file: - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchReleaseUIHandler.java Changes: ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchReleaseUIHandler.java ===================================== @@ -43,6 +43,7 @@ import fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseConfor import fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseStatusReference; import fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleasingTimeReference; import fr.ird.observe.dto.result.SaveResultDto; +import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -263,17 +264,25 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetNon } private void updateSpecies(SpeciesReference species) { + JaxxComboBox<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeEditor = getUi().getSpeciesGroupReleaseMode(); if (species == null) { - ui.getSpeciesGroupReleaseMode().setData(Collections.emptyList()); - setFormFocusOwner(ui.getSpecies()); + log.debug("Reset speciesGroupReleaseMode, there is no species selected."); + speciesGroupReleaseModeEditor.setSelectedItem(null); + speciesGroupReleaseModeEditor.setData(Collections.emptyList()); return; } String speciesGroupId = species.getSpeciesGroupId(); - SpeciesGroupDto speciesGroupDto = speciesGroupDtoMap.get(speciesGroupId); - Objects.requireNonNull(speciesGroupDto); - log.info(prefix + "Will use speciesGroup: " + speciesGroupDto.getLabel2()); - ui.getSpeciesGroupReleaseMode().setData(speciesGroupDto.getSpeciesGroupReleaseMode()); + SpeciesGroupDto speciesGroupDto = Objects.requireNonNull(speciesGroupDtoMap.get(speciesGroupId)); + log.debug(String.format("Will use speciesGroup: %s", speciesGroupDto)); + + SpeciesGroupReleaseModeReference speciesGroupReleaseMode = getModel().getTableEditBean().getSpeciesGroupReleaseMode(); + List<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeList = speciesGroupDto.getSpeciesGroupReleaseMode(); + speciesGroupReleaseModeEditor.setSelectedItem(null); + speciesGroupReleaseModeEditor.setData(speciesGroupReleaseModeList); + if (speciesGroupReleaseModeList.contains(speciesGroupReleaseMode)) { + log.debug(String.format("Set back speciesGroupReleaseMode: %s", speciesGroupReleaseMode)); + speciesGroupReleaseModeEditor.setSelectedItem(speciesGroupReleaseMode); + } SwingUtilities.invokeLater(ui::revalidate); - setFormFocusOwner(ui.getSex()); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f7687614cf6f87f0d8e60aa162... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f7687614cf6f87f0d8e60aa162... You're receiving this email because of your account on gitlab.com.