May 2020 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Deleted branch release/7.6.0
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT deleted branch release/7.6.0 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.6.0
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed new tag v7.6.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v7.6.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.6.0] [jgitflow-maven-plugin]updating poms for branch'release/7.6.0' with non-snapshot versions[skip ci]
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch release/7.6.0 at ultreiaio / ird-observe Commits: c0bbdbdc by Tony Chemit at 2020-05-21T08:34:29+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.0' with non-snapshot versions[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>server-configuration</artifactId> @@ -119,7 +119,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.0</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c0bbdbdcf048bfe703454803e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c0bbdbdcf048bfe703454803e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 11 commits: [jgitflow-maven-plugin]updating poms for 7.5.3-SNAPSHOT development[skip ci]
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 68a3f618 by Tony Chemit at 2020-05-13T17:09:57+02:00 [jgitflow-maven-plugin]updating poms for 7.5.3-SNAPSHOT development[skip ci] - - - - - 3b3ec569 by Tony Chemit at 2020-05-13T17:42:20+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - b083928d by Tony Chemit at 2020-05-13T17:42:21+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - e9dd77a3 by Tony Chemit at 2020-05-13T17:42:21+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - dd59aa48 by Tony Chemit at 2020-05-18T11:36:59+02:00 Prepare version 7.6.0 (Version de base dans tms_version - Closes #1485) - - - - - 5ad12da3 by Tony Chemit at 2020-05-18T12:41:05+02:00 [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si celui-ci n'est pas utilisé par les données (Do not take account of referential usages) - See #1432 - - - - - 4b175471 by Tony Chemit at 2020-05-18T12:41:21+02:00 Ne pas sauvegarder automatiquement la base locale lors d'une action longue - Close #1487 - - - - - a0611f51 by Tony Chemit at 2020-05-18T12:56:36+02:00 [SYNCHRO MAREES] L'assistant demande un remplacement de code manquant, même si celui-ci n'est pas utilisé par les données (Improve generator code) - See #1432 - - - - - f2769f7e by Tony Chemit at 2020-05-21T08:15:49+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - c0bbdbdc by Tony Chemit at 2020-05-21T08:34:29+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.0' with non-snapshot versions[skip ci] - - - - - 6493aec8 by Tony Chemit at 2020-05-21T08:48:17+02:00 [jgitflow-maven-plugin]merging 'release/7.6.0' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUI.jcss - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5_1.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_6.java - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlListRequestBuilder.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2869f823a567158b0c84966b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2869f823a567158b0c84966b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.6.0' with non-snapshot versions[skip ci]
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: c0bbdbdc by Tony Chemit at 2020-05-21T08:34:29+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.0' with non-snapshot versions[skip ci] - - - - - 6493aec8 by Tony Chemit at 2020-05-21T08:48:17+02:00 [jgitflow-maven-plugin]merging 'release/7.6.0' into 'master-7.x' - - - - - 3b51a25e by Tony Chemit at 2020-05-21T08:48:20+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 8f14e0ba by Tony Chemit at 2020-05-21T08:48:21+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 5100ddfc by Tony Chemit at 2020-05-21T08:48:21+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a6259aaa0fcad4b19f1f97f5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a6259aaa0fcad4b19f1f97f5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.6.1-SNAPSHOT development[skip ci]
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a6259aaa by Tony Chemit at 2020-05-21T08:32:16+02:00 [jgitflow-maven-plugin]updating poms for 7.6.1-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -119,7 +119,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0-SNAPSHOT</version> + <version>7.6.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6259aaa0fcad4b19f1f97f5b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6259aaa0fcad4b19f1f97f5b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.0
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed new branch release/7.6.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/7.6.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] La suppression d'une marée pourrait être permise même si le formulaire n'est...
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 30d8a319 by Tony Chemit at 2020-05-21T08:11:32+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - 3 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jcss Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jcss ===================================== @@ -46,4 +46,5 @@ #delete { visible:{model.isUpdatingMode()}; + enabled:{!model.isModified()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jcss ===================================== @@ -45,7 +45,7 @@ #delete { visible:{model.isUpdatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } #open { @@ -54,12 +54,12 @@ #close { visible:{model.isUpdatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } #create { visible:{!model.isCreatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } #extraActions { @@ -68,5 +68,5 @@ #move { visible:{model.isUpdatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jcss ===================================== @@ -53,12 +53,10 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _toolTipText:{t("observe.data.ll.logbook.TripSampleList.action.close.tip")}; } #create { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _text:{t("observe.data.ll.logbook.TripSampleList.action.create")}; _toolTipText:{t("observe.data.ll.logbook.TripSampleList.action.create.tip")}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/30d8a319bbb0c152c403167de… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/30d8a319bbb0c152c403167de… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] La suppression d'une marée pourrait être permise même si le formulaire n'est...
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f2769f7e by Tony Chemit at 2020-05-21T08:15:49+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - 8 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss ===================================== @@ -75,5 +75,5 @@ JComment { #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isValid()}; + enabled:{!model.isModified()}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss ===================================== @@ -73,13 +73,13 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _toolTipText:{t("observe.common.ActivityDto.action.close.tip")}; } #closeAndCreate { + enabled:{!model.isModified()}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _text:{t("observe.common.ActivityDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss ===================================== @@ -107,12 +107,12 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _toolTipText:{t("observe.common.TripDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _text:{t("observe.common.TripDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUI.jcss ===================================== @@ -156,12 +156,12 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _toolTipText:{t("observe.common.ActivityDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _text:{t("observe.common.ActivityDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss ===================================== @@ -273,7 +273,6 @@ JComment { #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; _toolTipText:{t("observe.action.delete.floatingObject.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.jcss ===================================== @@ -51,12 +51,12 @@ NumberEditor { } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _toolTipText:{t("observe.common.RouteDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _text:{t("observe.common.RouteDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.RouteDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -152,12 +152,12 @@ NumberEditor { } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()}; + enabled:{!model.isModified() && !dataContext.isOpenRoute()}; _toolTipText:{t("observe.common.TripDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()}; + enabled:{!model.isModified() && !dataContext.isOpenRoute()}; _text:{t("observe.common.TripDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUI.jcss ===================================== @@ -41,7 +41,6 @@ #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; } #openActions { @@ -52,19 +51,16 @@ _observeAction:{ReOpenUIAction.ACTION_NAME}; _globalAction:{OpenDataGlobalUIAction.ACTION_NAME}; visible:{model.isReadingMode() && model.isCanReopen()}; - enabled:{model.isReadingMode() && model.isCanReopen()}; } #close { _observeAction:{CloseOpenUIAction.ACTION_NAME}; _globalAction:{CloseDataGlobalUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isUpdatingMode()}; } #closeAndCreate { _observeAction:{CloseAndCreateUIAction.ACTION_NAME}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isUpdatingMode()}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f2769f7e57e52bb10600d5592… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f2769f7e57e52bb10600d5592… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] La suppression d'une marée pourrait être permise même si le formulaire n'est...
by Tony CHEMIT 21 May '20

21 May '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 42a1c9ab by Tony Chemit at 2020-05-21T07:51:45+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - 8 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss ===================================== @@ -75,5 +75,5 @@ JComment { #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isValid()}; + enabled:{!model.isModified()}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss ===================================== @@ -73,13 +73,13 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _toolTipText:{t("observe.common.ActivityDto.action.close.tip")}; } #closeAndCreate { + enabled:{!model.isModified()}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _text:{t("observe.common.ActivityDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss ===================================== @@ -107,12 +107,12 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _toolTipText:{t("observe.common.TripDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _text:{t("observe.common.TripDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUI.jcss ===================================== @@ -156,12 +156,12 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _toolTipText:{t("observe.common.ActivityDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; _text:{t("observe.common.ActivityDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.ActivityDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss ===================================== @@ -273,7 +273,6 @@ JComment { #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; _toolTipText:{t("observe.action.delete.floatingObject.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/RouteUI.jcss ===================================== @@ -51,12 +51,12 @@ NumberEditor { } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _toolTipText:{t("observe.common.RouteDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenActivity()}; + enabled:{!model.isModified() && !dataContext.isOpenActivity()}; _text:{t("observe.common.RouteDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.RouteDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -152,12 +152,12 @@ NumberEditor { } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()}; + enabled:{!model.isModified() && !dataContext.isOpenRoute()}; _toolTipText:{t("observe.common.TripDto.action.close.tip")}; } #closeAndCreate { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid()) && !dataContext.isOpenRoute()}; + enabled:{!model.isModified() && !dataContext.isOpenRoute()}; _text:{t("observe.common.TripDto.action.closeAndCreate")}; _toolTipText:{t("observe.common.TripDto.action.closeAndCreate.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUI.jcss ===================================== @@ -41,7 +41,6 @@ #delete { _observeAction:{DeleteDataUIAction.ACTION_NAME}; _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; } #openActions { @@ -52,19 +51,16 @@ _observeAction:{ReOpenUIAction.ACTION_NAME}; _globalAction:{OpenDataGlobalUIAction.ACTION_NAME}; visible:{model.isReadingMode() && model.isCanReopen()}; - enabled:{model.isReadingMode() && model.isCanReopen()}; } #close { _observeAction:{CloseOpenUIAction.ACTION_NAME}; _globalAction:{CloseDataGlobalUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isUpdatingMode()}; } #closeAndCreate { _observeAction:{CloseAndCreateUIAction.ACTION_NAME}; _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; visible:{model.isUpdatingMode()}; - enabled:{model.isUpdatingMode()}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/42a1c9abf84f94873eb0fdf2f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/42a1c9abf84f94873eb0fdf2f… You're receiving this email because of your account on gitlab.com.

1 0