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

branch develop updated (4e8b5f3 -> c4e11be)
by codelutin.com scm May 23, 2015

May 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 4e8b5f3 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development new 10d50de [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 32c36cd ajout de license header new 5abebb3 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC6' with non-snapshot versions new da84358 [jgitflow-maven-plugin]merging 'release/4.0-RC6' into 'master' new c072462 [jgitflow-maven-plugin]merging 'master' into 'develop' new c4e11be [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c4e11be92928d6f1b7111b02c5eff3f47a003075 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat May 23 14:35:56 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c072462360baea1178bbe262cfd80ff080fefc6d Merge: 10d50de da84358 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat May 23 14:35:54 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 10d50de6556e7fe404e0852f1f90571e240d5f60 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat May 23 14:35:53 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit da843583bdeea253ee427a0a54c00f2bc2fc309f Merge: 0b35bd6 5abebb3 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat May 23 14:35:49 2015 +0000 [jgitflow-maven-plugin]merging 'release/4.0-RC6' into 'master' commit 5abebb32a4ee36a1c63fafc63bc68c253f33121f Author: Maven Release <maven-release(a)codelutin.com> Date: Sat May 23 14:30:03 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC6' with non-snapshot versions commit 32c36cd62430523f2979ef460d11d0d8b4cc6cdd Author: Maven Release <maven-release(a)codelutin.com> Date: Sat May 23 14:29:50 2015 +0000 ajout de license header Summary of changes: .../report/model/operations/GroupByLength.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_0_RC6.java | 22 ++++++++++++++++++++++ .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql | 21 +++++++++++++++++++++ .../ui/util/tripMap/TripMapContentBuilder.java | 22 ++++++++++++++++++++++ 5 files changed, 108 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 6

annotated tag observe-4.0-RC6 created (now ec389f9)
by codelutin.com scm May 23, 2015

May 23, 2015

This is an automated email from the git hooks/post-receive script. New change to annotated tag observe-4.0-RC6 in repository observe. See http://git.codelutin.com/observe.git at ec389f9 (tag) tagging da843583bdeea253ee427a0a54c00f2bc2fc309f (commit) replaces observe-4.0-RC5 tagged by Maven Release on Sat May 23 14:35:51 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-RC6 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch release/4.0-RC6 updated (5fd814f -> 5abebb3)
by codelutin.com scm May 23, 2015

May 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC6 in repository observe. See http://git.codelutin.com/observe.git from 5fd814f fixes #7132: [LL] Caractéristiques de la carte LL fixes #7133: [PS] Petites améliorations souhaitées sur la carte PS Merge branch 'feature/7133' into develop adds 32c36cd ajout de license header adds 5abebb3 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC6' with non-snapshot versions No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- .../report/model/operations/GroupByLength.java | 22 ++++++++++++++++++++++ observe-entities/pom.xml | 2 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 22 ++++++++++++++++++++++ .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql | 21 +++++++++++++++++++++ observe-swing/pom.xml | 2 +- .../ui/util/tripMap/TripMapContentBuilder.java | 22 ++++++++++++++++++++++ observe-validation/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 113 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch master updated (0b35bd6 -> da84358)
by codelutin.com scm May 23, 2015

May 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See http://git.codelutin.com/observe.git from 0b35bd6 Merge branch 'release/4.0-RC5' adds b9ddad8 [jgitflow-maven-plugin]updating poms for 4.0-RC6-SNAPSHOT development adds 6bfdf41 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 824419d Merge branch 'master' into develop adds a944bc0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds e901afc use codelutinpom 2.0 adds da7d9ca on force a typer en float le résultat (fonctionne sous jdk 7 et 8) (refs #7074) adds d80bebc fixes #7074: Problème de lancement de calcul avec la jdk 8 Merge branch 'feature/7074' into develop adds feb42a7 utilisation de requetes spécifique pour les mises à jour plutôt que de charger la base via hibernate (refs #7135) adds e6a87c6 la dernière version de topia ajoute des binders simples pour toutes les entités (refs #7141) adds 995076f fixes #7141: Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée Merge branch 'feature/7141' into develop adds f899b96 on se base uniquement sur les topiaId des trip pour l'export des marées vers une base distante (refs #7041) adds d2c85b4 fixes #7041: La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid Merge branch 'feature/7041' into develop adds a5b99ae ajout de migration des ids défaillants (refs #7142) adds 49f7fc8 fixes #7142: Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine Merge branch 'feature/7142' into develop adds ab4e457 permettre d'utiliser des valeurs de variables non String (refs #7137) adds 8890409 ajout du rapport (refs #7137) adds 647b966 fixes #7137: [PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées Merge branch 'feature/7137' into develop adds d98308a fix API adds 48a13fc ajout d'une opération pour grouper par taille (refs #7138) adds 69993bb correction du nom des operations adds 7b344a2 ajout des requetes la distribution sur les échantillons des espèces ciblés + amélioration de celle pour les espèces non ciblées (refs #7138) adds 067cfd8 fixes #7138: [PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF) Merge branch 'feature/7138' into develop adds f5c16c9 correction des requetes (refs #7138) adds bcd0132 ajout de la requete (refs #7134) adds 066334f fixes #7134: [PS] Orthongel - Nouvelle requête Répartition des calées par cuve Merge branch 'feature/7134' into develop adds bf54268 fix API adds da4345a correction de la requete pour fonctionner sous pg (refs #7134) adds b41614c add release test db adds 213846e Uniformisation de la présentation d'attente adds a5d9544 refs #7133 : ajout des point "Au port" et style de la carte adds 8cd4c0e refs #7132 : ajout des point "Rencontre" et "station océanographique" et modification du style de la carte adds f21968e refs #7132 #7133 : utilisation des id plutot que les code pour les types activité. pour les palangre ne gardé q'un type "au port" (départ et arrivé) adds 2fed573 correction de l'égalité sur référence + inversion des equals (refs #7133 refs #7132) adds 5fd814f fixes #7132: [LL] Caractéristiques de la carte LL fixes #7133: [PS] Petites améliorations souhaitées sur la carte PS Merge branch 'feature/7133' into develop adds 32c36cd ajout de license header adds 5abebb3 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC6' with non-snapshot versions adds da84358 [jgitflow-maven-plugin]merging 'release/4.0-RC6' into 'master' No new revisions were added by this update. Summary of changes: README.txt | 8 +- observe-business/pom.xml | 2 +- .../src/main/filters/observe-reports.properties | 124 +++++- .../src/main/java/fr/ird/observe/DataService.java | 55 +++ .../fr/ird/observe/ObserveApplicationContext.java | 12 +- .../java/fr/ird/observe/report/ReportBuilder.java | 8 +- .../java/fr/ird/observe/report/model/Report.java | 12 +- .../fr/ird/observe/report/model/ReportExecute.java | 18 +- .../ird/observe/report/model/ReportOperation.java | 2 +- .../fr/ird/observe/report/model/ReportRequest.java | 10 +- .../report/model/operations/ExecuteRequests.java | 2 +- .../report/model/operations/GroupByLength.java | 109 +++++ .../observe/report/model/operations/SumColumn.java | 2 +- .../report/model/operations/SumIntColumn.java | 2 +- .../observe/report/model/operations/SumIntRow.java | 2 +- .../observe/report/model/operations/SumRow.java | 2 +- .../fr.ird.observe.report.model.ReportOperation | 3 +- .../ird/observe/its/report/AbstractReportIT.java | 4 +- .../its/report/accessoryCatch/Report2IT.java | 2 +- .../its/report/accessoryCatch/ReportIT.java | 2 +- .../report/accessoryCatchByGroup/Report2IT.java | 2 +- .../its/report/accessoryCatchByGroup/ReportIT.java | 2 +- .../test/resources/db/4.0-RC6/referentiel.sql.gz | Bin 0 -> 138231 bytes observe-entities/pom.xml | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 4 - .../entities/longline/TripLonglineDAOImpl.java | 142 ++++++- .../entities/longline/TripLonglineImpl.java | 85 ++-- .../migration/AbstractDataSourceMigration.java | 4 +- ... => DataSourceMigrationForVersion_4_0_RC6.java} | 18 +- .../referentiel/LengthWeightParemeterHelper.java | 19 +- .../ird/observe/entities/seine/RouteDAOImpl.java | 47 +++ .../fr/ird/observe/entities/seine/RouteImpl.java | 33 +- .../observe/entities/seine/TripSeineDAOImpl.java | 112 ++++- .../ird/observe/entities/seine/TripSeineImpl.java | 74 ++-- .../fr/ird/observe/tripMap/TripMapPointType.java | 10 +- .../fix-gearUseFeatures-topiaIds-H2.sql} | 6 +- .../fix-gearUseFeatures-topiaIds-PG.sql} | 6 +- .../i18n/observe-entities_en_GB.properties | 4 + .../i18n/observe-entities_es_ES.properties | 4 + .../i18n/observe-entities_fr_FR.properties | 6 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 3 +- .../src/test/java/fr/ird/observe/ScriptTest.java | 2 +- observe-swing/pom.xml | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 48 +-- .../ird/observe/ui/admin/export/ExportModel.java | 4 +- .../ird/observe/ui/admin/report/ReportModel.java | 6 +- .../observe/ui/admin/report/ReportUIHandler.java | 12 +- .../impl/longline/ActivityLonglineUIHandler.java | 72 +++- .../open/impl/longline/TripLonglineUIHandler.java | 5 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 64 +-- .../open/impl/seine/TripSeineUIHandler.java | 5 +- .../ui/util/tripMap/TripMapContentBuilder.java | 457 +++++++++++++++++++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 1 + .../observe/ui/util/tripMap/TripMapUIHandler.java | 357 ++-------------- observe-swing/src/main/map/style.xml | 163 +++++++- .../resources/i18n/observe-swing_en_GB.properties | 4 +- .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 4 +- observe-validation/pom.xml | 2 +- pom.xml | 6 +- 62 files changed, 1533 insertions(+), 651 deletions(-) create mode 100644 observe-business/src/main/java/fr/ird/observe/report/model/operations/GroupByLength.java create mode 100644 observe-business/src/test/resources/db/4.0-RC6/referentiel.sql.gz copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_3_12.java => DataSourceMigrationForVersion_4_0_RC6.java} (79%) copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql} (52%) copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql} (52%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

[ANN] - ObServe 4.0-RC6 released
by codelutin.com Release Notification May 23, 2015

May 23, 2015

The ObServe team is pleased to announce the observe-4.0-RC6 release! Projet ObServe Documentation of the project can be found here: https://observe.codelutin.com Changes ------- Changes in this version include: New features: o [PS] Orthongel - Nouvelle requête Répartition des calées par cuve Issue: 7134. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [PS] Petites améliorations souhaitées sur la carte PS Issue: 7133. Thanks to Pascal CAUQUIL. Resolved by sbavencoff. o Optimisation des mises à jour de dates de fin sur les marées et routes Issue: 7135. Thanks to Tony Chemit. Resolved by tchemit. o [PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF) Issue: 7138. Thanks to Tony Chemit. Resolved by tchemit. o [PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées Issue: 7137. Thanks to Tony Chemit. Resolved by tchemit. o [LL] Caractéristiques de la carte LL Issue: 7132. Thanks to Pascal CAUQUIL. Resolved by sbavencoff. o La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid Issue: 7041. Thanks to Pascal CAUQUIL. Resolved by tchemit. Fixed Bugs: o Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée Issue: 7141. Thanks to Tony Chemit. Resolved by tchemit. o Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine Issue: 7142. Thanks to Tony Chemit. Resolved by tchemit. o Problème de lancement de calcul avec la jdk 8 Issue: 7074. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/observe/files * observe-4.0-RC6.zip - http://forge.codelutin.com/attachments/download/3233 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -ObServe team

1 0

branch feature/7071 deleted (was aec514a)
by codelutin.com scm May 23, 2015

May 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7071 in repository observe. See http://git.codelutin.com/observe.git was aec514a refs #7071 : Cacher la carte pendant sa génération. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7073 deleted (was bfd6a85)
by codelutin.com scm May 23, 2015

May 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7073 in repository observe. See http://git.codelutin.com/observe.git was bfd6a85 refs #7073 : Ajout de la clés de traduction manquante. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7075 deleted (was 2740996)
by codelutin.com scm May 23, 2015

May 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7075 in repository observe. See http://git.codelutin.com/observe.git was 2740996 refs #7075 : passé le modèle à l'état modifier lors de la modification de l'avançon. Enegitré l'avancon en cour de modification a l'enregistrement du schéma de palangre The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch release/4.0-RC6 created (now 5fd814f)
by codelutin.com scm May 23, 2015

May 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC6 in repository observe. See http://git.codelutin.com/observe.git at 5fd814f fixes #7132: [LL] Caractéristiques de la carte LL fixes #7133: [PS] Petites améliorations souhaitées sur la carte PS Merge branch 'feature/7133' into develop No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch develop updated (5fd814f -> 4e8b5f3)
by codelutin.com scm May 23, 2015

May 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 5fd814f fixes #7132: [LL] Caractéristiques de la carte LL fixes #7133: [PS] Petites améliorations souhaitées sur la carte PS Merge branch 'feature/7133' into develop new 4e8b5f3 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4e8b5f3e50240441d0f4fc80d754f0a05b60077f Author: Maven Release <maven-release(a)codelutin.com> Date: Sat May 23 14:21:01 2015 +0000 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development Summary of changes: observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1