Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8f797cf7 by Tony Chemit at 2024-04-23T09:49:49+02:00 Sur LL logbooks, global composition, le bouton 'Save' est disponible dans des situations où il ne devrait pas - Closes #2862 - - - - - 2 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUI.jcss Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUI.jaxx ===================================== @@ -115,4 +115,5 @@ <SetBranchlinesCompositionUIModelStates id='branchlinesCompositionStates' initializer="branchlinesCompositionUI.getModel().getStates()"/> <SetHooksCompositionUIModelStates id='hooksCompositionStates' initializer="hooksCompositionUI.getModel().getStates()"/> <SetBaitsCompositionUIModelStates id='baitsCompositionStates' initializer="baitsCompositionUI.getModel().getStates()"/> + <JButton id="save"/> </fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUI.jcss ===================================== @@ -21,17 +21,14 @@ */ #states { + modified:{validator.isChanged() || floatlinesCompositionStates.isModified() || branchlinesCompositionStates.isModified() || hooksCompositionStates.isModified() || baitsCompositionStates.isModified()}; + valid:{validator.isValid() && floatlinesCompositionStates.isValid() && branchlinesCompositionStates.isValid() && hooksCompositionStates.isValid() && baitsCompositionStates.isValid()}; baitsCompositionModel:{baitsCompositionUI.getModel()}; branchlinesCompositionModel:{branchlinesCompositionUI.getModel()}; floatlinesCompositionModel:{floatlinesCompositionUI.getModel()}; hooksCompositionModel:{hooksCompositionUI.getModel()}; } -#states { - modified:{validator.isChanged() || floatlinesCompositionStates.isModified() || branchlinesCompositionStates.isModified() || hooksCompositionStates.isModified() || baitsCompositionStates.isModified()}; - valid:{validator.isValid() && floatlinesCompositionStates.isValid() && branchlinesCompositionStates.isValid() && hooksCompositionStates.isValid() && baitsCompositionStates.isValid()}; -} - #mainTabbedPane { _focusComponent:{newComponentArray(floatlinesCompositionUI,branchlinesCompositionUI,hooksCompositionUI,baitsCompositionUI,mitigationType)}; } @@ -51,3 +48,7 @@ #baitsCompositionUI { _tab:{"baitsCompositionTab"}; } + +#save { + enabled:{states.isModified() && states.isValid() && !(floatlinesCompositionStates.isCanSaveRow() || branchlinesCompositionStates.isCanSaveRow() || hooksCompositionStates.isCanSaveRow() || baitsCompositionStates.isCanSaveRow())}; +} \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8f797cf764fb40b669ec93dc70... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8f797cf764fb40b669ec93dc70... You're receiving this email because of your account on gitlab.com.