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

annotated tag wao-5.0-RC2 created (now be90014)
by codelutin.com scm 03 Feb '15

03 Feb '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-5.0-RC2 in repository wao. See http://git.codelutin.com/wao.git at be90014 (tag) tagging 8d789525522e43998db2dfb2d957071d2bc8d3f5 (commit) replaces wao-5.0-RC1 tagged by Maven Release on Tue Feb 3 14:12:23 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 5.0-RC2 ----------------------------------------------------------------------- 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.0-RC2 updated (4c99318 -> 45c0606)
by codelutin.com scm 03 Feb '15

03 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC2 in repository wao. See http://git.codelutin.com/wao.git from 4c99318 Merge branch 'release/5.0-RC2' of https://git.codelutin.com/wao into release/5.0-RC2 adds 45c0606 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC2' 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 master updated (8c8e421 -> 8d78952)
by codelutin.com scm 03 Feb '15

03 Feb '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 8c8e421 Merge branch 'release/5.0-RC1' adds 2f6ddd2 Export du réalisé depuis le plan scléro (fixes #6543) adds 9f8ac82 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 72836a5 Merge branch 'master' into develop adds 238d604 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 0be4426 Fusion des modifications faites pour la release dans develop adds 88c7397 Quand on enregistre le formulaire de modification d'un utilsateur, on doit retourner vers la liste des utilisateurs de la société (fixes #6534) adds 57de5a7 On trie les listes d'utilisateurs par nom (fixes #6535) adds 28585dc Erreur si on créee un laboratoire avec des membres (fixes #6554) adds 34917dc Correction d'une inversion dans les bundles adds 764bdfb On mentionne dans le pied de page le nom du laboratoire après la société (fixes #6558) adds 3f4f174 Plan d'échantillonnage, afficher colonne Société / Laboratoire en profil coordinateur et observateur (fixes #6559) adds 3139f2b Plan d'échantillonnage, enrichir le champ Paramètres à mesurer (fixes #6560) adds 60c5ed8 Plan d'échantillonnage, Formulaire de modification de ligne, modifier l'affichage des valeurs du champs Espèces cibles (fixes #6561) adds 95eb643 Plan d'échantillonnage et contacts, colonne Espèces cibles, afficher le nom scientifique et non le nom commun (fixes #6562) adds cfb619c Si une ligne est affectée à Ifremer, on autorise tous les labos à créer un contact scléro (fixes #6565) adds e019a68 On change le nom du programme de « Sclérochronologie » vers « Paramètres biologiques » adds 44a217f On change les intitulés dans les entêtes du plan scléro adds c810cdb Dans la scléro, on appelle les contacts prélèvements (fixes #6556) adds 4841088 Modification de libellés pour la sclérochronologie (fixes #6556) adds fa68104 correction des tests adds 1e6554d [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions adds 8622173 Ajout entête manquant adds 1b9402c [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions adds 4c99318 Merge branch 'release/5.0-RC2' of https://git.codelutin.com/wao into release/5.0-RC2 adds 45c0606 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC2' with non-snapshot versions adds 8d78952 Merge branch 'release/5.0-RC2' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../wao/entity/IndividualMeasurementStrategy.java | 10 ++ .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 16 +++ .../i18n/wao-persistence_en_GB.properties | 4 +- .../i18n/wao-persistence_fr_FR.properties | 4 +- wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 7 +- .../wao/services/service/SamplingPlanService.java | 16 +++ .../service/SclerochronologySamplingPlan.java | 2 +- .../SclerochronologySamplingPlanService.java | 44 ++++++++ .../administration/LaboratoriesService.java | 7 +- .../service/administration/WaoUsersList.java | 2 +- .../service/csv/ContactImportExportModel.java | 78 +++++++------- .../SclerochronologySamplingPlanExportModel.java | 116 +++++++++++++++++++++ .../import/contacts-sclerochronologie.csv | 2 +- .../src/test/resources/import/contacts.csv | 2 +- wao-web/pom.xml | 2 +- .../fr/ifremer/wao/web/WaoI18nTextProvider.java | 51 +++++++++ .../ExportSamplingPlanWithStatisticsAction.java | 9 +- .../action/administration/EditWaoUserAction.java | 4 +- .../main/resources/i18n/wao-web_en_GB.properties | 7 +- .../main/resources/i18n/wao-web_fr_FR.properties | 7 +- wao-web/src/main/resources/struts.xml | 2 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 4 +- .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 31 +++--- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 +- 29 files changed, 350 insertions(+), 89 deletions(-) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SclerochronologySamplingPlanExportModel.java create mode 100644 wao-web/src/main/java/fr/ifremer/wao/web/WaoI18nTextProvider.java rename wao-web/src/main/java/fr/ifremer/wao/web/action/{obsmer => }/ExportSamplingPlanWithStatisticsAction.java (85%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Wao 5.0-RC2 released
by codelutin.com Release Notification 03 Feb '15

03 Feb '15

The Wao team is pleased to announce the wao-5.0-RC2 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: Fixed Bugs: o Quand on affecte un utilisateur à SOCIETE/LABO il bascule sur la vue "LABO" au lieu de rester sur "SOCIETE" Issue: 6534. Thanks to Vincent BADTS. Resolved by bleny. o Merci de trier la liste des utilisateurs d'un société par ordre alphabétique de la colonne NOM Issue: 6535. Thanks to Vincent BADTS. Resolved by bleny. o Il manque la fonctionnalité permettant d'exporter le réalisé du plan sclérochronologie Issue: 6543. Thanks to Brendan Le Ny. Resolved by bleny. o Modification de libellés Issue: 6556. Thanks to Anne-Sophie Cornou. Resolved by bleny. 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 Profil Administrateur ne voit pas les actualités mises par un coordinateur Issue: 6563. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Impossible de créer un laboratoire cf erreur Issue: 6554. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Compléter le pied de page avec le nom du laboratoire après la société Issue: 6558. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Plan d'échantillonnage, enrichir le champ Paramètres à mesurer Issue: 6560. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Plan d'échantillonnage, Formulaire de modification de ligne, modifier l'affichage des valeurs du champs Espèces cibles Issue: 6561. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Plan d'échantillonnage, colonne Espèces cibles, afficher le nom scientifique et non le nom commun Issue: 6562. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Donner les droits en création de contact à une personne Ifremer à toutes les lignes du plan affectées à Ifremer/ labos Issue: 6565. 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.0-RC2.war - http://forge.codelutin.com/attachments/download/2831 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

branch release/5.0-RC2 updated (1b9402c -> 4c99318)
by codelutin.com scm 03 Feb '15

03 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC2 in repository wao. See http://git.codelutin.com/wao.git from 1b9402c [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions adds fa68104 correction des tests new 1e6554d [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions new 8622173 Ajout entête manquant new 4c99318 Merge branch 'release/5.0-RC2' of https://git.codelutin.com/wao into release/5.0-RC2 The 3 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 4c99318409198c437a128d751df3b947afbdc37f Merge: 8622173 1b9402c Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:09:26 2015 +0000 Merge branch 'release/5.0-RC2' of https://git.codelutin.com/wao into release/5.0-RC2 commit 8622173dfb6a70fb7b9b0ea15b2ed074fb2991c2 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:08:20 2015 +0000 Ajout entête manquant commit 1e6554dacc23d7fde267e127942b3fc956419735 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 13:59:41 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions Summary of changes: .../resources/import/contacts-sclerochronologie.csv | 2 +- wao-services/src/test/resources/import/contacts.csv | 2 +- .../fr/ifremer/wao/web/WaoI18nTextProvider.java | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (4841088 -> fa68104)
by codelutin.com scm 03 Feb '15

03 Feb '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 4841088 Modification de libellés pour la sclérochronologie (fixes #6556) new fa68104 correction des tests 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 fa68104876971a89330fe297e6cca71bdb1f7ed3 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 3 15:03:02 2015 +0100 correction des tests Summary of changes: wao-services/src/test/resources/import/contacts-sclerochronologie.csv | 2 +- wao-services/src/test/resources/import/contacts.csv | 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 release/5.0-RC2 created (now 1b9402c)
by codelutin.com scm 03 Feb '15

03 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC2 in repository wao. See http://git.codelutin.com/wao.git at 1b9402c [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions This branch includes the following new commits: new 1b9402c [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions 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 1b9402c000142db524302a88808780dc2c6c353d Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 13:59:41 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (cfb619c -> 4841088)
by codelutin.com scm 03 Feb '15

03 Feb '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 cfb619c Si une ligne est affectée à Ifremer, on autorise tous les labos à créer un contact scléro (fixes #6565) new e019a68 On change le nom du programme de « Sclérochronologie » vers « Paramètres biologiques » new 44a217f On change les intitulés dans les entêtes du plan scléro new c810cdb Dans la scléro, on appelle les contacts prélèvements (fixes #6556) new 4841088 Modification de libellés pour la sclérochronologie (fixes #6556) The 4 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 48410886ecdc51a57d8f08f6a0c30a512659d896 Merge: cfb619c c810cdb Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 3 14:55:12 2015 +0100 Modification de libellés pour la sclérochronologie (fixes #6556) commit c810cdb43652805f351242690c4026c262389164 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 3 14:54:04 2015 +0100 Dans la scléro, on appelle les contacts prélèvements (fixes #6556) commit 44a217f7b026d3e7a8a7bd403965ed0c7affcc98 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 27 17:47:56 2015 +0100 On change les intitulés dans les entêtes du plan scléro commit e019a6885f365ef7c5d7ccc1e4b0f0026a218891 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 27 17:47:16 2015 +0100 On change le nom du programme de « Sclérochronologie » vers « Paramètres biologiques » Summary of changes: .../i18n/wao-persistence_en_GB.properties | 2 +- .../i18n/wao-persistence_fr_FR.properties | 2 +- .../service/csv/ContactImportExportModel.java | 78 +++++++++++----------- .../fr/ifremer/wao/web/WaoI18nTextProvider.java | 30 +++++++++ .../main/resources/i18n/wao-web_en_GB.properties | 3 +- .../main/resources/i18n/wao-web_fr_FR.properties | 3 +- wao-web/src/main/resources/struts.xml | 2 +- .../content/sclerochronology/sampling-plan.jsp | 2 +- 8 files changed, 77 insertions(+), 45 deletions(-) create mode 100644 wao-web/src/main/java/fr/ifremer/wao/web/WaoI18nTextProvider.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/6556 deleted (was 44a217f)
by codelutin.com scm 03 Feb '15

03 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6556 in repository wao. See http://git.codelutin.com/wao.git was 44a217f On change les intitulés dans les entêtes du plan scléro This change permanently discards the following revisions: discards 44a217f On change les intitulés dans les entêtes du plan scléro discards e019a68 On change le nom du programme de « Sclérochronologie » vers « Paramètres biologiques » -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0