Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ae91f8e4 by Tony Chemit at 2024-12-10T16:25:47+01:00 Remove tagNumber data-binding (this is already done by the handler) - - - - - 7bd20224 by Tony Chemit at 2024-12-10T16:26:03+01:00 Remove tagNumber data-binding (this is already done by the handler) - - - - - 1c05758d by Tony Chemit at 2024-12-10T16:26:46+01:00 Make number enabled when individual and disabled (with value removed) when grouped - - - - - 5f4f0094 by Tony Chemit at 2024-12-10T16:26:52+01:00 Merge branch 'feature/issue_2950' into develop LL/observations/capture : Champ numéro au virage devrait être désactivé en saisie groupée - Closes #2950 - - - - - 2 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss ===================================== @@ -58,10 +58,6 @@ enabled:{!tableModel.isEditable() || tableModel.isCreate()}; } -#tagNumber { - enabled:{tableEditBean.getAcquisitionMode() == 0}; -} - /* ***************************************************************************** */ /* DEPREDATED TAB ************************************************************* */ /* ***************************************************************************** */ ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -257,6 +257,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { case GROUPED: if (createMode) { editBean.setCount(null); + editBean.setNumber(null); editBean.setTagNumber(null); editBean.setSection(null); editBean.setBasket(null); @@ -286,6 +287,8 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { ui.getSection().setEnabled(isIndividual); ui.getBasket().setEnabled(isIndividual); ui.getBranchline().setEnabled(isIndividual); + ui.getNumber().setEnabled(isIndividual); + ui.getTagNumber().setEnabled(isIndividual); if (createMode) { // on propage le mode de saisie dans le bean editBean.setAcquisitionMode(newMode.ordinal()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/13479925786d8dc245f45b6b2... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/13479925786d8dc245f45b6b2... You're receiving this email because of your account on gitlab.com.