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 c67f4e421ec774d2f978dd11870c19747bfa9527 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 11:03:06 2016 +0200 Déplacement de ReportType en ObserveModelType + ajout de ce type sur les rapports --- application-swing/pom.xml | 2 +- .../application/swing/ui/admin/AdminUIModel.java | 40 ++++++------------ .../swing/ui/admin/report/ReportConfigUI.jaxx | 11 ++--- .../swing/ui/admin/report/ReportConfigUI.jcss | 10 ++--- .../swing/ui/admin/report/ReportModel.java | 47 +++++++++++++--------- .../swing/ui/admin/report/ReportUIHandler.java | 5 ++- .../i18n/application-swing_en_GB.properties | 6 +-- .../i18n/application-swing_es_ES.properties | 6 +-- .../i18n/application-swing_fr_FR.properties | 6 +-- .../ird/observe/services/dto/ObserveModelType.java | 4 +- .../services/dto/actions/report/Report.java | 20 ++++++--- .../src/main/filters/observe-reports.properties | 31 +++++++------- .../service/actions/report/ReportBuilder.java | 5 ++- 13 files changed, 101 insertions(+), 92 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 1f716c9..88e19be 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -440,7 +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> + <enum>fr.ird.observe.services.dto.ObserveModelType</enum> </enums> </enumerationSet> <enumerationSet> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java index f512ad2..24255db 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java @@ -25,13 +25,12 @@ import com.google.common.collect.Lists; import fr.ird.observe.application.swing.I18nEnumHelper; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; -import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.configuration.constants.DbMode; +import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.consolidate.ConsolidateModel; import fr.ird.observe.application.swing.ui.admin.export.ExportModel; import fr.ird.observe.application.swing.ui.admin.report.ReportModel; -import fr.ird.observe.application.swing.ui.admin.report.ReportType; import fr.ird.observe.application.swing.ui.admin.save.SaveLocalModel; import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroModel; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode; @@ -47,7 +46,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.IdHelper; -import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.ObserveModelType; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.BabModelVersionException; @@ -277,21 +276,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { AdminStep oldStep = (AdminStep) evt.getOldValue(); AdminStep newStep = (AdminStep) evt.getNewValue(); - if (AdminStep.REPORT == newStep) { - - if (oldStep != null && oldStep.ordinal() < newStep.ordinal()) { - - int oldIndex = getStepIndex(oldStep); - int newIndex = getStepIndex(newStep); - - if (oldIndex < newIndex) { - - // on reinitialise le report sélectionné - getReportModel().setSelectedReport(null); - } - } - } - if (AdminStep.CONFIG == newStep) { // on repasse sur l'écran de configuration @@ -338,13 +322,13 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { // on remplit le modèle de sélection uniquement avec le bon type de marées ReportModel reportModel = getReportModel(); - ReportType reportType = reportModel.getReportType(); - boolean loadSeineTrip = ReportType.PS == reportType; + ObserveModelType reportType = reportModel.getModelType(); + boolean loadSeineTrip = ObserveModelType.PS == reportType; ObserveSwingDataSource dataSource = getSafeLocalSource(true); populateSelectionModel(dataSource, loadSeineTrip); return; - + } // on remplit le modèle de sélection @@ -620,8 +604,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { if (log.isWarnEnabled()) log.warn("Default report file " + reportFile + " does not exists."); } - // on charge la liste des reports disponilbes - List<Report> reports = getReportModel().getReports(); +// // on charge la liste des reports disponilbes +// List<Report> reports = getReportModel().getReports(); // on ecoute la modification du modèle getReportModel().removePropertyChangeListener(listenReportModified); @@ -631,9 +615,9 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { getSelectionDataModel().removePropertyChangeListener(DataSelectionModel.PROPERTY_SELECTED_DATA, listenerSelectedDataForReport); getSelectionDataModel().addPropertyChangeListener(DataSelectionModel.PROPERTY_SELECTED_DATA, listenerSelectedDataForReport); - if (log.isInfoEnabled()) { - log.info("Detects " + reports.size() + " report(s)."); - } +// if (log.isInfoEnabled()) { +// log.info("Detects " + reports.size() + " report(s)."); +// } } if (containsOperation(AdminStep.CONSOLIDATE)) { @@ -1205,7 +1189,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { if (containsOperation(AdminStep.SYNCHRONIZE)) { if (!localSourceModel.isValid()) { - return false; + return false; } ObserveDataSourceInformation leftDataSourceInformation = getLocalSourceInformation(); @@ -1214,7 +1198,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { } if (!centralSourceModel.isValid()) { - return false; + return false; } ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getDataSourceInformation(); 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 43cce49..f1cd03d 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 @@ -27,6 +27,7 @@ <import> fr.ird.observe.application.swing.ui.admin.AdminUIModel + fr.ird.observe.services.dto.ObserveModelType java.io.File @@ -55,13 +56,13 @@ protected void finalize() throws Throwable { <row> <cell anchor="west"> - <JLabel id='reportTypeLabel'/> + <JLabel id='modelTypeLabel'/> </cell> <cell weightx='1' fill="horizontal" columns="2"> - <EnumEditor id="reportType" - genericType='ReportType' - constructorParams='ReportType.class' - onItemStateChanged='getHandler().setReportTypeFromEvent(event)'/> + <EnumEditor id="modelType" + genericType='ObserveModelType' + constructorParams='ObserveModelType.class' + onItemStateChanged='getHandler().setModelTypeFromEvent(event)'/> </cell> </row> <row> 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 1279020..181406e 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,13 +24,13 @@ border:{new TitledBorder(t("observe.actions.report.config"))}; } -#reportTypeLabel { - text:"observe.actions.report.report.type"; - labelFor:{reportType}; +#modelTypeLabel { + text:"observe.actions.report.model.type"; + labelFor:{modelType}; } -#reportType { - selectedItem:{stepModel.getReportType()}; +#modelType { + selectedItem:{stepModel.getModelType()}; } #reportFileLabel { 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 c107824..d5e9c05 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 @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.report; import fr.ird.observe.application.swing.ui.admin.AdminActionModel; import fr.ird.observe.application.swing.ui.admin.AdminStep; +import fr.ird.observe.services.dto.ObserveModelType; import fr.ird.observe.services.dto.actions.report.Report; import fr.ird.observe.services.service.actions.report.ReportBuilder; import org.apache.commons.logging.Log; @@ -35,6 +36,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * Le modèle utilisé pour la fonctionnalité de génération de rapport. @@ -50,7 +52,7 @@ 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 MODEL_TYPE_PROPERTY_NAME = "modelType"; public static final String REPORT_FILE_PROPERTY_NAME = "reportFile"; @@ -70,7 +72,7 @@ public class ReportModel extends AdminActionModel { private static final Log log = LogFactory.getLog(ReportModel.class); /** Type de rapport à charger. */ - protected ReportType reportType = ReportType.PS; + protected ObserveModelType modelType = ObserveModelType.PS; /** la fichier contenant la définition des reports. */ protected File reportFile; @@ -105,6 +107,8 @@ public class ReportModel extends AdminActionModel { public ReportModel() { super(AdminStep.REPORT); variables = new TreeMap<>(); + // quand le type de modèle change, on mets à jour les rapports disponibles + addPropertyChangeListener(MODEL_TYPE_PROPERTY_NAME, evt -> updateReports()); } public List<Report> loadReports(URL resource) throws IOException { @@ -180,38 +184,36 @@ public class ReportModel extends AdminActionModel { return reports != null; } - public List<Report> getReports() { - if (reports == null && reportFile.exists()) { - + private List<Report> allReports; + public List<Report> getAllReports() { + if (allReports == null) { try { URL resource = reportFile.toURI().toURL(); - List<Report> reports = loadReports(resource); + allReports = loadReports(resource); if (log.isDebugEnabled()) { - log.debug("Add loaded " + reports.size() + " report(s)."); + log.debug("Add loaded " + allReports.size() + " report(s)."); } - setReports(reports); } catch (IOException e) { throw new IllegalStateException( "Could not load reports definition file (" + reportFile + ").", e); } } - return reports; + return allReports; } - public void setReports(List<Report> reports) { - this.reports = reports; - firePropertyChange(REPORTS_PROPERTY_NAME, reports); + public List<Report> getReports() { + return reports; } - public ReportType getReportType() { - return reportType; + public ObserveModelType getModelType() { + return modelType; } - public void setReportType(ReportType reportType) { - ReportType oldValue = getReportType(); - this.reportType = reportType; - firePropertyChange(REPORT_TYPE_PROPERTY_NAME, oldValue, reportType); + public void setModelType(ObserveModelType reportType) { + ObserveModelType oldValue = getModelType(); + this.modelType = reportType; + firePropertyChange(MODEL_TYPE_PROPERTY_NAME, oldValue, reportType); } public Report getSelectedReport() { @@ -259,4 +261,13 @@ public class ReportModel extends AdminActionModel { variables.clear(); firePropertyChange(VARIABLES_PROPERTY_NAME, null, variables); } + + public void updateReports() { + setSelectedReport(null); + reports = getAllReports().stream().filter(r -> modelType == r.getModelType()).collect(Collectors.toList()); + firePropertyChange(REPORTS_PROPERTY_NAME, reports); + if (log.isInfoEnabled()) { + log.info("Detects " + (reports.size() - 1) + " report(s)."); + } + } } 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 f0bf99d..23d45c8 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 @@ -35,6 +35,7 @@ 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.ObserveModelType; 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; @@ -215,9 +216,9 @@ public class ReportUIHandler extends AdminTabUIHandler { }); } - public void setReportTypeFromEvent(ItemEvent event) { + public void setModelTypeFromEvent(ItemEvent event) { if (event.getStateChange() == ItemEvent.SELECTED) { - getStepModel().setReportType((ReportType) event.getItem()); + getStepModel().setModelType((ObserveModelType) event.getItem()); } } 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 72101c3..cfa4eb7 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 @@ -174,8 +174,8 @@ observe.actions.report=Report observe.actions.report.config=Report configuration observe.actions.report.copy.options=Copy into clipboard options observe.actions.report.description=Generate reports +observe.actions.report.model.type=Model type to use 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 @@ -1329,8 +1329,6 @@ 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 @@ -1379,6 +1377,8 @@ observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DAT observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DATA.description=Only data observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL=Only referentials observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL.description=Only referentials +observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Longline +observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Seine observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Longline gear type observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne gear type observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Disabled 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 dcd4890..375f23d 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 @@ -174,8 +174,8 @@ observe.actions.report=Cuadros de síntesis 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.model.type=Model type to use \#TODO 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 @@ -1329,8 +1329,6 @@ 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 @@ -1379,6 +1377,8 @@ observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DAT observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DATA.description=Datos del observador observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL=Referencial observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL.description=Todos los referenciales +observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Palangre +observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Senne observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Palangre observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Desactivado 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 129e451..16a0fd8 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 @@ -174,8 +174,8 @@ observe.actions.report=Tableaux de synthèse 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.model.type=Type de modèle à utiliser 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 @@ -1329,8 +1329,6 @@ 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 @@ -1379,6 +1377,8 @@ observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DAT observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DATA.description=Données observées observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL=Référentiel observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL.description=Tous les référentiels +observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Palangre +observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Senne observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Longline observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Désactivé diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportType.java b/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java similarity index 58% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportType.java rename to services-dto/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java index 203d4f9..2dbcf20 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportType.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.admin.report; +package fr.ird.observe.services.dto; /** * Created on 27/10/16. @@ -6,7 +6,7 @@ package fr.ird.observe.application.swing.ui.admin.report; * @author Tony Chemit - chemit@codelutin.com * @since 5.0.2 */ -public enum ReportType { +public enum ObserveModelType { PS, LL } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java b/services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java index f023039..c05906e 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.dto.actions.report; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.ObserveDto; +import fr.ird.observe.services.dto.ObserveModelType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -64,9 +65,13 @@ public class Report implements Serializable, ObserveDto { /** la liste des variables de type repeat du report */ protected final ReportVariable[] repeatVariables; + /** Type de modèle utilisable pour ce report. */ + protected final ObserveModelType modelType; + private static final long serialVersionUID = 1L; - public Report(String id, + public Report(ObserveModelType modelType, + String id, String name, String description, String[] rowHeaders, @@ -75,6 +80,7 @@ public class Report implements Serializable, ObserveDto { ReportVariable[] variables, ReportVariable[] repeatVariables, ReportRequest... requests) { + this.modelType = modelType; this.id = id; this.name = name; this.description = description; @@ -86,10 +92,10 @@ public class Report implements Serializable, ObserveDto { this.repeatVariables = repeatVariables; if (log.isDebugEnabled()) { log.debug("New report [" + id + ":" + name + "], nb requests : " + - requests.length + ", nb objectOperations : " + - operations.length + ", nb variables : " + - variables.length + ", nb repeat variables : " + - repeatVariables.length); + requests.length + ", nb objectOperations : " + + operations.length + ", nb variables : " + + variables.length + ", nb repeat variables : " + + repeatVariables.length); } } @@ -188,4 +194,8 @@ public class Report implements Serializable, ObserveDto { return true; } + public ObserveModelType getModelType() { + return modelType; + } + } diff --git a/services/src/main/filters/observe-reports.properties b/services/src/main/filters/observe-reports.properties index ca55046..1ea6616 100644 --- a/services/src/main/filters/observe-reports.properties +++ b/services/src/main/filters/observe-reports.properties @@ -23,7 +23,7 @@ ################################################################################ ## Liste des activit\u00e9s avec des comments ################################################################################ - +report.activityWithComment.modelType=PS report.activityWithComment.name=Activit\u00e9s avec comment et leurs positions report.activityWithComment.description=Afficher les activit\u00e9s avec comment et leurs positions g\u00e9ographiques report.activityWithComment.columns=Jour - Heure observation, Latitude, Longitude, Activit\u00e9, Commentaire @@ -41,7 +41,7 @@ report.activityWithComment.request.1=0,0|row|\ ################################################################################ ## Liste de toutes les activit\u00e9s et leurs positions ################################################################################ - +report.allActivitys.modelType=PS report.allActivitys.name=Toutes les activit\u00e9s et leurs positions report.allActivitys.description=Afficher toutes les activit\u00e9s et leurs positions g\u00e9ographiques report.allActivitys.columns=Jour - Heure observation, Latitude, Longitude, Activit\u00e9, Commentaire @@ -58,7 +58,7 @@ report.allActivitys.request.1=0,0|row|\ ################################################################################ ## Nombre de cal\u00e9es et captures journali\u00e8res d'une mar\u00e9e ################################################################################ - +report.dailySetAndCatch.modelType=PS report.dailySetAndCatch.name=Nombre de cal\u00e9es et captures journali\u00e8res d'une mar\u00e9e report.dailySetAndCatch.description=Afficher le nombre de cal\u00e9es et les captures journali\u00e8res d\u2019une cal\u00e9e report.dailySetAndCatch.columns=Jour observation,Nombre de cal\u00e9es ,Captures thon @@ -77,7 +77,7 @@ report.dailySetAndCatch.request.1=0,0|row|\ ################################################################################ ## Utilisation des DCP ################################################################################ - +report.dcpUsage.modelType=PS report.dcpUsage.name=Utilisation des DCP report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es report.dcpUsage.columns=Type de DCP (Tableau 8),Nombre visit\u00e9s,Nombre p\u00each\u00e9s,Nombre mis \u00e0 l\u2019eau seuls,Nombre renforc\u00e9s par radeau balis\u00e9,R\u00e9cup\u00e9r\u00e9 sans p\u00eache,Nombre de tortues associ\u00e9es @@ -176,7 +176,7 @@ report.dcpUsage.request.7.repeat=typeObjetId|column ################################################################################ ## Nombre des cal\u00e9es selon le type d'association ################################################################################ - +report.setByAssociation.modelType=PS report.setByAssociation.name=Nombre de cal\u00e9es selon le type d\u2019association report.setByAssociation.description=Afficher la r\u00e9partitions des cal\u00e9es selon le type d\u2019association l\u2019issue du coup. Les coups sur BL baleine et BO requin-baleine sont sp\u00e9cifi\u00e9s. report.setByAssociation.columns=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total @@ -290,7 +290,7 @@ report.setByAssociation.request.8=3,1|column|\ ################################################################################ ## Captures thon par type d'association ################################################################################ - +report.targetCatchByAssociation.modelType=PS report.targetCatchByAssociation.name=Capture de thon selon le type d'association (en t) report.targetCatchByAssociation.description=Afficher la r\u00e9partitions des captures de thons selon le type d'association report.targetCatchByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total @@ -429,7 +429,7 @@ report.targetCatchByAssociation.request.19=0,3|row|\ ################################################################################ ## Rejets thons selon le type d'association ################################################################################ - +report.targetDiscardedByAssociation.modelType=PS report.targetDiscardedByAssociation.name=Rejets de thons selon le type d\u2019association (en t) report.targetDiscardedByAssociation.description=Afficher la r\u00e9partitions des rejets de thons selon le type d'association report.targetDiscardedByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total @@ -568,8 +568,7 @@ report.targetDiscardedByAssociation.request.19=0,3|row|\ ################################################################################ ## Captures accessoires observ\u00e9es ################################################################################ - - +report.accessoryCatch.modelType=PS report.accessoryCatch.name=Liste des captures accessoires selon le type de banc, filtr\u00e9es par groupe report.accessoryCatch.description=Afficher les captures accessoires par groupe d'esp\u00e8ce\nLes poids sont exprim\u00e9s en tonnes. report.accessoryCatch.columns=Esp\u00e8ce, Banc libre, Banc objet @@ -625,7 +624,7 @@ report.accessoryCatch.request.3.repeat=speciesId|column ################################################################################ ## Captures accessoires par speciesGroup d'esp\u00e8ces ################################################################################ - +report.accessoryCatchByGroup.modelType=PS report.accessoryCatchByGroup.name=D\u00e9nombrement des captures accessoires et devenir, filtr\u00e9s par groupe report.accessoryCatchByGroup.description=Afficher les nombres de captures accessoires par groupe d'esp\u00e8ce selon le type de banc et le devenir report.accessoryCatchByGroup.columns=Esp\u00e8ce, Total BL, Total BO, Sorti vivant/\u00e9chapp\u00e9, Sorti mort, Rejet\u00e9 vivant, Rejet\u00e9 mort, Partiellement conserv\u00e9, Cuve, Cuisine, Autre @@ -677,7 +676,7 @@ report.accessoryCatchByGroup.request.1=0,0|row|\ ########################################################### ## Distribution des tailles par espèces non ciblées ########################################################### - +report.nonTargetDistributionLengths.modelType=PS report.nonTargetDistributionLengths.name=Distribution des tailles par esp\u00e8ces non cibl\u00e9es report.nonTargetDistributionLengths.description=Afficher la nombre d'individus mesur\u00e9s par classe de taille pour les esp\u00e8ces non cibl\u00e9es report.nonTargetDistributionLengths.columns=Classe de taille,Effectif @@ -705,7 +704,7 @@ Order By ntl.length #################################################################### ## Distribution des tailles des conservés par espèces ciblées (LD1) #################################################################### - +report.targetStoredDistributionLengthsLD1.modelType=PS report.targetStoredDistributionLengthsLD1.name=Distribution des tailles des captures par esp\u00e8ces cibl\u00e9es (mesure LD1) report.targetStoredDistributionLengthsLD1.description=Afficher le nombre d'individus captur\u00e9s, mesur\u00e9s par classe de taille LD1 pour les esp\u00e8ces cibl\u00e9es report.targetStoredDistributionLengthsLD1.columns=Classe de taille,Effectif @@ -737,7 +736,7 @@ Order By tl.length ################################################################ ## Distribution des tailles des rejets par espèces ciblées (LD1) ################################################################ - +report.targetDiscardedDistributionLengthsLD1.modelType=PS report.targetDiscardedDistributionLengthsLD1.name=Distribution des tailles des rejets par esp\u00e8ces cibl\u00e9es (mesure LD1) report.targetDiscardedDistributionLengthsLD1.description=Afficher la nombre d'individus rejet\u00e9s, mesur\u00e9s par classe de taille LD1 pour les esp\u00e8ces cibl\u00e9es report.targetDiscardedDistributionLengthsLD1.columns=Classe de taille,Effectif @@ -769,7 +768,7 @@ Order By tl.length ############################################################### ## Distribution des tailles des conservés par espèces ciblées (LF) ############################################################### - +report.targetStoredDistributionLengthsLF.modelType=PS report.targetStoredDistributionLengthsLF.name=Distribution des tailles des captures par esp\u00e8ces cibl\u00e9es (mesure LF) report.targetStoredDistributionLengthsLF.description=Afficher le nombre d'individus captur\u00e9s, mesur\u00e9s par classe de taille LF pour les esp\u00e8ces cibl\u00e9es report.targetStoredDistributionLengthsLF.columns=Classe de taille,Effectif @@ -801,7 +800,7 @@ Order By tl.length ############################################################### ## Distribution des tailles des rejets par espèces ciblées (LF) ############################################################### - +report.targetDiscardedDistributionLengthsLF.modelType=PS report.targetDiscardedDistributionLengthsLF.name=Distribution des tailles des rejets par esp\u00e8ces cibl\u00e9es (mesure LF) report.targetDiscardedDistributionLengthsLF.description=Afficher le nombre d'individus rejet\u00e9s, mesur\u00e9s par classe de taille LF pour les esp\u00e8ces cibl\u00e9es report.targetDiscardedDistributionLengthsLF.columns=Classe de taille,Effectif @@ -833,7 +832,7 @@ Order By tl.length ############################################ ## Répartition des calées par cuves ############################################ - +report.repartionCaleeParCuve.modelType=PS report.repartionCaleeParCuve.name=R\u00e9partition des cal\u00e9es par cuves report.repartionCaleeParCuve.description=R\u00e9partition des cal\u00e9es par cuves, type de banc et esp\u00e8ce report.repartionCaleeParCuve.columns=Jour - Heure observation,Latitude,Longitude,Type de banc,Esp\u00e8ce,Tonnage,Cuve diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java index 13b5d35..cb1d7d1 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.actions.report; +import fr.ird.observe.services.dto.ObserveModelType; import fr.ird.observe.services.dto.actions.report.Report; import fr.ird.observe.services.dto.actions.report.ReportOperation; import fr.ird.observe.services.dto.actions.report.ReportRequest; @@ -131,6 +132,7 @@ public class ReportBuilder { log.debug("Will build report [" + reportName + "] with " + dico.size() + " properties (" + dico + ")."); } + ObserveModelType modelType = ObserveModelType.valueOf(getValue(dico, "modelType").trim().toUpperCase()); String name = getValue(dico, "name").trim(); String description = getValue(dico, "description").trim(); String rows = getValue(dico, "rows"); @@ -161,7 +163,8 @@ public class ReportBuilder { } } - return new Report(reportName, + return new Report(modelType, + reportName, name, description, rowHeaders, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 7a69690072a4f3f7c10b6d198510d364c37555ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 11:37:51 2016 +0200 [PS] Améliorer l'ergonomie de l'écran de saisie des mensurations de non target (Fixes #7511) --- .../table/impl/seine/TargetSampleUIHandler.java | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 13f5583..3ca2115 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -24,6 +24,11 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -34,11 +39,6 @@ import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TargetSampleHelper; import fr.ird.observe.services.service.seine.TargetSampleService; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -135,21 +135,20 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto JComponent requestFocus; + ModeSaisieEchantillonEnum modeSaisieEchantillonEnum; + if (create) { -// if (model.isCreate() && editingRow > 0) { + modeSaisieEchantillonEnum = ModeSaisieEchantillonEnum.byEffectif; if (model.isCreate()) { if (editingRow > 0) { // on recupere l'species de la ligne precedente TargetLengthDto editBean = model.getValueAt(editingRow - 1); species = editBean.getSpecies(); + modeSaisieEchantillonEnum = ModeSaisieEchantillonEnum.valueOf(editBean.getAcquisitionMode()); } - // on passe le mode de saisie en count - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(ModeSaisieEchantillonEnum.byEffectif); - // on utilise par défaut le code mesure lf ui.getMeasureType().setSelectedItem(null); ui.getMeasureType().setSelectedItem(CodeMesureEnum.lf); @@ -161,14 +160,14 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto requestFocus = ui.getCount(); - // on passe le mode de saisie int acquisitionMode = bean.getAcquisitionMode(); - ModeSaisieEchantillonEnum enumValue = - ModeSaisieEchantillonEnum.valueOf(acquisitionMode); - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(enumValue); + modeSaisieEchantillonEnum = ModeSaisieEchantillonEnum.valueOf(acquisitionMode); } + + ui.getAcquisitionModeGroup().setSelectedValue(null); + ui.getAcquisitionModeGroup().setSelectedValue(modeSaisieEchantillonEnum); + // on met a jour l'espce ui.getSpecies().setSelectedItem(null); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 389f44185d7fa310bb9aeb636771e7c5b9936756 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 14:53:28 2016 +0200 Ajout du type de marée LL --- .../entities/longline/TripLonglineTopiaDao.java | 22 ++++++++++++++++------ .../dto/reference/DataReferenceSetDefinitions.java | 1 + .../topia/binder/data/TripLonglineBinder.java | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index 86f875f..ae0e43f 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -33,6 +33,8 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.ProgramImpl; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; +import fr.ird.observe.entities.referentiel.longline.TripType; +import fr.ird.observe.entities.referentiel.longline.TripTypeImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -251,14 +253,16 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.startDate," + " t.endDate," + " pr.topiaId," + + " tt.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr, observe_longline.triptype tt" + " WHERE " + " t.program = ?" + " AND t.program = pr.topiaId" + + " AND t.tripType = tt.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -275,14 +279,16 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.startDate," + " t.endDate," + " pr.topiaId," + + " tt.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr, observe_longline.triptype tt" + " WHERE " + " t.topiaId = ?" + " AND t.program = pr.topiaId" + + " AND t.tripType = tt.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -311,17 +317,21 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl program.setTopiaId(set.getString(4)); trip.setProgram(program); - String observerLastName = set.getString(5); - String observerFirstName = set.getString(6); + TripType tripType = new TripTypeImpl(); + tripType.setTopiaId(set.getString(5)); + trip.setTripType(tripType); + + String observerLastName = set.getString(6); + String observerFirstName = set.getString(7); Person observer = new PersonImpl(); observer.setFirstName(observerFirstName); observer.setLastName(observerLastName); trip.setObserver(observer); Vessel vessel = new VesselImpl(); - String vesselId = set.getString(7); + String vesselId = set.getString(8); vessel.setTopiaId(vesselId); - String label = set.getString(8); + String label = set.getString(9); I18nReferenceEntities.setLabel(referenceLocale, vessel, label); trip.setVessel(vessel); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 48a19a0..6bd788d 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -128,6 +128,7 @@ public enum DataReferenceSetDefinitions { .addProperty(Date.class, TripLonglineDto.PROPERTY_START_DATE) .addProperty(Date.class, TripLonglineDto.PROPERTY_END_DATE) .addProperty(String.class, TripLonglineDto.PROPERTY_PROGRAM + "Id") + .addProperty(String.class, TripLonglineDto.PROPERTY_TRIP_TYPE + "Id") .addProperty(String.class, TripLonglineDto.PROPERTY_VESSEL) .addProperty(String.class, TripLonglineDto.PROPERTY_OBSERVER)), diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java index 7e216da..8fa58ec 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java @@ -104,6 +104,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong entity.getStartDate(), entity.getEndDate(), entity.getProgram().getTopiaId(), + entity.getTripType().getTopiaId(), getLabel(referentialLocale, entity.getVessel()), entity.getObserverLabel()); @@ -116,6 +117,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong dto.getStartDate(), dto.getEndDate(), dto.getProgram().getId(), + dto.getTripType().getId(), getLabel(referentialLocale, dto.getVessel()), PersonHelper.getNames(dto.getObserver())); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 576bc1d13706ec52c0bd31c4addf3cb639a8a1a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 14:54:48 2016 +0200 Conditionner l'utilisation selon le type de marée (LL) --- .../table/impl/longline/CatchLonglineUI.jcss | 1 - .../impl/longline/CatchLonglineUIHandler.java | 38 +++++++++++++++++----- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss index 5b6069d..0bb7962 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -155,7 +155,6 @@ #hookWhenDiscarded { _tablePropertyName:{CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED}; - _propertyName:{CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED}; booleanValue:{tableEditBean.getHookWhenDiscarded()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index bf75e79..9d06255 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -33,6 +33,9 @@ import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.TripLonglineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; @@ -43,6 +46,7 @@ import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchHelper; import fr.ird.observe.services.dto.longline.SizeMeasureDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -111,6 +115,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat private final JAXXContextEntryDef<LonglinePositionHelper<CatchLonglineDto>> POSITION_HELPER_ENTRY = UIHelper.newContextEntryDef("CatchLonglineUI-positionHelper", LonglinePositionHelper.class); + private static final String GROUPED_TRIP_TYPE_ID = "fr.ird.observe.entities.referentiel.longline.TripType#1239832686136#0.1"; + public CatchLonglineUIHandler(CatchLonglineUI ui) { super(ui, DataContextType.SetLongline); computeTabValidStateListener = e -> { @@ -119,7 +125,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat computeTabValidState(source); }; - catchFateChanged = evt -> onCatchFateChanged((ReferentialReference<CatchFateLonglineDto>) evt.getNewValue(), (CatchLonglineDto) evt.getSource()); + catchFateChanged = evt -> onCatchFateChanged((ReferentialReference<CatchFateLonglineDto>) evt.getNewValue()); branchlineChanged = evt -> onBranchlineChanged((DataReference<BranchlineDto>) evt.getNewValue()); weightTableModelModified = evt -> onWeightTableModelModified((Boolean) evt.getNewValue()); sizeTableModelModified = evt -> onSizeTableModelModified((Boolean) evt.getNewValue()); @@ -406,14 +412,28 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat JComponent requestFocus; + CatchAcquisitionModeEnum acquisitionModeEnum; + if (tableModel.isCreate()) { // go back to first pane ui.getFishingOperationTabPane().setSelectedIndex(0); // select by default individual acquisition mode - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(CatchAcquisitionModeEnum.INDIVIDUAL); + String openTripLonglineId = getDataContext().getOpenTripLonglineId(); + + ObserveTreeHelper treeHelper = ObserveSwingApplicationContext.get().getMainUI().getTreeHelper(); + ObserveNode selectedNode = treeHelper.getSelectedNode(); + while (!(selectedNode instanceof TripLonglineNode)) { + selectedNode = selectedNode.getParent(); + } + DataReference<TripLonglineDto> tripReference = ((TripLonglineNode) selectedNode).getEntity(); + String tripTypeId = (String) tripReference.getPropertyValue(TripLonglineDto.PROPERTY_TRIP_TYPE + "Id"); + if (log.isInfoEnabled()) { + log.info("Use tripId: " + tripTypeId); + } + acquisitionModeEnum = GROUPED_TRIP_TYPE_ID.equals(tripTypeId) + ? CatchAcquisitionModeEnum.GROUPED : CatchAcquisitionModeEnum.INDIVIDUAL; ui.getPredator().setEnabled(false); ui.getHookWhenDiscarded().setEnabled(false); @@ -426,11 +446,10 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } else { int acquisitionMode = bean.getAcquisitionMode(); - CatchAcquisitionModeEnum enumValue = CatchAcquisitionModeEnum.valueOf(acquisitionMode); - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(enumValue); - if (enumValue.equals(CatchAcquisitionModeEnum.GROUPED)) { + acquisitionModeEnum = CatchAcquisitionModeEnum.valueOf(acquisitionMode); + + if (acquisitionModeEnum.equals(CatchAcquisitionModeEnum.GROUPED)) { requestFocus = ui.getCount(); @@ -445,6 +464,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } + ui.getAcquisitionModeGroup().setSelectedValue(null); + ui.getAcquisitionModeGroup().setSelectedValue(acquisitionModeEnum); + bean.removePropertyChangeListener(CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); bean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); @@ -717,7 +739,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } - protected void onCatchFateChanged(ReferentialReference<CatchFateLonglineDto> newValue, CatchLonglineDto tableEditBean) { + protected void onCatchFateChanged(ReferentialReference<CatchFateLonglineDto> newValue) { CatchLonglineUI ui = getUi(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 ca01bdd44d69557e941217b5e9b61b95157c1c15 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:41:57 2016 +0200 fix tests --- .../observe/application/swing/validation/BeanValidatorDetectorTest.java | 2 +- .../fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java | 2 +- .../services/service/actions/report/observe-reports-test.properties | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java index 281bff7..bfd5ac4 100644 --- a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java +++ b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java @@ -274,7 +274,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SortedSet<NuitonValidator<?>> validators = detectValidators(ALL_TYPES); assertFalse(validators.isEmpty()); - assertEquals(176, validators.size()); + assertEquals(175, validators.size()); } diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java index 30a72ec..2251851 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java @@ -103,7 +103,7 @@ public class BinderEngineMetadataTest { ImmutableMap<Class<? extends DataDto>, Class<? extends ObserveDataEntity>> dataDtoToEntityTypes = binderEngine.getDataDtoToEntityTypes(); Assert.assertNotNull(dataDtoToEntityTypes); - Assert.assertEquals(57, dataDtoToEntityTypes.size()); + Assert.assertEquals(56, dataDtoToEntityTypes.size()); Set<Class<? extends ObserveDataEntity>> entityTypesFromEngine = Sets.newConcurrentHashSet(dataDtoToEntityTypes.values()); Set<Class<? extends ObserveDataEntity>> dataEntityTypesFromTopia = getDataEntityTypesFromTopia(); diff --git a/services/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties b/services/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties index 061de75..490841c 100644 --- a/services/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties +++ b/services/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties @@ -23,6 +23,7 @@ ## Rapport 1 : ################################################################################ +report.reportOne.modelType=PS report.reportOne.name=Rapport num\u00e9ro 1 report.reportOne.description=Description du rapport num\u00e9ro 1 report.reportOne.columns=Colonne 1, Colonne 2, Colonne 3, Derni\u00e8re colonne @@ -33,6 +34,7 @@ report.reportOne.request.1=0,0|row|\ ## Rapport 2 : ################################################################################ +report.reportTwo.modelType=PS report.reportTwo.name=Rapport num\u00e9ro 2 report.reportTwo.description=Description du rapport num\u00e9ro 2 report.reportTwo.columns=Colonne 1, Colonne 2, Colonne 3, Avant derni\u00e8re colonne, Total -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 3a0995b6ef1d8c56e1858cd520429ef3a7348f01 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:40:34 2016 +0200 Suppression SetSeine.sonarUsed (persistence) --- .../ObserveMigrationConfigurationProviderImpl.java | 3 +- .../DataSourceMigrationForVersion_5_1.java | 52 +++++++++++++++++++++ .../V_5_1_01_evol_8374_delete_sonarUsed-H2.sql | 1 + .../V_5_1_01_evol_8374_delete_sonarUsed-PG.sql | 1 + entities/src/main/xmi/observe-seine.zargo | Bin 83418 -> 83339 bytes 5 files changed, 56 insertions(+), 1 deletion(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java index 21734d4..7a993f8 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java @@ -67,7 +67,8 @@ public final class ObserveMigrationConfigurationProviderImpl extends ObserveMigr V_4_904("4.904"), V_4_905("4.905"), V_4_906("4.906"), - V_5_0("5.0"); + V_5_0("5.0"), + V_5_1("5.1"); private final Version version; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java new file mode 100644 index 0000000..bc7acd5 --- /dev/null +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -0,0 +1,52 @@ +package fr.ird.observe.entities.migration.versions; + +import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; + +import java.util.List; + +/** + * Created on 27/10/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationCallBack { + + + public DataSourceMigrationForVersion_5_1(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_5_1.getVersion(), callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) { + + addScript("01", "evol_8374_delete_sonarUsed", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_1 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_1 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} + diff --git a/entities-migration/src/main/resources/db/migration/V_5_1_01_evol_8374_delete_sonarUsed-H2.sql b/entities-migration/src/main/resources/db/migration/V_5_1_01_evol_8374_delete_sonarUsed-H2.sql new file mode 100644 index 0000000..883b446 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V_5_1_01_evol_8374_delete_sonarUsed-H2.sql @@ -0,0 +1 @@ +ALTER TABLE observe_seine."SET" DROP COLUMN sonarUsed; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/V_5_1_01_evol_8374_delete_sonarUsed-PG.sql b/entities-migration/src/main/resources/db/migration/V_5_1_01_evol_8374_delete_sonarUsed-PG.sql new file mode 100644 index 0000000..883b446 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V_5_1_01_evol_8374_delete_sonarUsed-PG.sql @@ -0,0 +1 @@ +ALTER TABLE observe_seine."SET" DROP COLUMN sonarUsed; \ No newline at end of file diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index 1184998..16d49a5 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 d50cb7ea608d6673aff10f9eb18bb0477fd476d5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:41:44 2016 +0200 Suppression SetSeine.sonarUsed (ui) --- .../application/swing/ui/content/impl/seine/SetSeineUI.jaxx | 5 ----- .../application/swing/ui/content/impl/seine/SetSeineUI.jcss | 7 ------- .../application/swing/ui/content/impl/seine/SetSeineUIHandler.java | 1 - .../application/swing/ui/content/impl/seine/SetSeineUIModel.java | 5 ++--- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx index 441a2cc..1ced60b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx @@ -203,11 +203,6 @@ <NumberEditor id='maxGearDepth' constructorParams='this'/> </cell> </row> - <row> - <cell columns='2' anchor="west"> - <JCheckBox id='sonarUsed'/> - </cell> - </row> </Table> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss index ebb6b08..c363595 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss @@ -214,13 +214,6 @@ _validatorLabel:{t("observe.content.setSeine.maxGearDepth")}; } -#sonarUsed { - _propertyName:{SetSeineDto.PROPERTY_SONAR_USED}; - text:"observe.content.setSeine.sonarUsed"; - selected:{bean.isSonarUsed()}; - _validatorLabel:{t("observe.content.setSeine.sonarUsed")}; -} - #delete { _toolTipText:{t("observe.action.delete.set.tip")}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index 7c4ee3b..ddc0df5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -225,7 +225,6 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { SetSeineUI.BINDING_CURRENT_SPEED_MODEL, SetSeineUI.BINDING_CURRENT_DIRECTION_MODEL, SetSeineUI.BINDING_REASON_FOR_NULL_SET_SELECTED_ITEM, - SetSeineUI.BINDING_SONAR_USED_SELECTED, SetSeineUI.BINDING_CURRENT_SPEED_MODEL, SetSeineUI.BINDING_NON_TARGET_DISCARDED_BOOLEAN_VALUE, SetSeineUI.BINDING_TARGET_DISCARDED_BOOLEAN_VALUE, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java index 35490ec..df22976 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIModel.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.impl.seine; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.seine.SetSeineDto; import java.util.Set; @@ -57,8 +57,7 @@ public class SetSeineUIModel extends ContentUIModel<SetSeineDto> { SetSeineDto.PROPERTY_CURRENT_SPEED, SetSeineDto.PROPERTY_CURRENT_DIRECTION, SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH, - SetSeineDto.PROPERTY_MAX_GEAR_DEPTH, - SetSeineDto.PROPERTY_SONAR_USED).build(); + SetSeineDto.PROPERTY_MAX_GEAR_DEPTH).build(); private static final long serialVersionUID = 1L; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 d7fba14f856776fc96165b6511b70a7e0cf0d900 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 20:06:35 2016 +0200 Ajout du menu contextuel pour changer l'ordre des captures --- .../impl/longline/CatchLonglineTableModel.java | 35 ++++++++++++++---- .../table/impl/longline/CatchLonglineUI.jaxx | 5 +++ .../table/impl/longline/CatchLonglineUI.jcss | 13 +++++++ .../impl/longline/CatchLonglineUIHandler.java | 42 ++++++++++++++++++++++ .../i18n/application-swing_en_GB.properties | 4 +++ .../i18n/application-swing_es_ES.properties | 4 +++ .../i18n/application-swing_fr_FR.properties | 4 +++ 7 files changed, 100 insertions(+), 7 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java index c03a5df..6068bb7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineTableModel.java @@ -22,17 +22,18 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; * #L% */ +import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; +import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; +import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.CatchLonglineHelper; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; -import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; -import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.SwingUtilities; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; @@ -85,16 +86,16 @@ public class CatchLonglineTableModel extends ContentTableModel<SetLonglineCatchD model.getSizeMeasuresTableModel().storeInCacheForRow(editingRow); List<SizeMeasureDto> sizeMeasures = model.getSizeMeasuresTableModel().getData().stream() - .filter(sizeMeasureDto -> sizeMeasureDto.getSizeMeasureType() != null) - .collect(Collectors.toList()); + .filter(sizeMeasureDto -> sizeMeasureDto.getSizeMeasureType() != null) + .collect(Collectors.toList()); getRowBean().setSizeMeasure(sizeMeasures); model.getWeightMeasuresTableModel().storeInCacheForRow(editingRow); List<WeightMeasureDto> weightMeasures = model.getWeightMeasuresTableModel().getData().stream() - .filter(weightMeasureDto -> weightMeasureDto.getWeightMeasureType() != null) - .collect(Collectors.toList()); + .filter(weightMeasureDto -> weightMeasureDto.getWeightMeasureType() != null) + .collect(Collectors.toList()); getRowBean().setWeightMeasure(weightMeasures); @@ -158,4 +159,24 @@ public class CatchLonglineTableModel extends ContentTableModel<SetLonglineCatchD protected CatchLonglineUIModel getModel() { return (CatchLonglineUIModel) super.getModel(); } + + public void moveUp(int selectedRow) { + CatchLonglineDto remove = data.remove(selectedRow); + data.add(selectedRow - 1, remove); + fireTableRowsUpdated(selectedRow - 1, selectedRow); + setSelectedRow(selectedRow - 1); + getModel().setCanSaveRow(false); + getModel().setCanResetRow(false); + getModel().setModified(true); + } + + public void moveDown(int selectedRow) { + CatchLonglineDto remove = data.remove(selectedRow); + data.add(selectedRow + 1, remove); + fireTableRowsUpdated(selectedRow, selectedRow + 1); + setSelectedRow(selectedRow + 1); + getModel().setCanSaveRow(false); + getModel().setCanResetRow(false); + getModel().setModified(true); + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx index 45ab0cd..14815cc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -124,6 +124,11 @@ <JMenuItem id='deleteSelectedWeightMeasure' onActionPerformed='getHandler().deleteSelectedWeightMeasure()'/> </JPopupMenu> + <JPopupMenu id='catchLonglinesPopup'> + <JMenuItem id='moveCatchLonglineUp' onActionPerformed='getHandler().moveCatchLonglineUp()'/> + <JMenuItem id='moveCatchLonglineDown' onActionPerformed='getHandler().moveCatchLonglineDown()'/> + </JPopupMenu> + <ButtonGroup id='acquisitionModeGroup' onStateChanged='getHandler().updateCatchAcquisitionMode((CatchAcquisitionModeEnum) acquisitionModeGroup.getSelectedValue())'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss index 0bb7962..ed5c587 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -28,6 +28,19 @@ /*canResetRow:{getHandler().canResetRow(tableModel.isModified() , validatorTable.isChanged())};*/ } +#moveCatchLonglineUp { + text: "observe.content.catchLongline.action.moveCatchLonglineUp"; + toolTipText: "observe.content.catchLongline.action.moveCatchLonglineUp.tip"; + actionIcon: go-up; +} + +#moveCatchLonglineDown { + text: "observe.content.catchLongline.action.moveCatchLonglineDown"; + toolTipText: "observe.content.catchLongline.action.moveCatchLonglineDown.tip"; + actionIcon: go-down; +} + + /* ***************************************************************************** */ /* CARACTERISTIC TAB ********************************************************** */ /* ***************************************************************************** */ diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index 9d06255..be10439 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -36,6 +36,7 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.node.TripLonglineNode; +import fr.ird.observe.application.swing.ui.util.table.AutotSelectRowAndShowPopupActionSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; @@ -72,7 +73,10 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; import javax.swing.JOptionPane; +import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeListener; @@ -531,6 +535,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat UIHelper.setTableColumnRenderer(table, 9, UIHelper.newBooleanTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 10, UIHelper.newStringTableCellRenderer(renderer, 10, true)); + new CatchLonglinesAutotSelectRowAndShowPopupAction(ui, ui.getTableScrollPane(), table, ui.getCatchLonglinesPopup()); + } { @@ -989,4 +995,40 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newBranchlineService(); } + public void moveCatchLonglineUp() { + int selectedRow = getUi().getTable().getSelectedRow(); + getTableModel().moveUp(selectedRow); + } + + public void moveCatchLonglineDown() { + int selectedRow = getUi().getTable().getSelectedRow(); + getTableModel().moveDown(selectedRow); + } + + static class CatchLonglinesAutotSelectRowAndShowPopupAction extends AutotSelectRowAndShowPopupActionSupport { + + private final CatchLonglineUI ui; + + public CatchLonglinesAutotSelectRowAndShowPopupAction(CatchLonglineUI ui, + JScrollPane pane, + JTable table, + JPopupMenu popup) { + super(pane, table, popup); + this.ui = ui; + } + + @Override + protected void beforeOpenPopup(int modelRowIndex, int modelColumnIndex) { + + CatchLonglineTableModel model = (CatchLonglineTableModel) getTable().getModel(); + + boolean canMoveUp = !ui.getModel().isCanSaveRow() && modelRowIndex > 0; + boolean canMoveDown = !ui.getModel().isCanSaveRow() && modelRowIndex < model.getRowCount() - 1; + + ui.getMoveCatchLonglineUp().setEnabled(canMoveUp); + ui.getMoveCatchLonglineDown().setEnabled(canMoveDown); + + } + + } } 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 ad778b1..717dd9b 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 @@ -709,6 +709,10 @@ observe.content.catchLongline.action.deleteSelectedSizeMeasure=Delete observe.content.catchLongline.action.deleteSelectedSizeMeasure.tip=Delete selected size measure observe.content.catchLongline.action.deleteSelectedWeightMeasure=Delete observe.content.catchLongline.action.deleteSelectedWeightMeasure.tip=Delete selected weight measure +observe.content.catchLongline.action.moveCatchLonglineDown=Move down +observe.content.catchLongline.action.moveCatchLonglineDown.tip=Move down the catch +observe.content.catchLongline.action.moveCatchLonglineUp=Move up +observe.content.catchLongline.action.moveCatchLonglineUp.tip=Move up the catch observe.content.catchLongline.action.new=New catch observe.content.catchLongline.action.new.tip=Create a new catch observe.content.catchLongline.action.reset.photoReferences.tip=Reset photo references 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 5132994..5807c0f 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 @@ -709,6 +709,10 @@ observe.content.catchLongline.action.deleteSelectedSizeMeasure=Eliminar observe.content.catchLongline.action.deleteSelectedSizeMeasure.tip=Eliminar la medida de tamaño observe.content.catchLongline.action.deleteSelectedWeightMeasure=Eliminar observe.content.catchLongline.action.deleteSelectedWeightMeasure.tip=Eliminar la medida de peso +observe.content.catchLongline.action.moveCatchLonglineDown=Move down \#TODO +observe.content.catchLongline.action.moveCatchLonglineDown.tip=Move down the catch \#TODO +observe.content.catchLongline.action.moveCatchLonglineUp=Move up \#TODO +observe.content.catchLongline.action.moveCatchLonglineUp.tip=Move up the catch \#TODO observe.content.catchLongline.action.new=Nueva captura observe.content.catchLongline.action.new.tip=Crear una nueva captura observe.content.catchLongline.action.reset.photoReferences.tip=Reiniciar las referencias photo 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 c236220..d622503 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 @@ -709,6 +709,10 @@ observe.content.catchLongline.action.deleteSelectedSizeMeasure=Supprimer observe.content.catchLongline.action.deleteSelectedSizeMeasure.tip=Supprimer la mesure de la taille observe.content.catchLongline.action.deleteSelectedWeightMeasure=Supprimer observe.content.catchLongline.action.deleteSelectedWeightMeasure.tip=Supprimer la mesure du poids +observe.content.catchLongline.action.moveCatchLonglineDown=Descendre +observe.content.catchLongline.action.moveCatchLonglineDown.tip=Descendre la capture +observe.content.catchLongline.action.moveCatchLonglineUp=Remonter +observe.content.catchLongline.action.moveCatchLonglineUp.tip=Remoter la capture observe.content.catchLongline.action.new=Nouvelle capture observe.content.catchLongline.action.new.tip=Créér une nouvelle capture observe.content.catchLongline.action.reset.photoReferences.tip=Réinitiliser les références photo -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 bc3f80e1c504033cb8f1104bfe605c9731ed5d24 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 20:27:54 2016 +0200 recopie de la liste avant sauvegarde --- .../ui/content/table/impl/longline/CatchLonglineUIHandler.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index be10439..b253832 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -76,7 +76,6 @@ import javax.swing.JOptionPane; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; import javax.swing.JTable; -import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeListener; @@ -620,6 +619,15 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } @Override + protected boolean prepareSave(SetLonglineCatchDto editBean, List<CatchLonglineDto> objets) throws Exception { + boolean doSave = super.prepareSave(editBean, objets); + if (doSave) { + editBean.setCatchLongline(objets); + } + return doSave; + } + + @Override protected void loadEditBean(String beanId) { Form<SetLonglineCatchDto> form = getSetLonglineCatchService().loadForm(beanId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 fc9004c0c80818729ce4dd316ff8acce9fcd5f0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 09:43:20 2016 +0200 Suppression champs supportVesselName (persistence) --- .../versions/DataSourceMigrationForVersion_5_1.java | 1 + ...5_1_03_evol-6997_delete_supportVesselName-H2.sql | 1 + ...5_1_03_evol-6997_delete_supportVesselName-PG.sql | 1 + entities/src/main/xmi/observe-seine.zargo | Bin 83339 -> 83232 bytes 4 files changed, 3 insertions(+) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java index 4c98f86..4de555b 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -29,6 +29,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("01", "evol_8374_delete_sonarUsed", queries); addScript("02", "evol_7886_catch_add_set_idx", queries); + addScript("03", "evol_6997_delete_supportVesselName", queries); } diff --git a/entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-H2.sql new file mode 100644 index 0000000..fc7374f --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-H2.sql @@ -0,0 +1 @@ +ALTER TABLE observe_seine.floatingobject DROP COLUMN supportVesselName; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-PG.sql new file mode 100644 index 0000000..fc7374f --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-PG.sql @@ -0,0 +1 @@ +ALTER TABLE observe_seine.floatingobject DROP COLUMN supportVesselName; \ No newline at end of file diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index 16d49a5..ab48b4f 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 1ec6cd6ad8d406a87e99ae829a295ac7f1a36e38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 09:44:22 2016 +0200 Suppression champs supportVesselName (ui) --- .../FloatingObjectDto-ui-create-error-validation.xml | 13 ------------- .../FloatingObjectDto-ui-update-error-validation.xml | 13 ------------- .../i18n/application-swing-validation_en_GB.properties | 1 - .../i18n/application-swing-validation_es_ES.properties | 1 - .../i18n/application-swing-validation_fr_FR.properties | 1 - .../swing/ui/content/impl/seine/FloatingObjectUI.jaxx | 13 ------------- .../swing/ui/content/impl/seine/FloatingObjectUI.jcss | 16 ---------------- .../ui/content/impl/seine/FloatingObjectUIHandler.java | 1 - .../resources/i18n/application-swing_en_GB.properties | 1 - .../resources/i18n/application-swing_es_ES.properties | 1 - .../resources/i18n/application-swing_fr_FR.properties | 1 - 11 files changed, 62 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml index 8d62fbb..07035e2 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml @@ -60,19 +60,6 @@ </field> - <field name="supportVesselName"> - - <!-- supportVesselName de ${maxLength} caractères maximum --> - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">maxLength:32</param> - <param name="expression"> - <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> - </param> - <message>validator.ui.floatingObject.size.supportVesselName##${ints.maxLength}</message> - </field-validator> - - </field> - <field name="daysAtSeaCount"> <!-- count de jours a la mer positif --> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml index 1917dc1..7adfcfd 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml @@ -60,19 +60,6 @@ </field> - <field name="supportVesselName"> - - <!-- supportVesselName de ${maxLength} caractères maximum --> - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">maxLength:32</param> - <param name="expression"> - <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> - </param> - <message>validator.ui.floatingObject.size.supportVesselName##${ints.maxLength}</message> - </field-validator> - - </field> - <field name="daysAtSeaCount"> <!-- count de jours a la mer positif --> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index 961e673..cd26f38 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -304,7 +304,6 @@ validator.ui.floatingObject.required.comment.for.type=A comment is required for validator.ui.floatingObject.required.objectFate=Object fate must be filled. validator.ui.floatingObject.required.objectOperation=Object operation must be filled. validator.ui.floatingObject.required.type=Type must be filled. -validator.ui.floatingObject.size.supportVesselName=Support vessel name length can't exceed %S characters. validator.ui.floatlinesComposition.bound.length=Length must be between %1$s and %2$s. validator.ui.floatlinesComposition.bound.proportion=Proportion must be between %1$s and %2$s. validator.ui.floatlinesComposition.desactivated.lineType=Selected line type is disabled. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index e9601b5..d7cc884 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -304,7 +304,6 @@ validator.ui.floatingObject.required.comment.for.type=Se requiere un comentario validator.ui.floatingObject.required.objectFate=Se recomienda seleccionar un futuro (devenir). validator.ui.floatingObject.required.objectOperation=Es obligatorio seleccionar un operación. validator.ui.floatingObject.required.type=Es obligatorio seleccionar un tipo de objeto. -validator.ui.floatingObject.size.supportVesselName=El número introducido debe tener una longitud inferior a %1$s caracteres. validator.ui.floatlinesComposition.bound.length=La longitud debe ser entre %s y %s. validator.ui.floatlinesComposition.bound.proportion=La proporción debe ser entre %s y %s. validator.ui.floatlinesComposition.desactivated.lineType=El tipo seleccionado está desactivado. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index 127a3a9..10c1d1d 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -304,7 +304,6 @@ validator.ui.floatingObject.required.comment.for.type=Un commentaire est requis validator.ui.floatingObject.required.objectFate=La sélection d'un devenir d'objet est conseillée. validator.ui.floatingObject.required.objectOperation=La sélection d'une opération d'objet est obligatoire. validator.ui.floatingObject.required.type=La sélection d'un type d'objet est obligatoire. -validator.ui.floatingObject.size.supportVesselName=Le nom supply doit avoir une taille inférieure à %1$s caractères. validator.ui.floatlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. validator.ui.floatlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. validator.ui.floatlinesComposition.desactivated.lineType=Le type sélectionnée est désactivée. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx index 2283918..796d75e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -92,19 +92,6 @@ </cell> </row> <row> - <cell anchor="west"> - <JLabel id='supportVesselNameLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='supportVesselNameToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetSupportVesselName' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='supportVesselName' constraints='BorderLayout.CENTER'/> - </JPanel> - </cell> - </row> - <row> <cell columns='2' fill="both" weighty="0.7"> <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss index 1cff29f..81ba641 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss @@ -77,22 +77,6 @@ BeanComboBox { numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.INT_6_DIGITS_PATTERN}; } -#supportVesselNameLabel { - text:"observe.common.supportVesselName"; - labelFor:{supportVesselName}; -} - -#supportVesselName { - _propertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; - text:{getStringValue(bean.getSupportVesselName())}; - _validatorLabel:{t("observe.common.supportVesselName")}; -} - -#resetSupportVesselName{ - toolTipText:"observe.content.action.reset.supportVesselName.tip"; - _resetPropertyName:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; -} - #comment { columnHeaderView:{new JLabel(t("observe.common.comment.floatingObject"))}; minimumSize:{new Dimension(10,50)}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java index 632387d..f03490c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -156,7 +156,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> super.startEditUI(FloatingObjectUI.BINDING_DAYS_AT_SEA_COUNT_MODEL, FloatingObjectUI.BINDING_OBJECT_TYPE_SELECTED_ITEM, FloatingObjectUI.BINDING_OBJECT_FATE_SELECTED_ITEM, - FloatingObjectUI.BINDING_SUPPORT_VESSEL_NAME_TEXT, FloatingObjectUI.BINDING_COMMENT2_TEXT); contentUIModel.setModified(create); } 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 717dd9b..a24fca8 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 @@ -487,7 +487,6 @@ observe.common.startLogValue=Start log value observe.common.status=Status observe.common.step.description=Step description observe.common.storage.not.valid=Data source not configured -observe.common.supportVesselName=Support vessel name observe.common.surroundingActivity=Surrounding activity observe.common.taille=Length observe.common.taillePoids.caracteristics=Length-Weight caracteristics 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 5807c0f..7f8ce44 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 @@ -487,7 +487,6 @@ observe.common.startLogValue=Corredera de mañana (millas) observe.common.status=Estado observe.common.step.description=Descripción de la etapa observe.common.storage.not.valid=Fuente de datos no configurada -observe.common.supportVesselName=Nombre del supply observe.common.surroundingActivity=Actividad circundante observe.common.taille=Talla (cm) observe.common.taillePoids.caracteristics=Características Talla-Peso 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 d622503..8ca5b83 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 @@ -487,7 +487,6 @@ observe.common.startLogValue=Loch du matin (milles) observe.common.status=Statut observe.common.step.description=Description de l'étape observe.common.storage.not.valid=Source de données non configurée -observe.common.supportVesselName=Nom supply observe.common.surroundingActivity=Activité environnante observe.common.taille=Taille (cm) observe.common.taillePoids.caracteristics=Caractéristiques Taille-Poids -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.