Observe-commits

Download

observe-commits@list.forge.codelutin.com

August 2017

1 participants
135 discussions

[Git][ultreiaio/ird-observe][develop] Ajout du zoom +/- sur les cartes (See #859)
by Tony CHEMIT 25 Aug '17

25 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4f3e50ee by Tony CHEMIT at 2017-08-25T02:20:56+02:00 Ajout du zoom +/- sur les cartes (See #859) - - - - - 21 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ExportPngUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/TripMapActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomItUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomMoinsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomPlusUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/content/open/TripUI.java - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUIHandler.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 - + client/src/main/resources/icons/action-zoomMoins.png - + client/src/main/resources/icons/action-zoomPlus.png - client/src/main/resources/observe-ui.properties - services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nLabelsBuilder.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java @@ -32,6 +32,7 @@ import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import javax.swing.AbstractAction; import javax.swing.AbstractButton; +import javax.swing.Action; import javax.swing.ActionMap; import javax.swing.Icon; import javax.swing.InputMap; @@ -131,8 +132,14 @@ public abstract class UIActionSupport extends AbstractAction { KeyStroke keyStroke = getAcceleratorKey(); if (keyStroke != null) { String actionCommandKey = getActionCommandKey(); + register(this, inputMap, actionMap,keyStroke, actionCommandKey); + } + } + + public static void register(Action action, InputMap inputMap, ActionMap actionMap, KeyStroke keyStroke , String actionCommandKey ) { + if (keyStroke != null) { inputMap.put(keyStroke, actionCommandKey); - actionMap.put(actionCommandKey, this); + actionMap.put(actionCommandKey, action); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ExportPngUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ExportPngUIAction.java @@ -0,0 +1,80 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ObserveSwingTechnicalException; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import javax.imageio.ImageIO; +import javax.swing.KeyStroke; + + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ExportPngUIAction extends TripMapActionSupport { + + public static final String ACTION_NAME = ExportPngUIAction.class.getName(); + + public ExportPngUIAction(ObserveMainUI mainUI) { + super(mainUI, + ACTION_NAME, + t("observe.content.map.action.exportPng"), + t("observe.content.map.action.exportPng.tip"), + "save", + KeyStroke.getKeyStroke("ctrl pressed S")); + } + + @Override + protected void actionPerformed(TripMapUI view) { + + File file = UIHelper.chooseFile( + view, + t("observe.content.map.export.chooseFile.title"), + t("observe.content.map.export.chooseFile.ok"), + null, + "^.+\\.png|.+\\.PNG$", + t("observe.content.map.export.chooseFile.png")); + + if (file != null && UIHelper.confirmOverwriteFileIfExist(view, file)) { + + BufferedImage im = new BufferedImage(view.getWidth(), view.getHeight(), BufferedImage.TYPE_INT_ARGB); + view.paint(im.getGraphics()); + try { + ImageIO.write(im, "PNG", file); + } catch (IOException e) { + throw new ObserveSwingTechnicalException("unable to export map ", e); + } + + UIHelper.displayInfo(t("observe.content.map.export.success", file)); + } + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/TripMapActionSupport.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/TripMapActionSupport.java @@ -0,0 +1,83 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.actions.UIActionSupport; +import fr.ird.observe.client.ui.content.open.TripUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import java.awt.event.ActionEvent; +import javax.swing.JComponent; +import javax.swing.KeyStroke; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public abstract class TripMapActionSupport extends UIActionSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(TripMapActionSupport.class); + + private TripMapUI ui; + protected ActionEvent e; + + protected abstract void actionPerformed(TripMapUI ui); + + TripMapActionSupport(ObserveMainUI mainUI, String actionCommandKey, String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { + super(mainUI, actionCommandKey, label, shortDescription, actionIcon, acceleratorKey); + } + + public void setUi(TripMapUI ui) { + this.ui = ui; + } + + @Override + public final void actionPerformed(ActionEvent e) { + if (!canExecuteAction()) { + return; + } + this.e = e; + + if (ui != null) { + actionPerformed(ui); + return; + } + TripUI source = (TripUI) e.getSource(); + actionPerformed(source.getTripMap()); + } + + private boolean canExecuteAction() { + JComponent editor = getEditor(); + if ((editor == null || (editor.isVisible() && editor.isEnabled() && editor.isShowing()))) { + return true; + } + if (log.isInfoEnabled()) { + log.info("Disabled action: " + getActionCommandKey() + " :: " + this); + } + return false; + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomItUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomItUIAction.java @@ -0,0 +1,61 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import javax.swing.KeyStroke; +import org.geotools.geometry.jts.ReferencedEnvelope; +import org.geotools.swing.JMapPane; + + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ZoomItUIAction extends TripMapActionSupport { + + public static final String ACTION_NAME = ZoomItUIAction.class.getName(); + + public ZoomItUIAction(ObserveMainUI mainUI) { + super(mainUI, + ACTION_NAME, + t("observe.content.map.action.zoomIt"), + t("observe.content.map.action.zoomIt.tip"), + "center", + KeyStroke.getKeyStroke("ctrl pressed I")); + } + + @Override + protected void actionPerformed(TripMapUI view) { + + ReferencedEnvelope tripArea = view.getHandler().getTripArea(); + if (!tripArea.isEmpty()) { + JMapPane mapPane = view.getObserveMapPane(); + mapPane.setDisplayArea(tripArea); + } + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomMoinsUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomMoinsUIAction.java @@ -0,0 +1,72 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUIHandler; +import java.awt.Point; +import javax.swing.KeyStroke; +import org.geotools.geometry.jts.ReferencedEnvelope; + + +import static fr.ird.observe.client.ui.util.tripMap.TripMapUIHandler.ZOOM_STEP_RATIO; +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ZoomMoinsUIAction extends TripMapActionSupport { + + public static final String ACTION_NAME = ZoomMoinsUIAction.class.getName(); + + public ZoomMoinsUIAction(ObserveMainUI mainUI) { + super(mainUI, + ACTION_NAME, + t("observe.content.map.action.zoomMoins"), + t("observe.content.map.action.zoomMoins.tip"), + "center", + KeyStroke.getKeyStroke("ctrl pressed L")); + } + + @Override + protected void actionPerformed(TripMapUI view) { + + TripMapUIHandler handler = view.getHandler(); + ReferencedEnvelope tripArea = handler.getTripArea(); + + if (!tripArea.isEmpty()) { + int notches = 1; + ReferencedEnvelope displayArea = view.getObserveMapPane().getDisplayArea(); + double w = displayArea.getMedian(0); + double h = displayArea.getMedian(1); + Point zoomCenter = new Point((int) w, (int) h); + handler.setZoomCenter(zoomCenter); + handler.setZoomRatio(handler.getZoomRatio() * (1 + (ZOOM_STEP_RATIO * notches * -1))); + handler.zoomApply(); + } + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomPlusUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomPlusUIAction.java @@ -0,0 +1,72 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUIHandler; +import java.awt.Point; +import javax.swing.KeyStroke; +import org.geotools.geometry.jts.ReferencedEnvelope; + + +import static fr.ird.observe.client.ui.util.tripMap.TripMapUIHandler.ZOOM_STEP_RATIO; +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ZoomPlusUIAction extends TripMapActionSupport { + + public static final String ACTION_NAME = ZoomPlusUIAction.class.getName(); + + public ZoomPlusUIAction(ObserveMainUI mainUI) { + super(mainUI, + ACTION_NAME, + t("observe.content.map.action.zoomPlus"), + t("observe.content.map.action.zoomPlus.tip"), + "zoomPlus", + KeyStroke.getKeyStroke("ctrl pressed P")); + } + + @Override + protected void actionPerformed(TripMapUI view) { + + TripMapUIHandler handler = view.getHandler(); + ReferencedEnvelope tripArea = handler.getTripArea(); + + if (!tripArea.isEmpty()) { + int notches = 1; + ReferencedEnvelope displayArea = view.getObserveMapPane().getDisplayArea(); + double w = displayArea.getMedian(0); + double h = displayArea.getMedian(1); + Point zoomCenter = new Point((int) w, (int) h); + handler.setZoomCenter(zoomCenter); + handler.setZoomRatio(handler.getZoomRatio() * (1 - (ZOOM_STEP_RATIO * notches * -1))); + handler.zoomApply(); + } + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/TripUI.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/TripUI.java @@ -0,0 +1,36 @@ +package fr.ird.observe.client.ui.content.open; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.util.tripMap.TripMapUI; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public interface TripUI { + + TripMapUI getTripMap(); + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jaxx @@ -23,7 +23,8 @@ <fr.ird.observe.client.ui.content.open.ContentOpenableUI i18nFormat="observe.common.TripLonglineDto.%s" superGenericType='TripLonglineDto, TripLonglineUI' - contentTitle='{n("observe.common.TripLonglineDto.title")}'> + contentTitle='{n("observe.common.TripLonglineDto.title")}' + implements="fr.ird.observe.client.ui.content.open.TripUI"> <style source="../../Common.jcss"/> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUIHandler.java @@ -43,6 +43,7 @@ import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import java.util.Date; import java.util.List; +import javax.swing.JComponent; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; import org.apache.commons.logging.Log; @@ -104,6 +105,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); tripMap.getHandler().setConfig(config); + tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); getUi().getMainTabbedPane().addChangeListener(e -> { JTabbedPane tripLonglineTabPane = (JTabbedPane) e.getSource(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jaxx @@ -23,7 +23,8 @@ <fr.ird.observe.client.ui.content.open.ContentOpenableUI i18nFormat="observe.common.TripSeineDto.%s" superGenericType='TripSeineDto, TripSeineUI' - contentTitle='{n("observe.common.TripSeineDto.title")}'> + contentTitle='{n("observe.common.TripSeineDto.title")}' + implements="fr.ird.observe.client.ui.content.open.TripUI"> <style source="../../Common.jcss"/> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java @@ -42,6 +42,7 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; import java.util.Date; import java.util.List; +import javax.swing.JComponent; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; import org.apache.commons.logging.Log; @@ -102,6 +103,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); tripMap.getHandler().setConfig(config); + tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); ui.getMainTabbedPane().addChangeListener(e -> { JTabbedPane tripSeineTabPane = (JTabbedPane) e.getSource(); ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jaxx @@ -19,20 +19,27 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JPanel id="tripMap" layout="{new CardLayout()}"> +<JPanel id="tripMap" layout="{new BorderLayout()}"> <import> + fr.ird.observe.client.ui.actions.tripMap.ExportPngUIAction + fr.ird.observe.client.ui.actions.tripMap.ZoomItUIAction + fr.ird.observe.client.ui.actions.tripMap.ZoomMoinsUIAction + fr.ird.observe.client.ui.actions.tripMap.ZoomPlusUIAction java.awt.CardLayout - static org.nuiton.i18n.I18n.n </import> - <JPopupMenu id='mapPopupMenu'> - <JMenuItem id='zoomIt' onActionPerformed='getHandler().zoomIt()'/> - <JMenuItem id='exportPng' onActionPerformed='getHandler().exportPng()'/> - </JPopupMenu> + <CardLayout id="contentLayout"/> + <JToolBar constraints="BorderLayout.NORTH"> + <JButton id='zoomIt'/> + <JButton id='zoomPlus'/> + <JButton id='zoomMoins'/> + <JButton id='exportPng'/> + </JToolBar> - <JLabel id="waitLoadingLabel"/> - - <ObserveMapPane id='observeMapPane' constraints="BorderLayout.CENTER"/> + <JPanel id="content" layout="{contentLayout}" constraints="BorderLayout.CENTER"> + <JLabel id="waitLoadingLabel"/> + <ObserveMapPane id='observeMapPane'/> + </JPanel> </JPanel> ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss @@ -28,13 +28,17 @@ } #zoomIt { - text: "observe.content.map.action.zoomIt"; - toolTipText: "observe.content.map.action.zoomIt.tip"; - actionIcon: center; + _observeAction:{ZoomItUIAction.ACTION_NAME}; +} + +#zoomMoins { + _observeAction:{ZoomMoinsUIAction.ACTION_NAME}; +} + +#zoomPlus { + _observeAction:{ZoomPlusUIAction.ACTION_NAME}; } #exportPng { - text: "observe.content.map.action.exportPng"; - toolTipText: "observe.content.map.action.exportPng.tip"; - actionIcon: save; + _observeAction:{ExportPngUIAction.ACTION_NAME}; } ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUIHandler.java @@ -26,12 +26,13 @@ import com.google.common.collect.Lists; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.client.ui.actions.tripMap.TripMapActionSupport; +import fr.ird.observe.client.ui.content.ObserveActionMap; import fr.ird.observe.common.TripMapPoint; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.TripMapDto; -import java.awt.CardLayout; import java.awt.Point; +import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; @@ -39,11 +40,13 @@ import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import java.awt.geom.AffineTransform; import java.awt.geom.Point2D; -import java.awt.image.BufferedImage; import java.io.File; -import java.io.IOException; import java.util.List; -import javax.imageio.ImageIO; +import java.util.Objects; +import javax.swing.AbstractButton; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.KeyStroke; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.geotools.geometry.DirectPosition2D; @@ -54,7 +57,7 @@ import org.geotools.swing.event.MapPaneListener; import org.nuiton.jaxx.runtime.spi.UIHandler; -import static org.nuiton.i18n.I18n.t; +import static fr.ird.observe.client.ui.content.ContentUIInitializer.OBSERVE_ACTION; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -65,12 +68,12 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { private static final Log log = LogFactory.getLog(TripMapUIHandler.class); - protected TripMapUI view; - + private TripMapUI ui; private ClientConfig config; - protected ReferencedEnvelope tripArea; - - protected boolean rendererRunning; + private ReferencedEnvelope tripArea; + private boolean rendererRunning; + private double zoomRatio = 1; + private Point zoomCenter; public void setConfig(ClientConfig config) { this.config = config; @@ -79,14 +82,14 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { mapPane.setBackground(config.getMapBackgroundColor()); } - protected ObserveMapPane getObserveMapPane() { - return view.getObserveMapPane(); + private ObserveMapPane getObserveMapPane() { + return ui.getObserveMapPane(); } public void doOpenMap(TripMapDto tripMapDto) { try { - ((CardLayout) view.getLayout()).first(view); + flipContent(); ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(true); ObserveMapPane mapPane = getObserveMapPane(); @@ -137,45 +140,15 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } - public void doCloseMap() { - ((CardLayout) view.getLayout()).first(view); - } - - public void zoomIt() { - if (!tripArea.isEmpty()) { - JMapPane mapPane = getObserveMapPane(); - mapPane.setDisplayArea(tripArea); - } + private void flipContent() { + ui.getContentLayout().first(ui.getContent()); } - public void exportPng() { - - File file = UIHelper.chooseFile( - view, - t("observe.content.map.export.chooseFile.title"), - t("observe.content.map.export.chooseFile.ok"), - null, - "^.+\\.png|.+\\.PNG$", - t("observe.content.map.export.chooseFile.png")); - - if (file != null && UIHelper.confirmOverwriteFileIfExist(view, file)) { - - BufferedImage im = new BufferedImage(view.getWidth(), view.getHeight(), BufferedImage.TYPE_INT_ARGB); - view.paint(im.getGraphics()); - try { - ImageIO.write(im, "PNG", file); - } catch (IOException e) { - throw new ObserveSwingTechnicalException("unable to export map ", e); - } - - UIHelper.displayInfo(t("observe.content.map.export.success", file)); - } + public void doCloseMap() { + flipContent(); } - protected double zoomRatio = 1; - protected Point zoomCenter; - - protected void zoomApply() { + public void zoomApply() { if (zoomRatio != 1 && !rendererRunning) { JMapPane mapPane = getObserveMapPane(); @@ -221,7 +194,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { @Override public void beforeInit(TripMapUI ui) { - this.view = ui; + this.ui = ui; } @Override @@ -235,12 +208,36 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { mapPane.addMouseListener(mouseMapListener); mapPane.addMapPaneListener(new TripMapListener()); - mapPane.setComponentPopupMenu(view.getMapPopupMenu()); - rendererRunning = false; } + public void init(InputMap inputMap) { + ObserveActionMap actionMap = ObserveSwingApplicationContext.get().getActionMap(); + + init(actionMap, inputMap, ui.zoomIt); + init(actionMap, inputMap, ui.zoomMoins); + init(actionMap, inputMap, ui.zoomPlus); + init(actionMap, inputMap, ui.exportPng); + + } + + public ReferencedEnvelope getTripArea() { + return tripArea; + } + + public double getZoomRatio() { + return zoomRatio; + } + + public void setZoomRatio(double zoomRatio) { + this.zoomRatio = zoomRatio; + } + + public void setZoomCenter(Point zoomCenter) { + this.zoomCenter = zoomCenter; + } + private class MouseMapListener implements MouseWheelListener, MouseListener, MouseMotionListener { @Override @@ -256,9 +253,9 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } - protected Point2D startPointInWorld; - protected AffineTransform startScreenToWorldTransform; - protected ReferencedEnvelope startDisplayArea; + Point2D startPointInWorld; + AffineTransform startScreenToWorldTransform; + ReferencedEnvelope startDisplayArea; @Override public void mousePressed(MouseEvent e) { @@ -294,7 +291,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } - protected void startMove(Point2D startPointInScreen) { + void startMove(Point2D startPointInScreen) { JMapPane mapPane = getObserveMapPane(); startDisplayArea = mapPane.getDisplayArea(); @@ -307,7 +304,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } - protected void endMove(Point2D endPointInScreen) { + void endMove(Point2D endPointInScreen) { Point2D endPointInWorld = new Point2D.Double(); @@ -332,7 +329,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { protected class TripMapListener implements MapPaneListener { - protected boolean firstRendering; + boolean firstRendering; @Override public void onNewMapContent(MapPaneEvent ev) { @@ -352,8 +349,13 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { public void onRenderingStopped(MapPaneEvent ev) { rendererRunning = false; if (firstRendering) { - zoomIt(); - ((CardLayout) view.getLayout()).last(view); + + if (!tripArea.isEmpty()) { + JMapPane mapPane = getObserveMapPane(); + mapPane.setDisplayArea(tripArea); + } + + ui.getContentLayout().last(ui.getContent()); firstRendering = false; } else { zoomApply(); @@ -361,4 +363,20 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } } + protected void init(ObserveActionMap actionMap, InputMap inputMap, AbstractButton editor) { + String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); + + // on a trouve une action commune + TripMapActionSupport action = (TripMapActionSupport) actionMap.get(actionId); + Objects.requireNonNull(action, "action [" + actionId + "] not found for ui " + ui.getClass().getName()); + + if (log.isDebugEnabled()) { + log.debug("init common action " + actionId); + } + + action.setUi(ui); + action.initForMainUi(editor, inputMap, actionMap); + + } + } ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -1204,6 +1204,10 @@ observe.content.map.action.exportPng=Export observe.content.map.action.exportPng.tip=Export map in PNG format observe.content.map.action.zoomIt=Center observe.content.map.action.zoomIt.tip=Center map on the trip +observe.content.map.action.zoomMoins=Zoom out +observe.content.map.action.zoomMoins.tip=Zoom out +observe.content.map.action.zoomPlus=Zoom in +observe.content.map.action.zoomPlus.tip=Zoom in observe.content.map.east=East observe.content.map.export.chooseFile.ok=Exporter observe.content.map.export.chooseFile.png=PNG image ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -1204,6 +1204,10 @@ observe.content.map.action.exportPng=Exportar observe.content.map.action.exportPng.tip=Exportar el mapa en el formato PNG observe.content.map.action.zoomIt=Centrar observe.content.map.action.zoomIt.tip=Centrar el mapa sobre la marea +observe.content.map.action.zoomMoins=Zoom out \#TODO +observe.content.map.action.zoomMoins.tip=Zoom out \#TODO +observe.content.map.action.zoomPlus=Zoom in \#TODO +observe.content.map.action.zoomPlus.tip=Zoom in \#TODO observe.content.map.east=Este observe.content.map.export.chooseFile.ok=Exportar observe.content.map.export.chooseFile.png=imagen PNG ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -1204,6 +1204,10 @@ observe.content.map.action.exportPng=Exporter observe.content.map.action.exportPng.tip=Exporter la carte au format PNG observe.content.map.action.zoomIt=Centrer observe.content.map.action.zoomIt.tip=Centrer la carte sur la marée +observe.content.map.action.zoomMoins=Réduire +observe.content.map.action.zoomMoins.tip=Réduire +observe.content.map.action.zoomPlus=Agrandir +observe.content.map.action.zoomPlus.tip=Agrandir observe.content.map.east=Est observe.content.map.export.chooseFile.ok=Exporter observe.content.map.export.chooseFile.png=image PNG ===================================== client/src/main/resources/icons/action-zoomMoins.png ===================================== Binary files /dev/null and b/client/src/main/resources/icons/action-zoomMoins.png differ ===================================== client/src/main/resources/icons/action-zoomPlus.png ===================================== Binary files /dev/null and b/client/src/main/resources/icons/action-zoomPlus.png differ ===================================== client/src/main/resources/observe-ui.properties ===================================== --- a/client/src/main/resources/observe-ui.properties +++ b/client/src/main/resources/observe-ui.properties @@ -105,6 +105,8 @@ icon.action.data-calcule=action-data-calcule.png icon.action.numbereditor-reset=action-numbereditor-reset.png icon.action.numbereditor-calculator=action-numbereditor-calculator.png icon.action.center=action-center.png +icon.action.zoomPlus=action-zoomPlus.png +icon.action.zoomMoins=action-zoomMoins.png icon.action.config=action-config.png icon.action.consolidate=action-data-calcule.png icon.action.connected=action-connected.png ===================================== services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nLabelsBuilder.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nLabelsBuilder.java +++ b/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nLabelsBuilder.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.decoration; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 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 com.google.common.collect.ImmutableMap; import fr.ird.observe.services.ObserveDtoInitializer; import fr.ird.observe.services.dto.referential.I18nReferentialDto; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4f3e50eef7940fce6e25e95cc7c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4f3e50eef7940fce6e25e95cc7c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout du zoom +/- sur les cartes (See #859)
by Tony CHEMIT 25 Aug '17

25 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 88fcecf7 by Tony CHEMIT at 2017-08-25T02:18:26+02:00 Ajout du zoom +/- sur les cartes (See #859) - - - - - 20 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ExportPngUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/TripMapActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomItUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomMoinsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomPlusUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/content/open/TripUI.java - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUIHandler.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 - + client/src/main/resources/icons/action-zoomMoins.png - + client/src/main/resources/icons/action-zoomPlus.png - client/src/main/resources/observe-ui.properties - services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nLabelsBuilder.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java @@ -32,6 +32,7 @@ import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import javax.swing.AbstractAction; import javax.swing.AbstractButton; +import javax.swing.Action; import javax.swing.ActionMap; import javax.swing.Icon; import javax.swing.InputMap; @@ -131,8 +132,14 @@ public abstract class UIActionSupport extends AbstractAction { KeyStroke keyStroke = getAcceleratorKey(); if (keyStroke != null) { String actionCommandKey = getActionCommandKey(); + register(this, inputMap, actionMap,keyStroke, actionCommandKey); + } + } + + public static void register(Action action, InputMap inputMap, ActionMap actionMap, KeyStroke keyStroke , String actionCommandKey ) { + if (keyStroke != null) { inputMap.put(keyStroke, actionCommandKey); - actionMap.put(actionCommandKey, this); + actionMap.put(actionCommandKey, action); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ExportPngUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ExportPngUIAction.java @@ -0,0 +1,80 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ObserveSwingTechnicalException; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import javax.imageio.ImageIO; +import javax.swing.KeyStroke; + + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ExportPngUIAction extends TripMapActionSupport { + + public static final String ACTION_NAME = ExportPngUIAction.class.getName(); + + public ExportPngUIAction(ObserveMainUI mainUI) { + super(mainUI, + ACTION_NAME, + t("observe.content.map.action.exportPng"), + t("observe.content.map.action.exportPng.tip"), + "save", + KeyStroke.getKeyStroke("ctrl pressed S")); + } + + @Override + protected void actionPerformed(TripMapUI view) { + + File file = UIHelper.chooseFile( + view, + t("observe.content.map.export.chooseFile.title"), + t("observe.content.map.export.chooseFile.ok"), + null, + "^.+\\.png|.+\\.PNG$", + t("observe.content.map.export.chooseFile.png")); + + if (file != null && UIHelper.confirmOverwriteFileIfExist(view, file)) { + + BufferedImage im = new BufferedImage(view.getWidth(), view.getHeight(), BufferedImage.TYPE_INT_ARGB); + view.paint(im.getGraphics()); + try { + ImageIO.write(im, "PNG", file); + } catch (IOException e) { + throw new ObserveSwingTechnicalException("unable to export map ", e); + } + + UIHelper.displayInfo(t("observe.content.map.export.success", file)); + } + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/TripMapActionSupport.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/TripMapActionSupport.java @@ -0,0 +1,83 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.actions.UIActionSupport; +import fr.ird.observe.client.ui.content.open.TripUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import java.awt.event.ActionEvent; +import javax.swing.JComponent; +import javax.swing.KeyStroke; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public abstract class TripMapActionSupport extends UIActionSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(TripMapActionSupport.class); + + private TripMapUI ui; + protected ActionEvent e; + + protected abstract void actionPerformed(TripMapUI ui); + + TripMapActionSupport(ObserveMainUI mainUI, String actionCommandKey, String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { + super(mainUI, actionCommandKey, label, shortDescription, actionIcon, acceleratorKey); + } + + public void setUi(TripMapUI ui) { + this.ui = ui; + } + + @Override + public final void actionPerformed(ActionEvent e) { + if (!canExecuteAction()) { + return; + } + this.e = e; + + if (ui != null) { + actionPerformed(ui); + return; + } + TripUI source = (TripUI) e.getSource(); + actionPerformed(source.getTripMap()); + } + + private boolean canExecuteAction() { + JComponent editor = getEditor(); + if ((editor == null || (editor.isVisible() && editor.isEnabled() && editor.isShowing()))) { + return true; + } + if (log.isInfoEnabled()) { + log.info("Disabled action: " + getActionCommandKey() + " :: " + this); + } + return false; + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomItUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomItUIAction.java @@ -0,0 +1,61 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import javax.swing.KeyStroke; +import org.geotools.geometry.jts.ReferencedEnvelope; +import org.geotools.swing.JMapPane; + + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ZoomItUIAction extends TripMapActionSupport { + + public static final String ACTION_NAME = ZoomItUIAction.class.getName(); + + public ZoomItUIAction(ObserveMainUI mainUI) { + super(mainUI, + ACTION_NAME, + t("observe.content.map.action.zoomIt"), + t("observe.content.map.action.zoomIt.tip"), + "center", + KeyStroke.getKeyStroke("ctrl pressed I")); + } + + @Override + protected void actionPerformed(TripMapUI view) { + + ReferencedEnvelope tripArea = view.getHandler().getTripArea(); + if (!tripArea.isEmpty()) { + JMapPane mapPane = view.getObserveMapPane(); + mapPane.setDisplayArea(tripArea); + } + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomMoinsUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomMoinsUIAction.java @@ -0,0 +1,72 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUIHandler; +import java.awt.Point; +import javax.swing.KeyStroke; +import org.geotools.geometry.jts.ReferencedEnvelope; + + +import static fr.ird.observe.client.ui.util.tripMap.TripMapUIHandler.ZOOM_STEP_RATIO; +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ZoomMoinsUIAction extends TripMapActionSupport { + + public static final String ACTION_NAME = ZoomMoinsUIAction.class.getName(); + + public ZoomMoinsUIAction(ObserveMainUI mainUI) { + super(mainUI, + ACTION_NAME, + t("observe.content.map.action.zoomMoins"), + t("observe.content.map.action.zoomMoins.tip"), + "center", + KeyStroke.getKeyStroke("ctrl pressed L")); + } + + @Override + protected void actionPerformed(TripMapUI view) { + + TripMapUIHandler handler = view.getHandler(); + ReferencedEnvelope tripArea = handler.getTripArea(); + + if (!tripArea.isEmpty()) { + int notches = 1; + ReferencedEnvelope displayArea = view.getObserveMapPane().getDisplayArea(); + double w = displayArea.getMedian(0); + double h = displayArea.getMedian(1); + Point zoomCenter = new Point((int) w, (int) h); + handler.setZoomCenter(zoomCenter); + handler.setZoomRatio(handler.getZoomRatio() * (1 + (ZOOM_STEP_RATIO * notches * -1))); + handler.zoomApply(); + } + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomPlusUIAction.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ZoomPlusUIAction.java @@ -0,0 +1,72 @@ +package fr.ird.observe.client.ui.actions.tripMap; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUI; +import fr.ird.observe.client.ui.util.tripMap.TripMapUIHandler; +import java.awt.Point; +import javax.swing.KeyStroke; +import org.geotools.geometry.jts.ReferencedEnvelope; + + +import static fr.ird.observe.client.ui.util.tripMap.TripMapUIHandler.ZOOM_STEP_RATIO; +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ZoomPlusUIAction extends TripMapActionSupport { + + public static final String ACTION_NAME = ZoomPlusUIAction.class.getName(); + + public ZoomPlusUIAction(ObserveMainUI mainUI) { + super(mainUI, + ACTION_NAME, + t("observe.content.map.action.zoomPlus"), + t("observe.content.map.action.zoomPlus.tip"), + "zoomPlus", + KeyStroke.getKeyStroke("ctrl pressed P")); + } + + @Override + protected void actionPerformed(TripMapUI view) { + + TripMapUIHandler handler = view.getHandler(); + ReferencedEnvelope tripArea = handler.getTripArea(); + + if (!tripArea.isEmpty()) { + int notches = 1; + ReferencedEnvelope displayArea = view.getObserveMapPane().getDisplayArea(); + double w = displayArea.getMedian(0); + double h = displayArea.getMedian(1); + Point zoomCenter = new Point((int) w, (int) h); + handler.setZoomCenter(zoomCenter); + handler.setZoomRatio(handler.getZoomRatio() * (1 - (ZOOM_STEP_RATIO * notches * -1))); + handler.zoomApply(); + } + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/TripUI.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/TripUI.java @@ -0,0 +1,36 @@ +package fr.ird.observe.client.ui.content.open; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2017 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.ui.util.tripMap.TripMapUI; + +/** + * Created by tchemit on 25/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public interface TripUI { + + TripMapUI getTripMap(); + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jaxx @@ -23,7 +23,8 @@ <fr.ird.observe.client.ui.content.open.ContentOpenableUI i18nFormat="observe.common.TripLonglineDto.%s" superGenericType='TripLonglineDto, TripLonglineUI' - contentTitle='{n("observe.common.TripLonglineDto.title")}'> + contentTitle='{n("observe.common.TripLonglineDto.title")}' + implements="fr.ird.observe.client.ui.content.open.TripUI"> <style source="../../Common.jcss"/> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jaxx @@ -23,7 +23,8 @@ <fr.ird.observe.client.ui.content.open.ContentOpenableUI i18nFormat="observe.common.TripSeineDto.%s" superGenericType='TripSeineDto, TripSeineUI' - contentTitle='{n("observe.common.TripSeineDto.title")}'> + contentTitle='{n("observe.common.TripSeineDto.title")}' + implements="fr.ird.observe.client.ui.content.open.TripUI"> <style source="../../Common.jcss"/> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java @@ -42,6 +42,7 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; import java.util.Date; import java.util.List; +import javax.swing.JComponent; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; import org.apache.commons.logging.Log; @@ -102,6 +103,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); tripMap.getHandler().setConfig(config); + tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); ui.getMainTabbedPane().addChangeListener(e -> { JTabbedPane tripSeineTabPane = (JTabbedPane) e.getSource(); ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jaxx @@ -19,20 +19,27 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JPanel id="tripMap" layout="{new CardLayout()}"> +<JPanel id="tripMap" layout="{new BorderLayout()}"> <import> + fr.ird.observe.client.ui.actions.tripMap.ExportPngUIAction + fr.ird.observe.client.ui.actions.tripMap.ZoomItUIAction + fr.ird.observe.client.ui.actions.tripMap.ZoomMoinsUIAction + fr.ird.observe.client.ui.actions.tripMap.ZoomPlusUIAction java.awt.CardLayout - static org.nuiton.i18n.I18n.n </import> - <JPopupMenu id='mapPopupMenu'> - <JMenuItem id='zoomIt' onActionPerformed='getHandler().zoomIt()'/> - <JMenuItem id='exportPng' onActionPerformed='getHandler().exportPng()'/> - </JPopupMenu> + <CardLayout id="contentLayout"/> + <JToolBar constraints="BorderLayout.NORTH"> + <JButton id='zoomIt'/> + <JButton id='zoomPlus'/> + <JButton id='zoomMoins'/> + <JButton id='exportPng'/> + </JToolBar> - <JLabel id="waitLoadingLabel"/> - - <ObserveMapPane id='observeMapPane' constraints="BorderLayout.CENTER"/> + <JPanel id="content" layout="{contentLayout}" constraints="BorderLayout.CENTER"> + <JLabel id="waitLoadingLabel"/> + <ObserveMapPane id='observeMapPane'/> + </JPanel> </JPanel> ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss @@ -28,13 +28,17 @@ } #zoomIt { - text: "observe.content.map.action.zoomIt"; - toolTipText: "observe.content.map.action.zoomIt.tip"; - actionIcon: center; + _observeAction:{ZoomItUIAction.ACTION_NAME}; +} + +#zoomMoins { + _observeAction:{ZoomMoinsUIAction.ACTION_NAME}; +} + +#zoomPlus { + _observeAction:{ZoomPlusUIAction.ACTION_NAME}; } #exportPng { - text: "observe.content.map.action.exportPng"; - toolTipText: "observe.content.map.action.exportPng.tip"; - actionIcon: save; + _observeAction:{ExportPngUIAction.ACTION_NAME}; } ===================================== client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUIHandler.java @@ -26,12 +26,13 @@ import com.google.common.collect.Lists; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.client.ui.actions.tripMap.TripMapActionSupport; +import fr.ird.observe.client.ui.content.ObserveActionMap; import fr.ird.observe.common.TripMapPoint; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.TripMapDto; -import java.awt.CardLayout; import java.awt.Point; +import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; @@ -39,11 +40,13 @@ import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import java.awt.geom.AffineTransform; import java.awt.geom.Point2D; -import java.awt.image.BufferedImage; import java.io.File; -import java.io.IOException; import java.util.List; -import javax.imageio.ImageIO; +import java.util.Objects; +import javax.swing.AbstractButton; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.KeyStroke; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.geotools.geometry.DirectPosition2D; @@ -54,7 +57,7 @@ import org.geotools.swing.event.MapPaneListener; import org.nuiton.jaxx.runtime.spi.UIHandler; -import static org.nuiton.i18n.I18n.t; +import static fr.ird.observe.client.ui.content.ContentUIInitializer.OBSERVE_ACTION; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -65,12 +68,12 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { private static final Log log = LogFactory.getLog(TripMapUIHandler.class); - protected TripMapUI view; - + private TripMapUI ui; private ClientConfig config; - protected ReferencedEnvelope tripArea; - - protected boolean rendererRunning; + private ReferencedEnvelope tripArea; + private boolean rendererRunning; + private double zoomRatio = 1; + private Point zoomCenter; public void setConfig(ClientConfig config) { this.config = config; @@ -79,14 +82,14 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { mapPane.setBackground(config.getMapBackgroundColor()); } - protected ObserveMapPane getObserveMapPane() { - return view.getObserveMapPane(); + private ObserveMapPane getObserveMapPane() { + return ui.getObserveMapPane(); } public void doOpenMap(TripMapDto tripMapDto) { try { - ((CardLayout) view.getLayout()).first(view); + flipContent(); ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(true); ObserveMapPane mapPane = getObserveMapPane(); @@ -137,45 +140,15 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } - public void doCloseMap() { - ((CardLayout) view.getLayout()).first(view); - } - - public void zoomIt() { - if (!tripArea.isEmpty()) { - JMapPane mapPane = getObserveMapPane(); - mapPane.setDisplayArea(tripArea); - } + private void flipContent() { + ui.getContentLayout().first(ui.getContent()); } - public void exportPng() { - - File file = UIHelper.chooseFile( - view, - t("observe.content.map.export.chooseFile.title"), - t("observe.content.map.export.chooseFile.ok"), - null, - "^.+\\.png|.+\\.PNG$", - t("observe.content.map.export.chooseFile.png")); - - if (file != null && UIHelper.confirmOverwriteFileIfExist(view, file)) { - - BufferedImage im = new BufferedImage(view.getWidth(), view.getHeight(), BufferedImage.TYPE_INT_ARGB); - view.paint(im.getGraphics()); - try { - ImageIO.write(im, "PNG", file); - } catch (IOException e) { - throw new ObserveSwingTechnicalException("unable to export map ", e); - } - - UIHelper.displayInfo(t("observe.content.map.export.success", file)); - } + public void doCloseMap() { + flipContent(); } - protected double zoomRatio = 1; - protected Point zoomCenter; - - protected void zoomApply() { + public void zoomApply() { if (zoomRatio != 1 && !rendererRunning) { JMapPane mapPane = getObserveMapPane(); @@ -221,7 +194,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { @Override public void beforeInit(TripMapUI ui) { - this.view = ui; + this.ui = ui; } @Override @@ -235,12 +208,36 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { mapPane.addMouseListener(mouseMapListener); mapPane.addMapPaneListener(new TripMapListener()); - mapPane.setComponentPopupMenu(view.getMapPopupMenu()); - rendererRunning = false; } + public void init(InputMap inputMap) { + ObserveActionMap actionMap = ObserveSwingApplicationContext.get().getActionMap(); + + init(actionMap, inputMap, ui.zoomIt); + init(actionMap, inputMap, ui.zoomMoins); + init(actionMap, inputMap, ui.zoomPlus); + init(actionMap, inputMap, ui.exportPng); + + } + + public ReferencedEnvelope getTripArea() { + return tripArea; + } + + public double getZoomRatio() { + return zoomRatio; + } + + public void setZoomRatio(double zoomRatio) { + this.zoomRatio = zoomRatio; + } + + public void setZoomCenter(Point zoomCenter) { + this.zoomCenter = zoomCenter; + } + private class MouseMapListener implements MouseWheelListener, MouseListener, MouseMotionListener { @Override @@ -256,9 +253,9 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } - protected Point2D startPointInWorld; - protected AffineTransform startScreenToWorldTransform; - protected ReferencedEnvelope startDisplayArea; + Point2D startPointInWorld; + AffineTransform startScreenToWorldTransform; + ReferencedEnvelope startDisplayArea; @Override public void mousePressed(MouseEvent e) { @@ -294,7 +291,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } - protected void startMove(Point2D startPointInScreen) { + void startMove(Point2D startPointInScreen) { JMapPane mapPane = getObserveMapPane(); startDisplayArea = mapPane.getDisplayArea(); @@ -307,7 +304,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } - protected void endMove(Point2D endPointInScreen) { + void endMove(Point2D endPointInScreen) { Point2D endPointInWorld = new Point2D.Double(); @@ -332,7 +329,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { protected class TripMapListener implements MapPaneListener { - protected boolean firstRendering; + boolean firstRendering; @Override public void onNewMapContent(MapPaneEvent ev) { @@ -352,8 +349,13 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { public void onRenderingStopped(MapPaneEvent ev) { rendererRunning = false; if (firstRendering) { - zoomIt(); - ((CardLayout) view.getLayout()).last(view); + + if (!tripArea.isEmpty()) { + JMapPane mapPane = getObserveMapPane(); + mapPane.setDisplayArea(tripArea); + } + + ui.getContentLayout().last(ui.getContent()); firstRendering = false; } else { zoomApply(); @@ -361,4 +363,20 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { } } + protected void init(ObserveActionMap actionMap, InputMap inputMap, AbstractButton editor) { + String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); + + // on a trouve une action commune + TripMapActionSupport action = (TripMapActionSupport) actionMap.get(actionId); + Objects.requireNonNull(action, "action [" + actionId + "] not found for ui " + ui.getClass().getName()); + + if (log.isDebugEnabled()) { + log.debug("init common action " + actionId); + } + + action.setUi(ui); + action.initForMainUi(editor, inputMap, actionMap); + + } + } ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -1204,6 +1204,10 @@ observe.content.map.action.exportPng=Export observe.content.map.action.exportPng.tip=Export map in PNG format observe.content.map.action.zoomIt=Center observe.content.map.action.zoomIt.tip=Center map on the trip +observe.content.map.action.zoomMoins=Zoom out +observe.content.map.action.zoomMoins.tip=Zoom out +observe.content.map.action.zoomPlus=Zoom in +observe.content.map.action.zoomPlus.tip=Zoom in observe.content.map.east=East observe.content.map.export.chooseFile.ok=Exporter observe.content.map.export.chooseFile.png=PNG image ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -1204,6 +1204,10 @@ observe.content.map.action.exportPng=Exportar observe.content.map.action.exportPng.tip=Exportar el mapa en el formato PNG observe.content.map.action.zoomIt=Centrar observe.content.map.action.zoomIt.tip=Centrar el mapa sobre la marea +observe.content.map.action.zoomMoins=Zoom out \#TODO +observe.content.map.action.zoomMoins.tip=Zoom out \#TODO +observe.content.map.action.zoomPlus=Zoom in \#TODO +observe.content.map.action.zoomPlus.tip=Zoom in \#TODO observe.content.map.east=Este observe.content.map.export.chooseFile.ok=Exportar observe.content.map.export.chooseFile.png=imagen PNG ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -1204,6 +1204,10 @@ observe.content.map.action.exportPng=Exporter observe.content.map.action.exportPng.tip=Exporter la carte au format PNG observe.content.map.action.zoomIt=Centrer observe.content.map.action.zoomIt.tip=Centrer la carte sur la marée +observe.content.map.action.zoomMoins=Réduire +observe.content.map.action.zoomMoins.tip=Réduire +observe.content.map.action.zoomPlus=Agrandir +observe.content.map.action.zoomPlus.tip=Agrandir observe.content.map.east=Est observe.content.map.export.chooseFile.ok=Exporter observe.content.map.export.chooseFile.png=image PNG ===================================== client/src/main/resources/icons/action-zoomMoins.png ===================================== Binary files /dev/null and b/client/src/main/resources/icons/action-zoomMoins.png differ ===================================== client/src/main/resources/icons/action-zoomPlus.png ===================================== Binary files /dev/null and b/client/src/main/resources/icons/action-zoomPlus.png differ ===================================== client/src/main/resources/observe-ui.properties ===================================== --- a/client/src/main/resources/observe-ui.properties +++ b/client/src/main/resources/observe-ui.properties @@ -105,6 +105,8 @@ icon.action.data-calcule=action-data-calcule.png icon.action.numbereditor-reset=action-numbereditor-reset.png icon.action.numbereditor-calculator=action-numbereditor-calculator.png icon.action.center=action-center.png +icon.action.zoomPlus=action-zoomPlus.png +icon.action.zoomMoins=action-zoomMoins.png icon.action.config=action-config.png icon.action.consolidate=action-data-calcule.png icon.action.connected=action-connected.png ===================================== services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nLabelsBuilder.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nLabelsBuilder.java +++ b/services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nLabelsBuilder.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.decoration; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 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 com.google.common.collect.ImmutableMap; import fr.ird.observe.services.ObserveDtoInitializer; import fr.ird.observe.services.dto.referential.I18nReferentialDto; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/88fcecf7c139284ce861fa1a7b9… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/88fcecf7c139284ce861fa1a7b9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] up toolkit
by Tony CHEMIT 24 Aug '17

24 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d1285f4f by Tony CHEMIT at 2017-08-24T22:57:27+02:00 up toolkit - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ <mavenVersion>3.5.0</mavenVersion> - <observeToolkitVersion>1.1-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>1.1</observeToolkitVersion> <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d1285f4f4fdceb33ea11051dcd4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d1285f4f4fdceb33ea11051dcd4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Impossible d'accéder au menu configuration lorsqu'une base est chargée (See #858)
by Tony CHEMIT 24 Aug '17

24 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1dd7775c by Tony CHEMIT at 2017-08-24T22:42:00+02:00 Impossible d'accéder au menu configuration lorsqu'une base est chargée (See #858) - - - - - 10 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/CloseStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ShowStorageInfoAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ChangeStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/CloseStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ReloadStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ShowStorageInfoAction.java - pom.xml Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss @@ -280,6 +280,7 @@ JSplitPane { toolTipText: {model.getStorageStatusTip()}; text: {model.getStorageStatusText()}; icon: {model.getStorageStatusIcon()}; + mnemonic:B; } #storageStatusInfo { ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java @@ -31,7 +31,6 @@ import java.awt.event.ActionEvent; import java.util.EnumSet; import java.util.Set; import java.util.stream.Collectors; -import javax.swing.KeyStroke; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,7 +61,7 @@ public class ChangeStorageAction extends MenuActionSupport { this(ui, (Set<DbMode>)null, null); } - public ChangeStorageAction(ObserveMainUI ui, String actionName,KeyStroke keyStroke) { + public ChangeStorageAction(ObserveMainUI ui, String actionName,char keyStroke) { super(ui, actionName, t("observe.action.change.storage"), t("observe.action.change.storage.tip"), "db-change", keyStroke); this.dbModes = EnumSet.noneOf(DbMode.class); this.title = null; ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/CloseStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/CloseStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/CloseStorageAction.java @@ -53,7 +53,7 @@ public class CloseStorageAction extends MenuActionSupport { super(ui, ACTION_NAME, t("observe.action.close.storage"), t("observe.action.close.storage.tip"), "db-none", 'F'); } - public CloseStorageAction(ObserveMainUI ui, String actionName,KeyStroke keyStroke) { + public CloseStorageAction(ObserveMainUI ui, String actionName, char keyStroke) { super(ui, actionName, t("observe.action.close.storage"), t("observe.action.close.storage.tip"), "db-none", keyStroke); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java @@ -58,7 +58,7 @@ public class ReloadStorageAction extends MenuActionSupport { super(ui, ACTION_NAME, t("observe.action.reload.storage"), t("observe.action.reload.storage.tip"), "db-reload", 'R'); } - public ReloadStorageAction(ObserveMainUI ui, String actionName, KeyStroke keyStroke) { + public ReloadStorageAction(ObserveMainUI ui, String actionName, char keyStroke) { super(ui, actionName, t("observe.action.reload.storage"), t("observe.action.reload.storage.tip"), "db-reload", keyStroke); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ShowStorageInfoAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ShowStorageInfoAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ShowStorageInfoAction.java @@ -30,7 +30,6 @@ import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; import java.awt.event.ActionEvent; import javax.swing.JLabel; import javax.swing.JOptionPane; -import javax.swing.KeyStroke; import static org.nuiton.i18n.I18n.t; @@ -51,7 +50,7 @@ public class ShowStorageInfoAction extends MenuActionSupport { super(ui, ACTION_NAME, t("observe.action.info.storage"), t("observe.action.info.storage.tip"), "information", 'O'); } - public ShowStorageInfoAction(ObserveMainUI ui, String actionName,KeyStroke keyStroke) { + public ShowStorageInfoAction(ObserveMainUI ui, String actionName, char keyStroke) { super(ui, actionName, t("observe.action.info.storage"), t("observe.action.info.storage.tip"), "information", keyStroke); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ChangeStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ChangeStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ChangeStorageAction.java @@ -39,7 +39,7 @@ public class ChangeStorageAction extends fr.ird.observe.client.ui.actions.main.m public static final String ACTION_NAME = ChangeStorageAction.class.getName(); public ChangeStorageAction(ObserveMainUI ui) { - super(ui, ACTION_NAME,KeyStroke.getKeyStroke('C', InputEvent.ALT_MASK)); + super(ui, ACTION_NAME,'C'); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/CloseStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/CloseStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/CloseStorageAction.java @@ -39,7 +39,7 @@ public class CloseStorageAction extends fr.ird.observe.client.ui.actions.main.me public static final String ACTION_NAME = CloseStorageAction.class.getName(); public CloseStorageAction(ObserveMainUI ui) { - super(ui, ACTION_NAME,KeyStroke.getKeyStroke('F', InputEvent.ALT_MASK)); + super(ui, ACTION_NAME,'F'); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ReloadStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ReloadStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ReloadStorageAction.java @@ -39,7 +39,7 @@ public class ReloadStorageAction extends fr.ird.observe.client.ui.actions.main.m public static final String ACTION_NAME = ReloadStorageAction.class.getName(); public ReloadStorageAction(ObserveMainUI ui) { - super(ui, ACTION_NAME,KeyStroke.getKeyStroke('R', InputEvent.ALT_MASK)); + super(ui, ACTION_NAME,'R'); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ShowStorageInfoAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ShowStorageInfoAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ShowStorageInfoAction.java @@ -23,8 +23,6 @@ package fr.ird.observe.client.ui.actions.main.storage; */ import fr.ird.observe.client.ui.ObserveMainUI; -import java.awt.event.InputEvent; -import javax.swing.KeyStroke; /** * Created on 1/17/15. @@ -39,7 +37,7 @@ public class ShowStorageInfoAction extends fr.ird.observe.client.ui.actions.main public static final String ACTION_NAME = ShowStorageInfoAction.class.getName(); public ShowStorageInfoAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, KeyStroke.getKeyStroke('O', InputEvent.ALT_MASK)); + super(ui, ACTION_NAME, 'O'); } } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-11-SNAPSHOT</jaxxVersion> + <jaxxVersion>3.0-alpha-11</jaxxVersion> <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1dd7775c4cacad9b342cdd6d475… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1dd7775c4cacad9b342cdd6d475… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Impossible de recopier les valeurs des matérials via les actions en bas (See #856)
by Tony CHEMIT 24 Aug '17

24 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6d8a5a83 by Tony CHEMIT at 2017-08-24T21:36:14+02:00 Impossible de recopier les valeurs des matérials via les actions en bas (See #856) - - - - - c95b2094 by Tony CHEMIT at 2017-08-24T21:37:58+02:00 Lors de la création d'un dcp, les matériaux ne sont pas validés si on y touche pas (See #857) - - - - - 41db386d by Tony CHEMIT at 2017-08-24T21:44:38+02:00 Improve i18n keys (See #855) : mise en place des nouveaux décorateurs - - - - - 30 changed files: - client/src/main/ftl/validationReport_en.ftl - client/src/main/ftl/validationReport_es.ftl - client/src/main/ftl/validationReport_fr.ftl - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToRightAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateConfigUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/RouteUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/UniqueKeyTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/ShipOwnerUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/LonglineDetailCompositionValidationContext.java - client/src/main/java/fr/ird/observe/client/ui/content/simple/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java - client/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.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 - services/pom.xml - services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nDecoratorHelper.java - + services/src/main/java/fr/ird/observe/services/decoration/ObserveI18nLabelsBuilder.java - services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultDtoMessage.java - services/src/main/java/fr/ird/observe/services/validation/validators/ActivitySimpleSpeedDtoValidator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/602be99494edcdc8d9aa7d324a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/602be99494edcdc8d9aa7d324a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve i18n keys (See #855) : sanitize i18n keys
by Tony CHEMIT 24 Aug '17

24 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 602be994 by Tony CHEMIT at 2017-08-24T16:53:40+02:00 Improve i18n keys (See #855) : sanitize i18n keys - - - - - 6 changed files: - services/src/main/resources/i18n/services_en_GB.properties - services/src/main/resources/i18n/services_es_ES.properties - services/src/main/resources/i18n/services_fr_FR.properties - 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: ===================================== services/src/main/resources/i18n/services_en_GB.properties ===================================== --- a/services/src/main/resources/i18n/services_en_GB.properties +++ b/services/src/main/resources/i18n/services_en_GB.properties @@ -1,228 +1,18 @@ -observe.common.activityLongline=Activity -observe.common.activitySeine=Activity -observe.common.baitHaulingStatus=Bait hauling status -observe.common.baitSettingStatus=Bait setting status -observe.common.baitType=Bait type -observe.common.baitsComposition=Baits composition -observe.common.baitsCompositionProportionSum=Baits composition proportion sum -observe.common.basket=Basket -observe.common.basketsPerSectionCount=Basket per section count -observe.common.branchline=Branchline -observe.common.branchlineLength=Branchline length -observe.common.branchlinesComposition=Branchlines composition -observe.common.branchlinesCompositionProportionSum=Branchlines composition proportion sum -observe.common.branchlinesPerBasketCount=Branchlines per basket count -observe.common.SensorBrandDto.brandName=Brand name -observe.common.VesselDto.capacity=Capacity -observe.common.capacityLabel=Capacity label -observe.common.captain=Captain -observe.common.catchFateLongline=Catch fate -observe.common.catchHealthness=Catch healthness -observe.common.catchWeight=Catch weight -observe.common.changeDate=Change date -observe.common.code=Code -observe.common.WithFormula.coefficients=Coefficients -observe.common.comment=Comment -observe.common.count=Count -observe.common.country=Country -observe.common.currentDirection=Current direction -observe.common.currentFpaZone=Current Fpa zone -observe.common.currentSpeed=Current speed -observe.common.dataEntryOperator=Data entry operator -observe.common.date=Date -observe.common.departureHarbour=Departure harbour -observe.common.deployementEnd=Deployement end -observe.common.description=Description -observe.common.detectionMode=Detection mode -observe.common.detectionTime=Detection time -observe.common.discardHealthness=Discard healthness -observe.common.distance=Distance -observe.common.encounterType=Encounter type -observe.common.endDate=End date -observe.common.endLogValue=End log value -observe.common.endPursingDate=End pursing date -observe.common.endPursingTimeStamp=End pursing timestamp -observe.common.endSetDate=End set date -observe.common.endSetTimeStamp=End set timestamp +observe.common.LengthLengthParameterDto.inputOutputFormula=Input to Output formula observe.common.faoCode=Fao code -observe.common.firstName=First name -observe.common.fishingEnd=Fishing end -observe.common.fishingStart=Fishing start -observe.common.flagCountry=Flag country -observe.common.fleetCountry=Fleet country -observe.common.floatingObject=Floating object -observe.common.floatingObjectEmpty=Empty floating object -observe.common.floatline1Length=floatline 1 length -observe.common.floatline2Length=floatline 2 length -observe.common.floatlinesComposition=floatlines composition -observe.common.floatlinesCompositionProportionSum=floatlines composition proportion sum -observe.common.formsUrl=Forms url -observe.common.fpaZone=Fpa zone -observe.common.gaugeLabel=Gauge label -observe.common.gear=Gear -observe.common.gearCaracteristicType=Gear caracteristic type -observe.common.gearType=Gear type -observe.common.gearUseFeaturesLongline=Gear use features -observe.common.gearUseFeaturesSeine=Gear use features -observe.common.gonadeWeight=Gonade weight observe.common.gps.activity=Activity observe.common.gps.gpsPoint=Gps point -observe.common.haulingBreaks=Hauling breaks -observe.common.haulingDirectionSameAsSetting=Hauling direction same as setting -observe.common.haulingEndLatitude=Hauling end latitude -observe.common.haulingEndLongitude=Hauling end longitude -observe.common.haulingEndQuadrant=Hauling end quadrant -observe.common.haulingEndTimeStamp=Hauling end timeStamp observe.common.haulingIdentifier=Hauling identifier -observe.common.haulingStartLatitude=Hauling start latitude -observe.common.haulingStartLongitude=Hauling start longitude -observe.common.haulingStartQuadrant=Hauling start quadrant -observe.common.haulingStartTimeStamp=Hauling start timeStamp observe.common.homeId=Home id -observe.common.hookOffset=Hook offset -observe.common.hookPosition=Hook position -observe.common.hookSize=Hook size -observe.common.hookType=Hook type -observe.common.hooksComposition=hooks composition -observe.common.hooksCompositionProportionSum=hooks composition proportion sum observe.common.inconnu=Unknown -observe.common.individualSize=Individual size -observe.common.individualWeight=Individual weight -observe.common.LengthLengthParameterDto.inputOutputFormula=Input to Output formula -observe.common.inputSizeMeasureType=Input size measure type -observe.common.CountryDto.iso2Code=Iso 2 code -observe.common.CountryDto.iso3Code=Iso 3 code -observe.common.itemHorizontalPosition=Item horizontal position -observe.common.itemVerticalPosition=Item vertical position -observe.common.keelCode=Keel code -observe.common.label=Label -observe.common.I18nReferentialDto.label1=English label -observe.common.I18nReferentialDto.label2=French label -observe.common.I18nReferentialDto.label3=Spanish label -observe.common.landingHarbour=Landing harbour -observe.common.lastName=Last name -observe.common.latitude=Latitude -observe.common.legacyCode=Legacy code -observe.common.VesselDto.length=Length observe.common.lengthWeightFormula=Length weight formula -observe.common.lightsticksColor=Lightsticks color -observe.common.lightsticksPerBasketCount=Lightsticks per basket count -observe.common.lightsticksType=Lightsticks type -observe.common.lineType=Line type -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.materialsValid=Materials -observe.common.maturityStatus=Maturity status -observe.common.maxDepthTargeted=Max depth targeted -observe.common.maxGearDepth=Max gear depth -observe.common.meanLength=Mean length -observe.common.meanWeight=Mean weight -observe.common.FloatingObjectReference.name=Name -observe.common.nextFpaZone=Next Fpa zone observe.common.nocode=Nocode -observe.common.NonTargetCatchDto.title=Non target catch -observe.common.nonTargetCatchReleaseStatus=Release state observe.common.none=None -observe.common.number=Number -observe.common.ObjectMaterialDto.objectMaterialType=Type -observe.common.objectOperation=Object operation -observe.common.objectType=Object type -observe.common.observedSystem=Observed system -observe.common.observedSystemDistance=Observed system distance -observe.common.observer=Observed -observe.common.ocean=Ocean -observe.common.organism=Organism -observe.common.LengthLengthParameterDto.outputInputFormula=Output to Input formula -observe.common.outputSizeMeasureType=Output size measure type -observe.common.parent=Parent -observe.common.power=Power -observe.common.previousFpaZone=Previous Fpa zone observe.common.program=Program -observe.common.proportion=Proportion -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Reason for discad -observe.common.reasonForNoFishing=Reason for no fishing -observe.common.reasonForNullSet=Reason for null set -observe.common.releaseTime=Release time -observe.common.reportsUrl=Reports url -observe.common.route=Route -observe.common.SchoolEstimateDto.title=School estimate -observe.common.schoolMeanDepth=School mean depth -observe.common.schoolThickness=School thickness -observe.common.schoolTopDepth=School top depth observe.common.scientificLabel=Scientific label -observe.common.seaSurfaceTemperature=Sea surface temperature -observe.common.searchMaximum=Search maximum -observe.common.section=Section -observe.common.sensorBrand=Sensor brand -observe.common.sensorDataFormat=Sensor data format -observe.common.sensorSerialNo=Sensor serial no -observe.common.sensorType=Sensor type -observe.common.settingEndLatitude=Setting end latitude -observe.common.settingEndLongitude=Setting end longitude -observe.common.settingEndQuadrant=Setting end quadrant -observe.common.settingEndTimeStamp=Setting end timeStamp observe.common.settingIdentifier=Setting -observe.common.settingShape=Setting shape -observe.common.settingStartLatitude=Setting start latitude -observe.common.settingStartLongitude=Setting start longitude -observe.common.settingStartQuadrant=Setting start quadrant -observe.common.settingStartTimeStamp=Setting start timeStamp -observe.common.settingVesselSpeed=Setting vessel speed observe.common.sex=Sex -observe.common.shipOwner=Ship owner -observe.common.shooterSpeed=Shooter speed -observe.common.sizeMeasureType=Size measure type -observe.common.snapWeight=Snap weight -observe.common.species=Species observe.common.species/scientificLabel=Scientific label -observe.common.speciesCatch=Species -observe.common.speciesFate=Species fate -observe.common.speciesGroup=Species group -observe.common.speciesGroupReleaseMode=Release mode -observe.common.speciesStatus=Species status -observe.common.speedRange=Speed range -observe.common.standardCode=Standard code -observe.common.startDate=Start date -observe.common.startLogValue=Start log value -observe.common.startTime=Sart time -observe.common.ReferentialDto.status=Status -observe.common.stomacFullness=Stomac fullness -observe.common.supportVesselName=Support vessel name -observe.common.surroundingActivity=Surrounding activity -observe.common.swivelWeight=Swivel weight -observe.common.TargetCatchDto.title=Target catch -observe.common.time=Time -observe.common.timeBetweenHooks=Time between hooks -observe.common.topType=Top type -observe.common.totalBasketsCount=Total baskets count -observe.common.totalCount=Count -observe.common.totalHooksCount=Total hooks count -observe.common.totalSectionsCount=Total section count -observe.common.totalWeight=Total weight -observe.common.tracelineLength=Traceline length -observe.common.tracelineType=Traceline type -observe.common.TransmittingBuoyDto.transmittingBuoyOperation=Transmitting buoy operation -observe.common.TransmittingBuoyDto.transmittingBuoyType=Transmitting buoy type -observe.common.tripType=Trip type -observe.common.ReferentialDto.uri=Uri -observe.common.ObjectMaterialDto.validation=Validation -observe.common.vessel=Boat -observe.common.vesselActivityLongline=Vessel activity -observe.common.vesselActivitySeine=Vessel activity -observe.common.vesselSizeCategory=Vessel size category -observe.common.vesselSpeed=Vessel speed -observe.common.vesselType=Vessel type -observe.common.waveHeight=Wave weight -observe.common.weight=Weight -observe.common.weightCategory=Weight category -observe.common.weightLengthFormula=Weight length formula -observe.common.well=Well -observe.common.whenArriving=When arriving -observe.common.whenLeaving=When leaving -observe.common.wind=Wind -observe.common.wormsId=Worms id -observe.common.yearService=Year service observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Longline observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description=Display Palangre's programs observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Seine ===================================== services/src/main/resources/i18n/services_es_ES.properties ===================================== --- a/services/src/main/resources/i18n/services_es_ES.properties +++ b/services/src/main/resources/i18n/services_es_ES.properties @@ -1,228 +1,18 @@ -observe.common.activityLongline=Actividad -observe.common.activitySeine=Actividad -observe.common.baitHaulingStatus=Estatuto del cebo en el arrastre -observe.common.baitSettingStatus=Estatuto del cebo en la calada -observe.common.baitType=Tipo de cebo -observe.common.baitsComposition=Cebo -observe.common.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%) -observe.common.basket=Cesta -observe.common.basketsPerSectionCount=Número de cestas por sección -observe.common.branchline=Arponcillo -observe.common.branchlineLength=Arponcillo (m) -observe.common.branchlinesComposition=Arponcillos -observe.common.branchlinesCompositionProportionSum=Suma de los proporciónes de arponcillos (%) -observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta -observe.common.SensorBrandDto.brandName=Marca -observe.common.VesselDto.capacity=Capacidad de transporte -observe.common.capacityLabel=Texto capacidad -observe.common.captain=Patrón -observe.common.catchFateLongline=Futuro de la captura -observe.common.catchHealthness=Salud a la captura -observe.common.catchWeight=Peso estimado (en t) -observe.common.changeDate=Fecha de carga -observe.common.code=Identificación -observe.common.WithFormula.coefficients=Coeficientes -observe.common.comment=Comentarios -observe.common.count=Número -observe.common.country=País -observe.common.currentDirection=Direction du courant (°) -observe.common.currentFpaZone=Zona FPA actual -observe.common.currentSpeed=Velocidad del corriente (nd) -observe.common.dataEntryOperator=Operador de captación de datos -observe.common.date=Día de observación -observe.common.departureHarbour=Puerto de embarque -observe.common.deployementEnd=Fin de despliegue -observe.common.description=Descripción -observe.common.detectionMode=Modo de detección -observe.common.detectionTime=Heure de détection \#TODO -observe.common.discardHealthness=Salud al rechazo -observe.common.distance=Distancia (m) -observe.common.encounterType=Tipo de encuentro -observe.common.endDate=Fecha de fin -observe.common.endLogValue=Corredera de tarde (millas) -observe.common.endPursingDate=Fecha de fin de calado de la red -observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red -observe.common.endSetDate=Fecha de fin de calado de la red -observe.common.endSetTimeStamp=Fecha - Hora de fin de validez +observe.common.LengthLengthParameterDto.inputOutputFormula=Formule Entrée vers Sortie \#TODO observe.common.faoCode=Codigo FAO -observe.common.firstName=Número -observe.common.fishingEnd=Fin de pesca -observe.common.fishingStart=Inicio de pesca -observe.common.flagCountry=Bandera -observe.common.fleetCountry=País -observe.common.floatingObject=Objeto flotante -observe.common.floatingObjectEmpty=Objeto flotante vacía -observe.common.floatline1Length=Orinque 1 (m) -observe.common.floatline2Length=Orinque 2 (m) -observe.common.floatlinesComposition=Orinques -observe.common.floatlinesCompositionProportionSum=Suma de los proporciónes de los orinques (%) -observe.common.formsUrl=URL de los formularios -observe.common.fpaZone=Zona FPA -observe.common.gaugeLabel=Texto «Capacidad» -observe.common.gear=Equipamiento -observe.common.gearCaracteristicType=Tipo de característica de equipamientos -observe.common.gearType=Tipo de arte de pesca -observe.common.gearUseFeaturesLongline=Equipamiento -observe.common.gearUseFeaturesSeine=Equipamiento -observe.common.gonadeWeight=Peso de las gonadas (g) observe.common.gps.activity=Actividad observe.common.gps.gpsPoint=Punto GPS -observe.common.haulingBreaks=Número de cortes -observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada -observe.common.haulingEndLatitude=Arrastre Latitud -observe.common.haulingEndLongitude=Arrastre Longitud -observe.common.haulingEndQuadrant=Arrastre Quadrant -observe.common.haulingEndTimeStamp=Timestamp de fin observe.common.haulingIdentifier=Arrastre -observe.common.haulingStartLatitude=Arrastre Latitud -observe.common.haulingStartLongitude=Arrastre Longitud -observe.common.haulingStartQuadrant=Arrastre Quadrant -observe.common.haulingStartTimeStamp=Timestamp del inicio observe.common.homeId=Identificador -observe.common.hookOffset=Offset anzuelo (°) -observe.common.hookPosition=Posición del anzuelo -observe.common.hookSize=Tamaño -observe.common.hookType=Tipo de anzuelo -observe.common.hooksComposition=Anzuelos -observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) observe.common.inconnu=desconocido -observe.common.individualSize=Tamaño (cm) -observe.common.individualWeight=Peso (kg) -observe.common.LengthLengthParameterDto.inputOutputFormula=Formule Entrée vers Sortie \#TODO -observe.common.inputSizeMeasureType=Type de mensuration d'entrée \#TODO -observe.common.CountryDto.iso2Code=Código ISO-2 -observe.common.CountryDto.iso3Code=Código ISO-3 -observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal -observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo -observe.common.keelCode=Código de Quilla -observe.common.label=Texto -observe.common.I18nReferentialDto.label1=Texto en inglés -observe.common.I18nReferentialDto.label2=Texto en francés -observe.common.I18nReferentialDto.label3=Nombre -observe.common.landingHarbour=Puerto de desembarque -observe.common.lastName=Nombre -observe.common.latitude=Latitud -observe.common.legacyCode=Ancien code \#TODO -observe.common.VesselDto.length=Longitud eslora total observe.common.lengthWeightFormula=Relación de peso -observe.common.lightsticksColor=Color de barrita de luz -observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta -observe.common.lightsticksType=Tipo de barrita de luz -observe.common.lineType=Tipo de línea -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.materialsValid=Materials \#TODO -observe.common.maturityStatus=Maturidad -observe.common.maxDepthTargeted=Profundidad máxima deseada -observe.common.maxGearDepth=Profundidad máxima (m) -observe.common.meanLength=Talla media (en cm) -observe.common.meanWeight=Peso medio (en Kg) -observe.common.FloatingObjectReference.name=Nombre -observe.common.nextFpaZone=Zona FPA penetrada observe.common.nocode=codigo ausente -observe.common.NonTargetCatchDto.title=Fauna accesoria conservada o descartada -observe.common.nonTargetCatchReleaseStatus=État à la libération \#TODO observe.common.none=Ninguno -observe.common.number=Número -observe.common.ObjectMaterialDto.objectMaterialType=Type \#TODO -observe.common.objectOperation=Operación sobre la baliza -observe.common.objectType=Tipo de objeto -observe.common.observedSystem=Sistema observado -observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) -observe.common.observer=Observador -observe.common.ocean=Océano -observe.common.organism=Organismo -observe.common.LengthLengthParameterDto.outputInputFormula=Formule Sortie vers Entrée \#TODO -observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO -observe.common.parent=Parent \#TODO -observe.common.power=Potencia del motor principal -observe.common.previousFpaZone=La zona FPA de que se salió observe.common.program=Programa -observe.common.proportion=Proporción (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Razón de descarte -observe.common.reasonForNoFishing=Razón de no pesca Senne -observe.common.reasonForNullSet=Causa de lance nulo -observe.common.releaseTime=Heure de libération \#TODO -observe.common.reportsUrl=URL del informe -observe.common.route=Ruta -observe.common.SchoolEstimateDto.title=Estimación del banco -observe.common.schoolMeanDepth=Profundidad media (m) -observe.common.schoolThickness=Grossor del banco (m) -observe.common.schoolTopDepth=Profundidad de la cumbre (m) observe.common.scientificLabel=Texto científico -observe.common.seaSurfaceTemperature=Temperatura en superficie (°) -observe.common.searchMaximum=Velocidad máxima de prospección -observe.common.section=Sección -observe.common.sensorBrand=Marca de sensor -observe.common.sensorDataFormat=Formato de los datos del sensor -observe.common.sensorSerialNo=Número de serie -observe.common.sensorType=Tipo de sensor -observe.common.settingEndLatitude=Calada Latitud -observe.common.settingEndLongitude=Calada longitud -observe.common.settingEndQuadrant=Calada quadrant -observe.common.settingEndTimeStamp=Timestamp de fin observe.common.settingIdentifier=Calada -observe.common.settingShape=Forma de la calada -observe.common.settingStartLatitude=Calada Latitud -observe.common.settingStartLongitude=Calada longitud -observe.common.settingStartQuadrant=Calada quadrant -observe.common.settingStartTimeStamp=Timestamp de inicio -observe.common.settingVesselSpeed=Velocidad del barco (nd) observe.common.sex=Sexo -observe.common.shipOwner=Armateur \#TODO -observe.common.shooterSpeed=Velocidad shooter (nd) -observe.common.sizeMeasureType=Tipo de medida -observe.common.snapWeight=Peso snap (kg) -observe.common.species=Especie observe.common.species/scientificLabel=Especie -observe.common.speciesCatch=Especie -observe.common.speciesFate=Devenir de fauna -observe.common.speciesGroup=Grupo de especie de fauna -observe.common.speciesGroupReleaseMode=Mode de libération \#TODO -observe.common.speciesStatus=Estado de especie -observe.common.speedRange=Texto velocidad del viento -observe.common.standardCode=Code standard \#TODO -observe.common.startDate=Fecha de comienzo -observe.common.startLogValue=Corredera de mañana (millas) -observe.common.startTime=Fecha - Heuro de inicio de validez -observe.common.ReferentialDto.status=Estado -observe.common.stomacFullness=Nivel de llenado del estomago -observe.common.supportVesselName=Nombre del macicero -observe.common.surroundingActivity=Actividad circundante -observe.common.swivelWeight=Peso de el destorcedor (kg) -observe.common.TargetCatchDto.title=Captura de atún -observe.common.time=Hora -observe.common.timeBetweenHooks=Temps entre anzuelos (s) -observe.common.topType=Tipo parte superior -observe.common.totalBasketsCount=Número total de baskets -observe.common.totalCount=Número estimado -observe.common.totalHooksCount=Número total d'arponcillos -observe.common.totalSectionsCount=Número total de secciones -observe.common.totalWeight=Peso -observe.common.tracelineLength=Parte baja (m) -observe.common.tracelineType=Tipo bajo de línea -observe.common.TransmittingBuoyDto.transmittingBuoyOperation=Operación sobre baliza -observe.common.TransmittingBuoyDto.transmittingBuoyType=Tipo de baliza -observe.common.tripType=Tipo de marea -observe.common.ReferentialDto.uri=URI -observe.common.ObjectMaterialDto.validation=Validation \#TODO -observe.common.vessel=Barco -observe.common.vesselActivityLongline=Actividad buque -observe.common.vesselActivitySeine=Actividad buque -observe.common.vesselSizeCategory=Capacidad -observe.common.vesselSpeed=Velocidad del barco (nd) -observe.common.vesselType=Pesquería -observe.common.waveHeight=Texto descriptivo de «altura media de la ola» -observe.common.weight=Peso (en t) -observe.common.weightCategory=Categoría de peso -observe.common.weightLengthFormula=Relación de tallas -observe.common.well=Cuba -observe.common.whenArriving=À l'arrivée \#TODO -observe.common.whenLeaving=Au départ \#TODO -observe.common.wind=Fuerza del viento -observe.common.wormsId=Worms -observe.common.yearService=año de entrada en servicio observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description=Voir les programmes Palangre \#TODO observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne ===================================== services/src/main/resources/i18n/services_fr_FR.properties ===================================== --- a/services/src/main/resources/i18n/services_fr_FR.properties +++ b/services/src/main/resources/i18n/services_fr_FR.properties @@ -1,228 +1,18 @@ -observe.common.activityLongline=Activité -observe.common.activitySeine=Activité -observe.common.baitHaulingStatus=Statut appât au virage -observe.common.baitSettingStatus=Statut appât au filage -observe.common.baitType=Type d'appât -observe.common.baitsComposition=Appâts -observe.common.baitsCompositionProportionSum=Somme des proportions d'appâts (%) -observe.common.basket=Panier -observe.common.basketsPerSectionCount=Nombre de panier par section -observe.common.branchline=Avançon -observe.common.branchlineLength=Longueur Avançon (m) -observe.common.branchlinesComposition=Avançons -observe.common.branchlinesCompositionProportionSum=Somme des proportions d'avançons (%) -observe.common.branchlinesPerBasketCount=Nombre d'hameçons par panier -observe.common.SensorBrandDto.brandName=Marque -observe.common.VesselDto.capacity=Capacité transport (m³) -observe.common.capacityLabel=Libellé capacité -observe.common.captain=Capitaine -observe.common.catchFateLongline=Devenir -observe.common.catchHealthness=Santé à la capture -observe.common.catchWeight=Poids estimé (en t) -observe.common.changeDate=Date changement pavillon -observe.common.code=Identifiant -observe.common.WithFormula.coefficients=Coefficients -observe.common.comment=Commentaire -observe.common.count=Nombre -observe.common.country=Pays -observe.common.currentDirection=Direction du courant (°) -observe.common.currentFpaZone=Zone FPA actuelle -observe.common.currentSpeed=Vitesse du courant (nd) -observe.common.dataEntryOperator=Saisisseur -observe.common.date=Jour d'observation -observe.common.departureHarbour=Port de départ -observe.common.deployementEnd=Fin déploiement -observe.common.description=Description -observe.common.detectionMode=Mode détection -observe.common.detectionTime=Heure de détection -observe.common.discardHealthness=Santé au rejet -observe.common.distance=Distance (m) -observe.common.encounterType=Type -observe.common.endDate=Fin de validité -observe.common.endLogValue=Loch du soir (milles) -observe.common.endPursingDate=Date de fin coulissage -observe.common.endPursingTimeStamp=Date - Heure de fin coulissage -observe.common.endSetDate=Date fin calée -observe.common.endSetTimeStamp=Date - Heure de fin de validité +observe.common.LengthLengthParameterDto.inputOutputFormula=Formule entrée -> sortie observe.common.faoCode=Code FAO -observe.common.firstName=Prénom -observe.common.fishingEnd=Fin pêche -observe.common.fishingStart=Début pêche -observe.common.flagCountry=Pavillon -observe.common.fleetCountry=Flotte -observe.common.floatingObject=Objet flottant -observe.common.floatingObjectEmpty=Objet flottant vide -observe.common.floatline1Length=Orin 1 (m) -observe.common.floatline2Length=Orin 2 (m) -observe.common.floatlinesComposition=Orins -observe.common.floatlinesCompositionProportionSum=Somme des proportions d'orins (%) -observe.common.formsUrl=URL des formulaires -observe.common.fpaZone=Zone FPA -observe.common.gaugeLabel=Libellé jauge -observe.common.gear=Equipement -observe.common.gearCaracteristicType=Type de caractéristique -observe.common.gearType=Type d'engin -observe.common.gearUseFeaturesLongline=Équipements -observe.common.gearUseFeaturesSeine=Équipements -observe.common.gonadeWeight=Poids des gonades (g) observe.common.gps.activity=Activité observe.common.gps.gpsPoint=Point GPS -observe.common.haulingBreaks=Nombre de coupures -observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage -observe.common.haulingEndLatitude=Latitude de fin de virage -observe.common.haulingEndLongitude=Longitude de fin de virage -observe.common.haulingEndQuadrant=Quadrant de fin de virage -observe.common.haulingEndTimeStamp=Horodatage fin observe.common.haulingIdentifier=Virage -observe.common.haulingStartLatitude=Latitude de début de virage -observe.common.haulingStartLongitude=Longitude de début de virage -observe.common.haulingStartQuadrant=Quadrant de début de virage -observe.common.haulingStartTimeStamp=Horodatage début observe.common.homeId=Identifiant -observe.common.hookOffset=Offset hameçon (°) -observe.common.hookPosition=Position de l'hameçon -observe.common.hookSize=Taille d'hameçon -observe.common.hookType=Type d'hameçon -observe.common.hooksComposition=Hameçons -observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) observe.common.inconnu=inconnu -observe.common.individualSize=Taille (cm) -observe.common.individualWeight=Poids (kg) -observe.common.LengthLengthParameterDto.inputOutputFormula=Formule entrée -> sortie -observe.common.inputSizeMeasureType=Type de mensuration d'entrée -observe.common.CountryDto.iso2Code=code ISO-2 -observe.common.CountryDto.iso3Code=Code ISO-3 -observe.common.itemHorizontalPosition=Position sur la ligne -observe.common.itemVerticalPosition=Position verticale -observe.common.keelCode=Code quille -observe.common.label=Libellé -observe.common.I18nReferentialDto.label1=Libellé anglais -observe.common.I18nReferentialDto.label2=Libellé français -observe.common.I18nReferentialDto.label3=Libellé espagnol -observe.common.landingHarbour=Port d'arrivée -observe.common.lastName=Nom -observe.common.latitude=Latitude -observe.common.legacyCode=Ancien code -observe.common.VesselDto.length=Longueur hors tout observe.common.lengthWeightFormula=Relation Poids -observe.common.lightsticksColor=Couleur de cyalumes -observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier -observe.common.lightsticksType=Type de cyalumes -observe.common.lineType=Type de ligne -observe.common.locode=Locode -observe.common.longitude=Longitude -observe.common.materialsValid=Matériaux -observe.common.maturityStatus=Maturité sexuelle -observe.common.maxDepthTargeted=Profondeur maximum ciblée -observe.common.maxGearDepth=Profondeur maximum (m) -observe.common.meanLength=Taille moyenne (en cm) -observe.common.meanWeight=Poids moyen (en Kg) -observe.common.FloatingObjectReference.name=Nom -observe.common.nextFpaZone=Zone FPA pénétrée observe.common.nocode=code absent -observe.common.NonTargetCatchDto.title=Faune accessoire conservée ou rejetée -observe.common.nonTargetCatchReleaseStatus=État à la libération observe.common.none=Aucun -observe.common.number=Nombre -observe.common.ObjectMaterialDto.objectMaterialType=Type -observe.common.objectOperation=Opération sur l'objet -observe.common.objectType=Type d'objet -observe.common.observedSystem=Système observé -observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) -observe.common.observer=Observateur -observe.common.ocean=Océan -observe.common.organism=Organisme -observe.common.LengthLengthParameterDto.outputInputFormula=Formule sortie -> entrée -observe.common.outputSizeMeasureType=Type de mensuration de sortie -observe.common.parent=Parent -observe.common.power=Puissance moteur principal -observe.common.previousFpaZone=Zone FPA quittée observe.common.program=Programme -observe.common.proportion=Proportion (%) -observe.common.quadrant=Quadrant -observe.common.reasonForDiscard=Raison rejet -observe.common.reasonForNoFishing=Raison de non coup de Senne -observe.common.reasonForNullSet=Cause coup nul -observe.common.releaseTime=Heure de libération -observe.common.reportsUrl=URL de rapport -observe.common.route=Route -observe.common.SchoolEstimateDto.title=Estimation banc -observe.common.schoolMeanDepth=Profondeur moyenne (m) -observe.common.schoolThickness=Épaisseur du banc (m) -observe.common.schoolTopDepth=Profondeur sommet (m) observe.common.scientificLabel=Libellé scientifique -observe.common.seaSurfaceTemperature=Température surface (°) -observe.common.searchMaximum=Vitesse maximale -observe.common.section=Section -observe.common.sensorBrand=Marque -observe.common.sensorDataFormat=Format de données -observe.common.sensorSerialNo=Numéro de série -observe.common.sensorType=Type -observe.common.settingEndLatitude=Latitude de fin de filage -observe.common.settingEndLongitude=Longitude de fin de filage -observe.common.settingEndQuadrant=Quadrant de fin de filage -observe.common.settingEndTimeStamp=Horodatage fin observe.common.settingIdentifier=Filage -observe.common.settingShape=Forme du filage -observe.common.settingStartLatitude=Latitude de début de filage -observe.common.settingStartLongitude=Longitude de début de filage -observe.common.settingStartQuadrant=Quadrant de début de filage -observe.common.settingStartTimeStamp=Horodatage début -observe.common.settingVesselSpeed=Vitesse bateau (nd) observe.common.sex=Sexe -observe.common.shipOwner=Armateur -observe.common.shooterSpeed=Vitesse shooter (nd) -observe.common.sizeMeasureType=Type de mensuration -observe.common.snapWeight=Poids snap (kg) -observe.common.species=Espèce observe.common.species/scientificLabel=Espèce -observe.common.speciesCatch=Espèce -observe.common.speciesFate=Devenir espèce -observe.common.speciesGroup=Groupe espèce -observe.common.speciesGroupReleaseMode=Mode de libération -observe.common.speciesStatus=Statut faune observée -observe.common.speedRange=Libellé vitesse vent -observe.common.standardCode=Code standard -observe.common.startDate=Début de validité -observe.common.startLogValue=Loch du matin (milles) -observe.common.startTime=Date - Heure de début de validité -observe.common.ReferentialDto.status=Statut -observe.common.stomacFullness=État de l'estomac -observe.common.supportVesselName=Nom supply -observe.common.surroundingActivity=Activité environnante -observe.common.swivelWeight=Poids de l'émerillon (kg) -observe.common.TargetCatchDto.title=Capture cible -observe.common.time=Heure -observe.common.timeBetweenHooks=Temps entre hameçons (s) -observe.common.topType=Type -observe.common.totalBasketsCount=Nombre de paniers -observe.common.totalCount=Nombre estimé -observe.common.totalHooksCount=Nombre total d'avançons -observe.common.totalSectionsCount=Nombre total de sections -observe.common.totalWeight=Poids -observe.common.tracelineLength=Partie basse (m) -observe.common.tracelineType=Type bas de ligne -observe.common.TransmittingBuoyDto.transmittingBuoyOperation=Opération balise -observe.common.TransmittingBuoyDto.transmittingBuoyType=Type de balise -observe.common.tripType=Type de marée -observe.common.ReferentialDto.uri=URI -observe.common.ObjectMaterialDto.validation=Validation -observe.common.vessel=Bateau -observe.common.vesselActivityLongline=Activité bateau -observe.common.vesselActivitySeine=Activité bateau -observe.common.vesselSizeCategory=Catégorie de bateau -observe.common.vesselSpeed=Vitesse bateau (nd) -observe.common.vesselType=Type de pêcherie -observe.common.waveHeight=Libellé Hauteur moyenne vagues -observe.common.weight=Poids (en t) -observe.common.weightCategory=Catégorie de poids -observe.common.weightLengthFormula=Relation Taille -observe.common.well=Cuve -observe.common.whenArriving=À l'arrivée -observe.common.whenLeaving=Au départ -observe.common.wind=Vent Beaufort -observe.common.wormsId=Worms -observe.common.yearService=Année de mise en service observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.description=Voir les programmes Palangre observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== --- a/validation/src/main/resources/i18n/validation_en_GB.properties +++ b/validation/src/main/resources/i18n/validation_en_GB.properties @@ -98,7 +98,6 @@ observe.common.I18nReferentialDto.label1=English label observe.common.I18nReferentialDto.label2=French label observe.common.I18nReferentialDto.label3=Spanish label observe.common.LengthLengthParameterDto.coefficients=Coefficients -observe.common.LengthLengthParameterDto.inputOutputFormula=Input to Output formula observe.common.LengthLengthParameterDto.inputSizeMeasureType=Input size measure type observe.common.LengthLengthParameterDto.outputInputFormula=Output to Input formula observe.common.LengthLengthParameterDto.outputSizeMeasureType=Output size measure type ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== --- a/validation/src/main/resources/i18n/validation_es_ES.properties +++ b/validation/src/main/resources/i18n/validation_es_ES.properties @@ -98,7 +98,6 @@ observe.common.I18nReferentialDto.label1=Texto en inglés observe.common.I18nReferentialDto.label2=Texto en francés observe.common.I18nReferentialDto.label3=Nombre observe.common.LengthLengthParameterDto.coefficients=Coeficientes -observe.common.LengthLengthParameterDto.inputOutputFormula=Formule Entrée vers Sortie \#TODO observe.common.LengthLengthParameterDto.inputSizeMeasureType=Type de mensuration d'entrée \#TODO observe.common.LengthLengthParameterDto.outputInputFormula=Formule Sortie vers Entrée \#TODO observe.common.LengthLengthParameterDto.outputSizeMeasureType=Type de mensuration de sortie \#TODO ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== --- a/validation/src/main/resources/i18n/validation_fr_FR.properties +++ b/validation/src/main/resources/i18n/validation_fr_FR.properties @@ -98,7 +98,6 @@ observe.common.I18nReferentialDto.label1=Libellé anglais observe.common.I18nReferentialDto.label2=Libellé français observe.common.I18nReferentialDto.label3=Libellé espagnol observe.common.LengthLengthParameterDto.coefficients=Coefficients -observe.common.LengthLengthParameterDto.inputOutputFormula=Formule entrée -> sortie observe.common.LengthLengthParameterDto.inputSizeMeasureType=Type de mensuration d'entrée observe.common.LengthLengthParameterDto.outputInputFormula=Formule sortie -> entrée observe.common.LengthLengthParameterDto.outputSizeMeasureType=Type de mensuration de sortie View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/602be99494edcdc8d9aa7d324ae… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/602be99494edcdc8d9aa7d324ae… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve i18n keys (See #855)
by Tony CHEMIT 24 Aug '17

24 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3c96e740 by Tony CHEMIT at 2017-08-24T16:30:44+02:00 Improve i18n keys (See #855) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivitySeineSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/EditFloatingObjectReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRouteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripSeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripsUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ReOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ResetEditUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/dcprefs/DeleteReferenceUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenActivityAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenProgramAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenRouteAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenSetAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenTripAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportConfigUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3c96e740cdfda1416b6c7fb7fe3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3c96e740cdfda1416b6c7fb7fe3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 13 commits: add commons to validation for i18n type migration
by Tony CHEMIT 23 Aug '17

23 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c5304af9 by Tony CHEMIT at 2017-08-23T18:58:12+02:00 add commons to validation for i18n type migration - - - - - ebdea48a by Tony CHEMIT at 2017-08-23T18:58:12+02:00 Fix english i18n - - - - - 7be98eea by Tony CHEMIT at 2017-08-23T18:58:12+02:00 Improve i18n keys (See #855) : add type on i18n keys in validators (first step) and migrate translations - - - - - 5ed61977 by Tony CHEMIT at 2017-08-23T18:58:12+02:00 Improve i18n keys (See #855) : trick to get good i18n keys from client (make a commit to be able to revert until it is ok) - - - - - 71946577 by Tony CHEMIT at 2017-08-23T18:58:12+02:00 Improve i18n keys (See #855) : ok got on jaxx nearly all i18n generated, but there is still some improvements we could to - - - - - a1524e9a by Tony CHEMIT at 2017-08-23T18:58:12+02:00 Improve i18n keys (See #855) : start to use i18n computed key for nearly all fields, but there is still some improvements we could to - - - - - 77d9e651 by Tony CHEMIT at 2017-08-23T18:58:12+02:00 Save before cleaning i18n keys in client module - - - - - ab07e446 by Tony CHEMIT at 2017-08-23T18:58:12+02:00 clean i18n keys in client module - - - - - 76c49cab by Tony CHEMIT at 2017-08-23T18:58:12+02:00 hum default css classes :) - - - - - 9a251f0e by Tony CHEMIT at 2017-08-23T19:07:18+02:00 clean i18n keys in client module - - - - - 8d9cc0b3 by Tony CHEMIT at 2017-08-23T20:24:09+02:00 save before storm - - - - - 9f087cd1 by Tony CHEMIT at 2017-08-23T20:59:44+02:00 -mone more commite... - - - - - e6df9bae by Tony CHEMIT at 2017-08-23T21:07:34+02:00 should be nearly done now... leass than 50 observe.common stuff (will do this tomorrow, fed up to do i18n all over this day...) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportConfigUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/list/longline/ActivityLonglinesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/list/longline/TripLonglinesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/list/seine/ActivitySeinesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/list/seine/RoutesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/list/seine/TripSeinesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/RouteUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/RouteUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/RouteUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/TripSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ReferenceEntity.jcss - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/CountryUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/CountryUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/FpaZoneUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicTypeUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/81510ce5d90c32a3ea63ada6a6… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/81510ce5d90c32a3ea63ada6a6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 20 Aug '17

20 Aug '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 959a2e92 by 166231 at 2017-08-20T04:13:49+00:00 Site checkin for project ObServe :: Pom - - - - - 19 changed files: - administration-web.html - aggregate-third-party-report.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install-serverPG.html - install.html - integration.html - issue-tracking.html - license.html - plugin-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/959a2e92e41e432646b6ed22488… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/959a2e92e41e432646b6ed22488… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog after stage of milestone 7.0-RC-6 [skip ci]
by Tony CHEMIT 19 Aug '17

19 Aug '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 81510ce5 by 166231 at 2017-08-19T12:04:32+00:00 Update changelog after stage of milestone 7.0-RC-6 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,60 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-08-03 01:08. + * Last generated at 2017-08-19 12:04. -## Version [7.0-RC-5](https://gitlab.com/ultreiaio/ird-observe/milestones/99) +## Version [7.0-RC-6](https://gitlab.com/ultreiaio/ird-observe/milestones/100) **Closed at *In progress*.** ### Download -* [Application (observe-7.0-RC-5.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-7.0-RC-5.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-7.0-RC-6.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-7.0-RC-6.war)](https://oss.sonatype.org/content/repositories/frirdo…) + +### Issues + * [[Anomalie 816]](https://gitlab.com/ultreiaio/ird-observe/issues/816) **[WIDOWS] Il arrive que l'application ne parvienne pas à supprimer le fichier i18n.zip** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 817]](https://gitlab.com/ultreiaio/ird-observe/issues/817) **Libellés manquants** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 819]](https://gitlab.com/ultreiaio/ird-observe/issues/819) **Lorsque l'on crée un nouvel objet FOB, le formulaire devrait toujours se positionner sur le premier onglet** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 820]](https://gitlab.com/ultreiaio/ird-observe/issues/820) **Caractéristiques calculées des objets FOB** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 822]](https://gitlab.com/ultreiaio/ird-observe/issues/822) **Raccourcis sur assistant de connexion** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 823]](https://gitlab.com/ultreiaio/ird-observe/issues/823) **Impossible d'enregistrer une DCP** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 826]](https://gitlab.com/ultreiaio/ird-observe/issues/826) **L'enregistrement d'un FOB plante** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 827]](https://gitlab.com/ultreiaio/ird-observe/issues/827) **L'accès aux écrans PS targetSample conservés et targetSample rejetés** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 831]](https://gitlab.com/ultreiaio/ird-observe/issues/831) **Mauvais repositionnement de l'écran lors du changement du type d'opération FOB** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 834]](https://gitlab.com/ultreiaio/ird-observe/issues/834) **Impossible de valider le référentiel** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 835]](https://gitlab.com/ultreiaio/ird-observe/issues/835) **[PS][Echantillons][Faune accessoires] Report du type de mensuration standard** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 837]](https://gitlab.com/ultreiaio/ird-observe/issues/837) **Problème d'UI lors de l'enregistrement d'un profil de connexion direct** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 838]](https://gitlab.com/ultreiaio/ird-observe/issues/838) **Problème des caractères accentués, le retour** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 839]](https://gitlab.com/ultreiaio/ird-observe/issues/839) **Problème sur l'assistant de sélection de marées** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 840]](https://gitlab.com/ultreiaio/ird-observe/issues/840) **L'assistant sauver la base (central vers local) plante** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 841]](https://gitlab.com/ultreiaio/ird-observe/issues/841) **La synchro avancée de référentiel ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 843]](https://gitlab.com/ultreiaio/ird-observe/issues/843) **[PS] Problème de validation sur captures cibles conservées** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 846]](https://gitlab.com/ultreiaio/ird-observe/issues/846) **Curiosité d'affichage dans l'assistant de sélection des marées** (Thanks to Tony CHEMIT) (Reported by ) + * [[Anomalie 851]](https://gitlab.com/ultreiaio/ird-observe/issues/851) **Certains raccourcis claviers peuvent être déclanché alors que cela ne devrait pas être possible** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 818]](https://gitlab.com/ultreiaio/ird-observe/issues/818) **Ecran faune sensible rejetée, gestion de la date du rejet** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 821]](https://gitlab.com/ultreiaio/ird-observe/issues/821) **La barre de progression en % ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 825]](https://gitlab.com/ultreiaio/ird-observe/issues/825) **Le mode d'acquisition sur les espèces sensibles est Par individu par défaut** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 828]](https://gitlab.com/ultreiaio/ird-observe/issues/828) **Amélioration de l'onglet des ObjectMaterials** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 830]](https://gitlab.com/ultreiaio/ird-observe/issues/830) **[FOB] Précisions sur la validation** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 836]](https://gitlab.com/ultreiaio/ird-observe/issues/836) **[PS][Echantillons] Afficher le type de mensuration utilisé dans le tableau d'empilement des échantillons** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 842]](https://gitlab.com/ultreiaio/ird-observe/issues/842) **Pouvoir ajouter une connexion directe ou serveur depuis l'écran de gestion des connexions** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 847]](https://gitlab.com/ultreiaio/ird-observe/issues/847) **Dans les écrans de sélections de marées (export, backup, ...) il faudrait supprimer les programmes sans marée** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 848]](https://gitlab.com/ultreiaio/ird-observe/issues/848) **Amélioration de la disposition des racourcis claviers dans les menus** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 849]](https://gitlab.com/ultreiaio/ird-observe/issues/849) **Déplacer le menu traduire dans le menu Aide** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 850]](https://gitlab.com/ultreiaio/ird-observe/issues/850) **Revoir le menu de configuration de la langue** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 852]](https://gitlab.com/ultreiaio/ird-observe/issues/852) **Trier les connexions sauvegardées + ajout raccourcis clavier** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 853]](https://gitlab.com/ultreiaio/ird-observe/issues/853) **Améliorer le tri des types** (Thanks to Tony CHEMIT) (Reported by ) + * [[Evolution 854]](https://gitlab.com/ultreiaio/ird-observe/issues/854) **Permettre l'utilisation de la molette de la souris même sur des zones protégées** (Thanks to Tony CHEMIT) (Reported by ) + * [[Tâche 806]](https://gitlab.com/ultreiaio/ird-observe/issues/806) **Review validation layouts** (Thanks to Tony CHEMIT) (Reported by ) + * [[Tâche 824]](https://gitlab.com/ultreiaio/ird-observe/issues/824) **optimize services usage in client** (Thanks to Tony CHEMIT) (Reported by ) + * [[Tâche 829]](https://gitlab.com/ultreiaio/ird-observe/issues/829) **Supprimer 2 champs dans objectmaterial** (Thanks to Tony CHEMIT) (Reported by ) + * [[Tâche 832]](https://gitlab.com/ultreiaio/ird-observe/issues/832) **Amélioration du format des logs** (Thanks to Tony CHEMIT) (Reported by ) + * [[Tâche 833]](https://gitlab.com/ultreiaio/ird-observe/issues/833) **Create a sub project to put frameworks extensions used in ObServe** (Thanks to Tony CHEMIT) (Reported by ) + +## Version [7.0-RC-5](https://gitlab.com/ultreiaio/ird-observe/milestones/99) + +**Closed at *In progress*.** + ### Issues * [[Anomalie 812]](https://gitlab.com/ultreiaio/ird-observe/issues/812) **L'écran Senne Activité indique qu'il n'y a pas de dcp alors que j'en ai saisi un** (Thanks to Tony CHEMIT) (Reported by ) @@ -21,6 +66,7 @@ **Closed at 2017-08-02.** + ### Issues * [[Anomalie 807]](https://gitlab.com/ultreiaio/ird-observe/issues/807) **Problème de chargement de l'écran de référentiel FloatingObjectMaterial** (Thanks to Tony CHEMIT) (Reported by ) * [[Evolution 809]](https://gitlab.com/ultreiaio/ird-observe/issues/809) **Correction du nom d'un champs sur FloatingObject + ne pas pouvoir éditer l'opération de l'objet est mode modification** (Thanks to Tony CHEMIT) (Reported by ) @@ -616,859 +662,3 @@ Mise en place web services

*(from redmine: created on 2014-02-05)* * [[Tâche 594]](https://gitlab.com/ultreiaio/ird-observe/issues/594) **[Persistence] Vérifier la présence de tous les index nécessaires** (Thanks to Tony CHEMIT) (Reported by ) * [[Tâche 597]](https://gitlab.com/ultreiaio/ird-observe/issues/597) **Bien vérifer que tous les champs commentaires sont bien à 1024 caractères** (Thanks to Tony CHEMIT) (Reported by ) -## Version [4.0.6](https://gitlab.com/ultreiaio/ird-observe/milestones/64) -

*(from redmine: created on 2015-11-04)* - -**Closed at 2016-01-13.** - -### Download -* [Application (observe-4.0.6.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.…) - -### Issues - * [[Anomalie 506]](https://gitlab.com/ultreiaio/ird-observe/issues/506) **[PS][VALIDATION] Les contrôles de saisie sur les tailles/poids min/max ne fonctionnent plus** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 511]](https://gitlab.com/ultreiaio/ird-observe/issues/511) **Exception JXPathNotFoundException** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 512]](https://gitlab.com/ultreiaio/ird-observe/issues/512) **[H2] Le problème de corruption à la fermeture ou à l'ouverture de la base locale perdure** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 494]](https://gitlab.com/ultreiaio/ird-observe/issues/494) **[PS] Gestion de l'équipement du bateau & affichage des unités** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 532]](https://gitlab.com/ultreiaio/ird-observe/issues/532) **Augementer la mémoire à utiliser dans les scripts de démarrage** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [4.0.5](https://gitlab.com/ultreiaio/ird-observe/milestones/63) -

*(from redmine: created on 2015-11-03)* - -**Closed at 2015-11-04.** - -### Download -* [Application (observe-4.0.5.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.…) - -### Issues - * [[Anomalie 489]](https://gitlab.com/ultreiaio/ird-observe/issues/489) **[PS] Tableaux de synthèse - les dernières requêtes mises en place ne fonctionnent plus** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 493]](https://gitlab.com/ultreiaio/ird-observe/issues/493) **[PS] Calculs taille/poids : Problème sur recalcul** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [4.0.4](https://gitlab.com/ultreiaio/ird-observe/milestones/62) -

*(from redmine: created on 2015-08-27)* - -**Closed at 2015-11-03.** - -### Download -* [Application (observe-4.0.4.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.…) - -### Issues - * [[Anomalie 418]](https://gitlab.com/ultreiaio/ird-observe/issues/418) **[PS] Petit soucis de gestion d'événement sur la sélection du quadrant** (Thanks to Pascal Cauquil) (Reported by ) - * [[Anomalie 437]](https://gitlab.com/ultreiaio/ird-observe/issues/437) **Bug lors du changement de nationalité d'une personne** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 450]](https://gitlab.com/ultreiaio/ird-observe/issues/450) **Champ résiduel issu de la traduction FR->EN** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 453]](https://gitlab.com/ultreiaio/ird-observe/issues/453) **Régulièrement, la ré ouverture du logiciel et de sa base locale se solde par une SQLGrammarException** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 488]](https://gitlab.com/ultreiaio/ird-observe/issues/488) **Plantage des calculs taille/poids lorsque des paramètres de conversion existent pour plusieurs sexes** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 490]](https://gitlab.com/ultreiaio/ird-observe/issues/490) **Des clics multiples sur "Charger la source de données/Utiliser" provoquent une exception** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 492]](https://gitlab.com/ultreiaio/ird-observe/issues/492) **Certains Actions sur une base ouverte sont disponibles alors que la base n'est pas ouverte** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 432]](https://gitlab.com/ultreiaio/ird-observe/issues/432) **Contrôle des positions** (Thanks to Pascal Cauquil) (Reported by ) - * [[Evolution 439]](https://gitlab.com/ultreiaio/ird-observe/issues/439) **On repasse en niveau INFO les logs pour les modifications des coordonnées** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 440]](https://gitlab.com/ultreiaio/ird-observe/issues/440) **Faire paraitre le type de marée dans le nom du programme** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [4.0.3](https://gitlab.com/ultreiaio/ird-observe/milestones/61) -

*(from redmine: created on 2015-08-27)* - -**Closed at 2015-08-27.** - -### Download -* [Application (observe-4.0.3.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.…) - -### Issues - * [[Anomalie 420]](https://gitlab.com/ultreiaio/ird-observe/issues/420) **Problème avec la saisie des positions** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 433]](https://gitlab.com/ultreiaio/ird-observe/issues/433) **Souci sur une fonction SQL de la migration 4.0.2 avec PostgreSQL 8** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [4.0.2](https://gitlab.com/ultreiaio/ird-observe/milestones/59) -

*(from redmine: created on 2015-08-11)* - -**Closed at 2015-08-27.** - -### Download -* [Application (observe-4.0.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.…) - -### Issues - * [[Anomalie 428]](https://gitlab.com/ultreiaio/ird-observe/issues/428) **La migration 4.0->4.0.1.1 plante sur PostgreSQL 8** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 410]](https://gitlab.com/ultreiaio/ird-observe/issues/410) **[PS] Question calculs taille/poids** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [4.0-2](https://gitlab.com/ultreiaio/ird-observe/milestones/31) -Contrat "Armateurs"

*(from redmine: created on 2014-01-30)* - -**Closed at 2015-06-08.** - - -### Issues - * [[Anomalie 103]](https://gitlab.com/ultreiaio/ird-observe/issues/103) **[Synchro Référentiel] L'association species.ocean n'est pas synchronisée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 85]](https://gitlab.com/ultreiaio/ird-observe/issues/85) **Réallocation du programme d'une marée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 109]](https://gitlab.com/ultreiaio/ird-observe/issues/109) **Rendre le formulaire calée pleinement visible sur petits écrans** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 111]](https://gitlab.com/ultreiaio/ird-observe/issues/111) **Amélioration de performances** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 113]](https://gitlab.com/ultreiaio/ird-observe/issues/113) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 114]](https://gitlab.com/ultreiaio/ird-observe/issues/114) **Ajout de caractéristiques bateau sur une marée (et non dans le référentiel)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 115]](https://gitlab.com/ultreiaio/ird-observe/issues/115) **Programmation de 10 requêtes supplémentaires dans les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 117]](https://gitlab.com/ultreiaio/ird-observe/issues/117) **Gestion du pool de balises d'objets flottants exploité par le bateau** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 118]](https://gitlab.com/ultreiaio/ird-observe/issues/118) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 133]](https://gitlab.com/ultreiaio/ird-observe/issues/133) **Faire passer le contrôle sur les distances entre activités en warning** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [4.0.1.1](https://gitlab.com/ultreiaio/ird-observe/milestones/60) -

*(from redmine: created on 2015-08-14)* - -**Closed at 2015-08-14.** - -### Download -* [Application (observe-4.0.1.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/…) - -### Issues - * [[Anomalie 425]](https://gitlab.com/ultreiaio/ird-observe/issues/425) **Correction du chemin de fichier de log** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 275]](https://gitlab.com/ultreiaio/ird-observe/issues/275) **Mise en forme des tableaux comprenant des cases à cocher** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [4.0.1](https://gitlab.com/ultreiaio/ird-observe/milestones/58) -

*(from redmine: created on 2015-06-08)* - -**Closed at 2015-08-14.** - - -### Issues - * [[Anomalie 398]](https://gitlab.com/ultreiaio/ird-observe/issues/398) **[PS/LL] Par défaut les marées de la base locale à sauver ne sont plus sélectionnées** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 399]](https://gitlab.com/ultreiaio/ird-observe/issues/399) **[Référentiel] Petit défaut de libellé** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 400]](https://gitlab.com/ultreiaio/ird-observe/issues/400) **[Référentiel] Problème sur l'édition/validation des relations taille-poids** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 403]](https://gitlab.com/ultreiaio/ird-observe/issues/403) **[Réferentiel] Impossible d'enregistrer une nouvelle relation taille-poids** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 404]](https://gitlab.com/ultreiaio/ird-observe/issues/404) **[PS] Il manque quelques contrantes FK** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 405]](https://gitlab.com/ultreiaio/ird-observe/issues/405) **[SECURITE] L'assistant sécurité n'applique pas la sécurité sur les fonctions** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 408]](https://gitlab.com/ultreiaio/ird-observe/issues/408) **[PS] La fonction calcul écrase une donnée observée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 409]](https://gitlab.com/ultreiaio/ird-observe/issues/409) **[PS] La fonction de calcul semble ne plus calculer** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 411]](https://gitlab.com/ultreiaio/ird-observe/issues/411) **[Référentiel] Ajout d'un observateur/valeur pas défaut de "code"** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 413]](https://gitlab.com/ultreiaio/ird-observe/issues/413) **[ObServeLL] les saisies des mesures/poids ne s'enregistrent pas** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 414]](https://gitlab.com/ultreiaio/ird-observe/issues/414) **[ObServeLL] problème ID de virage négatif** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 415]](https://gitlab.com/ultreiaio/ird-observe/issues/415) **[REPLICATION] Messages "exception" dans la console lors des synchros de marées** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 416]](https://gitlab.com/ultreiaio/ird-observe/issues/416) **[PS] Problème sur la définition des équipements du bateau** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 417]](https://gitlab.com/ultreiaio/ird-observe/issues/417) **[MIGRATION] Topiaids relatifs à la conversion de la senne en équipement non uniques** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 422]](https://gitlab.com/ultreiaio/ird-observe/issues/422) **[ObServeLL] champs Distance et Nombre inversés dans formulaire Rencontres** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 402]](https://gitlab.com/ultreiaio/ird-observe/issues/402) **Utilisation codelutinpom 2.3** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 424]](https://gitlab.com/ultreiaio/ird-observe/issues/424) **Permettre la configuration des logs au niveau utilisateur** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 423]](https://gitlab.com/ultreiaio/ird-observe/issues/423) **Remplacer un script sql dans la distribution V4.x par celui-ci** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [4.0](https://gitlab.com/ultreiaio/ird-observe/milestones/33) -ObserveLL

*(from redmine: created on 2014-06-23)* - -**Closed at 2015-06-08.** - -### Download -* [Application (observe-4.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.0/…) - -### Issues - * [[Anomalie 199]](https://gitlab.com/ultreiaio/ird-observe/issues/199) **Comportement du contrôle sur les vitesses entre activités** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 266]](https://gitlab.com/ultreiaio/ird-observe/issues/266) **[ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 316]](https://gitlab.com/ultreiaio/ird-observe/issues/316) **[ObServeLL] Echec de la mise à jour de la version 3.14 -> 3.15.1** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 318]](https://gitlab.com/ultreiaio/ird-observe/issues/318) **[ObServeLL] Mise en page du formulaireComposition détaillée/Détail avançon** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 320]](https://gitlab.com/ultreiaio/ird-observe/issues/320) **[ObServePS] Mauvais disposition sur l'écran des activités senne** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 323]](https://gitlab.com/ultreiaio/ird-observe/issues/323) **Problème de création de base distante (avec recopie de données)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 324]](https://gitlab.com/ultreiaio/ird-observe/issues/324) **Problème de création d'une nouvelle base (suppression schéma public)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 325]](https://gitlab.com/ultreiaio/ird-observe/issues/325) **Mauvais libéllé lors de la création d'une base distante** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 326]](https://gitlab.com/ultreiaio/ird-observe/issues/326) **Problème de création d'une nouvelle base (table tms_version non créée)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 328]](https://gitlab.com/ultreiaio/ird-observe/issues/328) **bug à l'exportation données vers base centrale** (Thanks to Pascal Cauquil) (Reported by ) - * [[Anomalie 329]](https://gitlab.com/ultreiaio/ird-observe/issues/329) **Problème sur la type de Program.geartype** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 330]](https://gitlab.com/ultreiaio/ird-observe/issues/330) **Problème lors de la synchronisation des référentiels** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 332]](https://gitlab.com/ultreiaio/ird-observe/issues/332) **Une case à cocher est toujours présente mais sans libellé dans les actions** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 334]](https://gitlab.com/ultreiaio/ird-observe/issues/334) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité a été ajoutée à une display list d'espèces** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 335]](https://gitlab.com/ultreiaio/ird-observe/issues/335) **La sauvegarde de marées de la base centrale vers la base locale semble ne pas fonctionner** (Thanks to Pascal Cauquil) (Reported by ) - * [[Anomalie 337]](https://gitlab.com/ultreiaio/ird-observe/issues/337) **Le bouton "Ajouter l'opération de pêche" ne doit être disponible que pour une activité de type "Opération de pêche"** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 338]](https://gitlab.com/ultreiaio/ird-observe/issues/338) **L'export d'une marée vers la base centrale échoue** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 339]](https://gitlab.com/ultreiaio/ird-observe/issues/339) **[PS] Problèmes d'utilisation du nouvel écran 'Equipements'** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 340]](https://gitlab.com/ultreiaio/ird-observe/issues/340) **[PS] Les équipements devraient avoir des caractéristiques par défaut** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 345]](https://gitlab.com/ultreiaio/ird-observe/issues/345) **[LL] Comportements erronés du widget des positions en LL** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 348]](https://gitlab.com/ultreiaio/ird-observe/issues/348) **[LL] Non reprise du quadrant lors de la création d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 349]](https://gitlab.com/ultreiaio/ird-observe/issues/349) **[LL] Lors de l'enregistrement d'une opérationde pêche, perte de l'infromation sur les quadrants** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 350]](https://gitlab.com/ultreiaio/ird-observe/issues/350) **Quadrant mal initialisé lors de l'arrvié sur un écran** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 351]](https://gitlab.com/ultreiaio/ird-observe/issues/351) **Renommage du navire Palengirer inconnu en Palengrier inconnu** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 360]](https://gitlab.com/ultreiaio/ird-observe/issues/360) **[ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 363]](https://gitlab.com/ultreiaio/ird-observe/issues/363) **2 migrations of 4.0-RC3 ne sont pas jouées** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 364]](https://gitlab.com/ultreiaio/ird-observe/issues/364) **[ObServePS] Les équipements ne sont pas synchonisés** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 368]](https://gitlab.com/ultreiaio/ird-observe/issues/368) **[ObserveLL] libellé position verticale d'un tdr** (Thanks to Pascal Cauquil) (Reported by ) - * [[Anomalie 370]](https://gitlab.com/ultreiaio/ird-observe/issues/370) **[ObserveLL] Schéma de palangre (composition détaillée) : problème de clic droit sous Windows (empêche la suppression de paniers ou avancons)** (Thanks to Pascal Cauquil) (Reported by ) - * [[Anomalie 371]](https://gitlab.com/ultreiaio/ird-observe/issues/371) **[ObservePS] Le controle sur la durée d'une calée ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 373]](https://gitlab.com/ultreiaio/ird-observe/issues/373) **[LL/PS] Problème de libellé lors de la suppression d'un équipement** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 374]](https://gitlab.com/ultreiaio/ird-observe/issues/374) **Problème de lancement de calcul avec la jdk 8** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 375]](https://gitlab.com/ultreiaio/ird-observe/issues/375) **[LL] Définition du schéma de la palangre -> indisponibilité du bouton enregistrer** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 384]](https://gitlab.com/ultreiaio/ird-observe/issues/384) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 385]](https://gitlab.com/ultreiaio/ird-observe/issues/385) **Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 386]](https://gitlab.com/ultreiaio/ird-observe/issues/386) **Echec de la mise à jour de la version 4.0 RC5 vers RC6 en base locale** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 390]](https://gitlab.com/ultreiaio/ird-observe/issues/390) **[PS] Après migration, la senne de toutes les marées anciennes devrait être marquée comme "utilisée pendant la marée"** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 392]](https://gitlab.com/ultreiaio/ird-observe/issues/392) **[PS/LL] La fonction Action/Valider les données plante** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 393]](https://gitlab.com/ultreiaio/ird-observe/issues/393) **La 4 RC7 migrer en RC6, est-ce normal ?** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 394]](https://gitlab.com/ultreiaio/ird-observe/issues/394) **Erreur de légende pour la cartographie des marées ObserveLL** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 125]](https://gitlab.com/ultreiaio/ird-observe/issues/125) **ObserveLL** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 172]](https://gitlab.com/ultreiaio/ird-observe/issues/172) **Ajout de la nationalité de la balise sur le formulaire Opération sur balise** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 178]](https://gitlab.com/ultreiaio/ird-observe/issues/178) **Suppression de champs obsolètes** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 245]](https://gitlab.com/ultreiaio/ird-observe/issues/245) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 272]](https://gitlab.com/ultreiaio/ird-observe/issues/272) **LL/PS - Libellé des marées dans l'arbre** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 317]](https://gitlab.com/ultreiaio/ird-observe/issues/317) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 319]](https://gitlab.com/ultreiaio/ird-observe/issues/319) **[ObServeLL] Association d'une capture à un TDR** (Thanks to Pascal Cauquil) (Reported by ) - * [[Evolution 321]](https://gitlab.com/ultreiaio/ird-observe/issues/321) **Inclure ce fichier observe-report.properties dans la 4.0 RC2** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 322]](https://gitlab.com/ultreiaio/ird-observe/issues/322) **Amélioration des temps d'ouverture de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 327]](https://gitlab.com/ultreiaio/ird-observe/issues/327) **Amélioration du script apply-extra.sh** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 331]](https://gitlab.com/ultreiaio/ird-observe/issues/331) **[ObServeLL] Revue de la fonctionnalité d'export de marée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 333]](https://gitlab.com/ultreiaio/ird-observe/issues/333) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 336]](https://gitlab.com/ultreiaio/ird-observe/issues/336) **Problème technique lors de la tentative d'accès au formulaire Rencontres** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 341]](https://gitlab.com/ultreiaio/ird-observe/issues/341) **[PS] Mise en page formulaire Calée / Mesure** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 342]](https://gitlab.com/ultreiaio/ird-observe/issues/342) **Menu Action / Calculer les données : ajouter une icône** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 346]](https://gitlab.com/ultreiaio/ird-observe/issues/346) **[PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 347]](https://gitlab.com/ultreiaio/ird-observe/issues/347) **Import Access ?** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 355]](https://gitlab.com/ultreiaio/ird-observe/issues/355) **Nommer les clef étrangères** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 356]](https://gitlab.com/ultreiaio/ird-observe/issues/356) **Améliorer l'affichage des coordonnées** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 358]](https://gitlab.com/ultreiaio/ird-observe/issues/358) **Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 359]](https://gitlab.com/ultreiaio/ird-observe/issues/359) **[ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 361]](https://gitlab.com/ultreiaio/ird-observe/issues/361) **[ObServePS] Pouvoir supprimer une mise en oeuvre de caractéristique d'un équipement** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 362]](https://gitlab.com/ultreiaio/ird-observe/issues/362) **[ObServeLL] Ajout de l'écran des équipements** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 367]](https://gitlab.com/ultreiaio/ird-observe/issues/367) **La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 369]](https://gitlab.com/ultreiaio/ird-observe/issues/369) **[ObserveLL] Contrôle abusif longueur orin entre sections** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 372]](https://gitlab.com/ultreiaio/ird-observe/issues/372) **Ne pas afficher la carte tant qu'elle n'est pas chargée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 378]](https://gitlab.com/ultreiaio/ird-observe/issues/378) **[LL] Caractéristiques de la carte LL** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 379]](https://gitlab.com/ultreiaio/ird-observe/issues/379) **[PS] Petites améliorations souhaitées sur la carte PS** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 380]](https://gitlab.com/ultreiaio/ird-observe/issues/380) **[PS] Orthongel - Nouvelle requête Répartition des calées par cuve** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 381]](https://gitlab.com/ultreiaio/ird-observe/issues/381) **Optimisation des mises à jour de dates de fin sur les marées et routes** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 382]](https://gitlab.com/ultreiaio/ird-observe/issues/382) **[PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 383]](https://gitlab.com/ultreiaio/ird-observe/issues/383) **[PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 387]](https://gitlab.com/ultreiaio/ird-observe/issues/387) **Optimisation des requêtes pour les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 388]](https://gitlab.com/ultreiaio/ird-observe/issues/388) **Mise à jour librairies** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 389]](https://gitlab.com/ultreiaio/ird-observe/issues/389) **Quelques ajustements sur les nouvelles requêtes des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 391]](https://gitlab.com/ultreiaio/ird-observe/issues/391) **Amélioration sur la carte** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 396]](https://gitlab.com/ultreiaio/ird-observe/issues/396) **Ajout d'une migration de base pour être en 4.0** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 246]](https://gitlab.com/ultreiaio/ird-observe/issues/246) **Traductions à améliorer** (Thanks to Pascal Cauquil) (Reported by ) - * [[Tâche 262]](https://gitlab.com/ultreiaio/ird-observe/issues/262) **Dans les scripts de migration Sealor et Autoech, vérifier l'utilisation d'un champ** (Thanks to Pascal Cauquil) (Reported by ) - -## Version [3.15.1](https://gitlab.com/ultreiaio/ird-observe/milestones/49) -

*(from redmine: created on 2015-03-22)* - -**Closed at 2015-03-22.** - -### Download -* [Application (observe-3.15.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3…) - -### Issues - * [[Anomalie 283]](https://gitlab.com/ultreiaio/ird-observe/issues/283) **Les tableaux de synthèse PS ne fonctionnent plus** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 312]](https://gitlab.com/ultreiaio/ird-observe/issues/312) **Certaines traductions ont disparues** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 314]](https://gitlab.com/ultreiaio/ird-observe/issues/314) **Lorsque l'on change de quadrant, cela altère les coordonnées** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 73]](https://gitlab.com/ultreiaio/ird-observe/issues/73) **Ne pas ouvrir une base locale si sa version est supérieure à celle de l'application** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 195]](https://gitlab.com/ultreiaio/ird-observe/issues/195) **Comportement du masque de saisie des coordonnées + ordre des boutons radio** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 313]](https://gitlab.com/ultreiaio/ird-observe/issues/313) **Amélioration de la migration** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.15](https://gitlab.com/ultreiaio/ird-observe/milestones/46) -

*(from redmine: created on 2015-01-27)* - -**Closed at 2015-03-19.** - -### Download -* [Application (observe-3.15.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.1…) - -### Issues - * [[Anomalie 241]](https://gitlab.com/ultreiaio/ird-observe/issues/241) **Il manque des espèces dans la combo box espèces du formulaire captures** (Thanks to Pascal Cauquil) (Reported by ) - * [[Anomalie 263]](https://gitlab.com/ultreiaio/ird-observe/issues/263) **[ObserveLL] Exception sur l'enregistrement d'une activité** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 265]](https://gitlab.com/ultreiaio/ird-observe/issues/265) **[ObserveLL] La sauvegarde ne prend pas en compte les marées LL** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 269]](https://gitlab.com/ultreiaio/ird-observe/issues/269) **[ObserveLL] Problème sur libellé de la marée LL dans l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 274]](https://gitlab.com/ultreiaio/ird-observe/issues/274) **Localisation des captures et TDR sur la composition détaillée de la palangre/fonctionnement en entonoir des listes section/basket/branchline** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 280]](https://gitlab.com/ultreiaio/ird-observe/issues/280) **Ecran composition détaillée de la palangre : accès à l'onglet "Détail avançon"** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 285]](https://gitlab.com/ultreiaio/ird-observe/issues/285) **[ObserveLL] Le mécanisme qui pilote la valeur par défaut de branchline.timer semble ne pas fonctionner** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 264]](https://gitlab.com/ultreiaio/ird-observe/issues/264) **[ObserveLL] Ecran composition détaillée de la palangre** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 268]](https://gitlab.com/ultreiaio/ird-observe/issues/268) **[ObserveLL] Le libellé de l'activité dans l'arbre devrait contenir sa date** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 276]](https://gitlab.com/ultreiaio/ird-observe/issues/276) **[ObserveLL] Formulaire Opération de pêche/Enregistreur de profondeur : déplacer des champs sur un onglet supplémentaire** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 277]](https://gitlab.com/ultreiaio/ird-observe/issues/277) **[ObserveLL] Changement entiers vers décimaux sur entité TDR** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 278]](https://gitlab.com/ultreiaio/ird-observe/issues/278) **[ObserveLL] Mise en page formulaire Opération de pêche/Composition détaillée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 281]](https://gitlab.com/ultreiaio/ird-observe/issues/281) **[ObserveLL] Quelques adaptations sur le formulaire Composition globale** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 282]](https://gitlab.com/ultreiaio/ird-observe/issues/282) **[ObserveLL] Quelques adaptations sur le formulaire "Captures"** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 286]](https://gitlab.com/ultreiaio/ird-observe/issues/286) **[ObserveLL] Formulaires Capture et TDR : présentation des 3 listes déroulante en entonoir** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 287]](https://gitlab.com/ultreiaio/ird-observe/issues/287) **Par défaut, replier la réglette du réglage de l'heure** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 288]](https://gitlab.com/ultreiaio/ird-observe/issues/288) **[ObserveLL] Supprimer champs Opération de pêche / Caractéristiques / Longueur d'avançon & Longueur traceline** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 289]](https://gitlab.com/ultreiaio/ird-observe/issues/289) **[ObserveLL] Appliquer un warning sur Capteur utilisé / Numéro de série** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 291]](https://gitlab.com/ultreiaio/ird-observe/issues/291) **[ObserveLL] Persister les templates sur Opération de pêche / Définition détaillée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 292]](https://gitlab.com/ultreiaio/ird-observe/issues/292) **Améliorer la gestion du focus sur les champs heure/minutes d'un horodatage** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 296]](https://gitlab.com/ultreiaio/ird-observe/issues/296) **[ObserveLL] Formulaire Captures : agencement des champs** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 297]](https://gitlab.com/ultreiaio/ird-observe/issues/297) **[ObserveLL] Formulaire Captures : Différencier le libellé du bouton "Nouveau" de celui des autres boutons "Nouveau"** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 298]](https://gitlab.com/ultreiaio/ird-observe/issues/298) **[ObserveLL] Formulaire Captures : ajouter un onglet qui reprend le contenu de Composition détaillée/Détail avançon** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 300]](https://gitlab.com/ultreiaio/ird-observe/issues/300) **[ObserveLL] Formulaire Captures : afficher 3 colonnes supplémentaires dans le tableau récapitulatif des captures** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 302]](https://gitlab.com/ultreiaio/ird-observe/issues/302) **[ObserveLL] Formulaire Activité : Remplir la date de la première activité d'une marée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 303]](https://gitlab.com/ultreiaio/ird-observe/issues/303) **[ObserveLL] Formulaire Activité/Opération de pêche/enregistreur de profondeur : permettre la nullité de l'hortadatage** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 304]](https://gitlab.com/ultreiaio/ird-observe/issues/304) **Arbre de navigation : quelques améliorations** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.14](https://gitlab.com/ultreiaio/ird-observe/milestones/45) -

*(from redmine: created on 2015-01-22)* - -**Closed at 2015-01-27.** - -### Download -* [Application (observe-3.14.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.1…) - -### Issues - * [[Anomalie 250]](https://gitlab.com/ultreiaio/ird-observe/issues/250) **La migration change le type du champ activitebateau.code (et d'autres)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 257]](https://gitlab.com/ultreiaio/ird-observe/issues/257) **Lorsque toutes les tailles d'un échantillon sont supprimées, l'échantillon reste en base** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 258]](https://gitlab.com/ultreiaio/ird-observe/issues/258) **Mauvaise gestion des flags targetsample.discarded et targetlength.discarded** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 261]](https://gitlab.com/ultreiaio/ird-observe/issues/261) **Impossible d'afficher l'écran Estimation banc** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 255]](https://gitlab.com/ultreiaio/ird-observe/issues/255) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 260]](https://gitlab.com/ultreiaio/ird-observe/issues/260) **Supprimer un champs redondant sur l'opération de pêche (LL)** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.13](https://gitlab.com/ultreiaio/ird-observe/milestones/44) -

*(from redmine: created on 2015-01-16)* - -**Closed at 2015-01-19.** - -### Download -* [Application (observe-3.13.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.1…) - -### Issues - * [[Anomalie 253]](https://gitlab.com/ultreiaio/ird-observe/issues/253) **[Synchro Référentiel] L'association species.ocean n'est pas synchronisée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 254]](https://gitlab.com/ultreiaio/ird-observe/issues/254) **[Synchro Référentiel] Problème de mise à jour des version** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 235]](https://gitlab.com/ultreiaio/ird-observe/issues/235) **Utilisation des topiaId pour configurer les liste des espèces dans les écrans (via la configuration)** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.12](https://gitlab.com/ultreiaio/ird-observe/milestones/43) -

*(from redmine: created on 2015-01-11)* - -**Closed at 2015-01-16.** - -### Download -* [Application (observe-3.12.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.1…) - -### Issues - * [[Anomalie 237]](https://gitlab.com/ultreiaio/ird-observe/issues/237) **Synchronisation des ports non fonctionnelle** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 248]](https://gitlab.com/ultreiaio/ird-observe/issues/248) **Impossible de scroller dans une double liste sur l'écran n'est pas éditable.** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 249]](https://gitlab.com/ultreiaio/ird-observe/issues/249) **Impossible de sauvegarder les modification dans une liste d'espèce** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 238]](https://gitlab.com/ultreiaio/ird-observe/issues/238) **Rajouter des libellés sur l'écran de référentiel Espèce** (Thanks to Pascal Cauquil) (Reported by ) - * [[Evolution 239]](https://gitlab.com/ultreiaio/ird-observe/issues/239) **Passer le port de départ en Warning** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 240]](https://gitlab.com/ultreiaio/ird-observe/issues/240) **Ne pas empêcher la clôture d'une marée même si son bateau ou observateur/saisisseur/capitaine est désactivé** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 242]](https://gitlab.com/ultreiaio/ird-observe/issues/242) **Ajouter les fonctions PostGIS sur les tables Port et Activté LL** (Thanks to Pascal Cauquil) (Reported by ) - * [[Evolution 247]](https://gitlab.com/ultreiaio/ird-observe/issues/247) **Somme des proportions dans les écran de définition de la composition globale** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 251]](https://gitlab.com/ultreiaio/ird-observe/issues/251) **Pouvoir utiliser des champs null sur les champs optionels des navires** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 252]](https://gitlab.com/ultreiaio/ird-observe/issues/252) **Ajouter un palangrier inconnu au référentiel** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.11](https://gitlab.com/ultreiaio/ird-observe/milestones/42) -

*(from redmine: created on 2014-12-22)* - -**Closed at 2015-01-11.** - -### Download -* [Application (observe-3.11.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.1…) - -### Issues - * [[Anomalie 228]](https://gitlab.com/ultreiaio/ird-observe/issues/228) **Problème d'initialisation de la sécurité sur de nouveaux logins** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 230]](https://gitlab.com/ultreiaio/ird-observe/issues/230) **[Sécurité] Bien supprimer les droits d'un utilisateur non utilisé** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 223]](https://gitlab.com/ultreiaio/ird-observe/issues/223) **Finaliser l'écran Composition détaillée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 224]](https://gitlab.com/ultreiaio/ird-observe/issues/224) **Suppression de champs obsolètes** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 225]](https://gitlab.com/ultreiaio/ird-observe/issues/225) **Ajout de la nationalité de la balise sur le formulaire Opération sur balise** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 229]](https://gitlab.com/ultreiaio/ird-observe/issues/229) **Faire passer le contrôle sur les distances entre activités en warning** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 231]](https://gitlab.com/ultreiaio/ird-observe/issues/231) **Réallocation du programme d'une marée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 232]](https://gitlab.com/ultreiaio/ird-observe/issues/232) **Rendre le formulaire calée pleinement visible sur petits écrans** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 234]](https://gitlab.com/ultreiaio/ird-observe/issues/234) **Modifier simultannement les états des composants d'heure et de position géographique** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 220]](https://gitlab.com/ultreiaio/ird-observe/issues/220) **Revoir la sélection de la position sur une palangre** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 233]](https://gitlab.com/ultreiaio/ird-observe/issues/233) **Mise à jour du script Postgis pour les activités** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.10](https://gitlab.com/ultreiaio/ird-observe/milestones/40) -

*(from redmine: created on 2014-12-07)* - -**Closed at 2015-12-29.** - -### Download -* [Application (observe-3.10.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.1…) - -### Issues - * [[Anomalie 185]](https://gitlab.com/ultreiaio/ird-observe/issues/185) **Hauteur des éditeurs de liste** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 194]](https://gitlab.com/ultreiaio/ird-observe/issues/194) **Version de base non reconnue lors de la création d'une nouvelle base locale depuis une base distante** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 215]](https://gitlab.com/ultreiaio/ird-observe/issues/215) **Il manque des contraintes FK dans les table 'set' et 'weightmeasure'** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 216]](https://gitlab.com/ultreiaio/ird-observe/issues/216) **Les date/heure/position de l'activité devraient être utilisées pour préremplir les date/heure/position du début de filage du set** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 217]](https://gitlab.com/ultreiaio/ird-observe/issues/217) **La migration crée des Person en doublon** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 218]](https://gitlab.com/ultreiaio/ird-observe/issues/218) **LL : Augmenter la taille des champs commentaire** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 219]](https://gitlab.com/ultreiaio/ird-observe/issues/219) **Problème sur les sensorDataformat** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 222]](https://gitlab.com/ultreiaio/ird-observe/issues/222) **[Écran Opération sur balises] Plus possible d'en créer** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 168]](https://gitlab.com/ultreiaio/ird-observe/issues/168) **Écran Composition détaillée de la palangre** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 221]](https://gitlab.com/ultreiaio/ird-observe/issues/221) **Pouvoir cliquer sur les onglets lorsque l'écran n'est pas éditable** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.9](https://gitlab.com/ultreiaio/ird-observe/milestones/38) -

*(from redmine: created on 2014-11-27)* - -**Closed at 2014-12-11.** - -### Download -* [Application (observe-3.9.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.9/…) - -### Issues - * [[Anomalie 213]](https://gitlab.com/ultreiaio/ird-observe/issues/213) **Par défaut, afficher le widget des coordonnées en DMS** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 167]](https://gitlab.com/ultreiaio/ird-observe/issues/167) **Écran Composition globale de la palangre** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 184]](https://gitlab.com/ultreiaio/ird-observe/issues/184) **Filtre sur les navires** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 201]](https://gitlab.com/ultreiaio/ird-observe/issues/201) **Bien s'assurer que les secondes sont prises en compte dans les éditeurs de position** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 204]](https://gitlab.com/ultreiaio/ird-observe/issues/204) **Pour saisir directement de la date de fin de la marée dès la création d'une marée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 205]](https://gitlab.com/ultreiaio/ird-observe/issues/205) **Ajouter des controles sur l'écran Rencontres** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 206]](https://gitlab.com/ultreiaio/ird-observe/issues/206) **Conserver le nom du fichier lors de l'import d'une pièce jointe** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 207]](https://gitlab.com/ultreiaio/ird-observe/issues/207) **Préciser le nom du fichier d'export d'une pièce jointe** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 208]](https://gitlab.com/ultreiaio/ird-observe/issues/208) **Contrôles et valeurs par défaut sur l'écran Calée (LL)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 209]](https://gitlab.com/ultreiaio/ird-observe/issues/209) **Mettre sur les onglets un icon quand il y a des erreurs** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 210]](https://gitlab.com/ultreiaio/ird-observe/issues/210) **Écran capture** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 211]](https://gitlab.com/ultreiaio/ird-observe/issues/211) **Mettre par defaut la format DMS sur les éditeurs de coordonnées** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 214]](https://gitlab.com/ultreiaio/ird-observe/issues/214) **Replir le référentiel SensorDataFormat** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.8](https://gitlab.com/ultreiaio/ird-observe/milestones/36) -

*(from redmine: created on 2014-11-24)* - -**Closed at 2014-12-05.** - -### Download -* [Application (observe-3.8.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.8/…) - -### Issues - * [[Anomalie 176]](https://gitlab.com/ultreiaio/ird-observe/issues/176) **Mauvais déclanchement de la validation des vitesses** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 182]](https://gitlab.com/ultreiaio/ird-observe/issues/182) **Impossible de créer une nouvelle calée seine** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 186]](https://gitlab.com/ultreiaio/ird-observe/issues/186) **Revoir le format des éditeurs de position en DMD** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 190]](https://gitlab.com/ultreiaio/ird-observe/issues/190) **Impossible d'ouvrir les détail d'une relation taille-poids** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 191]](https://gitlab.com/ultreiaio/ird-observe/issues/191) **Validation des plages de temps ne fonctionne plus sur la calée (PS)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 203]](https://gitlab.com/ultreiaio/ird-observe/issues/203) **Mauvaise liste d'espèces utilisées dans certains écrans** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 174]](https://gitlab.com/ultreiaio/ird-observe/issues/174) **Écran des capteurs (LL)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 181]](https://gitlab.com/ultreiaio/ird-observe/issues/181) **Utilisation des doubles listes dans l'application** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 183]](https://gitlab.com/ultreiaio/ird-observe/issues/183) **Ajouter les flag captain et saisisseur à l'utilisateur nommé [inconnu]** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 187]](https://gitlab.com/ultreiaio/ird-observe/issues/187) **Date heure des activités (LL)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 188]](https://gitlab.com/ultreiaio/ird-observe/issues/188) **Écran Calée (LL)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 189]](https://gitlab.com/ultreiaio/ird-observe/issues/189) **Écran Capture (LL)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 192]](https://gitlab.com/ultreiaio/ird-observe/issues/192) **Utilisation des nouveaux éditeurs sur les écrans Seine** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 193]](https://gitlab.com/ultreiaio/ird-observe/issues/193) **Écran des TDR (LL)** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.7.1](https://gitlab.com/ultreiaio/ird-observe/milestones/37) -

*(from redmine: created on 2014-11-25)* - -**Closed at 2014-11-25.** - -### Download -* [Application (observe-3.7.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.…) - -### Issues - * [[Anomalie 179]](https://gitlab.com/ultreiaio/ird-observe/issues/179) **Bug dans la migration 3.7** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 180]](https://gitlab.com/ultreiaio/ird-observe/issues/180) **Problème de génération du site** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.7](https://gitlab.com/ultreiaio/ird-observe/milestones/35) -

*(from redmine: created on 2014-08-25)* - -**Closed at 2014-11-24.** - -### Download -* [Application (observe-3.7.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.7/…) - -### Issues - * [[Anomalie 102]](https://gitlab.com/ultreiaio/ird-observe/issues/102) **L'assistant update-security ne rend pas la main au terminal en fin d'exécution** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 155]](https://gitlab.com/ultreiaio/ird-observe/issues/155) **Libellés erronés sur les écrans de migration d'update-obstuna 3.6** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 156]](https://gitlab.com/ultreiaio/ird-observe/issues/156) **L'espace mémoire que tente de réserver l'assistant update-obstuna 3.6 semble un peu trop important** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 177]](https://gitlab.com/ultreiaio/ird-observe/issues/177) **LL : Augmenter la taille des champs commentaire** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 124]](https://gitlab.com/ultreiaio/ird-observe/issues/124) **Mettre à jour observe-tools** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 158]](https://gitlab.com/ultreiaio/ird-observe/issues/158) **Renommage des entities Trip, VesselActivity, Activity et Set dans le modèle Seine** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 160]](https://gitlab.com/ultreiaio/ird-observe/issues/160) **Ajouter le champs needComment sur tous les référentiels** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 161]](https://gitlab.com/ultreiaio/ird-observe/issues/161) **Supprimer le champs TripSeine.organism** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 162]](https://gitlab.com/ultreiaio/ird-observe/issues/162) **Ajout des champs program et ocean sur TripLongline** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 163]](https://gitlab.com/ultreiaio/ird-observe/issues/163) **Écran de Marée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 165]](https://gitlab.com/ultreiaio/ird-observe/issues/165) **Écran Activité** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 166]](https://gitlab.com/ultreiaio/ird-observe/issues/166) **Écran Opération de pêche** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 169]](https://gitlab.com/ultreiaio/ird-observe/issues/169) **Écran Capture** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 170]](https://gitlab.com/ultreiaio/ird-observe/issues/170) **Finalisation de l'entité SetLongline** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 171]](https://gitlab.com/ultreiaio/ird-observe/issues/171) **Finalisation de l'entité CatchLongline** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 173]](https://gitlab.com/ultreiaio/ird-observe/issues/173) **Finalisation de l'entité Tdr** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 175]](https://gitlab.com/ultreiaio/ird-observe/issues/175) **Mise à jour des listes d'espèces pour le modèle ObserveLL** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 159]](https://gitlab.com/ultreiaio/ird-observe/issues/159) **Découper le module business en deux** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.6](https://gitlab.com/ultreiaio/ird-observe/milestones/34) -Intégration des référentiels longline + diverses évolutions et corrections

*(from redmine: created on 2014-07-24)* - -**Closed at 2014-08-06.** - -### Download -* [Application (observe-3.6.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.6/…) - -### Issues - * [[Anomalie 21]](https://gitlab.com/ultreiaio/ird-observe/issues/21) **Anomalie relative à la synchronisation de référentiel** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 128]](https://gitlab.com/ultreiaio/ird-observe/issues/128) **Exception due à un probleme de date d'activité** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 129]](https://gitlab.com/ultreiaio/ird-observe/issues/129) **NulPointerException sur une base** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 134]](https://gitlab.com/ultreiaio/ird-observe/issues/134) **Contrôle doublonné avec avertissement+erreur** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 135]](https://gitlab.com/ultreiaio/ird-observe/issues/135) **Mauvaise interprétation des logins postgres nécessitant d'être échappés** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 98]](https://gitlab.com/ultreiaio/ird-observe/issues/98) **Restauration de marées lors de la création d'une base centrale** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 110]](https://gitlab.com/ultreiaio/ird-observe/issues/110) **Libellé à modifier** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 150]](https://gitlab.com/ultreiaio/ird-observe/issues/150) **Stabilisation du modèle** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 151]](https://gitlab.com/ultreiaio/ird-observe/issues/151) **Ajout des référentiels longline** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 152]](https://gitlab.com/ultreiaio/ird-observe/issues/152) **Changement du type reference.code en String** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 154]](https://gitlab.com/ultreiaio/ird-observe/issues/154) **Ajout d'un champs gearType sur les programmes** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 153]](https://gitlab.com/ultreiaio/ird-observe/issues/153) **Ajout des traductions du modèle Palangre** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.5](https://gitlab.com/ultreiaio/ird-observe/milestones/30) -Traduction modèle + ajout modèle Longline

*(from redmine: created on 2014-01-09)* - -**Closed at 2014-07-06.** - -### Download -* [Application (observe-3.5.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.5/…) - -### Issues - * [[Anomalie 127]](https://gitlab.com/ultreiaio/ird-observe/issues/127) **Bug dans le calcul des données** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 107]](https://gitlab.com/ultreiaio/ird-observe/issues/107) **Traduire le schéma de la base (tables/champs) en anglais** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 108]](https://gitlab.com/ultreiaio/ird-observe/issues/108) **Réunir les espèces thon et les espèces faune dans une même table et créer la notion de listes d'affichage** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 116]](https://gitlab.com/ultreiaio/ird-observe/issues/116) **Modélisation senne** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 140]](https://gitlab.com/ultreiaio/ird-observe/issues/140) **Mise en place modèle ObServeLL** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 141]](https://gitlab.com/ultreiaio/ird-observe/issues/141) **Mise en place des listes d'espèces** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 142]](https://gitlab.com/ultreiaio/ird-observe/issues/142) **Réusinage des Personnes** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 143]](https://gitlab.com/ultreiaio/ird-observe/issues/143) **Migration VentBeaufort** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 144]](https://gitlab.com/ultreiaio/ird-observe/issues/144) **Ajout champs captain et dataEntryOperator sur la marée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 145]](https://gitlab.com/ultreiaio/ird-observe/issues/145) **Add Sex common reference + rename gender field to sex** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 146]](https://gitlab.com/ultreiaio/ird-observe/issues/146) **Add FpaZone reference** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 147]](https://gitlab.com/ultreiaio/ird-observe/issues/147) **Ajout des référentiels du modèle Palangre** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 148]](https://gitlab.com/ultreiaio/ird-observe/issues/148) **utilisation de schéma sql** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 137]](https://gitlab.com/ultreiaio/ird-observe/issues/137) **Mise à jour librairies nuiton** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 138]](https://gitlab.com/ultreiaio/ird-observe/issues/138) **Supprimer la fonctionnalité d'import depuis les bases accès** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 139]](https://gitlab.com/ultreiaio/ird-observe/issues/139) **Supprimer les anciennes migrations** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.1.2](https://gitlab.com/ultreiaio/ird-observe/milestones/39) -

*(from redmine: created on 2014-12-02)* - -**Closed at 2014-12-02.** - -### Download -* [Application (observe-3.1.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.…) - -### Issues - * [[Anomalie 197]](https://gitlab.com/ultreiaio/ird-observe/issues/197) **Mauvais calcul des vitesses dans les activités** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.1.1](https://gitlab.com/ultreiaio/ird-observe/milestones/29) -

*(from redmine: created on 2013-10-10)* - -**Closed at 2013-10-10.** - -### Download -* [Application (observe-3.1.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.…) - -### Issues - * [[Tâche 101]](https://gitlab.com/ultreiaio/ird-observe/issues/101) **Updates topia to 2.8.1.3** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.1](https://gitlab.com/ultreiaio/ird-observe/milestones/28) -

*(from redmine: created on 2013-07-18)* - -**Closed at 2013-10-10.** - -### Download -* [Application (observe-3.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.1/…) - -### Issues - * [[Anomalie 91]](https://gitlab.com/ultreiaio/ird-observe/issues/91) **Problèmes de création de nouvelle base, si la base est sous Postgis 2** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 94]](https://gitlab.com/ultreiaio/ird-observe/issues/94) **Problème sur la migration des flags xxxcalcule ?** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 95]](https://gitlab.com/ultreiaio/ird-observe/issues/95) **Bug potentiel sur la contrainte d'unicité du formulaire "Faune accessoire conservée ou rejetée"** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 97]](https://gitlab.com/ultreiaio/ird-observe/issues/97) **Doublons et absence de clé primaire dans especefaune_ocean et especethon_ocean** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 99]](https://gitlab.com/ultreiaio/ird-observe/issues/99) **Gros problèmes avec une base locale** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 96]](https://gitlab.com/ultreiaio/ird-observe/issues/96) **Ajouter ce fichier à la distribution** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 100]](https://gitlab.com/ultreiaio/ird-observe/issues/100) **Updates topia to 2.8.1.2** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [3.0](https://gitlab.com/ultreiaio/ird-observe/milestones/24) -

*(from redmine: created on 2013-07-04)* - -**Closed at 2013-09-12.** - -### Download -* [Application (observe-3.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.0/…) - -### Issues - * [[Anomalie 8]](https://gitlab.com/ultreiaio/ird-observe/issues/8) **Un contrôle empêche la saisie d'une activite 6-Début de pêche** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 13]](https://gitlab.com/ultreiaio/ird-observe/issues/13) **Calcul de données** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 24]](https://gitlab.com/ultreiaio/ird-observe/issues/24) **[TECH] L'appli v2.5 permet de se connecter à une base centrale v2.1 sans message d'avertissement ou d'erreur** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 60]](https://gitlab.com/ultreiaio/ird-observe/issues/60) **[TECH] Problème de mise à jour d'une base distante** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 61]](https://gitlab.com/ultreiaio/ird-observe/issues/61) **[TECH] Problème d'application de la sécurité sur des roles avec des - dans leur nom** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 68]](https://gitlab.com/ultreiaio/ird-observe/issues/68) **[TECH] Action validation ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 70]](https://gitlab.com/ultreiaio/ird-observe/issues/70) **Dans la fenêtre perte du contenu de certains onglets** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 71]](https://gitlab.com/ultreiaio/ird-observe/issues/71) **[Validation] Les contrôles de vitesse ne fonctionnent pas bien dans l'action de validation** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 72]](https://gitlab.com/ultreiaio/ird-observe/issues/72) **Taille du zip anormalement grande** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 75]](https://gitlab.com/ultreiaio/ird-observe/issues/75) **Contrôle des vitesses au niveau activité** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 76]](https://gitlab.com/ultreiaio/ird-observe/issues/76) **Libellé du message sur test de vitesse au niveau activité** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 77]](https://gitlab.com/ultreiaio/ird-observe/issues/77) **Pb avec update-obstuna.sh et le SSL** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 78]](https://gitlab.com/ultreiaio/ird-observe/issues/78) **Problème de migration 3.0** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 79]](https://gitlab.com/ultreiaio/ird-observe/issues/79) **Ecran Capture faune : libellés d'erreur/warning** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 80]](https://gitlab.com/ultreiaio/ird-observe/issues/80) **Clic sur engrenage pour réinitialiser à "observé"** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 82]](https://gitlab.com/ultreiaio/ird-observe/issues/82) **Calcul des données capture faune associée : tout n'est pas calculé** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 83]](https://gitlab.com/ultreiaio/ird-observe/issues/83) **Manque la vitesse sur le controle des vitesse au niveau de la route** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 86]](https://gitlab.com/ultreiaio/ird-observe/issues/86) **Export central -> local : est-ce une erreur ?** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 90]](https://gitlab.com/ultreiaio/ird-observe/issues/90) **Création BD centrale sans référentiel -> initialisation d'un programme -> l'arbre ne montre pas le programme** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 22]](https://gitlab.com/ultreiaio/ird-observe/issues/22) **[Validation] Contrôle de la véracité de la position d'une activité au regard de la précédente et de la vitesse maxi d'un bateau** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 25]](https://gitlab.com/ultreiaio/ird-observe/issues/25) **Ajouter le nom de l'observateur dans l'identification des marées dans l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 26]](https://gitlab.com/ultreiaio/ird-observe/issues/26) **Classer partout les listes d'espèce (thons et faune associée) par code FAO par défaut** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 27]](https://gitlab.com/ultreiaio/ird-observe/issues/27) **Inverser les codes 1 et 2 correspondant aux types de banc** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 28]](https://gitlab.com/ultreiaio/ird-observe/issues/28) **[Validation] Empêcher l'utilisation d'une espèce dans un océan si elle n'y est pas marquée dans le référentiel comme présente** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 30]](https://gitlab.com/ultreiaio/ird-observe/issues/30) **Inclure cette fonction SQL sur le dépôt des sources et dans la distribution** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 31]](https://gitlab.com/ultreiaio/ird-observe/issues/31) **[EchantillonThon] Bug sur la saisie des échantillons de thons, saisie par individu** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 32]](https://gitlab.com/ultreiaio/ird-observe/issues/32) **Correction d'un libellé** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 33]](https://gitlab.com/ultreiaio/ird-observe/issues/33) **Intégrer ce fichier de requêtes dans la distribution courante** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 34]](https://gitlab.com/ultreiaio/ird-observe/issues/34) **Passer la relation objetflottant_operation de 0..n à 1..1** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 36]](https://gitlab.com/ultreiaio/ird-observe/issues/36) **[Validation] Passer "Devenir de l'objet" en warning** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 37]](https://gitlab.com/ultreiaio/ird-observe/issues/37) **[TECH] Voir s'il est possible de simplifier la connexion SSL** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 38]](https://gitlab.com/ultreiaio/ird-observe/issues/38) **Modélisation de la senne** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 39]](https://gitlab.com/ultreiaio/ird-observe/issues/39) **Pouvoir choisir directement l'année sur le composant Date** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 40]](https://gitlab.com/ultreiaio/ird-observe/issues/40) **Passer sur des vrais champs Date ou heure** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 41]](https://gitlab.com/ultreiaio/ird-observe/issues/41) **[Validation] ne pas permettre de rajouter deux routes à la même date** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 42]](https://gitlab.com/ultreiaio/ird-observe/issues/42) **[Validation] ne pas permettre de rajouter deux activités à la même heure** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 43]](https://gitlab.com/ultreiaio/ird-observe/issues/43) **[Validation] passer en warning tous les contrôles sur des intervalles de poids** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 44]](https://gitlab.com/ultreiaio/ird-observe/issues/44) **[Validation] Changer le contrôle pour exiger deux champs minimum dont au moins un des deux champs (poids estimé ou nombre estimé) soit renseigné (Faune accessoire ou rejeté)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 45]](https://gitlab.com/ultreiaio/ird-observe/issues/45) **[Validation] ne pas pouvoir faire d'échantillon s'il n'y a pas d'individus capturés (thon et faune)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 46]](https://gitlab.com/ultreiaio/ird-observe/issues/46) **[Validation] ne pas forcer d'avoir une activité de fin de pêche pour pouvoir en créer une nouvelle** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 47]](https://gitlab.com/ultreiaio/ird-observe/issues/47) **Pouvoir changer le status d'une donnée calculée en donnée observée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 48]](https://gitlab.com/ultreiaio/ird-observe/issues/48) **Valeurs à la création** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 49]](https://gitlab.com/ultreiaio/ird-observe/issues/49) **Décoration des espèces** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 50]](https://gitlab.com/ultreiaio/ird-observe/issues/50) **Ajouter un nouveau champ Calee#profondeurMesure (en m)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 51]](https://gitlab.com/ultreiaio/ird-observe/issues/51) **Correction de la traduction espagnole validator.captureFaune.bound.poidsMoyen** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 52]](https://gitlab.com/ultreiaio/ird-observe/issues/52) **[EchantillonFaune] Pouvoir saisir des echantillons faunes associés en mode effectif ou par individu** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 53]](https://gitlab.com/ultreiaio/ird-observe/issues/53) **Ajout d'une champ Programme#commentaire** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 54]](https://gitlab.com/ultreiaio/ird-observe/issues/54) **Supprimer unicité sur Espece#codeFAO** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 55]](https://gitlab.com/ultreiaio/ird-observe/issues/55) **Déplacer le champs ObjetFlottant#appartenance vers BaliseLue#appartenance** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 56]](https://gitlab.com/ultreiaio/ird-observe/issues/56) **Problème d'affichage des arbres sous jdk 7** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 57]](https://gitlab.com/ultreiaio/ird-observe/issues/57) **Amélioration de l'initialisation du référentiel d'une base centrale** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 58]](https://gitlab.com/ultreiaio/ird-observe/issues/58) **Décorer en rouge les messages d'avertissement** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 59]](https://gitlab.com/ultreiaio/ird-observe/issues/59) **Permettre le changement des dates de fin de calée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 62]](https://gitlab.com/ultreiaio/ird-observe/issues/62) **[TECH] Ne permettre l'utilisation lors de la création de la même base pour faire l'import du référentiel** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 63]](https://gitlab.com/ultreiaio/ird-observe/issues/63) **[EchantillonThon] Pouvoir modifier l'espèce et la classe de taille en mode effectif** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 64]](https://gitlab.com/ultreiaio/ird-observe/issues/64) **Algorithme de colmatage des données de taille/poids manquantes sur les captures de faune associée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 74]](https://gitlab.com/ultreiaio/ird-observe/issues/74) **Signalement d'une position d'activité suspecte (test de vitesse) -> diverses difficultés** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 84]](https://gitlab.com/ultreiaio/ird-observe/issues/84) **Ajout champs Maree#iders** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 88]](https://gitlab.com/ultreiaio/ird-observe/issues/88) **Ajout d'un nouvel onglet dans l'écran À propos pour les traductions** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 29]](https://gitlab.com/ultreiaio/ird-observe/issues/29) **Mise à jour de librairies** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 35]](https://gitlab.com/ultreiaio/ird-observe/issues/35) **Suppression des modules inutiles** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 65]](https://gitlab.com/ultreiaio/ird-observe/issues/65) **[Validation] Mettre tous les validateurs dans le module dédié** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 66]](https://gitlab.com/ultreiaio/ird-observe/issues/66) **Changer la disposition des libellés de traductions dans les formulaire du référentiel** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 69]](https://gitlab.com/ultreiaio/ird-observe/issues/69) **Mettre à jour les traductions espagnoles** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 87]](https://gitlab.com/ultreiaio/ird-observe/issues/87) **Mise à jour du fichier des reports** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 89]](https://gitlab.com/ultreiaio/ird-observe/issues/89) **updates mavenpom to 3.4.13** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 92]](https://gitlab.com/ultreiaio/ird-observe/issues/92) **Updates mavenpom to 4.0** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 93]](https://gitlab.com/ultreiaio/ird-observe/issues/93) **Updates h2 to 1.3.173** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [2.5](https://gitlab.com/ultreiaio/ird-observe/milestones/19) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2012-09-27.** - -### Download -* [Application (observe-2.5.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/2.5/…) - -### Issues - * [[Anomalie 2]](https://gitlab.com/ultreiaio/ird-observe/issues/2) **Can not edit calee#vitesseCourant as a decimal** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 4]](https://gitlab.com/ultreiaio/ird-observe/issues/4) **Deux bug génants autours de parametrageTaillePoidsFaune** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 5]](https://gitlab.com/ultreiaio/ird-observe/issues/5) **Bug sur calcul de données avec JVM Java 7 (Linux/Ubuntu 11.10/IcedTea)** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 6]](https://gitlab.com/ultreiaio/ird-observe/issues/6) **bug d'affichage Java 7 : arbre de navigation** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 7]](https://gitlab.com/ultreiaio/ird-observe/issues/7) **Contrôles de position inactifs dans le formulaire Activité** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 9]](https://gitlab.com/ultreiaio/ird-observe/issues/9) **Remplacer le fichier observe-reports.properties par celui fourni ici** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 11]](https://gitlab.com/ultreiaio/ird-observe/issues/11) **Modification d'un contrôle sur formulaire Activité** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 12]](https://gitlab.com/ultreiaio/ird-observe/issues/12) **Modification de contrôle sur formulaire Calée** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 14]](https://gitlab.com/ultreiaio/ird-observe/issues/14) **Mettre à jour le fichier de traduction espagnol** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 15]](https://gitlab.com/ultreiaio/ird-observe/issues/15) **Exception au changement du sexe d'un paramétrage taille-poids faune** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 16]](https://gitlab.com/ultreiaio/ird-observe/issues/16) **Revoir les contrôles d'unicité des clefs métiers des entités ParametrageTaillePoidsFaune et ParametrageTaillePoidsThon** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 17]](https://gitlab.com/ultreiaio/ird-observe/issues/17) **Suppression impossible dans le référentiel** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 18]](https://gitlab.com/ultreiaio/ird-observe/issues/18) **Mauvais libellé dans le référentiel ParamétrageTaillePoidsThon** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 19]](https://gitlab.com/ultreiaio/ird-observe/issues/19) **Lors d'une erreur dans les actions, on ne voit pas bien les erreurs** (Thanks to Tony CHEMIT) (Reported by ) - * [[Anomalie 20]](https://gitlab.com/ultreiaio/ird-observe/issues/20) **L'ajout de nouvelles entitées via la synchronisation ne fonctionne pas pour les liasions** (Thanks to Tony CHEMIT) (Reported by ) - * [[Evolution 10]](https://gitlab.com/ultreiaio/ird-observe/issues/10) **Mettre à jour la doc avec les PJ ici présentes** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 1]](https://gitlab.com/ultreiaio/ird-observe/issues/1) **Migrates from labs.libre-entreprise.org to forge.codelutin.com** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 3]](https://gitlab.com/ultreiaio/ird-observe/issues/3) **Upgrades libraries** (Thanks to Tony CHEMIT) (Reported by ) - * [[Tâche 23]](https://gitlab.com/ultreiaio/ird-observe/issues/23) **Ne plus déployer observe-cli** (Thanks to Tony CHEMIT) (Reported by ) - -## Version [2.4](https://gitlab.com/ultreiaio/ird-observe/milestones/18) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2011-06-27.** - -### Download -* [Application (observe-2.4.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/2.4/…) - -### Issues -No issue. - -## Version [2.3](https://gitlab.com/ultreiaio/ird-observe/milestones/17) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2011-04-15.** - -### Download -* [Application (observe-2.3.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/2.3/…) - -### Issues -No issue. - -## Version [2.2](https://gitlab.com/ultreiaio/ird-observe/milestones/16) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2011-02-22.** - -### Download -* [Application (observe-2.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/2.2/…) - -### Issues -No issue. - -## Version [2.1](https://gitlab.com/ultreiaio/ird-observe/milestones/15) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2011-01-27.** - -### Download -* [Application (observe-2.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/2.1/…) - -### Issues -No issue. - -## Version [2.0.1](https://gitlab.com/ultreiaio/ird-observe/milestones/14) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2011-01-21.** - -### Download -* [Application (observe-2.0.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/2.…) - -### Issues -No issue. - -## Version [2.0](https://gitlab.com/ultreiaio/ird-observe/milestones/13) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2011-01-03.** - -### Download -* [Application (observe-2.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/2.0/…) - -### Issues -No issue. - -## Version [1.9.1](https://gitlab.com/ultreiaio/ird-observe/milestones/12) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-10-30.** - -### Download -* [Application (observe-1.9.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.…) - -### Issues -No issue. - -## Version [1.9](https://gitlab.com/ultreiaio/ird-observe/milestones/11) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-10-18.** - -### Download -* [Application (observe-1.9.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.9/…) - -### Issues -No issue. - -## Version [1.8](https://gitlab.com/ultreiaio/ird-observe/milestones/10) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-09-30.** - -### Download -* [Application (observe-1.8.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.8/…) - -### Issues -No issue. - -## Version [1.7](https://gitlab.com/ultreiaio/ird-observe/milestones/9) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-09-22.** - -### Download -* [Application (observe-1.7.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.7/…) - -### Issues -No issue. - -## Version [1.6.1](https://gitlab.com/ultreiaio/ird-observe/milestones/8) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-09-20.** - -### Download -* [Application (observe-1.6.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.…) - -### Issues -No issue. - -## Version [1.6](https://gitlab.com/ultreiaio/ird-observe/milestones/7) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-09-20.** - -### Download -* [Application (observe-1.6.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.6/…) - -### Issues -No issue. - -## Version [1.5](https://gitlab.com/ultreiaio/ird-observe/milestones/6) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-09-16.** - -### Download -* [Application (observe-1.5.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.5/…) - -### Issues -No issue. - -## Version [1.4](https://gitlab.com/ultreiaio/ird-observe/milestones/5) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-07-06.** - -### Download -* [Application (observe-1.4.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.4/…) - -### Issues -No issue. - -## Version [1.3.1](https://gitlab.com/ultreiaio/ird-observe/milestones/4) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-05-07.** - -### Download -* [Application (observe-1.3.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.…) - -### Issues -No issue. - -## Version [1.3](https://gitlab.com/ultreiaio/ird-observe/milestones/3) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-03-31.** - -### Download -* [Application (observe-1.3.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.3/…) - -### Issues -No issue. - -## Version [1.2](https://gitlab.com/ultreiaio/ird-observe/milestones/2) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-03-13.** - -### Download -* [Application (observe-1.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.2/…) - -### Issues -No issue. - -## Version [1.1.0](https://gitlab.com/ultreiaio/ird-observe/milestones/1) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2010-01-27.** - -### Download -* [Application (observe-1.1.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/1.…) - -### Issues -No issue. - -## Version [1.1](https://gitlab.com/ultreiaio/ird-observe/milestones/21) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2009-09-04.** - - -### Issues -No issue. - -## Version [1.0](https://gitlab.com/ultreiaio/ird-observe/milestones/20) -

*(from redmine: created on 2011-08-02)* - -**Closed at 2009-07-08.** - - -### Issues -No issue. - View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/81510ce5d90c32a3ea63ada6a66… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/81510ce5d90c32a3ea63ada6a66… You're receiving this email because of your account on gitlab.com.

1 0

Jump to page: