March 2015 - Wao-commits - mailman.cloud.codelutin.com

branch release/5.1 deleted (was 70f001d)
by codelutin.com scm 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.1 in repository wao. See http://git.codelutin.com/wao.git was 70f001d [jgitflow-maven-plugin]updating poms for branch'release/5.1' with non-snapshot versions 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)codelutin.com>.

1 0

annotated tag wao-5.1 created (now f95a16d)
by codelutin.com scm 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-5.1 in repository wao. See http://git.codelutin.com/wao.git at f95a16d (tag) tagging fbfdd1823aaafdfbc364ba460f180dd70af82cbe (commit) replaces wao-5.0 tagged by Maven Release on Thu Mar 5 09:11:44 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 5.1 ----------------------------------------------------------------------- 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)codelutin.com>.

1 0

branch release/5.1 updated (e836235 -> 70f001d)
by codelutin.com scm 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.1 in repository wao. See http://git.codelutin.com/wao.git from e836235 Correction « échantillonage » en « échantillonnage » (termine #6765) adds 70f001d [jgitflow-maven-plugin]updating poms for branch'release/5.1' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (0392b96 -> 4c24103)
by codelutin.com scm 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 0392b96 [jgitflow-maven-plugin]updating poms for 5.2-SNAPSHOT development new 014c308 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 70f001d [jgitflow-maven-plugin]updating poms for branch'release/5.1' with non-snapshot versions new fbfdd18 Merge branch 'release/5.1' new ef4c5fe Merge branch 'master' into develop new 4c24103 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 4c2410328285e64b7269bea0fd2c0fbbaacd0c20 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 5 09:11:46 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit ef4c5fe9d8daa5d85138ad235f98bfe9aab5db29 Merge: 014c308 fbfdd18 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 5 09:11:45 2015 +0000 Merge branch 'master' into develop commit 014c308b434357af33ebf99a8945289db0decce1 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 5 09:11:45 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit fbfdd1823aaafdfbc364ba460f180dd70af82cbe Merge: fce17c4 70f001d Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 5 09:11:44 2015 +0000 Merge branch 'release/5.1' commit 70f001df65c7885bd470a13b5de33c2e136c0333 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 5 09:09:02 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.1' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch master updated (fce17c4 -> fbfdd18)
by codelutin.com scm 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository wao. See http://git.codelutin.com/wao.git from fce17c4 Merge branch 'release/5.0' adds 5405695 [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development adds 3af26ff [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2dd0e0b Merge branch 'master' into develop adds 90c3842 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 1322a83 Remaniement de la génération du graphique du planifié vs réalisé, on introduit un pattern Template Method et trois implémentations (une par programme) adds 49a6592 Factorisation de la déclaration du converter, on applique le même pour toutes les instances de JFreeChart adds b54359d Ajout de .chart sur toutes les images correspondantes et mise en place d'une marge adds b2f3804 Dans la synthèse ObsMer on, montre le graphique du réalisé en jours de mers adds 237cadb Suppression de code mort adds 34567cf Dans la synthèse, on modifie le TemplateMethod pour pouvoir permettre de préciser un réalisé sur plusieurs mois adds bed195a Récupération via cherry-pick, dans WaoUtils, de la méthode permettant de déduire le mois sur lequel compter le contact ObsMer adds 3c6b59f Dans la synthèse, on compte désormais l'observation sur le mois avec le plus de jours de mer adds 5f70e8a Correction d'un bogue dans le calcul du réalisé dans les synthèses adds e77194d Merge branch 'feature/5923' into develop adds ecc4187 Lors du calcul du plan ObsMer, on ne se repose plus sur les données dénormalisées en base mais on calcul les nombres d'observations par mois en même temps que le nombre de jours par mois. En même temps, on corrige le mode de calcul en affectant la marée au mois ayant le plus de jours (testable-cl #6392) adds 6fa7fe7 Extraction, dans WaoUtils, de la méthode permettant de déduire le mois sur lequel compter le contact ObsMer adds 16c5570 Merge branch 'feature/6392' into develop adds a53a891 prototype pour un bouton pour tout sélectionner dans un filtre adds a6d116c Bouton pour tout sélectionner dans les filtres et tout déselectionner (testable-client #6383) adds fe97750 Merge branch 'feature/6393' into develop adds da14b3b Ajout du code espèces cibles DCP (crevettes) (refs #6452) adds a4b5b34 Merge branch 'feature/6452' into develop adds 5be88b9 Mise à jour des dépendances adds 4bf3b56 On remanie la génération du plan ObsVente pour ne plus lire en base l'estimé et le réalisé. Du coup, tous les programmes n'utilisent plus les champs dénormalisés de la base. adds 1d8b333 Correction d'une expression OGNL (termine #6732) adds b44b984 On contrôle la cohérence des dates de début et de fin de période à l'import du plan (termine #6731) adds 272bc5e Correction d'un appel constructeur avec <> manquant adds ee1ac27 Correction du build (les données de tests datent d'avant la première mise en prod de Wao donc on change la date de contrôle) adds 26102ed On revoit le calcul de la synthèse pour exprimer le prévisionnel, on introduit une nouvelle action pour le filtrage vu que les filtres doivent intégrer le planifé et pas seulement les contacts adds bab86b3 Fusion de la branche 'feature/6733' dans develop (testable-cl #6733) adds 616cce3 Correction d'un bogue dans le calcul de mois ayant le plus de jour (on ne mettait pas à jour le max, donc on tombait toujours sur le dernier mois) (testable-cl #6392)) adds 149e50f Modification du build pour filtrer web.xml afin d'injecter la version du projet dans la description du war (termine #6734) adds fe00227 L'observateur peut désormais filtrer selon le labo/la société sur scléro (testable-client #6763) adds e836235 Correction « échantillonage » en « échantillonnage » (termine #6765) adds 70f001d [jgitflow-maven-plugin]updating poms for branch'release/5.1' with non-snapshot versions adds fbfdd18 Merge branch 'release/5.1' No new revisions were added by this update. Summary of changes: pom.xml | 14 +- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 19 +- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 32 +- .../java/fr/ifremer/wao/entity/SampleMonths.java | 70 --- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 51 -- .../java/fr/ifremer/wao/entity/SampleRows.java | 19 - .../ifremer/wao/entity/TargetSpeciesDcfImpl.java | 2 +- .../i18n/wao-persistence_en_GB.properties | 1 + .../i18n/wao-persistence_fr_FR.properties | 3 +- wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 2 +- .../service/ContactsFilterValuesCacheKey.java | 3 +- .../service/ObsMerSamplingPlanBuilder.java | 125 +++-- .../service/ObsVenteSamplingPlanBuilder.java | 178 +++---- .../service/ObsVenteSamplingPlanService.java | 7 +- .../services/service/SampleRowsFilterValues.java | 9 +- .../fr/ifremer/wao/services/service/Synthesis.java | 34 +- .../wao/services/service/SynthesisCacheKey.java | 49 +- .../wao/services/service/SynthesisService.java | 582 +++++++++++++++++---- .../service/administration/ReferentialService.java | 2 +- .../service/csv/SamplingPlanImportExportModel.java | 10 +- ...ormatter.java => MonthYearParserFormatter.java} | 12 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 3 +- wao-web/pom.xml | 10 +- .../fr/ifremer/wao/web/action/SynthesisAction.java | 2 +- ...n.java => SynthesisFilterValuesJsonAction.java} | 18 +- .../web/converter/JFreeChartToImgTagConverter.java | 2 +- .../service/Synthesis-conversion.properties | 22 - .../src/main/resources/xwork-conversion.properties | 1 + .../main/webapp/WEB-INF/content/boat-details.jsp | 4 +- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 9 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 + wao-web/src/main/webapp/wao.css | 2 +- wao-web/src/main/webapp/wao.js | 23 + 36 files changed, 825 insertions(+), 502 deletions(-) delete mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonths.java copy wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/{DayParserFormatter.java => MonthYearParserFormatter.java} (82%) copy wao-web/src/main/java/fr/ifremer/wao/web/action/{ContactsFilterValuesJsonAction.java => SynthesisFilterValuesJsonAction.java} (78%) delete mode 100644 wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Wao 5.1 released
by codelutin.com Release Notification 05 Mar '15

05 Mar '15

The Wao team is pleased to announce the wao-5.1 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: New features: o Vue en jour de mer dans les synthèses Issue: 5923. Thanks to Vincent BADTS. Resolved by vbadts. o Modifier l'affectation des marées à cheval sur deux mois pour suivre les règles fixées par la DPMA Issue: 6392. Thanks to Anne-Sophie Cornou. Resolved by vbadts. o Améliorer la possibilité de sélection des champs dans les filtres Issue: 6393. Thanks to Anne-Sophie Cornou. Resolved by vbadts. o Ajouter un code engin et trois codes espèces cibles au référentiel des codes DCF5 Issue: 6452. Thanks to Vincent BADTS. Resolved by vbadts. Fixed Bugs: o Plan d'échantillonnage, afficher colonne Société / Laboratoire en profil coordinateur et observateur Issue: 6559. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Certains filtres de l'écran Navires ne fonctionnent pas Issue: 6728. Thanks to Léo Kaufmann. Resolved by lkaufmann. o Erreur import ref espèces Issue: 6729. Thanks to Vincent BADTS. Resolved by bleny. o Erreur lors de la sélection d'un navire pour créer un contact Issue: 6732. Thanks to Léo Kaufmann. Resolved by bleny. o On peut importer un mauvais plan si le format de début de période et de fin de période n'est pas respecté Issue: 6731. Thanks to Brendan Le Ny. Resolved by bleny. o rien dans la synthèse Issue: 6733. Thanks to Vincent BADTS. Resolved by vbadts. o Afficher la version du logiciel dans le nom du .war Issue: 6734. Thanks to Brendan Le Ny. Resolved by bleny. o Erreur calcul nb de marée en 5.1 Issue: 6739. Thanks to Vincent BADTS. Resolved by bleny. o L'observateur sclérochronologie ne peut pas filtrer selon le filtre société/labo Issue: 6763. Thanks to Brendan Le Ny. Resolved by vbadts. o Faute de frappe dans échantillonnage sur la page synthèse Issue: 6765. Thanks to Anne-Sophie Cornou. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-5.1.war - http://forge.codelutin.com/attachments/download/2967 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

branch release/5.1 created (now e836235)
by codelutin.com scm 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.1 in repository wao. See http://git.codelutin.com/wao.git at e836235 Correction « échantillonage » en « échantillonnage » (termine #6765) 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)codelutin.com>.

1 0

branch develop updated (e836235 -> 0392b96)
by codelutin.com scm 05 Mar '15

05 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from e836235 Correction « échantillonage » en « échantillonnage » (termine #6765) new 0392b96 [jgitflow-maven-plugin]updating poms for 5.2-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 0392b9667903a82770c768e81d7f92a5b58db10c Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 5 09:04:54 2015 +0000 [jgitflow-maven-plugin]updating poms for 5.2-SNAPSHOT development Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (fe00227 -> e836235)
by codelutin.com scm 04 Mar '15

04 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from fe00227 L'observateur peut désormais filtrer selon le labo/la société sur scléro (testable-client #6763) new e836235 Correction « échantillonage » en « échantillonnage » (termine #6765) 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 e836235f8420c4f1cfc4dc5eec759d199c6d78cb Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Mar 4 10:56:58 2015 +0100 Correction « échantillonage » en « échantillonnage » (termine #6765) Summary of changes: .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 2 +- wao-services/src/main/resources/i18n/wao-services_fr_FR.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (149e50f -> fe00227)
by codelutin.com scm 03 Mar '15

03 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 149e50f Modification du build pour filtrer web.xml afin d'injecter la version du projet dans la description du war (termine #6734) new fe00227 L'observateur peut désormais filtrer selon le labo/la société sur scléro (testable-client #6763) 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 fe002277ef824301613c424a65c9124d04129cbb Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Mar 3 17:56:25 2015 +0100 L'observateur peut désormais filtrer selon le labo/la société sur scléro (testable-client #6763) Summary of changes: .../src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1