This is an automated email from the git hooks/post-receive script. New change to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git from 912ef1e Ébauche du formulaire de modification d'un contact scléro new 068d1a2 Tableau des contacts pour scléro et forme du formulaire (pas encore de validation adéquat) new 5d6b2f2 Passage du plan scléro en nombre d'individus (totaux manquants) new 8de096c Ajout des totaux en individus dans le plan 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 8de096c5589af53138cfecf4afde0169df650c91 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Dec 26 12:05:25 2014 +0100 Ajout des totaux en individus dans le plan commit 5d6b2f229d296dce252cbd15e0b23804eef48fde Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Dec 26 11:39:06 2014 +0100 Passage du plan scléro en nombre d'individus (totaux manquants) commit 068d1a2dc4068527ec7571f9c0bf819785d19fc4 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Dec 26 10:13:42 2014 +0100 Tableau des contacts pour scléro et forme du formulaire (pas encore de validation adéquat) Summary of changes: .../service/ObsMerSamplingPlanService.java | 27 --- .../ifremer/wao/services/service/SamplingPlan.java | 19 +- .../wao/services/service/SamplingPlanService.java | 22 +++ .../service/SclerochronologySamplingPlan.java | 39 +++- .../SclerochronologySamplingPlanBuilder.java | 218 +++++++++++---------- .../SclerochronologySamplingPlanService.java | 6 +- .../SclerochronologySamplingPlanServiceTest.java | 32 +++ .../wao/entity/Contact-conversion.properties | 5 +- .../main/resources/i18n/wao-web_en_GB.properties | 10 +- .../main/resources/i18n/wao-web_fr_FR.properties | 10 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 155 +++++++++++---- .../webapp/WEB-INF/content/edit-contact-input.jsp | 3 +- .../content/sclerochronology/sampling-plan.jsp | 10 +- 13 files changed, 354 insertions(+), 202 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.