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

branch master updated (d2cb61f -> 3376104)
by codelutin.com scm Nov. 12, 2014

Nov. 12, 2014

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 d2cb61f Merge branch 'release/4.2.1' adds d764db7 [jgitflow-maven-plugin]updating poms for 4.2.2-SNAPSHOT development adds fb98730 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 238c992 Merge branch 'master' into develop adds a633eaf [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5eba42d Lors du calcul d'un effort, on ne doit pas afficher "-" parce que le numérateur vaut 0 mais bien 0 (fixes #6048) adds bdb44c9 Dans le calcul du nombre de jours de mers, si la date de débarquement est à minuit, on veille à bien compter le jour d'arrivée comme jour de mer adds a9b400f Déplacement d'un assertion de test dans un verify guava adds 53a85f0 Quand on calcule les jours de mers entre deux dates comportant un changement d'heure (heure d'été/heure d'hiver), il semblerait que DateUtil.getDifferenceInDays donne un résultat faux. Réécriture de l'algo pour ne pas utiliser DateUtil. adds 8caade5 Correction du calcul des jours de mers dans le plan ObsMer : on répartit bien tous les jours du contact dans le plan (fixes #6050) adds 9c03a08 Suite à la migration (en 4.1) du champ immatriculation de Boat vers String, on a oublié de corriger le pattern d'un String.format dans une valeur i18n (fixes #6049) adds b777525 Fusion de la branche 6049 dans develop adds 68ae88c On ajoute une règle de validation pour empêcher l'erreur qui survient lorsqu'on essaie d'envoyer un mail à utilisateur inactif (fixes #6052) adds 30ff5e9 Fusion de la branche 6052 dans develop adds 1071dd4 Simplification d'une expression booléenne adds 83e6755 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) adds 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) adds 8ed5935 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' with non-snapshot versions adds 3376104 Merge branch 'release/4.2.2' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 29 ++++++++++--- .../src/test/java/fr/ifremer/wao/WaoUtilsTest.java | 50 ++++++++++++++++------ wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 11 ++++- .../ifremer/wao/services/service/SamplingPlan.java | 4 +- .../mail/AddBoatToUserAllegroWalletEmail.java | 6 ++- .../AddBoatToUserAllegroWalletEmail_en.mustache | 3 +- .../AddBoatToUserAllegroWalletEmail_fr.mustache | 3 +- .../resources/i18n/wao-services_en_GB.properties | 2 +- .../resources/i18n/wao-services_fr_FR.properties | 2 +- wao-web/pom.xml | 2 +- .../action/administration/EditWaoUserAction.java | 4 ++ .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 1 + 16 files changed, 91 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Wao 4.2.2 released
by codelutin.com Release Notification Nov. 12, 2014

Nov. 12, 2014

The Wao team is pleased to announce the wao-4.2.2 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 Problème dans le mail de demande d'ajout de navires Issue: 6049. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Problème d'affichage des % dans plan d'échantillonnage Issue: 6048. Thanks to Vincent BADTS. Resolved by bleny. o Revoir le calcul des jours de mer par marée Issue: 6050. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Création d'observateur Obsventes impossible Issue: 6052. 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-4.2.2.war - http://forge.codelutin.com/attachments/download/2456 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

branch release/4.2.2 created (now 1ee6819)
by codelutin.com scm Nov. 12, 2014

Nov. 12, 2014

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2.2 in repository wao. See http://git.codelutin.com/wao.git at 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) 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 (1ee6819 -> 8cb8b78)
by codelutin.com scm Nov. 12, 2014

Nov. 12, 2014

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 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) new 8cb8b78 [jgitflow-maven-plugin]updating poms for 4.2.3-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 8cb8b789b33b4a02c9b9214909ce630a5b4f1d1f Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 10:52:04 2014 +0000 [jgitflow-maven-plugin]updating poms for 4.2.3-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 (83e6755 -> 1ee6819)
by codelutin.com scm Nov. 7, 2014

Nov. 7, 2014

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 83e6755 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) new 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) 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 1ee68198408f1cf706ef0b8a04841d9076d8baed Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Nov 7 10:23:25 2014 +0100 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) Summary of changes: .../wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java | 6 +++++- .../resources/email/AddBoatToUserAllegroWalletEmail_en.mustache | 3 +-- .../resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[wao] branch develop updated (30ff5e9 -> 83e6755)
by codelutin.com scm Nov. 5, 2014

Nov. 5, 2014

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 30ff5e9 Fusion de la branche 6052 dans develop new 1071dd4 Simplification d'une expression booléenne new 83e6755 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) 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 83e6755a5608ce8afd095c244f887cb564462ea9 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Nov 5 16:31:34 2014 +0100 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) commit 1071dd45b20937efe5b10e6a10baefcd973bc768 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Nov 5 16:30:16 2014 +0100 Simplification d'une expression booléenne Summary of changes: .../java/fr/ifremer/wao/services/AuthenticatedWaoUser.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

[wao] branch develop updated (b777525 -> 30ff5e9)
by codelutin.com scm Nov. 5, 2014

Nov. 5, 2014

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 b777525 Fusion de la branche 6049 dans develop new 68ae88c On ajoute une règle de validation pour empêcher l'erreur qui survient lorsqu'on essaie d'envoyer un mail à utilisateur inactif (fixes #6052) new 30ff5e9 Fusion de la branche 6052 dans develop 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 30ff5e9ce7250b4aa8e52c4cae8fe93efc5c2853 Merge: b777525 68ae88c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Nov 5 12:37:30 2014 +0100 Fusion de la branche 6052 dans develop commit 68ae88cf5b124ebaacab80c503c0727e636e9db7 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Nov 5 12:36:23 2014 +0100 On ajoute une règle de validation pour empêcher l'erreur qui survient lorsqu'on essaie d'envoyer un mail à utilisateur inactif (fixes #6052) Summary of changes: .../fr/ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 ++++ wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 1 + wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 1 + 3 files changed, 6 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

[wao] branch develop updated (8caade5 -> b777525)
by codelutin.com scm Nov. 5, 2014

Nov. 5, 2014

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 8caade5 Correction du calcul des jours de mers dans le plan ObsMer : on répartit bien tous les jours du contact dans le plan (fixes #6050) new 9c03a08 Suite à la migration (en 4.1) du champ immatriculation de Boat vers String, on a oublié de corriger le pattern d'un String.format dans une valeur i18n (fixes #6049) new b777525 Fusion de la branche 6049 dans develop 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 b777525ada3c6141bc540f104c736a7da981322b Merge: 8caade5 9c03a08 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Nov 5 12:16:54 2014 +0100 Fusion de la branche 6049 dans develop pour expliquer en quoi cette fusion est commit 9c03a08ebda665c38dc3dbe78231633f9a07793a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Nov 5 12:13:37 2014 +0100 Suite à la migration (en 4.1) du champ immatriculation de Boat vers String, on a oublié de corriger le pattern d'un String.format dans une valeur i18n (fixes #6049) Summary of changes: wao-services/src/main/resources/i18n/wao-services_en_GB.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 2

[wao] branch develop updated (5eba42d -> 8caade5)
by codelutin.com scm Nov. 5, 2014

Nov. 5, 2014

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 5eba42d Lors du calcul d'un effort, on ne doit pas afficher "-" parce que le numérateur vaut 0 mais bien 0 (fixes #6048) new bdb44c9 Dans le calcul du nombre de jours de mers, si la date de débarquement est à minuit, on veille à bien compter le jour d'arrivée comme jour de mer new a9b400f Déplacement d'un assertion de test dans un verify guava new 53a85f0 Quand on calcule les jours de mers entre deux dates comportant un changement d'heure (heure d'été/heure d'hiver), il semblerait que DateUtil.getDifferenceInDays donne un résultat faux. Réécriture de l'algo pour ne pas utiliser DateUtil. new 8caade5 Correction du calcul des jours de mers dans le plan ObsMer : on répartit bien tous les jours du contact dans le plan (fixes #6050) 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 8caade58b33140b2002fb7fec71c21757c4cf54d Merge: 5eba42d 53a85f0 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Nov 5 12:01:54 2014 +0100 Correction du calcul des jours de mers dans le plan ObsMer : on répartit bien tous les jours du contact dans le plan (fixes #6050) commit 53a85f0dc0014d97735acbb4a696a6f0a7bfaba9 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Nov 4 10:56:50 2014 +0100 Quand on calcule les jours de mers entre deux dates comportant un changement d'heure (heure d'été/heure d'hiver), il semblerait que DateUtil.getDifferenceInDays donne un résultat faux. Réécriture de l'algo pour ne pas utiliser DateUtil. commit a9b400f2504df440fe4d9e210d403a936d5b3bb3 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Nov 4 10:55:27 2014 +0100 Déplacement d'un assertion de test dans un verify guava commit bdb44c978ff752914b52c06c02cace1e98db1a4c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Nov 4 10:52:06 2014 +0100 Dans le calcul du nombre de jours de mers, si la date de débarquement est à minuit, on veille à bien compter le jour d'arrivée comme jour de mer Summary of changes: .../src/main/java/fr/ifremer/wao/WaoUtils.java | 29 ++++++++++--- .../src/test/java/fr/ifremer/wao/WaoUtilsTest.java | 50 ++++++++++++++++------ 2 files changed, 60 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

[wao] branch develop updated (a633eaf -> 5eba42d)
by codelutin.com scm Nov. 4, 2014

Nov. 4, 2014

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 a633eaf [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5eba42d Lors du calcul d'un effort, on ne doit pas afficher "-" parce que le numérateur vaut 0 mais bien 0 (fixes #6048) 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 5eba42de91b7f0d509465d2291f6819de6ee962d Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Nov 4 12:03:02 2014 +0100 Lors du calcul d'un effort, on ne doit pas afficher "-" parce que le numérateur vaut 0 mais bien 0 (fixes #6048) Summary of changes: .../src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java | 4 ++-- 1 file 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