Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: aa23ea72 by Tony Chemit at 2023-09-25T19:44:17+02:00 add specs pdf to gitignore - - - - - 36c083cb by Tony Chemit at 2023-09-30T11:09:24+02:00 Erreur sur ajout d'un orin dans LL / Observations / Composition globale - Closes #2790 - - - - - c3e2e386 by Tony Chemit at 2023-09-30T11:09:24+02:00 update pom - - - - - 4 changed files: - .gitignore - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUI.jcss - pom.xml Changes: ===================================== .gitignore ===================================== @@ -29,7 +29,7 @@ server/runner/src/main/assembly/dist/config/observe-server* /*/*/*/.mvn/i18n-configuration.properties /*/*/*/*/.mvn/i18n-configuration.properties /*/*/*/*/*/.mvn/i18n-configuration.properties -doc/specs/*/* +doc/specs/*/*.pdf /*/src/site/markdown/index.md /*/*/src/site/markdown/index.md /*/*/*/src/site/markdown/index.md ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUI.jaxx ===================================== @@ -106,4 +106,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/observation/SetGlobalCompositionUI.jcss ===================================== @@ -48,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 ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.44</version> + <version>2023.45</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e2af5abffe4deef80c7113d79... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e2af5abffe4deef80c7113d79... You're receiving this email because of your account on gitlab.com.