This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 8483a4ea091bca21526be129e113fd8fe5ac69ee Merge: 79078b2 c67f4e4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 11:03:15 2016 +0200 Pour les rapports, proposer un choix sur le type de marées à utiliser (Fixes #6853) Merge branch 'feature/6853' into develop application-swing/pom.xml | 1 + .../application/swing/ui/admin/AdminUIModel.java | 62 ++++++++++++--------- .../swing/ui/admin/report/ReportConfigUI.jaxx | 15 +++++- .../swing/ui/admin/report/ReportConfigUI.jcss | 9 ++++ .../swing/ui/admin/report/ReportModel.java | 48 +++++++++++++---- .../swing/ui/admin/report/ReportUIHandler.java | 21 +++++--- .../swing/ui/storage/tabs/DataSelectionModel.java | 63 ++++++++++++++++++++-- .../i18n/application-swing_en_GB.properties | 3 ++ .../i18n/application-swing_es_ES.properties | 3 ++ .../i18n/application-swing_fr_FR.properties | 3 ++ .../ird/observe/services/dto/ObserveModelType.java | 12 +++++ .../services/dto/actions/report/Report.java | 20 +++++-- .../src/main/filters/observe-reports.properties | 31 ++++++----- .../service/actions/report/ReportBuilder.java | 5 +- 14 files changed, 226 insertions(+), 70 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.