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

[Git][ultreiaio/ird-observe][develop] Update changelog after stage of milestone 7.0-RC-5 [skip ci]
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 724b07b4 by Tony CHEMIT at 2017-08-03T01:08:23+02:00 Update changelog after stage of milestone 7.0-RC-5 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,29 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-08-02 14:47. + * Last generated at 2017-08-03 01:08. + +## Version [7.0-RC-5](https://gitlab.com/ultreiaio/ird-observe/milestones/99) + +**Closed at *In progress*.** + +### Download +* [Application (observe-7.0-RC-5.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-7.0-RC-5.war)](https://oss.sonatype.org/content/repositories/frirdo…) + +### Issues + * [[Anomalie 812]](https://gitlab.com/ultreiaio/ird-observe/issues/812) **L'écran Senne Activité indique qu'il n'y a pas de dcp alors que j'en ai saisi un** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 815]](https://gitlab.com/ultreiaio/ird-observe/issues/815) **Problème lors de la création d'une base** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 810]](https://gitlab.com/ultreiaio/ird-observe/issues/810) **Ajout de la consolidation des dcp** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 814]](https://gitlab.com/ultreiaio/ird-observe/issues/814) **Migration sur les dcp du ObjectType en ObjectMaterialParts** (Thanks to Tony CHEMIT) (Reported by ) ## Version [7.0-RC-4](https://gitlab.com/ultreiaio/ird-observe/milestones/98) **Closed at 2017-08-02.** ### Download -* [Application (observe-7.0-RC-4.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-7.0-RC-4.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-7.0-RC-4.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe…) +* [Serveur (observe-7.0-RC-4.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe…) ### Issues * [[Anomalie 807]](https://gitlab.com/ultreiaio/ird-observe/issues/807) **Problème de chargement de l'écran de référentiel FloatingObjectMaterial** (Thanks to Tony CHEMIT) (Reported by ) @@ -117,6 +131,7 @@ * [[Evolution 581]](https://gitlab.com/ultreiaio/ird-observe/issues/581) **Gestion plus perfectionnée des calculs taille-poids** (Thanks to Tony CHEMIT) (Reported by ) * [[Evolution 584]](https://gitlab.com/ultreiaio/ird-observe/issues/584) **Améliorer la gestion du focus et ajouter des racourcis clavier** (Thanks to Pascal Cauquil) (Reported by ) * [[Evolution 587]](https://gitlab.com/ultreiaio/ird-observe/issues/587) **[REFERENTIEL] Ajouter des colonnes dans Vessel** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 626]](https://gitlab.com/ultreiaio/ird-observe/issues/626) **Assistant de connexion** (Thanks to Tony CHEMIT) (Reported by ) * [[Evolution 631]](https://gitlab.com/ultreiaio/ird-observe/issues/631) **Ajout de champs liés au marquage d'individus** (Thanks to Tony CHEMIT) (Reported by ) * [[Evolution 632]](https://gitlab.com/ultreiaio/ird-observe/issues/632) **Ajout du champ Sexe sur les échantillons de cible** (Thanks to Tony CHEMIT) (Reported by ) * [[Evolution 637]](https://gitlab.com/ultreiaio/ird-observe/issues/637) **[PS] Sur les échantillons de non cible, ajouter un champ Devenir** (Thanks to Tony CHEMIT) (Reported by ) @@ -153,6 +168,8 @@ * [[Anomalie 772]](https://gitlab.com/ultreiaio/ird-observe/issues/772) **Erreur lors de synchros avec la base IEO** (Thanks to Tony CHEMIT) (Reported by ) * [[Anomalie 774]](https://gitlab.com/ultreiaio/ird-observe/issues/774) **Problème lors de la synchro de relation taille-poids entre la base française et la base espagnole** (Thanks to Tony CHEMIT) (Reported by ) * [[Anomalie 783]](https://gitlab.com/ultreiaio/ird-observe/issues/783) **Problème de restitution des dates sur une base locale lorsque la time zone change** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 397]](https://gitlab.com/ultreiaio/ird-observe/issues/397) **[PS/LL] Séparer les programmes LL et PS dans l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 552]](https://gitlab.com/ultreiaio/ird-observe/issues/552) **Sur l'écran de sélection des marées, remplacer la sélection en bleu par des cases à cocher** (Thanks to Tony CHEMIT) (Reported by ) * [[Evolution 730]](https://gitlab.com/ultreiaio/ird-observe/issues/730) **libellés dans Exporter les données** (Thanks to Pascal Cauquil) (Reported by ) * [[Evolution 775]](https://gitlab.com/ultreiaio/ird-observe/issues/775) **Amélioration des libellés espagnols** (Thanks to Pascal Cauquil) (Reported by ) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/724b07b4405b5fe9183458bae49… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/724b07b4405b5fe9183458bae49… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0-RC-5
by Tony CHEMIT 02 Aug '17

02 Aug '17

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

1 0

[Git][ultreiaio/ird-observe][release/7.0-RC-5] [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-5' with…
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch release/7.0-RC-5 at ultreiaio / ird-observe Commits: dcbd4b87 by 166231 at 2017-08-02T22:46:07+00:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-5' with non-snapshot versions[skip ci] - - - - - 18 changed files: - client-configuration/pom.xml - client-validation/pom.xml - client/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-validation/pom.xml ===================================== --- a/client-validation/pom.xml +++ b/client-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>client-validation</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>client</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>server</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-5</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dcbd4b872e14506c3c4f346ec0c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dcbd4b872e14506c3c4f346ec0c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0-RC-5
by Tony CHEMIT 02 Aug '17

02 Aug '17

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

1 0

[Git][ultreiaio/ird-observe][master] 13 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-5-SNAPSHOT development[skip ci]
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 39c7c529 by 166231 at 2017-08-02T12:19:07+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-5-SNAPSHOT development[skip ci] - - - - - 22cf0be6 by 166231 at 2017-08-02T12:27:25+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 14a30298 by 166231 at 2017-08-02T12:27:26+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop'[skip ci] - - - - - 3839bdc3 by 166231 at 2017-08-02T12:27:28+00:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 2b36e4bb by Tony CHEMIT at 2017-08-02T14:47:28+02:00 Update changelog after stage of milestone 7.0-RC-4 [skip ci] - - - - - 69cd0c35 by Tony CHEMIT at 2017-08-02T17:17:46+02:00 Migration sur les dcp du ObjectType en ObjectMaterialParts (See #814) - - - - - 72605589 by Tony CHEMIT at 2017-08-02T20:42:15+02:00 Ajout de la consolidation des dcp (calcul du SimplifiedObjectType) (See #810) - - - - - 0c43c46b by Tony CHEMIT at 2017-08-02T21:28:50+02:00 L'écran Senne Activité indique qu'il n'y a pas de dcp alors que j'en ai saisi un (See #812) - - - - - 4c44fbe5 by Tony CHEMIT at 2017-08-02T21:40:15+02:00 correction du nom du set à récuperer - - - - - 1663a048 by Tony CHEMIT at 2017-08-03T00:20:50+02:00 improve user configuration actions - - - - - a2029feb by Tony CHEMIT at 2017-08-03T00:21:26+02:00 Ajout de la consolidation des dcp (See #810) - fix some bugs to make this works... - - - - - dcbd4b87 by 166231 at 2017-08-02T22:46:07+00:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-5' with non-snapshot versions[skip ci] - - - - - e3cf678e by 166231 at 2017-08-02T22:56:30+00:00 [jgitflow-maven-plugin]merging 'release/7.0-RC-5' into 'master'[skip ci] - - - - - 30 changed files: - CHANGELOG.md - client-configuration/pom.xml - client-validation/pom.xml - − client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-error-validation.xml - − client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-warning-validation.xml - − client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-error-validation.xml - − client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml - client-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java → client-validation/src/test/java/fr/ird/observe/client/validation/BeanValidatorDetectorTest.java - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectTypeUI.jaxx - common/pom.xml - observe/pom.xml - persistence/pom.xml - client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectTypeUIModel.java → persistence/src/main/java/fr/ird/observe/entities/referentiel/seine/ObjectMaterialImpl.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectTypeUIHandler.java → persistence/src/main/java/fr/ird/observe/entities/referentiel/seine/ObjectMaterialTopiaDao.java - + persistence/src/main/java/fr/ird/observe/entities/referentiel/seine/SimplifiedObjectTypeNode.java - persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_4.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e9fde02d7afe3cc7cd0833c964… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e9fde02d7afe3cc7cd0833c964… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-5' with…
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dcbd4b87 by 166231 at 2017-08-02T22:46:07+00:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-5' with non-snapshot versions[skip ci] - - - - - e3cf678e by 166231 at 2017-08-02T22:56:30+00:00 [jgitflow-maven-plugin]merging 'release/7.0-RC-5' into 'master'[skip ci] - - - - - fa6cf282 by 166231 at 2017-08-02T22:56:36+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 17160669 by 166231 at 2017-08-02T22:56:37+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop'[skip ci] - - - - - 48079671 by 166231 at 2017-08-02T22:56:39+00: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/323b40c1dff83dfc2e5b8078e1… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/323b40c1dff83dfc2e5b8078e1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 7.0-RC-6-SNAPSHOT development[skip ci]
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 323b40c1 by 166231 at 2017-08-02T22:45:54+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-6-SNAPSHOT development[skip ci] - - - - - 18 changed files: - client-configuration/pom.xml - client-validation/pom.xml - client/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-validation/pom.xml ===================================== --- a/client-validation/pom.xml +++ b/client-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>client-validation</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-5-SNAPSHOT</version> + <version>7.0-RC-6-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/323b40c1dff83dfc2e5b8078e1d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/323b40c1dff83dfc2e5b8078e1d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-5
by Tony CHEMIT 02 Aug '17

02 Aug '17

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

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: improve user configuration actions
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1663a048 by Tony CHEMIT at 2017-08-03T00:20:50+02:00 improve user configuration actions - - - - - a2029feb by Tony CHEMIT at 2017-08-03T00:21:26+02:00 Ajout de la consolidation des dcp (See #810) - fix some bugs to make this works... - - - - - 6 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/SimplifiedObjectTypeManager.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -78,7 +78,9 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { - parentContainer.getNextAction().doClick(); + if (parentContainer.getModel().getNextStep()!=null) { + parentContainer.getNextAction().doClick(); + } if (getMainUI() != null) { parentContainer.getApplyAction().doClick(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java @@ -79,7 +79,9 @@ public class UseServerConfigurationUIAction extends AbstractUIAction { SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { - parentContainer.getNextAction().doClick(); + if (parentContainer.getModel().getNextStep() != null) { + parentContainer.getNextAction().doClick(); + } if (getMainUI() != null) { parentContainer.getApplyAction().doClick(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java @@ -30,6 +30,7 @@ import fr.ird.observe.common.constants.seine.DcpComputedValue; import fr.ird.observe.services.binder.ReferenceBinderEngine; import fr.ird.observe.services.dto.FloatingObjectReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectPartDto; @@ -136,6 +137,9 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { public void reset() { whenArriving.clear(); whenLeaving.clear(); + firePropertyChange("computedBiodegradableValue", getComputedBiodegradableValue()); + firePropertyChange("computedNonEntanglingValue", getComputedNonEntanglingValue()); + firePropertyChange("computedSimplifiedObjectTypeValue", getComputedSimplifiedObjectTypeValue()); } public Map<ObjectMaterialDto, String> getWhenArriving() { ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java @@ -84,7 +84,7 @@ public class ConsolidateActivitySeineDataResultBuilder { void flushDcpModification(FloatingObject dcp, String... propertyNamesModified) { - String dcpLabel = activitySeine.getVesselActivitySeine().getLabel2() + "[" + activitySeine.getTime() + "]" + " - " + dcp.getObjectOperation().getLabel2(); + String dcpLabel = activitySeine.getVesselActivitySeine().getLabel2() + "[" + activitySeine.getTime() + "]" + " - " + (dcp.getObjectOperation() == null ? "" : dcp.getObjectOperation().getLabel2()); for (String modifiedProperty : propertyNamesModified) { switch (modifiedProperty) { case FloatingObject.PROPERTY_COMPUTED_BIODEGRADABLE: { ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -131,9 +131,9 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements for (ActivitySeine activitySeine : route.getActivitySeine()) { - if (!activitySeine.isSetOperation()) { + if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { if (log.isDebugEnabled()) { - log.debug("No set on activity " + activitySeine); + log.debug("No set nor dcp on activity " + activitySeine); } continue; } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/SimplifiedObjectTypeManager.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/SimplifiedObjectTypeManager.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/SimplifiedObjectTypeManager.java @@ -59,6 +59,10 @@ class SimplifiedObjectTypeManager { // get highest level first availableNodes.sort(Comparator.comparing(SimplifiedObjectTypeNode::getLevel).reversed()); + if (availableNodes.isEmpty()) { + return getNodeForStandardCode("FOB").getStandardCode(); + } + // remove from available nodes, all nodes in the path of other ones List<SimplifiedObjectTypeNode> mainNodes = new LinkedList<>(availableNodes); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c44fbe53bca2b03b3d226c447… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c44fbe53bca2b03b3d226c447… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] correction du nom du set à récuperer
by Tony CHEMIT 02 Aug '17

02 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4c44fbe5 by Tony CHEMIT at 2017-08-02T21:40:15+02:00 correction du nom du set à récuperer - - - - - 1 changed file: - client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java @@ -44,7 +44,7 @@ class ObjectMaterialUIHandler extends ContentReferenceUIHandler<ObjectMaterialDt @Override public void createUI() { super.createUI(); - Optional<Set<ReferentialReference<ObjectMaterialDto>>> optionalReferenceSetDto = getModel().tryToGetReferentialReferenceSet("parentCode"); + Optional<Set<ReferentialReference<ObjectMaterialDto>>> optionalReferenceSetDto = getModel().tryToGetReferentialReferenceSet(ObjectMaterialDto.PROPERTY_PARENT); if (optionalReferenceSetDto.isPresent()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c44fbe53bca2b03b3d226c4474… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c44fbe53bca2b03b3d226c4474… You're receiving this email because of your account on gitlab.com.

1 0