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

branch develop updated (f7553a4 -> 86d2bb9)
by codelutin.com scm 12 Feb '15

12 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 f7553a4 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) new 88bd4db Corrige un contrôle de sécurité qui fait que le coordinateur ne voit rien dans les filtres new 86d2bb9 Dans les filtres, on ajoute le nom commun en plus du nom scientifique de l'espèce (testable-client #6638) The 2 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 86d2bb9bd2a9e8005bac526d9d2ad031a9113aa0 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 15:12:40 2015 +0100 Dans les filtres, on ajoute le nom commun en plus du nom scientifique de l'espèce (testable-client #6638) commit 88bd4dbf97146a721a2296b4681a30832543f94d Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 11:35:06 2015 +0100 Corrige un contrôle de sécurité qui fait que le coordinateur ne voit rien dans les filtres Summary of changes: .../ifremer/wao/services/service/SampleRowsFilterValues.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (67951c8 -> f7553a4)
by codelutin.com scm 10 Feb '15

10 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 67951c8 Problème dans les synthèses : à la remise à zéro des filtres, on pouvait obtenir une synthèse qui ne tenait pas contre du filtre estimé/réalisé (testable-client #6642) new 769de12 Ajout d'un padding dans les cellules du corps du tableau plan d'échantillonnage scléro (testable-client #6639) new f7553a4 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) The 2 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 f7553a4dd063dcef05803c0a9e3d838af2412bc8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 16:37:40 2015 +0100 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) commit 769de12d997f6e0375025a55f202011b8ecc203f Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 16:33:04 2015 +0100 Ajout d'un padding dans les cellules du corps du tableau plan d'échantillonnage scléro (testable-client #6639) Summary of changes: .../java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java | 5 +++++ .../src/main/resources/i18n/wao-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 1 + .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/wao.css | 5 +++++ 5 files changed, 13 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (5c3e714 -> 67951c8)
by codelutin.com scm 10 Feb '15

10 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 5c3e714 Pour la scléro, ajout d'un filtre sur le code quartier de la zone de pêche (termine #6637) new c3c14f7 Correction du lien pour zoomer sur une ligne new c3a1723 Nom latin pour l'espece dans les filtres, détail de l'espèce dans le tableau (refs #6638) new 67951c8 Problème dans les synthèses : à la remise à zéro des filtres, on pouvait obtenir une synthèse qui ne tenait pas contre du filtre estimé/réalisé (testable-client #6642) 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 67951c8c2ced57caefa913d683a2b6857cc47d34 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 16:13:50 2015 +0100 Problème dans les synthèses : à la remise à zéro des filtres, on pouvait obtenir une synthèse qui ne tenait pas contre du filtre estimé/réalisé (testable-client #6642) commit c3a172370ac448162f8fbb1e6505a64114bcd68e Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 15:41:47 2015 +0100 Nom latin pour l'espece dans les filtres, détail de l'espèce dans le tableau (refs #6638) commit c3c14f7948cf567d3894d96fa82f32fca231a6ed Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 14:56:06 2015 +0100 Correction du lien pour zoomer sur une ligne Summary of changes: .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 17 +++++++++++++++++ wao-persistence/src/main/xmi/wao-model.zargo | Bin 62318 -> 62375 bytes .../services/service/SampleRowsFilterValues.java | 2 +- .../service/SclerochronologySamplingPlan.java | 7 +++++++ .../wao/services/service/SynthesisService.java | 1 + .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 10 +++++++--- 7 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (3ec2be2 -> 5c3e714)
by codelutin.com scm 10 Feb '15

10 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 3ec2be2 Modifier titre de l'axe y dans synthèse scléro (termine #6623) new 5c3e714 Pour la scléro, ajout d'un filtre sur le code quartier de la zone de pêche (termine #6637) 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 5c3e714f664f86449e5f7bd3576e2de91e352260 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 14:40:06 2015 +0100 Pour la scléro, ajout d'un filtre sur le code quartier de la zone de pêche (termine #6637) Summary of changes: .../src/main/java/fr/ifremer/wao/SampleRowsFilter.java | 14 ++++++++++++++ .../main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java | 6 ++++++ .../wao/services/service/SampleRowsFilterValues.java | 11 +++++++++++ wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 1 + wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 3 ++- wao-web/src/main/webapp/WEB-INF/content/contacts.jsp | 7 +++++++ .../WEB-INF/content/sclerochronology/sampling-plan.jsp | 5 +++++ wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp | 7 +++++++ 8 files changed, 53 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (eae605a -> 3ec2be2)
by codelutin.com scm 09 Feb '15

09 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 eae605a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c2f0262 Correction d'une NPE potentielle, a priori pas de raisons qu'elles se produise (refs #6621) new 3ec2be2 Modifier titre de l'axe y dans synthèse scléro (termine #6623) The 2 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 3ec2be251d1ad48492c45fbb364eb6f1bf9569e4 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Feb 9 14:15:55 2015 +0100 Modifier titre de l'axe y dans synthèse scléro (termine #6623) commit c2f0262159149ae5c8484f4db63af6da05b52e25 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Feb 9 13:59:43 2015 +0100 Correction d'une NPE potentielle, a priori pas de raisons qu'elles se produise (refs #6621) Summary of changes: .../java/fr/ifremer/wao/services/service/SynthesisService.java | 8 +++++++- .../src/main/resources/i18n/wao-services_en_GB.properties | 1 + .../src/main/resources/i18n/wao-services_fr_FR.properties | 1 + .../ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 +++- 4 files changed, 12 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (fa68104 -> eae605a)
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 fa68104 correction des tests new 1e5c92f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts 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 new 45c0606 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC2' with non-snapshot versions new 8d78952 Merge branch 'release/5.0-RC2' new 0dff500 Merge branch 'master' into develop new eae605a [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 eae605aec62640d869d636c8ff9acbadc70b42ee Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:12:27 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0dff50030ccb3cb94ee70ad8393a98314822faa9 Merge: 1e5c92f 8d78952 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:12:26 2015 +0000 Merge branch 'master' into develop commit 1e5c92f03a4d1937581d822907a1cf531f3c81e5 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:12:26 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8d789525522e43998db2dfb2d957071d2bc8d3f5 Merge: 8c8e421 45c0606 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:12:23 2015 +0000 Merge branch 'release/5.0-RC2' commit 45c06067976601f01e534d157fca9ea75d622794 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:09:44 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC2' with non-snapshot versions Summary of changes: .../fr/ifremer/wao/web/WaoI18nTextProvider.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch release/5.0-RC2 deleted (was 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 was 45c0606 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC2' 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.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