This is an automated email from the git hooks/post-receive script. New change to branch feature/2263 in repository wao. See http://git.codelutin.com/wao.git from f4a83c2 Import du plan d'échantillonnage scléro new fde3c64 On gère les filtres dans le plan scléro new 321824f Ajout des champs scléro dans le formulaire de modification d'une ligne du plan new 626b064 Les filtres du plan sont désormais effectifs new 5bcc4c2 Dans le plan scléro, on ajoute une colonne pour l'espèce 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 5bcc4c289cf3ff8473efda00a0a1af960f537de5 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 16:59:10 2014 +0100 Dans le plan scléro, on ajoute une colonne pour l'espèce commit 626b064a5985fa0ac36176bfc71e7091e7271220 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 16:56:26 2014 +0100 Les filtres du plan sont désormais effectifs commit 321824f7e06ca6331d81be51c38b135eed7962a6 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 16:37:42 2014 +0100 Ajout des champs scléro dans le formulaire de modification d'une ligne du plan commit fde3c645ee6d1671b268b802f58d3fa5e3833fa8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 15:09:42 2014 +0100 On gère les filtres dans le plan scléro Summary of changes: .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 68 ++++++++++--- .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 +- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 16 ++- .../ifremer/wao/services/service/BoatsService.java | 6 +- .../wao/services/service/ContactsService.java | 2 +- .../services/service/SampleRowsFilterValues.java | 88 ++++++++++++----- .../wao/services/service/SamplingPlanService.java | 22 +++-- .../service/SclerochronologySamplingPlan.java | 11 +++ .../services/service/UpdateSampleRowCommand.java | 51 ++++++++++ .../resources/i18n/wao-services_en_GB.properties | 2 +- .../services/service/SclerochronologyFixtures.java | 15 +++ .../SclerochronologySamplingPlanServiceTest.java | 24 +++++ .../wao/web/action/EditSampleRowAction.java | 17 +--- .../action/SampleRowsFilterValuesJsonAction.java | 34 ++++++- .../main/webapp/WEB-INF/content/boat-details.jsp | 2 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 2 +- .../WEB-INF/content/edit-sample-row-input.jsp | 108 ++++++++++++++------- .../WEB-INF/content/obsmer/sampling-plan.jsp | 6 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 6 +- .../content/sclerochronology/sampling-plan.jsp | 26 ++--- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 4 +- 21 files changed, 391 insertions(+), 121 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.