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 f17ffef1ad018f522ad9fd9776d14d15587fd07d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 09:39:39 2016 +0200 Ajout d'une eénumration ReportType et utilisation dans l'écran de configuration des rapports --- application-swing/pom.xml | 1 + .../swing/ui/admin/report/ReportConfigUI.jaxx | 14 ++++++++++++-- .../swing/ui/admin/report/ReportConfigUI.jcss | 9 +++++++++ .../swing/ui/admin/report/ReportModel.java | 19 +++++++++++++++++-- .../swing/ui/admin/report/ReportType.java | 12 ++++++++++++ .../swing/ui/admin/report/ReportUIHandler.java | 20 +++++++++++++------- .../i18n/application-swing_en_GB.properties | 3 +++ .../i18n/application-swing_es_ES.properties | 3 +++ .../i18n/application-swing_fr_FR.properties | 3 +++ 9 files changed, 73 insertions(+), 11 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 2173103..1f716c9 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -440,6 +440,7 @@ <enum>fr.ird.observe.application.swing.ui.storage.ObstunaAdminAction</enum> <enum>fr.ird.observe.application.swing.ui.admin.AdminStep</enum> <enum>fr.ird.observe.application.swing.db.constants.ConnexionStatus</enum> + <enum>fr.ird.observe.application.swing.ui.admin.report.ReportType</enum> </enums> </enumerationSet> <enumerationSet> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx index 3e06f0b..43cce49 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx @@ -33,8 +33,7 @@ static fr.ird.observe.application.swing.ui.UIHelper.getStringValue </import> - <ReportUIHandler id='handler' - initializer='getContextValue(ReportUIHandler.class)'/> + <ReportUIHandler id='handler' initializer='getContextValue(ReportUIHandler.class)'/> <AdminUIModel id='model' initializer='getContextValue(AdminUIModel.class)'/> @@ -56,6 +55,17 @@ protected void finalize() throws Throwable { <row> <cell anchor="west"> + <JLabel id='reportTypeLabel'/> + </cell> + <cell weightx='1' fill="horizontal" columns="2"> + <EnumEditor id="reportType" + genericType='ReportType' + constructorParams='ReportType.class' + onItemStateChanged='getHandler().setReportTypeFromEvent(event)'/> + </cell> + </row> + <row> + <cell anchor="west"> <JLabel id='reportFileLabel'/> </cell> <cell weightx='1' fill="horizontal"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jcss index 387d78c..1279020 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jcss @@ -24,6 +24,15 @@ border:{new TitledBorder(t("observe.actions.report.config"))}; } +#reportTypeLabel { + text:"observe.actions.report.report.type"; + labelFor:{reportType}; +} + +#reportType { + selectedItem:{stepModel.getReportType()}; +} + #reportFileLabel { text:"observe.actions.report.select.file"; toolTipText:"observe.actions.report.select.file.tip"; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java index 748839d..c107824 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java @@ -21,10 +21,10 @@ */ package fr.ird.observe.application.swing.ui.admin.report; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.service.actions.report.ReportBuilder; import fr.ird.observe.application.swing.ui.admin.AdminActionModel; import fr.ird.observe.application.swing.ui.admin.AdminStep; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -50,6 +50,8 @@ public class ReportModel extends AdminActionModel { public static final String REPORTS_PROPERTY_NAME = "reports"; + public static final String REPORT_TYPE_PROPERTY_NAME = "reportType"; + public static final String REPORT_FILE_PROPERTY_NAME = "reportFile"; public static final String COPY_ROW_HEADERS_PROPERTY_NAME = "copyRowHeaders"; @@ -67,6 +69,9 @@ public class ReportModel extends AdminActionModel { /** Logger. */ private static final Log log = LogFactory.getLog(ReportModel.class); + /** Type de rapport à charger. */ + protected ReportType reportType = ReportType.PS; + /** la fichier contenant la définition des reports. */ protected File reportFile; @@ -199,6 +204,16 @@ public class ReportModel extends AdminActionModel { firePropertyChange(REPORTS_PROPERTY_NAME, reports); } + public ReportType getReportType() { + return reportType; + } + + public void setReportType(ReportType reportType) { + ReportType oldValue = getReportType(); + this.reportType = reportType; + firePropertyChange(REPORT_TYPE_PROPERTY_NAME, oldValue, reportType); + } + public Report getSelectedReport() { return selectedReport; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportType.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportType.java new file mode 100644 index 0000000..203d4f9 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportType.java @@ -0,0 +1,12 @@ +package fr.ird.observe.application.swing.ui.admin.report; + +/** + * Created on 27/10/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0.2 + */ +public enum ReportType { + PS, + LL +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java index 072f777..f0bf99d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java @@ -24,13 +24,6 @@ package fr.ird.observe.application.swing.ui.admin.report; import com.google.common.collect.Lists; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportVariable; -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.service.actions.report.ReportService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUI; @@ -40,6 +33,13 @@ import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; +import fr.ird.observe.services.dto.DataDto; +import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.actions.report.ReportVariable; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.service.actions.report.ReportService; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.editor.bean.BeanComboBox; import jaxx.runtime.swing.wizard.ext.WizardState; @@ -215,6 +215,12 @@ public class ReportUIHandler extends AdminTabUIHandler { }); } + public void setReportTypeFromEvent(ItemEvent event) { + if (event.getStateChange() == ItemEvent.SELECTED) { + getStepModel().setReportType((ReportType) event.getItem()); + } + } + public void updateSelectedReportFromEvent(ItemEvent event) { if (event.getStateChange() == ItemEvent.SELECTED) { diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index a56e6b8..72101c3 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -175,6 +175,7 @@ observe.actions.report.config=Report configuration observe.actions.report.copy.options=Copy into clipboard options observe.actions.report.description=Generate reports observe.actions.report.report.description=Description of selected report +observe.actions.report.report.type=Model type to use observe.actions.report.result=Results observe.actions.report.select=Select report observe.actions.report.select.file=File of reports definitions @@ -1328,6 +1329,8 @@ observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.SYNCHRONIZE=Upd observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.SYNCHRONIZE.description=Update referential observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE=Validation observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE.description=Validation data +observe.enum.fr.ird.observe.application.swing.ui.admin.report.ReportType.LL=Longline +observe.enum.fr.ird.observe.application.swing.ui.admin.report.ReportType.PS=Seine observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bi directionnal observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=From left to right observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=From right to left diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 0499c0f..dcd4890 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -175,6 +175,7 @@ observe.actions.report.config=Configuración de los informes observe.actions.report.copy.options=Opciones de copia en el portapapeles observe.actions.report.description=Generar los cuadros de síntesis del informe de fin del embarque observe.actions.report.report.description=Descripción del informe seleccionado +observe.actions.report.report.type=Model type to use \#TODO observe.actions.report.result=Resultados del informe observe.actions.report.select=Selección del informe observe.actions.report.select.file=Archivo de definición de informes @@ -1328,6 +1329,8 @@ observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.SYNCHRONIZE=Act observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.SYNCHRONIZE.description=Actualizar el referencial con una base central observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE=Validación observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE.description=Validación de los datos de una fuente de datos +observe.enum.fr.ird.observe.application.swing.ui.admin.report.ReportType.LL=Palangre +observe.enum.fr.ird.observe.application.swing.ui.admin.report.ReportType.PS=Senne observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bidireccional observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De izquierda a derecha observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De derecha a izquierda diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index a8a846f..129e451 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -175,6 +175,7 @@ observe.actions.report.config=Configuration des reports observe.actions.report.copy.options=Options de copie dans le presse-papier observe.actions.report.description=Générer les tableaux de synthèse du rapport de fin d'embarquement observe.actions.report.report.description=Description du rapport sélectionné +observe.actions.report.report.type=Type de modèle à utiliser observe.actions.report.result=Résultats du rapport observe.actions.report.select=Sélection du rapport observe.actions.report.select.file=Fichier de définition de reports @@ -1328,6 +1329,8 @@ observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.SYNCHRONIZE=Mis observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.SYNCHRONIZE.description=Mettre à jour le référentiel depuis une base centrale observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE=Validation observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE.description=Validation des données d'une source de données +observe.enum.fr.ird.observe.application.swing.ui.admin.report.ReportType.LL=Palangre +observe.enum.fr.ird.observe.application.swing.ui.admin.report.ReportType.PS=Senne observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bi directionnel observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De la gauche vers la droite observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De la droite vers la gauche -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.