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 ee1ac27 Correction du build (les données de tests datent d'avant la première mise en prod de Wao donc on change la date de contrôle) new 26102ed On revoit le calcul de la synthèse pour exprimer le prévisionnel, on introduit une nouvelle action pour le filtrage vu que les filtres doivent intégrer le planifé et pas seulement les contacts new bab86b3 Fusion de la branche 'feature/6733' dans develop (testable-cl #6733) 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 bab86b3b84b189e33dab0f5a54d42a8681d1c579 Merge: ee1ac27 26102ed Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Mar 2 18:22:08 2015 +0100 Fusion de la branche 'feature/6733' dans develop (testable-cl #6733) commit 26102edd13dd8548146f0583088d1b9e8155ffa4 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Mar 2 18:20:30 2015 +0100 On revoit le calcul de la synthèse pour exprimer le prévisionnel, on introduit une nouvelle action pour le filtrage vu que les filtres doivent intégrer le planifé et pas seulement les contacts Summary of changes: .../service/ContactsFilterValuesCacheKey.java | 3 +- .../services/service/SampleRowsFilterValues.java | 9 +- .../fr/ifremer/wao/services/service/Synthesis.java | 22 +++++ .../wao/services/service/SynthesisCacheKey.java | 49 +++++++++- .../wao/services/service/SynthesisService.java | 103 +++++++++++++++------ .../fr/ifremer/wao/web/action/SynthesisAction.java | 2 +- ...n.java => SynthesisFilterValuesJsonAction.java} | 18 ++-- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 4 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 + 9 files changed, 162 insertions(+), 50 deletions(-) copy wao-web/src/main/java/fr/ifremer/wao/web/action/{ContactsFilterValuesJsonAction.java => SynthesisFilterValuesJsonAction.java} (78%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.