- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] Connexion HTTP probablement périmée - Closes #1141
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: fa200798 by Tony CHEMIT at 2018-10-14T10:09:19Z Connexion HTTP probablement périmée - Closes #1141 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java ===================================== @@ -112,9 +112,7 @@ public class ContentUIManager { UIHelper.handlingError(e); withError = true; } finally { - if (withError) { - close(); - } else { + if (!withError) { getLayoutContent().removeAll(); getLayoutContent().add(content, BorderLayout.CENTER); getMainUI().getHandler().updateContentSize(); ===================================== client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== @@ -35,6 +35,7 @@ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.services.security.InvalidAuthenticationTokenException; +import io.ultreia.java4all.http.HResponseErrorException; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; @@ -561,7 +562,9 @@ public class UIHelper extends SwingUtil { if (type.isInstance(e)) { return true; } - + if (e instanceof HResponseErrorException) { + return containsExceptionInStack(((HResponseErrorException) e).getError().getException(), type); + } while (e.getCause() != null) { e = e.getCause(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa200798150308b23339d8f237a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa200798150308b23339d8f237a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Création de profils de connexions : cosmétique - Closes #1642
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f5a66b58 by Tony CHEMIT at 2018-10-14T09:19:26Z Création de profils de connexions : cosmétique - Closes #1642 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/ObserveMapPane.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/ObserveMapPane.java ===================================== @@ -23,8 +23,8 @@ package fr.ird.observe.client.ui.util.tripMap; */ import com.google.common.collect.Lists; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.renderer.lite.RendererUtilities; import org.geotools.styling.FeatureTypeStyle; @@ -68,6 +68,7 @@ public class ObserveMapPane extends JMapPane { protected String labelScaleUp; protected double rotation; + private long scaleInMiles; public ObserveMapPane() { labelScaleUp = "0 m"; @@ -84,6 +85,16 @@ public class ObserveMapPane extends JMapPane { } + public long getScaleInMiles() { + return scaleInMiles; + } + + public void setScaleInMiles(long scaleInMiles) { + long oldValue = getScaleInMiles(); + this.scaleInMiles = scaleInMiles; + firePropertyChange("scaleInMiles", oldValue, scaleInMiles); + } + protected void updateScale() { ReferencedEnvelope displayArea = getDisplayArea(); double dpi = 2.54 / 100; // pour avoir l'echélle en metre/pixel @@ -109,9 +120,9 @@ public class ObserveMapPane extends JMapPane { useFirstDigit = 1; } - long scaleInMiles = useFirstDigit * (long) Math.pow(10, nbDigit); + setScaleInMiles(useFirstDigit * (long) Math.pow(10, nbDigit)); - scaleWidth = (int) Math.round(scaleInMiles * METERS_BY_MILES / meterPerPixel); + this.scaleWidth = (int) Math.round(scaleInMiles * METERS_BY_MILES / meterPerPixel); labelScaleUp = String.format("%,d " + t("observe.content.map.miles"), scaleInMiles); @@ -297,7 +308,6 @@ public class ObserveMapPane extends JMapPane { } - @Override public void paint(Graphics graphics) { ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss ===================================== @@ -32,6 +32,7 @@ } #zoomMoins { + enabled:{observeMapPane.getScaleInMiles() < 2000}; _observeAction:{ZoomMoinsUIAction.ACTION_NAME}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5a66b58a27200ec05b92fbda91… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5a66b58a27200ec05b92fbda91… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Création de profils de connexions : cosmétique - Closes #1140
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 21ccec2c by Tony CHEMIT at 2018-10-14T08:55:30Z Création de profils de connexions : cosmétique - Closes #1140 - - - - - 12 changed files: - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelRemoteUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelRemoteUIAction.java ===================================== @@ -0,0 +1,62 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.dto.presets.RemoteDataSourceConfiguration; + +import java.util.ArrayList; +import java.util.List; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 14/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class CancelRemoteUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = CancelRemoteUIAction.class.getName(); + + public CancelRemoteUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.cancel"), n("observe.action.cancel.remote.tip"), "cancel", ObserveKeyStrokes.KEY_STROKE_RESET); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + RemoteDataSourceConfiguration configuration = ui.getModel().getRemoteDataSourceConfiguration(); + + List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); + configurations.remove(configuration); + ui.getModel().setRemoteDataSourceConfigurations(configurations); + ObserveSwingApplicationContext.get().getConfig().removeRemoteDataSourceConfiguration(configuration); + ui.getModel().setRemoteDataSourceConfiguration(null); + ui.getModel().setRemoteCreateMode(false); + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelServerUIAction.java ===================================== @@ -0,0 +1,62 @@ +package fr.ird.observe.client.ui.actions.storage.presets; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.ObserveSwingApplicationContext; +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.storage.presets.RemotePresetsUI; +import fr.ird.observe.dto.presets.ServerDataSourceConfiguration; + +import java.util.ArrayList; +import java.util.List; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 14/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class CancelServerUIAction extends PresetsUIActionSupport { + + public static final String ACTION_NAME = CancelServerUIAction.class.getName(); + + public CancelServerUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.action.cancel"), n("observe.action.cancel.server.tip"), "cancel", ObserveKeyStrokes.KEY_STROKE_RESET); + } + + @Override + protected void doActionPerformed(RemotePresetsUI ui) { + + ServerDataSourceConfiguration configuration = ui.getModel().getServerDataSourceConfiguration(); + + List<ServerDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getServerDataSourceConfigurations()); + configurations.remove(configuration); + ui.getModel().setServerDataSourceConfigurations(configurations); + ObserveSwingApplicationContext.get().getConfig().removeServerDataSourceConfiguration(configuration); + ui.getModel().setServerDataSourceConfiguration(null); + ui.getModel().setServerCreateMode(false); + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java ===================================== @@ -52,21 +52,19 @@ public class CreatePresetUIAction extends PresetsUIActionSupport { switch (ui.getTabs().getSelectedIndex()) { case 0: { RemoteDataSourceConfiguration configuration = new RemoteDataSourceConfiguration(); - configuration.setName("Change me"); List<RemoteDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getRemoteDataSourceConfigurations()); configurations.add(configuration); ui.getModel().setRemoteDataSourceConfigurations(configurations); - + ui.getModel().setRemoteCreateMode(true); ui.getRemoteConfigurations().setSelectedValue(configuration, true); } break; case 1: { ServerDataSourceConfiguration configuration = new ServerDataSourceConfiguration(); - configuration.setName("Change me"); - List<ServerDataSourceConfiguration> configurations = new ArrayList<>(ui.getModel().getServerDataSourceConfigurations()); configurations.add(configuration); ui.getModel().setServerDataSourceConfigurations(configurations); + ui.getModel().setServerCreateMode(true); ui.getServerConfigurations().setSelectedValue(configuration, true); } break; ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java ===================================== @@ -59,6 +59,9 @@ public class SaveRemoteUIAction extends PresetsUIActionSupport { ui.getModel().setRemoteDataSourceConfiguration(null); ui.getModel().setRemoteDataSourceConfiguration(remoteDataSourceConfiguration); ui.getModel().setRemoteModified(false); + if (ui.getModel().isRemoteCreateMode()) { + ui.getModel().setRemoteCreateMode(false); + } } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java ===================================== @@ -60,6 +60,9 @@ public class SaveServerUIAction extends PresetsUIActionSupport { ui.getModel().setServerDataSourceConfiguration(null); ui.getModel().setServerDataSourceConfiguration(serverDataSourceConfiguration); ui.getModel().setServerModified(false); + if (ui.getModel().isServerCreateMode()) { + ui.getModel().setServerCreateMode(false); + } } } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx ===================================== @@ -29,7 +29,9 @@ fr.ird.observe.client.ui.actions.storage.presets.DeleteRemoteUIAction fr.ird.observe.client.ui.actions.storage.presets.DeleteServerUIAction fr.ird.observe.client.ui.actions.storage.presets.QuitPresetsUIAction + fr.ird.observe.client.ui.actions.storage.presets.CancelRemoteUIAction fr.ird.observe.client.ui.actions.storage.presets.ResetRemoteUIAction + fr.ird.observe.client.ui.actions.storage.presets.CancelServerUIAction fr.ird.observe.client.ui.actions.storage.presets.ResetServerUIAction fr.ird.observe.client.ui.actions.storage.presets.SaveRemoteUIAction fr.ird.observe.client.ui.actions.storage.presets.SaveServerUIAction @@ -89,7 +91,8 @@ <row> <cell columns='2'> - <JPanel layout="{new GridLayout(1, 0)}"> + <JPanel id="remoteActions" layout="{new GridLayout(1, 0)}"> + <JButton id="cancelRemoteAction"/> <JButton id="resetRemoteAction"/> <JButton id="saveRemoteAction"/> <JButton id="deleteRemoteAction"/> @@ -151,7 +154,8 @@ <row> <cell columns='2'> - <JPanel layout="{new GridLayout(1, 0)}"> + <JPanel id="serverActions" layout="{new GridLayout(1, 0)}"> + <JButton id="cancelServerAction"/> <JButton id="resetServerAction"/> <JButton id="saveServerAction"/> <JButton id="deleteServerAction"/> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss ===================================== @@ -81,8 +81,11 @@ text:{SwingUtil.getStringValue(model.getServerDataSourceConfiguration().getDatabaseName())}; } +#cancelRemoteAction { + _observeAction:{CancelRemoteUIAction.ACTION_NAME}; +} + #resetRemoteAction { - enabled:{model.isRemoteModified()}; _observeAction:{ResetRemoteUIAction.ACTION_NAME}; } @@ -99,6 +102,10 @@ _observeAction:{TestRemoteUIAction.ACTION_NAME}; } +#cancelServerAction { + _observeAction:{CancelServerUIAction.ACTION_NAME}; +} + #resetServerAction { enabled:{model.isServerModified()}; _observeAction:{ResetServerUIAction.ACTION_NAME}; ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.storage.presets; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -40,6 +40,7 @@ import javax.swing.ActionMap; import javax.swing.DefaultListModel; import javax.swing.InputMap; import javax.swing.JComponent; +import javax.swing.JPanel; import javax.swing.JSplitPane; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; @@ -88,7 +89,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { } - Decorator<RemoteDataSourceConfiguration> remoteDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class,DecoratorService.WITH_URL); + Decorator<RemoteDataSourceConfiguration> remoteDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class, DecoratorService.WITH_URL); ui.getRemoteConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(remoteDecorator)); DefaultListModel<RemoteDataSourceConfiguration> remoteModel = new DefaultListModel<>(); @@ -140,7 +141,20 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { SwingUtilities.invokeLater(ui::repaint); }); - Decorator<ServerDataSourceConfiguration> serverDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class,DecoratorService.WITH_URL); + ui.getModel().addPropertyChangeListener("remoteCreateMode", evt -> { + JPanel remoteActions = ui.getRemoteActions(); + if ((Boolean) evt.getNewValue()) { + remoteActions.remove(ui.getResetRemoteAction()); + remoteActions.remove(ui.getDeleteRemoteAction()); + remoteActions.add(ui.getCancelRemoteAction(), 0); + } else { + remoteActions.add(ui.getResetRemoteAction(), 0); + remoteActions.add(ui.getDeleteRemoteAction(), 2); + remoteActions.remove(ui.getCancelRemoteAction()); + } + }); + ui.getRemoteActions().remove(0); + Decorator<ServerDataSourceConfiguration> serverDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class, DecoratorService.WITH_URL); ui.getServerConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(serverDecorator)); DefaultListModel<ServerDataSourceConfiguration> ServerModel = new DefaultListModel<>(); ui.getModel().getServerDataSourceConfigurations().forEach(ServerModel::addElement); @@ -191,6 +205,21 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { SwingUtilities.invokeLater(ui::repaint); }); + ui.getModel().addPropertyChangeListener("serverCreateMode", evt -> { + JPanel serverActions = ui.getServerActions(); + if ((Boolean) evt.getNewValue()) { + serverActions.remove(ui.getResetServerAction()); + serverActions.remove(ui.getDeleteServerAction()); + serverActions.add(ui.getCancelServerAction(), 0); + } else { + + serverActions.add(ui.getResetServerAction(), 0); + serverActions.add(ui.getDeleteServerAction(), 2); + serverActions.remove(ui.getCancelServerAction()); + } + }); + + ui.getServerActions().remove(0); UIHelper.askFocus(ui.getCreateAction()); } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java ===================================== @@ -43,6 +43,8 @@ public class RemotePresetsUIModel extends AbstractBean { private boolean remoteModified; private boolean serverModified; + private boolean remoteCreateMode; + private boolean serverCreateMode; public List<RemoteDataSourceConfiguration> getRemoteDataSourceConfigurations() { return remoteDataSourceConfigurations; @@ -99,4 +101,22 @@ public class RemotePresetsUIModel extends AbstractBean { this.serverModified = serverModified; firePropertyChange("serverModified", null, serverModified); } + + public boolean isRemoteCreateMode() { + return remoteCreateMode; + } + + public void setRemoteCreateMode(boolean remoteCreateMode) { + this.remoteCreateMode = remoteCreateMode; + firePropertyChange("remoteCreateMode", null, remoteCreateMode); + } + + public boolean isServerCreateMode() { + return serverCreateMode; + } + + public void setServerCreateMode(boolean serverCreateMode) { + this.serverCreateMode = serverCreateMode; + firePropertyChange("serverCreateMode", null, serverCreateMode); + } } ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -8,6 +8,8 @@ observe.action.auto.copy.to.clipboard.tip=Copy automaticly in clipboard with rep observe.action.back.to.list=Back to list observe.action.back.to.list.tip=Go back to the list observe.action.cancel=Cancel +observe.action.cancel.remote.tip=Cancel create remote configuration +observe.action.cancel.server.tip=Cancel create server configuration observe.action.change.storage=Change storage observe.action.change.storage.tip=To change current storage observe.action.choose.db.dump=Choose the backup ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -8,6 +8,8 @@ observe.action.auto.copy.to.clipboard.tip=Puesta a punto automáticamente el con observe.action.back.to.list=Volver a la lista observe.action.back.to.list.tip=Volver a la lista de datos observe.action.cancel=Cancelar +observe.action.cancel.remote.tip=Cancel create remote configuration \#TODO +observe.action.cancel.server.tip=Cancel create server configuration \#TODO observe.action.change.storage=Cambiar la fuente de datos observe.action.change.storage.tip=Para cambiar la fuente de datos de la aplicación observe.action.choose.db.dump=Elegir la copia de seguridad ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -8,6 +8,8 @@ observe.action.auto.copy.to.clipboard.tip=Mettre à jour automatiquement le cont observe.action.back.to.list=Retour à la liste observe.action.back.to.list.tip=Retour à la liste des données observe.action.cancel=Annuler +observe.action.cancel.remote.tip=Annuler la création de la configuration +observe.action.cancel.server.tip=Annuler la création de la configuration observe.action.change.storage=Changer la source de données observe.action.change.storage.tip=Pour changer la source de données de l'application observe.action.choose.db.dump=Choisir la sauvegarde View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/21ccec2c0c29eb0e02e425c24cc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/21ccec2c0c29eb0e02e425c24cc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: [PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après…
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9cfd1b6f by Tony CHEMIT at 2018-10-14T08:02:22Z [PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après le premier enregistrement - Closes #1143 - - - - - 64264463 by Tony CHEMIT at 2018-10-14T08:10:52Z Problème d'affichage dans l'UI référentiel relations taille-poids - Closes #1142 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss ===================================== @@ -46,13 +46,11 @@ #resetWell { toolTipText:"observe.common.DataDto.action.reset.well.tip"; - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; _resetTablePropertyName:{NonTargetCatchDto.PROPERTY_WELL}; } #well { text:{getStringValue(tableEditBean.getWell())}; - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; _tablePropertyName:{NonTargetCatchDto.PROPERTY_WELL}; } ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java ===================================== @@ -52,6 +52,9 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi entity.setStartDate(dto.getStartDate()); entity.setEndDate(dto.getEndDate()); entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType())); + entity.setMeanLength(dto.getMeanLength()); + entity.setMeanWeight(dto.getMeanWeight()); + } @@ -69,7 +72,8 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi dto.setStartDate(entity.getStartDate()); dto.setEndDate(entity.getEndDate()); dto.setSizeMeasureType(toReferentialReference(referentialLocale, entity.getSizeMeasureType())); - + dto.setMeanLength(entity.getMeanLength()); + dto.setMeanWeight(entity.getMeanWeight()); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3ef955bbf7ce2d675551cbccd2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3ef955bbf7ce2d675551cbccd2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [LL] Rendre fonctionnels les bouton "Déplacer échantillon" - Closes #1120
by Tony CHEMIT 13 Oct '18

13 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6cce186b by Tony CHEMIT at 2018-10-12T11:30:12Z [LL] Rendre fonctionnels les bouton "Déplacer échantillon" - Closes #1120 - - - - - e068dbf5 by Tony CHEMIT at 2018-10-13T13:21:28Z Internationaliser le référentiel port - Closes #1138 - - - - - 704da5e7 by Tony CHEMIT at 2018-10-13T13:21:32Z fix typo - - - - - 75ed4e6b by Tony CHEMIT at 2018-10-13T13:21:32Z add missing license header - - - - - 9b7e19a4 by Tony CHEMIT at 2018-10-13T13:21:32Z fix referential ui. - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/DefaultMoveMultipleDataRequest.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleDataRequestSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/DefaultMoveSingleDataRequest.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataRequestSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/BackToReferentialListUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/EditReferentialFromListUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/DetailReferentialUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleActivityLonglineLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleLonglineSampleLogbookRequest.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripLonglineLandingLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleTripUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineSampleLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleLonglineSampleLogbookRequest.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineLandingLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleTripUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineObsUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveMultipleActivitySeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveMultipleRouteUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f32b0c3e93a220bbb94fcbecdc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f32b0c3e93a220bbb94fcbecdc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Rendre fonctionnels les bouton "Déplacer échantillon" - Closes #1120
by Tony CHEMIT 10 Oct '18

10 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f32b0c3e by Tony CHEMIT at 2018-10-10T10:32:30Z [LL] Rendre fonctionnels les bouton "Déplacer échantillon" - Closes #1120 - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleTripUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/move/DefaultMoveSingleDataRequest.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/move/MoveSingleDataRequestSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/move/MoveSingleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleTripUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/move/MoveSingleTripUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleActivityLonglineSampleLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleLonglineSampleLogbookRequest.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineLandingLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveSingleActivitySeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveSingleRouteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/seine/move/MoveSingleTripSeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f32b0c3e93a220bbb94fcbecdc4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f32b0c3e93a220bbb94fcbecdc4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update toolkit
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2e14f03d by Tony CHEMIT at 2018-10-07T17:51:55Z update toolkit - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -153,7 +153,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.5-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>4.5</observeToolkitVersion>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2e14f03d6744553b78e6ad0af13… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2e14f03d6744553b78e6ad0af13… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Echantillons consignés au niveau marée : Petits ajustements - Closes #1134
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e8122185 by Tony CHEMIT at 2018-10-07T17:31:24Z [LL] Echantillons consignés au niveau marée : Petits ajustements - Closes #1134 - - - - - 20 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml - + validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml - + validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java ===================================== @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.constants.AcquisitionMode; import fr.ird.observe.client.ui.content.api.data.table.ContentTableModel; -import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler; +import fr.ird.observe.client.ui.content.api.data.table.NotStandaloneContentTableUIHandler; import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.data.longline.SampleLogbookDto; @@ -57,7 +57,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.7 */ -public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogbookDto, SamplePartLogbookDto, SamplePartLogbookUI> implements UIHandler<SamplePartLogbookUI> { +public class SamplePartLogbookUIHandler extends NotStandaloneContentTableUIHandler<SampleLogbookDto, SamplePartLogbookDto, SamplePartLogbookUI> implements UIHandler<SamplePartLogbookUI> { private static final Logger log = LogManager.getLogger(SamplePartLogbookUIHandler.class); private final PropertyChangeListener speciesChanged; @@ -76,7 +76,6 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb ui.setContextValue(new SamplePartLogbookUIModel(ui, ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbook())); } else { ui.setContextValue(new SamplePartLogbookUIModel(ui)); - } } @@ -202,16 +201,6 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb } - @Override - public void doPersist(SampleLogbookDto bean) { - // fait par le doSave de LonglineGlobalCompositionLogbookUIHandler - } - - @Override - protected void loadEditBean(String beanId) { - // fait par le parent - } - private Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) { Optional<SizeMeasureTypeReference> result = Optional.empty(); if (species != null) { ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -91,7 +91,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -108,7 +108,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -122,7 +122,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -76,7 +76,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -93,7 +93,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -107,7 +107,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml ===================================== @@ -92,7 +92,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -109,7 +109,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -123,7 +123,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml ===================================== @@ -77,7 +77,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -94,7 +94,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -108,7 +108,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml ===================================== @@ -35,8 +35,11 @@ <field name="quadrant"> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]> + </param> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -51,9 +54,11 @@ <field name="latitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]> + </param> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -65,9 +70,12 @@ <field name="longitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]> + </param> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -76,6 +84,7 @@ </field-validator> </field> + <field name="comment">  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-warning-validation.xml ===================================== @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="timeStamp"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.sampleLogbook.required.date</message> + </field-validator> + + </field> + + <field name="quadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.quadrant</message> + </field-validator> + + </field> + + <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.latitude</message> + </field-validator> + + </field> + + <field name="longitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.longitude</message> + </field-validator> + </field> + + <field name="comment"> + +  + <field-validator type="stringlength" short-circuit="true"> + <param name="maxLength">1024</param> + <message>observe.validation.catchLongline.comment.tobig</message> + </field-validator> + + </field> + +</validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml ===================================== @@ -33,11 +33,13 @@ </field> - <field name="quadrant"> - <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]> + </param> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -52,9 +54,11 @@ <field name="latitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]> + </param> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -66,9 +70,12 @@ <field name="longitude"> -  - <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]> + </param> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> @@ -77,6 +84,7 @@ </field-validator> </field> + <field name="comment">  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-warning-validation.xml ===================================== @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="timeStamp"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.sampleLogbook.required.date</message> + </field-validator> + + </field> + + <field name="quadrant"> + + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.quadrant</message> + </field-validator> + + </field> + + <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.latitude</message> + </field-validator> + + </field> + + <field name="longitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.validation.required.longitude</message> + </field-validator> + </field> + + <field name="comment"> + +  + <field-validator type="stringlength" short-circuit="true"> + <param name="maxLength">1024</param> + <message>observe.validation.catchLongline.comment.tobig</message> + </field-validator> + + </field> + +</validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -201,7 +201,7 @@ <field name="settingStartQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -248,7 +248,7 @@ <param name="expression"> <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -299,7 +299,7 @@ <param name="expression"> <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -350,7 +350,7 @@ <param name="expression"> <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-warning-validation.xml ===================================== @@ -48,7 +48,7 @@ <param name="expression"> <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> @@ -81,7 +81,7 @@ <param name="expression"> <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> @@ -114,7 +114,7 @@ <param name="expression"> <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -232,7 +232,7 @@ <param name="expression"> <![CDATA[ settingEndQuadrant != null || (settingEndLatitude == null && settingEndLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -283,7 +283,7 @@ <param name="expression"> <![CDATA[ haulingStartQuadrant != null || (haulingStartLatitude == null && haulingStartLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -334,7 +334,7 @@ <param name="expression"> <![CDATA[ haulingEndQuadrant != null || (haulingEndLatitude == null && haulingEndLongitude == null )]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-warning-validation.xml ===================================== @@ -48,7 +48,7 @@ <param name="expression"> <![CDATA[ settingEndQuadrant != null || settingEndLatitude != null || settingEndLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> @@ -81,7 +81,7 @@ <param name="expression"> <![CDATA[ haulingStartQuadrant != null || haulingStartLatitude != null || haulingStartLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> @@ -114,7 +114,7 @@ <param name="expression"> <![CDATA[ haulingEndQuadrant != null || haulingEndLatitude != null || haulingEndLongitude != null ]]> </param> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml ===================================== @@ -210,7 +210,7 @@ <field name="settingStartQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -254,7 +254,7 @@ <field name="settingEndQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -298,7 +298,7 @@ <field name="haulingStartQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -342,7 +342,7 @@ <field name="haulingEndQuadrant"> <field-validator type="required" short-circuit="true"> - <message>observe.validation.setLongline.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml ===================================== @@ -239,7 +239,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -283,7 +283,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -328,7 +328,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -373,7 +373,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml ===================================== @@ -172,7 +172,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -189,7 +189,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -203,7 +203,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -30,7 +30,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.quadrant</message> + <message>observe.validation.required.quadrant</message> </field-validator>  @@ -47,7 +47,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.latitude</message> + <message>observe.validation.required.latitude</message> </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> @@ -61,7 +61,7 @@  <field-validator type="required" short-circuit="true"> - <message>observe.validation.activity.required.longitude</message> + <message>observe.validation.required.longitude</message> </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -472,10 +472,7 @@ observe.validation.activity.required.comment.for.previousFpaZone=A comment is re observe.validation.activity.required.comment.for.reasonForNoFishing=A comment is required for the selected reason for no fishing mode. observe.validation.activity.required.comment.for.vesselActivity=A comment is required for the selected vessel activity mode. observe.validation.activity.required.date=Observation date must be filled. -observe.validation.activity.required.latitude=Latitude must be filled. -observe.validation.activity.required.longitude=Longitude must be filled. observe.validation.activity.required.observedSystem.for.nonTargetCatch=Some of the following observed systems are required for the non target catches \: %s -observe.validation.activity.required.quadrant=quadrant must be filled. observe.validation.activity.required.time=Time must be filled. observe.validation.activity.required.vesselActivity=must be filled. observe.validation.activityLongline.desactivated.fpaZone=Fpa zone is disabled. @@ -704,6 +701,9 @@ observe.validation.referentiel.untranslated.label1=English label is not translat observe.validation.referentiel.untranslated.label3=Spanish label is not translated. observe.validation.required.compagnies=Compagnies is not filled. observe.validation.required.harbour=Harbour is not filleds. +observe.validation.required.latitude=Latitude must be filled. +observe.validation.required.longitude=Longitude must be filled. +observe.validation.required.quadrant=Quadrant is mandatory. observe.validation.required.species=Species is not filled. observe.validation.route.activityFinDeVeille.notAvailable=There is already an end watch activity on trip. observe.validation.route.comment.tobig=Comment size can not exceed 1024 characters. @@ -794,7 +794,6 @@ observe.validation.setLongline.required.haulingEndTimeStamp=Timestamp must be fi observe.validation.setLongline.required.haulingStartLatitude=Latitude must be filled. observe.validation.setLongline.required.haulingStartLongitude=Longitude must be filled. observe.validation.setLongline.required.haulingStartTimeStamp=Timestamp must be filled. -observe.validation.setLongline.required.quadrant=Quadrant is mandatory. observe.validation.setLongline.required.settingEndLatitude=Latitude must be filled. observe.validation.setLongline.required.settingEndLongitude=Longitude must be filled. observe.validation.setLongline.required.settingEndTimeStamp=Timestamp must be filled. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -474,10 +474,7 @@ observe.validation.activity.required.comment.for.previousFpaZone=Se necesita un observe.validation.activity.required.comment.for.reasonForNoFishing=Se necesita un comentario para la causa de no lance. observe.validation.activity.required.comment.for.vesselActivity=Se necesita un comentario para la actividad del barco. observe.validation.activity.required.date=La fecha de observación de la actividad es mandatoria. -observe.validation.activity.required.latitude=La latitud debe ser introducida -observe.validation.activity.required.longitude=La longitud debe ser introducida observe.validation.activity.required.observedSystem.for.nonTargetCatch=Some of the following observed systems are required for the non target catches \: %s \#TODO -observe.validation.activity.required.quadrant=Se debe seleccionar el cuadrante. observe.validation.activity.required.time=La hora de observación para la actividad es mandatoria. observe.validation.activity.required.vesselActivity=Se debe seleccionar la actividad del barco. observe.validation.activityLongline.desactivated.fpaZone=La zona FPA seleccionada está desactivada. @@ -706,6 +703,9 @@ observe.validation.referentiel.untranslated.label1=La etiqueta en inglés no se observe.validation.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido. observe.validation.required.compagnies=Compagnies is not filled. observe.validation.required.harbour=Harbour is not filleds. +observe.validation.required.latitude=La latitud debe ser introducida +observe.validation.required.longitude=La longitud debe ser introducida +observe.validation.required.quadrant=Se debe seleccionar el cuadrante. observe.validation.required.species=Species is not filled. observe.validation.route.activityFinDeVeille.notAvailable=Existe una actividad de fin de guardia en la ruta. observe.validation.route.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres. @@ -796,7 +796,6 @@ observe.validation.setLongline.required.haulingEndTimeStamp=Timestamp de fin de observe.validation.setLongline.required.haulingStartLatitude=Latitud de inicio de arrastre vacía. observe.validation.setLongline.required.haulingStartLongitude=Longitud de inicio de arrastre vacía. observe.validation.setLongline.required.haulingStartTimeStamp=Timestamp de inicio de arrastre vacío. -observe.validation.setLongline.required.quadrant=Se debe seleccionar el cuadrante. observe.validation.setLongline.required.settingEndLatitude=Latitud de fin de calada vacíoe. observe.validation.setLongline.required.settingEndLongitude=longitud de fin de calada vacía. observe.validation.setLongline.required.settingEndTimeStamp=Timestamp de fin de calada vacío. ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -472,10 +472,7 @@ observe.validation.activity.required.comment.for.previousFpaZone=Un commentaire observe.validation.activity.required.comment.for.reasonForNoFishing=Un commentaire est requis pour la raison de non pêche sélectionnée. observe.validation.activity.required.comment.for.vesselActivity=Un commentaire est requis pour le type d'activité sélectionné. observe.validation.activity.required.date=La date d'observation de l'activité est obligatoire. -observe.validation.activity.required.latitude=La latitude doit être renseignée. -observe.validation.activity.required.longitude=La longitude doit être renseignée. observe.validation.activity.required.observedSystem.for.nonTargetCatch=Certains systèmes observés parmis les suivants sont obligatoires en regard des captures de faunes accessoires \: %s -observe.validation.activity.required.quadrant=Le quadrant doit être sélectionné. observe.validation.activity.required.time=L'heure d'observation de l'activité est obligatoire. observe.validation.activity.required.vesselActivity=L'activité du navire est obligatoire. observe.validation.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée. @@ -704,6 +701,9 @@ observe.validation.referentiel.untranslated.label1=Le libellé anglais n'est pas observe.validation.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit. observe.validation.required.compagnies=La compagnie n'est pas renseignée. observe.validation.required.harbour=Le port n'est pas renseigné. +observe.validation.required.latitude=La latitude doit être renseignée. +observe.validation.required.longitude=La longitude doit être renseignée. +observe.validation.required.quadrant=Le quadrant est obligatoire. observe.validation.required.species=L'espèce n'est pas renseigné. observe.validation.route.activityFinDeVeille.notAvailable=Il existe déjà une activité de fin de veille sur la route observe.validation.route.comment.tobig=La taille du commentaire est limitée à 1024 caractères. @@ -794,7 +794,6 @@ observe.validation.setLongline.required.haulingEndTimeStamp=Horodatage de fin de observe.validation.setLongline.required.haulingStartLatitude=Latitude de début de virage non renseignée. observe.validation.setLongline.required.haulingStartLongitude=longitude de début de virage non renseignée. observe.validation.setLongline.required.haulingStartTimeStamp=Horodatage de début de virage non renseigné. -observe.validation.setLongline.required.quadrant=Le quadrant est obligatoire. observe.validation.setLongline.required.settingEndLatitude=Latitude de fin de filage non renseignée. observe.validation.setLongline.required.settingEndLongitude=longitude de fin de filage non renseignée. observe.validation.setLongline.required.settingEndTimeStamp=Horodatage de fin de filage non renseigné. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e812218542acc19f7ff060b9af7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e812218542acc19f7ff060b9af7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Activité : Petits ajustements - Closes #1118
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fb37a010 by Tony CHEMIT at 2018-10-07T16:57:36Z [LL] Activité : Petits ajustements - Closes #1118 - - - - - 24 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/models/Observe-06-data-longline-logbook.model - persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java - persistence/src/main/models/Observe-06-data-longline-logbook.model - + persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLonglineLogbookServiceLocal.java - test/src/main/resources/db/8.3/dataForTestLongline.sql.gz - test/src/main/resources/db/8.3/dataForTestSeine.sql.gz - test/src/main/resources/db/8.3/empty_h2.sql.gz - test/src/main/resources/db/8.3/empty_pg.sql.gz - test/src/main/resources/db/8.3/referentiel.sql.gz - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx ===================================== @@ -113,12 +113,41 @@ </row>  + <row> + <cell anchor='west'> + <JLabel id='windSpeedLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windSpeed' constructorParams='this' styleClass="float2"/> + </cell> + </row> + +  + <row> + <cell anchor='west'> + <JLabel id='windDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windDirection' constructorParams='this' styleClass="int6"/> + </cell> + </row> +  <row> <cell anchor='west'> <JLabel id='currentSpeedLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float2"/> + <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float1"/> + </cell> + </row> + +  + <row> + <cell anchor='west'> + <JLabel id='currentDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='currentDirection' constructorParams='this' styleClass="int6"/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -57,6 +57,26 @@ storageTemperature:{bean.getSeaSurfaceTemperature()}; } +#currentSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_SPEED}; + numberValue:{bean.getCurrentSpeed()}; +} + +#currentDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_DIRECTION}; + numberValue:{bean.getCurrentDirection()}; +} + +#windSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_SPEED}; + numberValue:{bean.getWindSpeed()}; +} + +#windDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_DIRECTION}; + numberValue:{bean.getWindDirection()}; +} + #dataQuality { property:{ActivityLonglineLogbookDto.PROPERTY_DATA_QUALITY}; selectedItem:{bean.getDataQuality()}; ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Add the fishing operatio observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineLogbookDto.action.moves=Change trip observe.common.ActivityLonglineLogbookDto.action.moves.tip=Change trip of activities -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed observe.common.ActivityLonglineLogbookDto.list.message.none=< No activity for current trip > observe.common.ActivityLonglineLogbookDto.message.active.found=An activity is opened. observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=An activity is opened in another trip. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ observe.common.ActivityLonglineLogbookDto.timeStamp=timestamp observe.common.ActivityLonglineLogbookDto.titles=Activities observe.common.ActivityLonglineLogbookDto.wind=Wind +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind spped (kt) observe.common.ActivityLonglineObsDto.action.addSet=Add the fishing operation observe.common.ActivityLonglineObsDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineObsDto.action.moves=Change trip ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Añadir la operación de observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineLogbookDto.action.moves=Cambiar de marea observe.common.ActivityLonglineLogbookDto.action.moves.tip=Cambiar la marea de las actividades seleccionas -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed \#TODO observe.common.ActivityLonglineLogbookDto.list.message.none=< Ninguna actividad por la marea actual > observe.common.ActivityLonglineLogbookDto.message.active.found=Actividad abierta observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ observe.common.ActivityLonglineLogbookDto.timeStamp=Timestamp observe.common.ActivityLonglineLogbookDto.titles=Actividades observe.common.ActivityLonglineLogbookDto.wind=Wind \#TODO +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind sppe (kt) \#TODO observe.common.ActivityLonglineObsDto.action.addSet=Añadir la operación de pesca observe.common.ActivityLonglineObsDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineObsDto.action.moves=Cambiar de marea ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Ajouter l'opération de observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineLogbookDto.action.moves=Changer de marée observe.common.ActivityLonglineLogbookDto.action.moves.tip=Changer la marée des activités sélectionnées -observe.common.ActivityLonglineLogbookDto.currentSpeed=Vitesse observe.common.ActivityLonglineLogbookDto.list.message.none=< Aucune activité pour la marée courante > observe.common.ActivityLonglineLogbookDto.message.active.found=Une activité est ouverte. observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Une activité ouverte existe dans une autre marée. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Activité obse observe.common.ActivityLonglineLogbookDto.timeStamp=Horodatage observe.common.ActivityLonglineLogbookDto.titles=Activités observe.common.ActivityLonglineLogbookDto.wind=Vent +observe.common.ActivityLonglineLogbookDto.windSpeed=Vitesse du vent (nd) observe.common.ActivityLonglineObsDto.action.addSet=Ajouter l'opération de pêche observe.common.ActivityLonglineObsDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineObsDto.action.moves=Changer de marée ===================================== dto/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -27,6 +27,7 @@ hasSetLongline + {*:1} boolean quadrant + {*:1} Integer fpaZone {*:1} fr.ird.observe.dto.referential.FpaZoneReference wind {*:1} fr.ird.observe.dto.referential.WindReference +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float currentDirection + {*:1} Integer ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.binder.data.longline; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -50,6 +50,11 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS entity.setFpaZone(toEntity(dto.getFpaZone())); entity.setDataQuality(toEntity(dto.getDataQuality())); entity.setSample(toDataEntity(dto.getSample())); + entity.setWind(toEntity(dto.getWind())); + entity.setWindSpeed(dto.getWindSpeed()); + entity.setWindDirection(dto.getWindDirection()); + entity.setCurrentSpeed(dto.getCurrentSpeed()); + entity.setCurrentDirection(dto.getCurrentDirection()); } @Override @@ -67,6 +72,12 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS dto.setSample(toDataReference(referentialLocale, entity.getSample())); dto.setSetLongline(toDataReference(referentialLocale, entity.getSetLongline())); dto.setHasSetLongline(entity.getSetLongline() != null); + + dto.setWind(toReferentialReference(referentialLocale, entity.getWind())); + dto.setWindSpeed(entity.getWindSpeed()); + dto.setWindDirection(entity.getWindDirection()); + dto.setCurrentSpeed(entity.getCurrentSpeed()); + dto.setCurrentDirection(entity.getCurrentDirection()); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java ===================================== @@ -45,6 +45,7 @@ public class DataSourceMigrationForVersion_8_3 extends MigrationVersionResource executor.addScript("02", "update_referential_common_harbour"); executor.addScript("03", "update_referential_longline_line_type"); executor.addScript("04", "update_longline_set_logbook_field"); + executor.addScript("05", "update_longline_activity_logbook_field"); } } ===================================== persistence/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -5,6 +5,7 @@ latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float wind + {*:1} referentiel.Wind +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float currentDirection + {*:1} Integer ===================================== persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- + +ALTER TABLE observe_longline.ACTIVITYLOGBOOK ADD COLUMN windSpeed REAL; \ No newline at end of file ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLonglineLogbookServiceLocal.java ===================================== @@ -36,6 +36,7 @@ import fr.ird.observe.entities.longline.ActivityLonglineLogbook; import fr.ird.observe.entities.longline.ActivityLonglineLogbookTopiaDao; import fr.ird.observe.entities.longline.SampleLogbook; import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.referentiel.DataQuality; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.data.longline.ActivityLonglineLogbookService; @@ -48,6 +49,9 @@ import java.util.List; */ public class ActivityLonglineLogbookServiceLocal extends ObserveServiceLocal implements ActivityLonglineLogbookService { + //FIXME-PROTECTED-ID + private static final String LONGLINE_ACTIVITY_LOGBOOK_DEFAULT_DATA_QUALITY_ID = "fr.ird.observe.entities.referentiel.DataQuality#0#1"; + @Override public DataDtoReferenceSet<ActivityLonglineLogbookReference> getActivityLonglineByTripLongline(String tripLonglineId) { ActivityLonglineLogbookTopiaDao dao = ACTIVITY_LONGLINE_LOGBOOK_SPI.getDao(getTopiaPersistenceContext()); @@ -92,6 +96,8 @@ public class ActivityLonglineLogbookServiceLocal extends ObserveServiceLocal imp timestamp = lastActivityLongline.getTimeStamp(); } preCreated.setTimeStamp(timestamp); + DataQuality defaultDataQuality = getTopiaPersistenceContext().getDataQualityDao().forTopiaIdEquals(LONGLINE_ACTIVITY_LOGBOOK_DEFAULT_DATA_QUALITY_ID).findUnique(); + preCreated.setDataQuality(defaultDataQuality); return ACTIVITY_LONGLINE_LOGBOOK_SPI.dataEntityToForm(preCreated, getReferentialLocale()); } ===================================== test/src/main/resources/db/8.3/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/empty_h2.sql.gz ===================================== @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windSpeed float, windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion integer, individualSize integer, individualWeight float, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/empty_pg.sql.gz ===================================== @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windSpeed float4, windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion int4, individualSize int4, individualWeight float4, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -190,4 +190,37 @@ </field-validator> </field> + <field name="currentDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + +  + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -165,4 +165,39 @@ <message>observe.validation.activity.desactivated.dataQuality</message> </field-validator> </field> + + + <field name="currentDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + +  + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -134,7 +134,7 @@  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ windSpeed == null || ventBeaufort.enabled ]]> + <![CDATA[ wind == null || wind.enabled ]]> </param> <message>observe.validation.activity.desactivated.wind</message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml ===================================== @@ -156,8 +156,8 @@  <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -168,7 +168,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-update-error-validation.xml ===================================== @@ -168,8 +168,8 @@  <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -180,7 +180,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Activity comment +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current Speed (kt) observe.common.ActivityLonglineLogbookDto.dataQuality=Data quality observe.common.ActivityLonglineLogbookDto.date=Date observe.common.ActivityLonglineLogbookDto.fpaZone=FPA Zone @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=SST observe.common.ActivityLonglineLogbookDto.time=Time observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Vessel activity +observe.common.ActivityLonglineLogbookDto.windDirection=Wind direction (°) observe.common.ActivityLonglineObsDto.comment=Activity comment observe.common.ActivityLonglineObsDto.dataQuality=Data quality observe.common.ActivityLonglineObsDto.date=Date @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion is required. observe.validation.basket.bound.floatline1Length=Floatline 1 length must be bound between %s and %s. observe.validation.basket.bound.floatline2Length=Floatline 2 length must be bound between %s and %s. observe.validation.basket.required.settingIdentifier=Setting identifier is required. +observe.validation.bound.currentDirection=current direction must be bound between %s and %s. +observe.validation.bound.currentSpeed=Current speed must be bound between %s and %s. +observe.validation.bound.windDirection=wind direction must be bound between %s and %s. observe.validation.branchline.bound.branchlineLength=Branchline length must be bound between %s and %s. observe.validation.branchline.bound.tracelineLength=Traceline length must be bound between %s and %s. observe.validation.branchline.desactivated.baitHaulingStatus=Selected bait Hauling status is disabled. @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Selected sensor data observe.validation.sensorUsed.desactivated.sensorType=Selected sensor type is disabled. observe.validation.sensorUsed.null.sensorSerialNo=Sensor serial No is not filled. observe.validation.sensorUsed.required.sensorType=Sensor type must be filled. -observe.validation.set.bound.currentDirection=current direction must be bound between %s and %s. -observe.validation.set.bound.currentSpeed=Current speed must be bound between %s and %s. observe.validation.set.bound.delay=Delay must be bound between %s and %s. observe.validation.set.bound.maxGearDepth=Max gear depth must be bound between %s and %s. observe.validation.set.bound.schoolMeanDepth=School mean depth must be bound between %s and %s. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Comentario de la actividad +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) \#TODO +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed (kt) \#TODO observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineLogbookDto.date=Día de observación observe.common.ActivityLonglineLogbookDto.fpaZone=Zona FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Temperatura de la superficie observe.common.ActivityLonglineLogbookDto.time=Hora observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Actividad barco +observe.common.ActivityLonglineLogbookDto.windDirection=Dirección del viento (°) observe.common.ActivityLonglineObsDto.comment=Comentario de la actividad observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineObsDto.date=Día de observación @@ -488,6 +491,9 @@ observe.validation.baitsComposition.required.proportion=La proporción está vac observe.validation.basket.bound.floatline1Length=La longitud del orinque 1 debe ser entre %1$s y %2$s. observe.validation.basket.bound.floatline2Length=La longitud d'orinque 1 debe ser entre %1$s y %2$s.& observe.validation.basket.required.settingIdentifier=El identificador de la calada es mandatorio. +observe.validation.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. +observe.validation.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s +observe.validation.bound.windDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. observe.validation.branchline.bound.branchlineLength=La longitud del arponcillo debe ser entre %1$s y %2$s. observe.validation.branchline.bound.tracelineLength=La longitud de la parte baja debe ser entre %1$s y %2$s. observe.validation.branchline.desactivated.baitHaulingStatus=El estado del cebo está desactivado. @@ -735,8 +741,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=El tipo de formato d observe.validation.sensorUsed.desactivated.sensorType=El tipo seleccionado está desactivado. observe.validation.sensorUsed.null.sensorSerialNo=El número de serie es mandatorio. observe.validation.sensorUsed.required.sensorType=La selección de un tipo es mandatoria. -observe.validation.set.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. -observe.validation.set.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s observe.validation.set.bound.delay=La duración entre la hora final del lance y la de fin de recogida de la jareta debe ser al menos de %1$s minutos. observe.validation.set.bound.maxGearDepth=Las profundidas debe ser comprendidas entre %1$s y %2$s. observe.validation.set.bound.schoolMeanDepth=La profundidad media debe ser un entero comprendido entre %1$s y %2$s ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Commentaire de l'activité +observe.common.ActivityLonglineLogbookDto.currentDirection=Direction du courant (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=vitesse du courant (nd) observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineLogbookDto.date=Jour d'observation observe.common.ActivityLonglineLogbookDto.fpaZone=Zone FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Température surface observe.common.ActivityLonglineLogbookDto.time=Heure observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Activité bateau +observe.common.ActivityLonglineLogbookDto.windDirection=Direction du vent (°) observe.common.ActivityLonglineObsDto.comment=Commentaire de l'activité observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineObsDto.date=Jour d'observation @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion non renseign observe.validation.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. observe.validation.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.& observe.validation.basket.required.settingIdentifier=L'identifiant de filage est obligatoire. +observe.validation.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. +observe.validation.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. +observe.validation.bound.windDirection=La direction du vent doit être un entier compris entre %1$s et %2$s. observe.validation.branchline.bound.branchlineLength=La longueur avançon doit être comprise entre %1$s et %2$s. observe.validation.branchline.bound.tracelineLength=La longueur de la partie basse doit être comprise entre %1$s et %2$s. observe.validation.branchline.desactivated.baitHaulingStatus=L'état d'appât est désactivé. @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Le type de format de observe.validation.sensorUsed.desactivated.sensorType=Le type sélectionné est désactivé. observe.validation.sensorUsed.null.sensorSerialNo=Le numéro de série n'est pas renseigné. observe.validation.sensorUsed.required.sensorType=La sélection d'un type est obligatoire. -observe.validation.set.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. -observe.validation.set.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. observe.validation.set.bound.delay=La durée entre l'heure de fin de calée et l'heure de fin de coulissage doit être d'au moins %1$s minutes. observe.validation.set.bound.maxGearDepth=La profondeur doit être comprise entre %1$s et %2$s. observe.validation.set.bound.schoolMeanDepth=La profondeur moyenne doit être un entier compris entre %1$s et %2$s. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fb37a0107db9ba37620a94da187… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fb37a0107db9ba37620a94da187… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Activité : Petits ajustements - Closes #1118
by Tony CHEMIT 07 Oct '18

07 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 71b5db56 by Tony CHEMIT at 2018-10-07T16:54:39Z [LL] Activité : Petits ajustements - Closes #1118 - - - - - 23 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/models/Observe-06-data-longline-logbook.model - persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java - persistence/src/main/models/Observe-06-data-longline-logbook.model - + persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql - test/src/main/resources/db/8.3/dataForTestLongline.sql.gz - test/src/main/resources/db/8.3/dataForTestSeine.sql.gz - test/src/main/resources/db/8.3/empty_h2.sql.gz - test/src/main/resources/db/8.3/empty_pg.sql.gz - test/src/main/resources/db/8.3/referentiel.sql.gz - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx ===================================== @@ -113,12 +113,41 @@ </row>  + <row> + <cell anchor='west'> + <JLabel id='windSpeedLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windSpeed' constructorParams='this' styleClass="float2"/> + </cell> + </row> + +  + <row> + <cell anchor='west'> + <JLabel id='windDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='windDirection' constructorParams='this' styleClass="int6"/> + </cell> + </row> +  <row> <cell anchor='west'> <JLabel id='currentSpeedLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float2"/> + <NumberEditor id='currentSpeed' constructorParams='this' styleClass="float1"/> + </cell> + </row> + +  + <row> + <cell anchor='west'> + <JLabel id='currentDirectionLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NumberEditor id='currentDirection' constructorParams='this' styleClass="int6"/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -57,6 +57,26 @@ storageTemperature:{bean.getSeaSurfaceTemperature()}; } +#currentSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_SPEED}; + numberValue:{bean.getCurrentSpeed()}; +} + +#currentDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_CURRENT_DIRECTION}; + numberValue:{bean.getCurrentDirection()}; +} + +#windSpeed { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_SPEED}; + numberValue:{bean.getWindSpeed()}; +} + +#windDirection { + property:{ActivityLonglineLogbookDto.PROPERTY_WIND_DIRECTION}; + numberValue:{bean.getWindDirection()}; +} + #dataQuality { property:{ActivityLonglineLogbookDto.PROPERTY_DATA_QUALITY}; selectedItem:{bean.getDataQuality()}; ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Add the fishing operatio observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineLogbookDto.action.moves=Change trip observe.common.ActivityLonglineLogbookDto.action.moves.tip=Change trip of activities -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed observe.common.ActivityLonglineLogbookDto.list.message.none=< No activity for current trip > observe.common.ActivityLonglineLogbookDto.message.active.found=An activity is opened. observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=An activity is opened in another trip. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ observe.common.ActivityLonglineLogbookDto.timeStamp=timestamp observe.common.ActivityLonglineLogbookDto.titles=Activities observe.common.ActivityLonglineLogbookDto.wind=Wind +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind spped (kt) observe.common.ActivityLonglineObsDto.action.addSet=Add the fishing operation observe.common.ActivityLonglineObsDto.action.addSet.tip=Add the fishing operation associated with this activity observe.common.ActivityLonglineObsDto.action.moves=Change trip ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Añadir la operación de observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineLogbookDto.action.moves=Cambiar de marea observe.common.ActivityLonglineLogbookDto.action.moves.tip=Cambiar la marea de las actividades seleccionas -observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed \#TODO observe.common.ActivityLonglineLogbookDto.list.message.none=< Ninguna actividad por la marea actual > observe.common.ActivityLonglineLogbookDto.message.active.found=Actividad abierta observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observ observe.common.ActivityLonglineLogbookDto.timeStamp=Timestamp observe.common.ActivityLonglineLogbookDto.titles=Actividades observe.common.ActivityLonglineLogbookDto.wind=Wind \#TODO +observe.common.ActivityLonglineLogbookDto.windSpeed=Wind sppe (kt) \#TODO observe.common.ActivityLonglineObsDto.action.addSet=Añadir la operación de pesca observe.common.ActivityLonglineObsDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineObsDto.action.moves=Cambiar de marea ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -357,7 +357,6 @@ observe.common.ActivityLonglineLogbookDto.action.addSet=Ajouter l'opération de observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineLogbookDto.action.moves=Changer de marée observe.common.ActivityLonglineLogbookDto.action.moves.tip=Changer la marée des activités sélectionnées -observe.common.ActivityLonglineLogbookDto.currentSpeed=Vitesse observe.common.ActivityLonglineLogbookDto.list.message.none=< Aucune activité pour la marée courante > observe.common.ActivityLonglineLogbookDto.message.active.found=Une activité est ouverte. observe.common.ActivityLonglineLogbookDto.message.active.found.for.other.trip=Une activité ouverte existe dans une autre marée. @@ -370,6 +369,7 @@ observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Activité obse observe.common.ActivityLonglineLogbookDto.timeStamp=Horodatage observe.common.ActivityLonglineLogbookDto.titles=Activités observe.common.ActivityLonglineLogbookDto.wind=Vent +observe.common.ActivityLonglineLogbookDto.windSpeed=Vitesse du vent (nd) observe.common.ActivityLonglineObsDto.action.addSet=Ajouter l'opération de pêche observe.common.ActivityLonglineObsDto.action.addSet.tip=Ajouter l'opération de pêche associée à cette activité observe.common.ActivityLonglineObsDto.action.moves=Changer de marée ===================================== dto/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -27,6 +27,7 @@ hasSetLongline + {*:1} boolean quadrant + {*:1} Integer fpaZone {*:1} fr.ird.observe.dto.referential.FpaZoneReference wind {*:1} fr.ird.observe.dto.referential.WindReference +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float currentDirection + {*:1} Integer ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookEntityDtoBinder.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.binder.data.longline; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -50,6 +50,11 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS entity.setFpaZone(toEntity(dto.getFpaZone())); entity.setDataQuality(toEntity(dto.getDataQuality())); entity.setSample(toDataEntity(dto.getSample())); + entity.setWind(toEntity(dto.getWind())); + entity.setWindSpeed(dto.getWindSpeed()); + entity.setWindDirection(dto.getWindDirection()); + entity.setCurrentSpeed(dto.getCurrentSpeed()); + entity.setCurrentDirection(dto.getCurrentDirection()); } @Override @@ -67,6 +72,12 @@ public class ActivityLonglineLogbookEntityDtoBinder extends DataEntityDtoBinderS dto.setSample(toDataReference(referentialLocale, entity.getSample())); dto.setSetLongline(toDataReference(referentialLocale, entity.getSetLongline())); dto.setHasSetLongline(entity.getSetLongline() != null); + + dto.setWind(toReferentialReference(referentialLocale, entity.getWind())); + dto.setWindSpeed(entity.getWindSpeed()); + dto.setWindDirection(entity.getWindDirection()); + dto.setCurrentSpeed(entity.getCurrentSpeed()); + dto.setCurrentDirection(entity.getCurrentDirection()); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java ===================================== @@ -45,6 +45,7 @@ public class DataSourceMigrationForVersion_8_3 extends MigrationVersionResource executor.addScript("02", "update_referential_common_harbour"); executor.addScript("03", "update_referential_longline_line_type"); executor.addScript("04", "update_longline_set_logbook_field"); + executor.addScript("05", "update_longline_activity_logbook_field"); } } ===================================== persistence/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -5,6 +5,7 @@ latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float wind + {*:1} referentiel.Wind +windSpeed + {*:1} Float windDirection + {*:1} Integer currentSpeed + {*:1} Float currentDirection + {*:1} Integer ===================================== persistence/src/main/resources/db/migration/8.3/05_update_longline_activity_logbook_field-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- + +ALTER TABLE observe_longline.ACTIVITYLOGBOOK ADD COLUMN windSpeed REAL; \ No newline at end of file ===================================== test/src/main/resources/db/8.3/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/8.3/empty_h2.sql.gz ===================================== @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, wind varchar(255), windSpeed float, windDirection integer, currentSpeed float, currentDirection integer, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), timeStamp timestamp, latitude float, longitude float, seaSurfaceTemperature float, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion integer, individualSize integer, individualWeight float, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/empty_pg.sql.gz ===================================== @@ -34,7 +34,7 @@ create table OBSERVE_COMMON.vesselType (topiaId varchar(255) not null, topiaVers create table OBSERVE_COMMON.weightMeasureMethod (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.weightMeasureType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_COMMON.wind (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), speedRange varchar(255), waveHeight varchar(255), primary key (topiaId)); -create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); +create table OBSERVE_LONGLINE.ActivityLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, wind varchar(255), windSpeed float4, windDirection int4, currentSpeed float4, currentDirection int4, vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.ActivityObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, timeStamp timestamp, latitude float4, longitude float4, seaSurfaceTemperature float4, set varchar(255), vesselActivity varchar(255), dataQuality varchar(255), fpaZone varchar(255), trip varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitHaulingStatus (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table OBSERVE_LONGLINE.baitsCompositionLogbook (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, proportion int4, individualSize int4, individualWeight float4, baitSettingStatus varchar(255), baitType varchar(255), set varchar(255), primary key (topiaId)); ===================================== test/src/main/resources/db/8.3/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -190,4 +190,37 @@ </field-validator> </field> + <field name="currentDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + +  + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -165,4 +165,39 @@ <message>observe.validation.activity.desactivated.dataQuality</message> </field-validator> </field> + + + <field name="currentDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> + </field-validator> + + </field> + + <field name="currentSpeed"> + +  + <field-validator type="double" short-circuit="true"> + <param name="minExclusive">0</param> + <param name="maxInclusive">20</param> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + </field-validator> + + </field> + + <field name="windDirection"> + +  + <field-validator type="int" short-circuit="true"> + <param name="min">0</param> + <param name="max">359</param> + <message>observe.validation.bound.windDirection##${min}##${max}</message> + </field-validator> + + </field> + </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml ===================================== @@ -134,7 +134,7 @@  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ windSpeed == null || ventBeaufort.enabled ]]> + <![CDATA[ wind == null || wind.enabled ]]> </param> <message>observe.validation.activity.desactivated.wind</message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-create-error-validation.xml ===================================== @@ -156,8 +156,8 @@  <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -168,7 +168,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineDto-update-error-validation.xml ===================================== @@ -168,8 +168,8 @@  <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <param name="max">360</param> - <message>observe.validation.set.bound.currentDirection##${min}##${max}</message> + <param name="max">359</param> + <message>observe.validation.bound.currentDirection##${min}##${max}</message> </field-validator> </field> @@ -180,7 +180,7 @@ <field-validator type="double" short-circuit="true"> <param name="minExclusive">0</param> <param name="maxInclusive">40</param> - <message>observe.validation.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> + <message>observe.validation.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> </field-validator> </field> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Activity comment +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current Speed (kt) observe.common.ActivityLonglineLogbookDto.dataQuality=Data quality observe.common.ActivityLonglineLogbookDto.date=Date observe.common.ActivityLonglineLogbookDto.fpaZone=FPA Zone @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=SST observe.common.ActivityLonglineLogbookDto.time=Time observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Vessel activity +observe.common.ActivityLonglineLogbookDto.windDirection=Wind direction (°) observe.common.ActivityLonglineObsDto.comment=Activity comment observe.common.ActivityLonglineObsDto.dataQuality=Data quality observe.common.ActivityLonglineObsDto.date=Date @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion is required. observe.validation.basket.bound.floatline1Length=Floatline 1 length must be bound between %s and %s. observe.validation.basket.bound.floatline2Length=Floatline 2 length must be bound between %s and %s. observe.validation.basket.required.settingIdentifier=Setting identifier is required. +observe.validation.bound.currentDirection=current direction must be bound between %s and %s. +observe.validation.bound.currentSpeed=Current speed must be bound between %s and %s. +observe.validation.bound.windDirection=wind direction must be bound between %s and %s. observe.validation.branchline.bound.branchlineLength=Branchline length must be bound between %s and %s. observe.validation.branchline.bound.tracelineLength=Traceline length must be bound between %s and %s. observe.validation.branchline.desactivated.baitHaulingStatus=Selected bait Hauling status is disabled. @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Selected sensor data observe.validation.sensorUsed.desactivated.sensorType=Selected sensor type is disabled. observe.validation.sensorUsed.null.sensorSerialNo=Sensor serial No is not filled. observe.validation.sensorUsed.required.sensorType=Sensor type must be filled. -observe.validation.set.bound.currentDirection=current direction must be bound between %s and %s. -observe.validation.set.bound.currentSpeed=Current speed must be bound between %s and %s. observe.validation.set.bound.delay=Delay must be bound between %s and %s. observe.validation.set.bound.maxGearDepth=Max gear depth must be bound between %s and %s. observe.validation.set.bound.schoolMeanDepth=School mean depth must be bound between %s and %s. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Comentario de la actividad +observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (°) \#TODO +observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed (kt) \#TODO observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineLogbookDto.date=Día de observación observe.common.ActivityLonglineLogbookDto.fpaZone=Zona FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Temperatura de la superficie observe.common.ActivityLonglineLogbookDto.time=Hora observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Actividad barco +observe.common.ActivityLonglineLogbookDto.windDirection=Dirección del viento (°) observe.common.ActivityLonglineObsDto.comment=Comentario de la actividad observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineObsDto.date=Día de observación @@ -488,6 +491,9 @@ observe.validation.baitsComposition.required.proportion=La proporción está vac observe.validation.basket.bound.floatline1Length=La longitud del orinque 1 debe ser entre %1$s y %2$s. observe.validation.basket.bound.floatline2Length=La longitud d'orinque 1 debe ser entre %1$s y %2$s.& observe.validation.basket.required.settingIdentifier=El identificador de la calada es mandatorio. +observe.validation.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. +observe.validation.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s +observe.validation.bound.windDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. observe.validation.branchline.bound.branchlineLength=La longitud del arponcillo debe ser entre %1$s y %2$s. observe.validation.branchline.bound.tracelineLength=La longitud de la parte baja debe ser entre %1$s y %2$s. observe.validation.branchline.desactivated.baitHaulingStatus=El estado del cebo está desactivado. @@ -735,8 +741,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=El tipo de formato d observe.validation.sensorUsed.desactivated.sensorType=El tipo seleccionado está desactivado. observe.validation.sensorUsed.null.sensorSerialNo=El número de serie es mandatorio. observe.validation.sensorUsed.required.sensorType=La selección de un tipo es mandatoria. -observe.validation.set.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. -observe.validation.set.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s observe.validation.set.bound.delay=La duración entre la hora final del lance y la de fin de recogida de la jareta debe ser al menos de %1$s minutos. observe.validation.set.bound.maxGearDepth=Las profundidas debe ser comprendidas entre %1$s y %2$s. observe.validation.set.bound.schoolMeanDepth=La profundidad media debe ser un entero comprendido entre %1$s y %2$s ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -1,4 +1,6 @@ observe.common.ActivityLonglineLogbookDto.comment=Commentaire de l'activité +observe.common.ActivityLonglineLogbookDto.currentDirection=Direction du courant (°) +observe.common.ActivityLonglineLogbookDto.currentSpeed=vitesse du courant (nd) observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineLogbookDto.date=Jour d'observation observe.common.ActivityLonglineLogbookDto.fpaZone=Zone FPA @@ -8,6 +10,7 @@ observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Température surface observe.common.ActivityLonglineLogbookDto.time=Heure observe.common.ActivityLonglineLogbookDto.vesselActivityLongline=Activité bateau +observe.common.ActivityLonglineLogbookDto.windDirection=Direction du vent (°) observe.common.ActivityLonglineObsDto.comment=Commentaire de l'activité observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée observe.common.ActivityLonglineObsDto.date=Jour d'observation @@ -486,6 +489,9 @@ observe.validation.baitsComposition.required.proportion=Proportion non renseign observe.validation.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. observe.validation.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.& observe.validation.basket.required.settingIdentifier=L'identifiant de filage est obligatoire. +observe.validation.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. +observe.validation.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. +observe.validation.bound.windDirection=La direction du vent doit être un entier compris entre %1$s et %2$s. observe.validation.branchline.bound.branchlineLength=La longueur avançon doit être comprise entre %1$s et %2$s. observe.validation.branchline.bound.tracelineLength=La longueur de la partie basse doit être comprise entre %1$s et %2$s. observe.validation.branchline.desactivated.baitHaulingStatus=L'état d'appât est désactivé. @@ -733,8 +739,6 @@ observe.validation.sensorUsed.desactivated.sensorDataFormat=Le type de format de observe.validation.sensorUsed.desactivated.sensorType=Le type sélectionné est désactivé. observe.validation.sensorUsed.null.sensorSerialNo=Le numéro de série n'est pas renseigné. observe.validation.sensorUsed.required.sensorType=La sélection d'un type est obligatoire. -observe.validation.set.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. -observe.validation.set.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. observe.validation.set.bound.delay=La durée entre l'heure de fin de calée et l'heure de fin de coulissage doit être d'au moins %1$s minutes. observe.validation.set.bound.maxGearDepth=La profondeur doit être comprise entre %1$s et %2$s. observe.validation.set.bound.schoolMeanDepth=La profondeur moyenne doit être un entier compris entre %1$s et %2$s. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71b5db568c1671fa916e4c83bf3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71b5db568c1671fa916e4c83bf3… You're receiving this email because of your account on gitlab.com.

1 0