Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2cc16312 by tchemit at 2019-06-09T14:40:19Z [LL Composition détaillée] Quelques améliorations d'ergonomies - Closes #1319 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineDetailCompositionObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineDetailCompositionObsUIAction.java ===================================== @@ -34,6 +34,7 @@ import fr.ird.observe.dto.data.ll.observation.SectionObsWithTemplate; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; /** * Created by tchemit on 28/09/2018. @@ -78,7 +79,7 @@ public class SaveLonglineDetailCompositionObsUIAction extends SaveSimpleDataUIAc BranchlineObsDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); super.afterSave(ui, bean); if (branchline != null) { - ui.getBranchlineDetailUI().edit(branchline); + ui.getHandler().editBranchline(branchline); } } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jcss ===================================== @@ -71,6 +71,10 @@ /* COMPOSITION TAB ************************************************************ */ /* ***************************************************************************** */ +#compositionTab { + enabled: {model.isGenerateTabValid()}; +} + #generateAll { _observeAction:{LonglineDetailCompositionGenerateAllSectionsAction.ACTION_NAME}; visible: {model.isUpdatingMode()}; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIHandler.java ===================================== @@ -969,4 +969,21 @@ public class LonglineDetailCompositionObsUIHandler extends ContentSimpleUIHandle return validationHelper; } + @Override + public void resetEditUI() { + BranchlineObsDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); + super.resetEditUI(); + if (branchline != null) { + ui.getHandler().editBranchline(branchline); + } + } + + public void editBranchline(BranchlineObsDto branchline) { + boolean changed = ui.getValidator().isChanged(); + try { + ui.getBranchlineDetailUI().edit(branchline); + } finally { + ui.getValidator().setChanged(changed); + } + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2cc16312eb03e844e30f8e9f7a0d... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2cc16312eb03e844e30f8e9f7a0d... You're receiving this email because of your account on gitlab.com.