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

[Git][ultreiaio/ird-observe][develop] Erreur Calendar.SetTime lors de l'export d'une base locale vers la base centrale - Closes #2651
by Tony CHEMIT (＠tchemit) 16 Mar '23

16 Mar '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c1f46034 by Tony Chemit at 2023-03-16T21:16:47+01:00 Erreur Calendar.SetTime lors de l'export d'une base locale vers la base centrale - Closes #2651 - - - - - 1 changed file: - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java Changes: ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java ===================================== @@ -68,7 +68,11 @@ public class ActivityConsolidateEngine { log.debug(String.format("%s Skip activity (No floating object found): %s", activityPrefix, activity.getTopiaId())); return Optional.empty(); } - activity.setTime(Dates.getDateAndTime(route.getDate(), activity.getTime(), true, true)); + if (activity.getTime() != null) { + activity.setTime(route.getDate()); + } else { + activity.setTime(Dates.getDateAndTime(route.getDate(), activity.getTime(), true, true)); + } activity.registerDecorator(activityDecorator); ActivityConsolidateContext activityContext = new ActivityConsolidateContext(activity); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1f46034d5e6a4e9f50d306a0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1f46034d5e6a4e9f50d306a0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Erreur Calendar.SetTime lors de l'export d'une base locale vers la base centrale - Closes #2651
by Tony CHEMIT (＠tchemit) 16 Mar '23

16 Mar '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 78413fdd by Tony Chemit at 2023-03-16T21:17:00+01:00 Erreur Calendar.SetTime lors de l'export d'une base locale vers la base centrale - Closes #2651 - - - - - 1 changed file: - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java Changes: ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/ActivityConsolidateEngine.java ===================================== @@ -68,7 +68,11 @@ public class ActivityConsolidateEngine { log.debug(String.format("%s Skip activity (No floating object found): %s", activityPrefix, activity.getTopiaId())); return Optional.empty(); } - activity.setTime(Dates.getDateAndTime(route.getDate(), activity.getTime(), true, true)); + if (activity.getTime() != null) { + activity.setTime(route.getDate()); + } else { + activity.setTime(Dates.getDateAndTime(route.getDate(), activity.getTime(), true, true)); + } activity.registerDecorator(activityDecorator); ActivityConsolidateContext activityContext = new ActivityConsolidateContext(activity); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/78413fdd3825a7f4ca56e9d52… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/78413fdd3825a7f4ca56e9d52… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.1.0-RC-1
by Tony CHEMIT (＠tchemit) 13 Mar '23

13 Mar '23

Tony CHEMIT deleted branch release/9.1.0-RC-1 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 v9.1.0-RC-1
by Tony CHEMIT (＠tchemit) 13 Mar '23

13 Mar '23

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

1 0

[Git][ultreiaio/ird-observe][release/9.1.0-RC-1] [jgitflow-maven-plugin]updating poms for branch'release/9.1.0-RC-1' with...
by Tony CHEMIT (＠tchemit) 13 Mar '23

13 Mar '23

Tony CHEMIT pushed to branch release/9.1.0-RC-1 at ultreiaio / ird-observe Commits: 710242f6 by Tony Chemit at 2023-03-13T19:55:37+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.0-RC-1' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/710242f62440274c4d9d73ea6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/710242f62440274c4d9d73ea6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 9.1.0-RC-1 branch with snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 13 Mar '23

13 Mar '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4eb0325a by Tony Chemit at 2023-03-13T19:55:11+01:00 [jgitflow-maven-plugin]updating poms for 9.1.0-RC-1 branch with snapshot versions[skip ci] - - - - - 710242f6 by Tony Chemit at 2023-03-13T19:55:37+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.0-RC-1' with non-snapshot versions[skip ci] - - - - - 583d5149 by Tony Chemit at 2023-03-13T20:27:55+01:00 [jgitflow-maven-plugin]merging 'release/9.1.0-RC-1' into 'master' - - - - - e5cba830 by Tony Chemit at 2023-03-13T20:28:03+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 6a8992bb by Tony Chemit at 2023-03-13T20:28:04+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - c809529a by Tony Chemit at 2023-03-13T20:28:06+01: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/ba5ef1c902aa416b7ffdec37… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ba5ef1c902aa416b7ffdec37… 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 9.1.0-RC-2-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 13 Mar '23

13 Mar '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ba5ef1c9 by Tony Chemit at 2023-03-13T19:55:14+01:00 [jgitflow-maven-plugin]updating poms for 9.1.0-RC-2-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ba5ef1c902aa416b7ffdec37f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ba5ef1c902aa416b7ffdec37f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.1.0-RC-1
by Tony CHEMIT (＠tchemit) 13 Mar '23

13 Mar '23

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

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.1.0-RC-1 [skip CI]
by Tony CHEMIT (＠tchemit) 13 Mar '23

13 Mar '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f27a2ece by Tony Chemit at 2023-03-13T19:53:39+01:00 Update changelog for v.9.1.0-RC-1 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,29 +1,11 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-03-13 15:55. - -## Version [9.0.28](https://gitlab.com/ultreiaio/ird-observe/-/milestones/258) - -**Closed at 2023-03-13.** - -### Download -* [Client (observe-9.0.28-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) -* [Serveur (observe-9.0.28.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) -* [Serveur (observe-9.0.28-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) - -### Issues - * [[Type::Anomalie 2638]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2638) **Messages en double dans le log de l'assistant d'export** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Type::Anomalie 2639]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2639) **Pouvoir tester l'ouverture d'une base 9.1 avec une application 9.0.28** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Type::Anomalie 2640]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2640) **Imperfection sur le rapport Observations - Dénombrement des captures selon le type d'association, filtrées par groupe et mode (rejeté/conservé)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Type::Anomalie 2641]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2641) **Problème de sérialisation sur le retour de la consolidation en mode serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Type::Anomalie 2643]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2643) **La supression d'un panier du schéma de palangre supprime toute la section** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) - * [[Type::Evolution 2644]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2644) **Dernières améliorations sur l'APi de consolidation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Type::Tâche 2642]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2642) **Ajout d'une documentation sur la consolidation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * Last generated at 2023-03-13 19:52. ## Version [9.1.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/243) -**Closed at 2023-03-08.** +**Closed at 2023-03-13.** ### Download * [Client (observe-9.1.0-RC-1-client.zip)](https://repo1.maven.org/maven2/fr/ird/obser…) @@ -43,6 +25,24 @@ * [[Type::Evolution 2620]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2620) **Nettoyage de la table LastUpdateDate** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2628]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2628) **Sur les captures, suppression de la méthode de mesure de poids si le poids n'est pas déclaré, ou qu'il est calculé dans l'action de consolidation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [9.0.28](https://gitlab.com/ultreiaio/ird-observe/-/milestones/258) + +**Closed at 2023-03-13.** + +### Download +* [Client (observe-9.0.28-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.28.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.28-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2638]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2638) **Messages en double dans le log de l'assistant d'export** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2639]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2639) **Pouvoir tester l'ouverture d'une base 9.1 avec une application 9.0.28** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2640]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2640) **Imperfection sur le rapport Observations - Dénombrement des captures selon le type d'association, filtrées par groupe et mode (rejeté/conservé)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2641]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2641) **Problème de sérialisation sur le retour de la consolidation en mode serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2643]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2643) **La supression d'un panier du schéma de palangre supprime toute la section** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2644]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2644) **Dernières améliorations sur l'APi de consolidation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Tâche 2642]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2642) **Ajout d'une documentation sur la consolidation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + ## Version [9.0.27](https://gitlab.com/ultreiaio/ird-observe/-/milestones/257) **Closed at 2023-03-09.** @@ -53,9 +53,9 @@ * [Serveur (observe-9.0.27-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) ### Issues -* [[Type::Anomalie 2635]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2635) **Erreur si on quitte un formulaire (avec des modifications) pour aller vers un assistant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -* [[Type::Anomalie 2636]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2636) **Problème sur les arrondis de nombres décimaux** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -* [[Type::Evolution 2637]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2637) **Validation - Amélioration du message sur une détection d'entrée non unique dans une collection (on ajoute désormais le rendu de l'objet validé)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2635]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2635) **Erreur si on quitte un formulaire (avec des modifications) pour aller vers un assistant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2636]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2636) **Problème sur les arrondis de nombres décimaux** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2637]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2637) **Validation - Amélioration du message sur une détection d'entrée non unique dans une collection (on ajoute désormais le rendu de l'objet validé)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.26](https://gitlab.com/ultreiaio/ird-observe/-/milestones/256) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f27a2ece9e7ea6ca8d53e8690… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f27a2ece9e7ea6ca8d53e8690… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Site - add tests report :)
by Tony CHEMIT (＠tchemit) 13 Mar '23

13 Mar '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dba73d2c by Tony Chemit at 2023-03-13T18:51:27+01:00 Site - add tests report :) - - - - - 2 changed files: - pom.xml - toolkit/api-server/pom.xml Changes: ===================================== pom.xml ===================================== @@ -1283,6 +1283,18 @@ </reportSet> </reportSets> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>${plugin.version.surefire}</version> + <reportSets> + <reportSet> + <reports> + <report>report-only</report> + </reports> + </reportSet> + </reportSets> + </plugin> </plugins> </reporting> </profile> ===================================== toolkit/api-server/pom.xml ===================================== @@ -63,6 +63,11 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all.config</groupId> + <artifactId>config-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dba73d2c782ba59593f138c80… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dba73d2c782ba59593f138c80… You're receiving this email because of your account on gitlab.com.

1 0