This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 91733c0decd2bcbe37da654bb92c7ef8dc6b2279 Merge: 0785e47 4bbbec4 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Oct 14 17:06:55 2014 +0200 Dans le plan d'échantillonnage, on propose l'affichage de l'effort en jours de mer et plus seulement en nombre de marées (refs #5651)) .../src/main/java/fr/ifremer/wao/WaoUtils.java | 56 ++++ .../java/fr/ifremer/wao/entity/ContactImpl.java | 9 +- .../src/test/java/fr/ifremer/wao/WaoUtilsTest.java | 46 ++++ .../fr/ifremer/wao/entity/ContactImplTest.java | 52 ---- .../wao/services/service/ObsMerSamplingPlan.java | 153 +++-------- .../service/ObsMerSamplingPlanBuilder.java | 282 +++++++++------------ .../service/ObsMerSamplingPlanService.java | 153 ++++------- .../wao/services/service/ObsVenteSamplingPlan.java | 8 +- .../service/ObsVenteSamplingPlanBuilder.java | 34 +-- .../ifremer/wao/services/service/SamplingPlan.java | 219 +++++++--------- .../wao/services/service/SamplingPlanCacheKey.java | 12 + .../service/csv/ObsMerSamplingPlanExportModel.java | 12 +- .../service/ObsMerSamplingPlanServiceTest.java | 12 +- .../fr/ifremer/wao/web/WaoJspActionSupport.java | 3 +- .../main/resources/i18n/wao-web_en_GB.properties | 2 + .../main/resources/i18n/wao-web_fr_FR.properties | 2 + .../WEB-INF/content/obsmer/sampling-plan.jsp | 233 ++++++----------- .../WEB-INF/content/obsvente/sampling-plan.jsp | 105 ++------ .../WEB-INF/content/templates/td-effort-obsmer.jsp | 13 + .../webapp/WEB-INF/content/templates/td-effort.jsp | 32 +++ wao-web/src/main/webapp/wao.css | 2 + 21 files changed, 609 insertions(+), 831 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.