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

[Git][ultreiaio/ird-observe][develop] 2 commits: Défauts d'affichage dans l'arbre (on peut désormais sélectionner un nœud à...
by Tony CHEMIT 27 Jul '20

27 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2571beb8 by Tony Chemit at 2020-07-27T18:11:02+02:00 Défauts d'affichage dans l'arbre (on peut désormais sélectionner un nœud à partir de la souris quelque soit la position du point) - See #1580 - - - - - 22ea111d by Tony Chemit at 2020-07-27T18:12:55+02:00 Défauts d'affichage dans l'arbre (suppression de la bordure en noire sur la ligne sélectionnée) - See #1580 - - - - - 2 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/ObserveNavigationTreeShowPopupAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeCellRenderer.java Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/ObserveNavigationTreeShowPopupAction.java ===================================== @@ -112,41 +112,53 @@ public class ObserveNavigationTreeShowPopupAction { boolean rightClick = SwingUtilities.isRightMouseButton(e); - if (rightClick) { - - // get the coordinates of the mouse click - Point p = e.getPoint(); + // get the coordinates of the mouse click + Point p = e.getPoint(); - int closestRowForLocation = tree.getClosestRowForLocation(e.getX(), e.getY()); + int closestRowForLocation = tree.getClosestRowForLocation(e.getX(), e.getY()); - int rowToSelect = -1; + int rowToSelect = -1; - if (isRowSelected(closestRowForLocation)) { + if (isRowSelected(closestRowForLocation)) { - rowToSelect = closestRowForLocation; - } - - if (rowToSelect == -1) { - - // try to change selection + rowToSelect = closestRowForLocation; + } - TreePath pathForRow = tree.getPathForRow(closestRowForLocation); - tree.setSelectionPath(pathForRow); + if (rowToSelect == -1) { - if (isRowSelected(closestRowForLocation)) { + // try to change selection - rowToSelect = closestRowForLocation; - } + TreePath pathForRow = tree.getPathForRow(closestRowForLocation); + tree.setSelectionPath(pathForRow); + if (isRowSelected(closestRowForLocation)) { + rowToSelect = closestRowForLocation; } - if (rowToSelect != -1) { - - showPopup(rowToSelect, p); - + } else { + TreePath pathForRow = tree.getPathForRow(rowToSelect); + + Rectangle pathBounds = tree.getPathBounds(pathForRow); + if (e.getClickCount() == 2 && pathBounds != null && !pathBounds.contains(e.getPoint())) { + SwingUtilities.invokeLater(() -> { + if (tree.isExpanded(pathForRow)) { + tree.collapsePath(pathForRow); + } else { + tree.expandPath(pathForRow); + } + }); + e.consume(); + return; } } + if (rowToSelect != -1) { + return; + } + + if (rightClick) { + showPopup(rowToSelect, p); + } } private void openNodeMenu(KeyEvent e) { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeCellRenderer.java ===================================== @@ -49,6 +49,7 @@ public class NavigationTreeCellRenderer extends DefaultTreeRenderer { defaultVisuals.setForeground(value.getColor()); } super.configureVisuals(context); + rendererComponent.setBorder(null); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9c6b4c4fc789d575df29629f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9c6b4c4fc789d575df29629f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Défauts d'affichage dans l'arbre - Closes #1580
by Tony CHEMIT 26 Jul '20

26 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9c6b4c4f by Tony Chemit at 2020-07-26T13:01:38+02:00 Défauts d'affichage dans l'arbre - Closes #1580 - - - - - 5 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTree.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeCellRenderer.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/NavigationTreeNodeSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/ObserveTreeNodeSupport.java Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTree.java ===================================== @@ -93,8 +93,7 @@ public class NavigationTree extends JXTree { openNode(e.getPath()); }); - NavigationTreeCellRenderer renderer = new NavigationTreeCellRenderer(); - setCellRenderer(renderer); + setCellRenderer(new NavigationTreeCellRenderer()); ClientUIContext clientUIContext = ClientUIContextApplicationComponent.value(); ObserveEditModel navigationEdit = clientUIContext.getObserveEditModel(); @@ -108,6 +107,15 @@ public class NavigationTree extends JXTree { ); } +// public boolean getScrollableTracksViewportWidth() { +// return true; +// } + +// @Override +// public boolean isFixedRowHeight() { +// return true; +// } + @Override public void updateUI() { setSelectionModel(new NavigationTreeSelectionModel()); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeCellRenderer.java ===================================== @@ -1,40 +1,13 @@ package fr.ird.observe.client.datasource.editor.tree.navigation; -/*- - * #%L - * ObServe :: Client DataSource Editor API - * %% - * Copyright (C) 2008 - 2020 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.datasource.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.jdesktop.swingx.renderer.CellContext; +import org.jdesktop.swingx.renderer.DefaultTreeRenderer; +import org.jdesktop.swingx.renderer.IconValue; +import org.jdesktop.swingx.renderer.LabelProvider; import org.jdesktop.swingx.renderer.StringValue; -import org.jdesktop.swingx.tree.DefaultXTreeCellRenderer; import javax.swing.Icon; -import javax.swing.JLabel; -import javax.swing.JTree; -import javax.swing.SwingUtilities; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; /** * Created on 14/11/16. @@ -42,78 +15,41 @@ import java.awt.Dimension; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class NavigationTreeCellRenderer extends DefaultXTreeCellRenderer implements StringValue { +public class NavigationTreeCellRenderer extends DefaultTreeRenderer { - /** Logger */ - private static final Logger log = LogManager.getLogger(NavigationTreeCellRenderer.class); - -// @Override -// public Color getBackgroundSelectionColor() { -// return null; -// } -// -// @Override -// public Color getBackgroundNonSelectionColor() { -// // Fixes http://forge.codelutin.com/issues/830 for jdk 7 -// return Color.WHITE; -// } + public NavigationTreeCellRenderer() { + super(new NavigationTreeLabelProvider()); + } - @Override - public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { + private static class NavigationTreeStringIconValue implements StringValue, IconValue { - if (!(tree.getModel() instanceof NavigationTreeModel)) { - Component rendererComponent; - rendererComponent = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); - return rendererComponent; + @Override + public Icon getIcon(Object value) { + NavigationTreeNodeSupport<?> n = (NavigationTreeNodeSupport<?>) value; + return n.getIcon(); } - // get the icon to set for the node - NavigationTreeNodeSupport node = (NavigationTreeNodeSupport) value; - - Icon icon = node.getIcon(); + @Override + public String getString(Object value) { + NavigationTreeNodeSupport<?> n = (NavigationTreeNodeSupport<?>) value; + return n.toString(); + } + } - if (!sel) { + private static class NavigationTreeLabelProvider extends LabelProvider { - Color color = node.getColor(); - if (log.isTraceEnabled()) { - log.trace("===" + color + " for node " + node.getDataType() + " - " + node.getId()); - } - setTextNonSelectionColor(color); + public NavigationTreeLabelProvider() { + super(new NavigationTreeStringIconValue()); } - String text = node.getText(); - if (log.isTraceEnabled()) { - log.trace("===" + text + " for node " + node.getDataType() + " - " + node.getId()); - } - JLabel comp = (JLabel) super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus); - comp.setToolTipText(text); - comp.setIcon(icon); - Dimension size = comp.getPreferredSize(); - double height = size.getHeight(); - if (height > 50) { - log.error(String.format("Size is amazing: %s for node: %s", size, text)); - Dimension newSize = new Dimension((int) size.getWidth(), 32); - comp.setSize(newSize); - comp.setPreferredSize(newSize); - } else { - int stringWidth = SwingUtilities.computeStringWidth(comp.getFontMetrics(comp.getFont()), text); - if (size.getWidth() < stringWidth) { - log.error(String.format("Size is too low: %s for node: %s", size, text)); - Dimension newSize = new Dimension(stringWidth + 5, (int) height); - comp.setPreferredSize(newSize); + @Override + protected void configureVisuals(CellContext context) { + NavigationTreeNodeSupport<?> value = (NavigationTreeNodeSupport<?>) context.getValue(); + if (!context.isSelected()) { + defaultVisuals.setForeground(value.getColor()); } + super.configureVisuals(context); } - return comp; - } - - @Override - public String getString(Object value) { - NavigationTreeNodeSupport node = (NavigationTreeNodeSupport) value; - return node.getText(); - } - @Override - protected String paramString() { - return "Nope"; } } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTreeModel.java ===================================== @@ -24,12 +24,10 @@ package fr.ird.observe.client.datasource.editor.tree.navigation; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.configuration.NavigationTreeConfigBean; -import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.NavigationTreeModelInitializer; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.RootNavigationTreeNode; -import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.StringNavigationTreeNodeSupport; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.WithChildsToReload; import fr.ird.observe.navigation.model.DtoModelNavigationModel; import fr.ird.observe.navigation.model.ObserveNavigationNode; ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/NavigationTreeNodeSupport.java ===================================== @@ -124,7 +124,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor this.loaded = loaded; } - public NavigationTreeNodeSupport findChildById(String id) { + public NavigationTreeNodeSupport<?> findChildById(String id) { if (id == null) { // id null ? donc rien a faire @@ -147,9 +147,9 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor // au final le noeud est une feuille, donc ne convient pas return null; } - Enumeration children = children(); + Enumeration<?> children = children(); while (children.hasMoreElements()) { - NavigationTreeNodeSupport node = (NavigationTreeNodeSupport) children.nextElement(); + NavigationTreeNodeSupport<?> node = (NavigationTreeNodeSupport<?>) children.nextElement(); if (id.equals(node.getId()) || (node.getUserObject() instanceof String && id.equals(node.getUserObject()))) { return node; } @@ -158,7 +158,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor return null; } - public NavigationTreeNodeSupport findChildByType(Class<?> childType) { + public NavigationTreeNodeSupport<?> findChildByType(Class<?> childType) { if (childType.isAssignableFrom(getClass())) { @@ -177,9 +177,9 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor // au final le noeud est une feuille, donc ne convient pas return null; } - Enumeration children = children(); + Enumeration<?> children = children(); while (children.hasMoreElements()) { - NavigationTreeNodeSupport node = (NavigationTreeNodeSupport) children.nextElement(); + NavigationTreeNodeSupport<?> node = (NavigationTreeNodeSupport<?>) children.nextElement(); if (childType.isAssignableFrom(node.getClass())) { return node; } @@ -202,30 +202,6 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor return isOpen() ? Color.BLACK : Color.GRAY; } -// public JMenuItem toMenuItem(SelectNode action, JAXXObject ui) { -// -// JMenuItem mi = new JMenuItem(); -// AbstractAction a = new AbstractAction() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// if (log.isInfoEnabled()) { -// log.info("Select action from menuItem: " + e.getSource()); -// } -// action.actionPerformed(mi); -// } -// }; -// mi.setAction(a); -// mi.setText(getText().trim()); -// ObserveKeyStrokes.addKeyStroke(mi, ObserveKeyStrokes.KEY_STROKE_PRESSED_ENTER); -// mi.setIcon(getIcon(true)); -// mi.setForeground(getColor()); -// mi.setBackground(Color.WHITE); -// mi.putClientProperty("node", this); -// mi.putClientProperty("ui", ui); -// return mi; -// } - public NavigationTreeNodeSupport<?> findChildByModelNode(ObserveNavigationNode<?> node) { if (!isLoaded()) { @@ -238,7 +214,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor String id = node.getId(); Class<?> type = node.getType(); - Enumeration children = children(); + Enumeration<?> children = children(); while (children.hasMoreElements()) { NavigationTreeNodeSupport<?> child = (NavigationTreeNodeSupport<?>) children.nextElement(); if (child instanceof ReferenceNavigationTreeNodeSupport<?, ?>) { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/ObserveTreeNodeSupport.java ===================================== @@ -67,4 +67,8 @@ public abstract class ObserveTreeNodeSupport<O> extends DefaultMutableTreeNode { return servicesProviderSupplier.get(); } + @Override + public String toString() { + return getText(); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9c6b4c4fc789d575df29629f8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9c6b4c4fc789d575df29629f8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Utilisation de la nouvelle API dans JAXX pour éviter les surcharges de...
by Tony CHEMIT 25 Jul '20

25 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b8eeb691 by Tony Chemit at 2020-07-19T17:33:17+02:00 Utilisation de la nouvelle API dans JAXX pour éviter les surcharges de composants (on préfère utiliser des écouteurs). - - - - - 1acdd009 by Tony Chemit at 2020-07-19T17:35:00+02:00 On continue à nettoyer les model d'admin - - - - - 09adb6c4 by Tony Chemit at 2020-07-19T17:35:53+02:00 Essaie pour valider les DSS (mais probablement à supprimer et continuer) - - - - - 81c03639 by Tony Chemit at 2020-07-25T15:03:42+02:00 Remove action executor interface - - - - - 07026e7e by Tony Chemit at 2020-07-25T15:03:44+02:00 clean code - - - - - 6ef8a09f by Tony Chemit at 2020-07-25T15:03:44+02:00 Let's move to ObserveSwingDataSource some useful methods (to open or close, + icons) - - - - - 5b28f7ad by Tony Chemit at 2020-07-25T15:30:30+02:00 [ASSITANTS SYNCHRO AVANCEE] Cosmétique écran de connexions - Closes #1545 - - - - - 30 changed files: - + client-configuration/.mvn/i18n/parse-java - client-configuration/src/main/i18n/getters/java.getter - + client-core/src/main/java/fr/ird/observe/client/ActionWorkerInMainUIListener.java - client-core/src/main/java/fr/ird/observe/client/util/action/WithActionExecutor.java → client-core/src/main/java/fr/ird/observe/client/ApplicationContextClosedListener.java - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - + client-core/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-datasource-actions/pom.xml - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - + client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionWorkerListener.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/Close.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/NextStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5e7ba0cfabc64c30e347e112… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5e7ba0cfabc64c30e347e112… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Les requetes de type revert sont effectuées dans le mauvais sens :(
by Tony CHEMIT 18 Jul '20

18 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b76eb59e by Tony Chemit at 2020-07-18T19:33:07+02:00 Les requetes de type revert sont effectuées dans le mauvais sens :( - - - - - bc8c9e9e by Tony Chemit at 2020-07-18T19:33:31+02:00 la mise à jour avec propriétés ne fonctionne pas bien :( - - - - - c0e33071 by Tony Chemit at 2020-07-18T19:35:53+02:00 simplification du code sur un sélecteur de source de données (mais ça pourrait encore etre plus simple, faut tout remettre à plat :() - - - - - 70274902 by Tony Chemit at 2020-07-18T20:21:58+02:00 ajout d'une méthode simple sans ui pour initialiser un StorageModel - - - - - 7b8c6f9a by Tony Chemit at 2020-07-18T20:22:07+02:00 correction de la validation - - - - - 4bca01d1 by Tony Chemit at 2020-07-18T21:25:37+02:00 correction de l'ordre de fermeture du context d'ui - - - - - 5e7ba0cf by Tony Chemit at 2020-07-18T21:37:53+02:00 [ASSITANTS SYNCHRO AVANCEE] Cosmétique écran de connexions - See #1545 (première étape de réusinage du code) - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/actions/Prepare.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bf051055b3c3fe4b1478d2a9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bf051055b3c3fe4b1478d2a9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Améliorer la transition vers l'onglet de sélection de données - Closes #1556
by Tony CHEMIT 17 Jul '20

17 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bf051055 by Tony Chemit at 2020-07-17T22:19:21+02:00 Améliorer la transition vers l'onglet de sélection de données - Closes #1556 - - - - - 28 changed files: - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/i18n/getters/jaxx.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/SelectData.java → client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jaxx - − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/connexion/DataSourceSelectorModel.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-datasource-actions/src/main/i18n/getters/java.getter ===================================== @@ -3,6 +3,8 @@ observe.Id.validation.field.tip observe.Id.validation.message.tip observe.Id.validation.scope.tip observe.common.none +observe.constant.AdminStep.SELECT_DATA +observe.constant.AdminStep.SELECT_DATA.description observe.ui.action.admin.cancel observe.ui.action.admin.close observe.ui.action.apply ===================================== client-datasource-actions/src/main/i18n/getters/jaxx.getter ===================================== @@ -23,6 +23,7 @@ observe.ui.datasource.editor.actions.report.select observe.ui.datasource.editor.actions.report.select.file observe.ui.datasource.editor.actions.report.select.file.tip observe.ui.datasource.editor.actions.report.variables +observe.ui.datasource.editor.actions.select.loading observe.ui.datasource.editor.actions.synchro.data.actionsToPerform observe.ui.datasource.editor.actions.synchro.referential.config.mode observe.ui.datasource.editor.actions.synchro.referential.obsolete.entities.list ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.actions; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.datasource.actions.config.ConfigUI; +import fr.ird.observe.client.datasource.actions.config.SelectDataModel; import fr.ird.observe.client.datasource.actions.config.SelectDataUI; import fr.ird.observe.client.datasource.actions.consolidate.ConsolidateModel; import fr.ird.observe.client.datasource.actions.consolidate.ConsolidateUI; @@ -77,9 +78,21 @@ public enum AdminStep implements WizardExtStep { /** pour selectionner les donnes */ SELECT_DATA( - null, +// null, +// SelectDataUI.class, +// true + n("observe.constant.AdminStep.SELECT_DATA"), + n("observe.constant.AdminStep.SELECT_DATA.description"), + "synchronizeReferentiel", + n("observe.constant.AdminStep.SELECT_DATA"), + n("observe.constant.AdminStep.SELECT_DATA.description"), + SelectDataModel.class, SelectDataUI.class, - true + false, + false, + false, + false, + 'S' ), /** pour résoudre les entités obosolètes */ @@ -435,6 +448,16 @@ public enum AdminStep implements WizardExtStep { return oldStep != null && oldStep.ordinal() < ordinal(); } + /** + * Is this step is the new step and come from a greater step (in ordinal order) ? + * + * @param oldStep the step before + * @return {@code true} if new step is this step and old step has a greater ordinal, {@code false} otherwise + */ + public boolean rewindToThisStep(AdminStep oldStep) { + return oldStep != null && oldStep.ordinal() > ordinal(); + } + public boolean isNeedReferentiel() { return needReferentiel; } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx ===================================== @@ -81,8 +81,12 @@ public void propertyChange(PropertyChangeEvent evt) { //propertyChange.super(evt); } -public void onComing(boolean pending) { - getHandler().onComing(pending); +public void onComingFromPreviousStep(boolean pending) { + getHandler().onComingFromPreviousStep(pending); +} + +public void onComingFromNextStep(AdminStep oldStep) { + getHandler().onComingFromNextStep(oldStep); } ]]> ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java ===================================== @@ -49,7 +49,11 @@ public class AdminTabUIHandler<U extends AdminTabUI> implements WithClientConfig protected AdminUI parentUI; protected DecoratorService decoratorService; - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { + // by default nothing to do + } + + protected void onComingFromNextStep(AdminStep oldStep) { // by default nothing to do } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java ===================================== @@ -188,7 +188,9 @@ public class AdminUIHandler implements UIHandler<AdminUI>, WithClientUIContext { AdminUIModel model = ui.getModel(); if (newStep.forwardToThisStep(oldStep)) { - c.onComing(model.getStepState(newStep) == WizardState.PENDING); + c.onComingFromPreviousStep(model.getStepState(newStep) == WizardState.PENDING); + } else if (newStep.rewindToThisStep(oldStep)) { + c.onComingFromNextStep(oldStep); } // selection du nouvel onglet @@ -223,7 +225,7 @@ public class AdminUIHandler implements UIHandler<AdminUI>, WithClientUIContext { return; } - if (selected != null && selected.getStep().isConfig()) { + if (selected != null && (selected.getStep().isConfig() || selected.getStep() == AdminStep.SELECT_DATA)) { log.debug("Selected step is config : " + selected.getStep()); while (itr.hasNext()) { @@ -231,7 +233,7 @@ public class AdminUIHandler implements UIHandler<AdminUI>, WithClientUIContext { Component tab = itr.next(); AdminTabUI tabUI = (AdminTabUI) tab; AdminStep synchroStep = tabUI.getStep(); - if (synchroStep.isConfig()) { + if (synchroStep.isConfig() || (synchroStep == AdminStep.SELECT_DATA && ui.getModel().getStepState(synchroStep) == WizardState.SUCCESSED)) { log.debug("Test config panel : " + synchroStep); boolean valid = ui.getModel().validate(synchroStep); if (valid) { @@ -274,8 +276,6 @@ public class AdminUIHandler implements UIHandler<AdminUI>, WithClientUIContext { // on demarre le modele ui.getModel().start(ui); - ui.onWasInit(); - // affichage ui ui.setVisible(true); ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java ===================================== @@ -38,8 +38,6 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtModel; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Arrays; import java.util.EnumSet; @@ -65,13 +63,10 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { private final EnumSet<DbMode> availableIncomingModes; - private final PropertyChangeListener listenStepChanged; - public AdminUIModel(AdminStep adminStep) { super(AdminStep.class); this.adminStep = Objects.requireNonNull(adminStep); this.availableIncomingModes = EnumSet.noneOf(DbMode.class); - this.listenStepChanged = this::onStepChanged; log.debug(String.format("model [%s] is instantiated.", this)); } @@ -79,43 +74,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { return adminStep; } - private void onStepChanged(PropertyChangeEvent evt) { - if (isWasStarted()) { - - // on ne propage plus rien (il n'y a plus de configuration possible...) - log.debug("Stop propagation, was started... " + evt.getPropertyName()); - return; - } - - AdminStep oldStep = (AdminStep) evt.getOldValue(); - AdminStep newStep = (AdminStep) evt.getNewValue(); - - if (oldStep != null && oldStep != AdminStep.CONFIG) { - - // on fait rien si on ne vient pas de la configuration - return; - } - - // on était sur l'écran de configuration - - // mise à jour des modèles de sélection si on arrive sur une étape - // qui le requière - - boolean needSelect = needSelect(); - - if (!needSelect) { - - // pas besoin d'agir sur le model de sélection de données - return; - } - - if (newStep == AdminStep.SELECT_DATA) { - - getSelectDataModel().initSelectionModel(this); - - } - } - @Override public void firePropertyChange(String propertyName, Object newValue) { super.firePropertyChange(propertyName, newValue); @@ -282,13 +240,12 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { getReferentialSynchroModel().start(ui); } - removePropertyChangeListener(STEP_PROPERTY_NAME, listenStepChanged); - addPropertyChangeListener(STEP_PROPERTY_NAME, listenStepChanged); - log.info("End of start..."); // on revalide le modèle (tout est prêt) validate(); + + ui.onWasInit(); } @Override @@ -308,6 +265,9 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { @Override public AdminUIModel addOperation(AdminStep step) { + if (step.isNeedSelect()) { + getOperations().add(AdminStep.SELECT_DATA); + } if (AdminStep.EXPORT_DATA == step) { // pour exporter les données utilisateurs ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java ===================================== @@ -31,7 +31,6 @@ import fr.ird.observe.client.datasource.actions.report.ReportModel; import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchronizeMode; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.tree.selection.SelectionTreeModel; -import fr.ird.observe.client.datasource.editor.wizard.StorageUIModel; import fr.ird.observe.client.datasource.editor.wizard.connexion.DataSourceSelectorModel; import fr.ird.observe.client.util.ObserveKeyStrokesSupport; import fr.ird.observe.client.util.UIHelper; @@ -83,6 +82,17 @@ public class ConfigModel extends AdminActionModel { ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep()); ConfigModel.this.firePropertyChange("valid", isValid()); } + + @Override + public void start(DbMode dbMode) { + super.start(dbMode); + if (isValid()) { + // load at once + setDataSourceInformation(null); + getSourceInformation(); + getSafeSource(true); + } + } }; centralSourceModel = new DataSourceSelectorModel(ObserveKeyStrokesSupport.KEY_STROKE_CONFIGURE_REMOTE_SOURCE) { @@ -106,8 +116,8 @@ public class ConfigModel extends AdminActionModel { boolean validate = true; - StorageUIModel centralSourceModel = getCentralSourceModel(); - StorageUIModel localSourceModel = getLocalSourceModel(); + DataSourceSelectorModel centralSourceModel = getCentralSourceModel(); + DataSourceSelectorModel localSourceModel = getLocalSourceModel(); if (uiModel.isNeedIncomingDataSource()) { if (!localSourceModel.isValid()) { @@ -215,9 +225,9 @@ public class ConfigModel extends AdminActionModel { atLeastOneWrite = true; } - if (centralSourceModel.getDataSourceInformation() != null) { + if (centralSourceModel.getSourceInformation() != null) { - ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getDataSourceInformation(); + ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getSourceInformation(); if (!(rightDataSourceInformation.canReadData())) { log.debug("can not read data on right data source"); return false; @@ -253,7 +263,7 @@ public class ConfigModel extends AdminActionModel { return false; } - ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getDataSourceInformation(); + ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getSourceInformation(); if (rightDataSourceInformation == null) { return false; } @@ -297,7 +307,7 @@ public class ConfigModel extends AdminActionModel { return false; } - ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getDataSourceInformation(); + ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getSourceInformation(); if (rightDataSourceInformation == null) { return false; } @@ -319,8 +329,8 @@ public class ConfigModel extends AdminActionModel { // il faut une base locale et une connexion distante // avec des droits d'écriture de données - validate &= centralSourceModel.getDataSourceInformation() != null - && centralSourceModel.getDataSourceInformation().canWriteData(); + validate &= centralSourceModel.getSourceInformation() != null + && centralSourceModel.getSourceInformation().canWriteData(); } @@ -333,8 +343,8 @@ public class ConfigModel extends AdminActionModel { validate &= reportFile != null && reportFile.exists() && reports != null && !reports.isEmpty(); } if (uiModel.containsOperation(AdminStep.ACTIVITY_LONGLINE_PAIRING)) { - validate &= localSourceModel.getDataSourceInformation() != null - && localSourceModel.getDataSourceInformation().canWriteData(); + validate &= localSourceModel.getSourceInformation() != null + && localSourceModel.getSourceInformation().canWriteData(); } return validate; ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUIHandler.java ===================================== @@ -61,6 +61,9 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa JPanel operations = ui.getOperations(); operations.removeAll(); for (AdminStep operation : model.getOperations()) { + if (AdminStep.SELECT_DATA == operation) { + continue; + } log.info("Add operation: " + operation); JLabel label = new JLabel(operation.getLabel()); label.setFont(label.getFont().deriveFont(Font.ITALIC).deriveFont(13f)); ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java ===================================== @@ -66,7 +66,6 @@ public class SelectDataModel extends AdminActionModel { this.selectionDataModel = selectionDataModel; } - public void initSelectionModel(AdminUIModel uiModel) { SelectionTreeModel selectionDataModel = getSelectionDataModel(); @@ -128,14 +127,14 @@ public class SelectDataModel extends AdminActionModel { } - public DataDtoReference getSelectedTrip() { + public DataDtoReference<?,?> getSelectedTrip() { Set<DataDtoReference<?, ?>> data = getSelectionDataModel().getSelectedData(); if (data.isEmpty()) { // pas de Trip selectionne return null; } - DataDtoReference dto = data.iterator().next(); + DataDtoReference<?,?> dto = data.iterator().next(); if (dto instanceof fr.ird.observe.dto.data.ps.common.TripReference) { return dto; } @@ -158,8 +157,6 @@ public class SelectDataModel extends AdminActionModel { public void start(AdminUIModel uiModel) { if (!uiModel.needSelect()) { - - // pas d'opération avec une sélection de données, rien a faire ici return; } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx ===================================== @@ -34,6 +34,16 @@ public static SelectDataUI get(AdminUI ui) { <SelectDataModel id='stepModel' initializer='getModel().getSelectDataModel()'/> <JPanel id='PENDING_content' layout="{new BorderLayout()}"> - <SelectionTreePane id='selectTreePane' decorator='boxed' constraints='BorderLayout.CENTER'/> + <Table constraints='BorderLayout.CENTER' fill='both' weightx='1' weighty='1'> + <row> + <cell> + <JButton id='selectData'/> + </cell> + </row> + </Table> </JPanel> + <JPanel id='invisiblePanel' > + <SelectionTreePane id='selectTreePane'/> + </JPanel> + </fr.ird.observe.client.datasource.actions.AdminTabUI> ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java ===================================== @@ -22,11 +22,17 @@ package fr.ird.observe.client.datasource.actions.config; * #L% */ +import fr.ird.observe.client.datasource.actions.AdminStep; import fr.ird.observe.client.datasource.actions.AdminTabUIHandler; -import fr.ird.observe.client.datasource.actions.actions.SelectData; import fr.ird.observe.client.datasource.editor.tree.selection.SelectionTree; import fr.ird.observe.client.util.UIHelper; import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.SwingUtil; +import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; + +import javax.swing.SwingUtilities; +import java.awt.GridBagConstraints; +import java.awt.Insets; /** * Created on 28/11/16. @@ -36,27 +42,42 @@ import org.nuiton.jaxx.runtime.spi.UIHandler; */ public class SelectDataUIHandler extends AdminTabUIHandler<SelectDataUI> implements UIHandler<SelectDataUI> { + boolean fix; + @Override - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { if (pending) { - SelectData action = SelectData.init(ui, null, SelectData.class); - action.run(); + SwingUtilities.invokeLater(ui.getSelectData()::doClick); } } @Override public void afterInit(SelectDataUI ui) { super.afterInit(ui); - - UIHelper.setLayerUI(ui.getContent(), null); - UIHelper.setLayerUI(ui.getSelectTreePane(), parentUI.getConfigBlockLayerUI()); - SelectionTree tree = ui.getSelectTreePane().getTree(); getModel().getSelectDataModel().setSelectionDataModel(tree.getTreeModel()); - tree.installUI(ui.getSelectTreePane()); - //FIXME Init tree ? -// UIHelper.initUI(ui.getSelectTreePane(), tree); } + @Override + protected void onComingFromNextStep(AdminStep oldStep) { + WizardState stepState = getModel().getStepState(oldStep); + if (stepState != WizardState.PENDING && !fix) { + UIHelper.setLayerUI(ui.getContent(), null); + UIHelper.setLayerUI(ui.getSelectTreePane(), parentUI.getConfigBlockLayerUI()); + fix = true; + } + } + + @Override + protected void onStateChangeToRunning() { + super.onStateChangeToRunning(); + } + + @Override + protected void onStateChangeToSuccess() { + super.onStateChangeToSuccess(); + ui.getSUCCESSED_panel().removeAll(); + ui.getSUCCESSED_panel().add(SwingUtil.boxComponentWithJxLayer(ui.getSelectTreePane()), new GridBagConstraints(0, 0, 1, 1, 1.0, 1, 10, 1, new Insets(3, 3, 3, 3), 0, 0)); + } } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/SelectData.java → client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.datasource.actions.actions; +package fr.ird.observe.client.datasource.actions.config.actions; /*- * #%L @@ -22,19 +22,33 @@ package fr.ird.observe.client.datasource.actions.actions; * #L% */ +import fr.ird.observe.client.datasource.actions.AdminUIModel; +import fr.ird.observe.client.datasource.actions.actions.AdminTabUIActionSupport; import fr.ird.observe.client.datasource.actions.config.SelectDataUI; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.tree.selection.SelectionTree; +import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; +import javax.swing.ActionMap; +import javax.swing.InputMap; import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; +import static io.ultreia.java4all.i18n.I18n.t; + public class SelectData extends AdminTabUIActionSupport<SelectDataUI> implements Runnable { public SelectData() { - super(null, null, null, null); + super(null, null, "wizard-start", 'D'); } + @Override + protected void defaultInit(InputMap inputMap, ActionMap actionMap) { + setText(t("observe.ui.datasource.editor.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel()))); + setTooltipText(t("observe.ui.datasource.editor.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel()))); + super.defaultInit(inputMap, actionMap); + } + @Override protected void doActionPerformed(ActionEvent e, SelectDataUI ui) { run(); @@ -45,24 +59,28 @@ public class SelectData extends AdminTabUIActionSupport<SelectDataUI> implements if (getParentUI().getConfigBlockLayerUI().isBlock()) { return; } - getParentUI().getModel().setBusy(true); - try { - SwingUtilities.invokeLater(this::run0); - } finally { - getParentUI().getModel().setBusy(false); - } + addAdminWorker(ui.getSelectData().getToolTipText(), this::run0); } - private void run0() { + private WizardState run0() { + AdminUIModel model = ui.getModel(); + WizardState stepState = model.getStepState(ui.getStep()); + if (stepState != WizardState.PENDING) { + return stepState; + } SelectionTree selectTree = ui.getSelectTreePane().getTree(); selectTree.clearSelection(); + + ui.getStepModel().initSelectionModel(model); + SwingUtilities.invokeLater(selectTree::grabFocus); if (selectTree.getTreeModel().isNotEmpty()) { selectTree.setSelectionRow(0); } - ObserveSwingDataSource localSource = ui.getModel().getConfigModel().getLocalSourceModel().getSafeSource(true); + ObserveSwingDataSource localSource = model.getConfigModel().getLocalSourceModel().getSafeSource(true); if (localSource.isLocal()) { SwingUtilities.invokeLater(selectTree::expandAll); } + return WizardState.SUCCESSED; } } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jaxx ===================================== @@ -34,7 +34,7 @@ public static ConsolidateUI get(AdminUI ui) { <ConsolidateModel id='stepModel' initializer='getModel().getConsolidateModel()'/> - <JPanel id='PENDING_content'> + <JPanel id='PENDING_content' layout="{new BorderLayout()}"> <Table constraints='BorderLayout.CENTER' fill='both' weightx='1' weighty='1'> <row> <cell> ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jcss deleted ===================================== @@ -1,30 +0,0 @@ -/* - * #%L - * ObServe :: Client DataSource Actions - * %% - * Copyright (C) 2008 - 2020 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% - */ - - -#PENDING_content { - layout:{new BorderLayout()}; -} - -#NEED_FIX_content { - layout:{new BorderLayout()}; -} ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java ===================================== @@ -35,7 +35,7 @@ import static io.ultreia.java4all.i18n.I18n.t; public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> implements UIHandler<ConsolidateUI> { @Override - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { if (pending) { SwingUtilities.invokeLater(ui.getStart()::doClick); } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUIHandler.java ===================================== @@ -52,7 +52,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa private static final Logger log = LogManager.getLogger(ExportUIHandler.class); @Override - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { if (pending) { SwingUtilities.invokeLater(ui.getPrepare()::doClick); } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUIHandler.java ===================================== @@ -35,7 +35,7 @@ import javax.swing.SwingUtilities; public class ActivityLonglinePairingUIHandler extends AdminTabUIHandler<ActivityLonglinePairingUI> implements UIHandler<ActivityLonglinePairingUI> { @Override - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { if (pending) { SwingUtilities.invokeLater(ui.getPrepare()::doClick); } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUIHandler.java ===================================== @@ -40,7 +40,7 @@ import static io.ultreia.java4all.i18n.I18n.t; public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implements UIHandler<SaveLocalUI> { @Override - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { updateText(); if (pending && !ui.getStepModel().isLocalSourceNeedSave()) { SwingUtilities.invokeLater(ui.getContinueAction()::doClick); ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java ===================================== @@ -45,7 +45,7 @@ import java.awt.Color; public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> implements UIHandler<DataSynchroUI> { @Override - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { if (pending) { SwingUtilities.invokeLater(ui.getStart()::doClick); } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java ===================================== @@ -56,7 +56,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple } @Override - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { if (pending) { SwingUtilities.invokeLater(ui.getStart()::doClick); } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUIHandler.java ===================================== @@ -53,7 +53,7 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy } @Override - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { if (pending) { SwingUtilities.invokeLater(ui.getStart()::doClick); } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java ===================================== @@ -68,7 +68,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements private static final Logger log = LogManager.getLogger(ValidateUIHandler.class); @Override - protected void onComing(boolean pending) { + protected void onComingFromPreviousStep(boolean pending) { if (pending) { ui.setEnabled(true); SwingUtilities.invokeLater(ui.getStart()::doClick); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java ===================================== @@ -181,8 +181,8 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie protected String serverUrl; /** Les information de connextion a la base **/ protected ObserveDataSourceInformation dataSourceInformation; - /** Les information de connextion a la base **/ - protected ObserveDataSourceInformation h2DataSourceInformation; +// /** Les information de connextion a la base **/ +// protected ObserveDataSourceInformation h2DataSourceInformation; /** le fichier d'import des données */ protected File dumpFile; /** le mode de creation d'une base */ @@ -419,7 +419,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie // on est actuellement connecte sur une base locale fromStorageConfig((ObserveDataSourceConfigurationTopiaH2) previousConfig); - h2DataSourceInformation = previousInfo; +// h2DataSourceInformation = previousInfo; } else if (previousConfig instanceof ObserveDataSourceConfigurationTopiaPG) { if (!isLocalStorageExist) { @@ -1946,9 +1946,9 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie } public ObserveDataSourceInformation getDataSourceInformation() { - if (DbMode.USE_LOCAL.equals(dbMode)) { - return getH2DataSourceInformation(); - } +// if (DbMode.USE_LOCAL.equals(dbMode)) { +// return getH2DataSourceInformation(); +// } return dataSourceInformation; } @@ -1957,18 +1957,18 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie this.dataSourceInformation = dataSourceInformation; } - public ObserveDataSourceInformation getH2DataSourceInformation() { - if (h2DataSourceInformation == null && localStorageExist) { - ObserveSwingDataSource dataSource = ClientUIContextApplicationComponent.value().getDataSourcesManager().newDataSource(h2Config); - try { - h2DataSourceInformation = dataSource.checkCanConnect(false); - } catch (Exception e) { - log.debug("error on load data source information for local storage", e); - } - } - - return h2DataSourceInformation; - } +// public ObserveDataSourceInformation getH2DataSourceInformation() { +// if (h2DataSourceInformation == null && localStorageExist) { +// ObserveSwingDataSource dataSource = ClientUIContextApplicationComponent.value().getDataSourcesManager().newDataSource(h2Config); +// try { +// h2DataSourceInformation = dataSource.checkCanConnect(false); +// } catch (Exception e) { +// log.debug("error on load data source information for local storage", e); +// } +// } +// +// return h2DataSourceInformation; +// } private boolean isValidDumpFile(File dumpFile) { return dumpFile != null && ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/connexion/DataSourceSelectorModel.java ===================================== @@ -30,7 +30,7 @@ import org.apache.logging.log4j.Logger; import javax.swing.KeyStroke; -public class DataSourceSelectorModel extends StorageUIModel { +public class DataSourceSelectorModel extends StorageUIModel { private static final Logger log = LogManager.getLogger(DataSourceSelectorModel.class); @@ -64,12 +64,17 @@ public class DataSourceSelectorModel extends StorageUIModel { public ObserveDataSourceInformation getSourceInformation() { if (sourceInformation == null) { - ObserveSwingDataSource localSource = getSafeSource(false); - try { - sourceInformation = localSource.checkCanConnect(false); - } catch (Exception e) { - //FIXME ! il faut faire quelque chose dans ce cas précis, au moins avertir l'utilisateur - log.error("unable to find local source information", e); + ObserveDataSourceInformation dataSourceInformation = getDataSourceInformation(); + if (dataSourceInformation != null) { + sourceInformation = dataSourceInformation; + } else { + try { + sourceInformation = getSafeSource(false).checkCanConnect(false); + setDataSourceInformation(sourceInformation); + } catch (Exception e) { + //FIXME ! il faut faire quelque chose dans ce cas précis, au moins avertir l'utilisateur + log.error("unable to find local source information", e); + } } } return sourceInformation; ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -2218,6 +2218,7 @@ observe.ui.datasource.editor.actions.report.title.tip=Help to generate reports observe.ui.datasource.editor.actions.report.variables=Variables configuration observe.ui.datasource.editor.actions.saveLocal=Save local database observe.ui.datasource.editor.actions.saveLocal.description=Save modifcations on local database +observe.ui.datasource.editor.actions.select.loading=< Data source select tree is loading > observe.ui.datasource.editor.actions.synchro.cancel.tip=Cancel observe.ui.datasource.editor.actions.synchro.copy.tip=Copy result of report in clipboard observe.ui.datasource.editor.actions.synchro.data=Advanced data management ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2218,6 +2218,7 @@ observe.ui.datasource.editor.actions.report.title.tip=Ayuda a la generación del observe.ui.datasource.editor.actions.report.variables=Configuración de variables observe.ui.datasource.editor.actions.saveLocal=Copia de seguridad de la base local observe.ui.datasource.editor.actions.saveLocal.description=Guardar las modificationes realizadas en la base locale +observe.ui.datasource.editor.actions.select.loading=< Data source select tree is loading > \#TODO observe.ui.datasource.editor.actions.synchro.cancel.tip=Cancelar observe.ui.datasource.editor.actions.synchro.copy.tip=Copiar el informe en el portapapeles observe.ui.datasource.editor.actions.synchro.data=Gestión avanzada de los datos ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2218,6 +2218,7 @@ observe.ui.datasource.editor.actions.report.title.tip=Aide à la génération du observe.ui.datasource.editor.actions.report.variables=Configuration des variables observe.ui.datasource.editor.actions.saveLocal=Sauvegarde de la base locale observe.ui.datasource.editor.actions.saveLocal.description=Sauvegarder les modifications effectuées vers la base locale +observe.ui.datasource.editor.actions.select.loading=< L'arbre de sélection de données est en cours de chargement > observe.ui.datasource.editor.actions.synchro.cancel.tip=Annuler observe.ui.datasource.editor.actions.synchro.copy.tip=Copier le rapport dans le presse-papier observe.ui.datasource.editor.actions.synchro.data=Gestion avancée de données View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf051055b3c3fe4b1478d2a90… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf051055b3c3fe4b1478d2a90… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Amélioration de la représentation des sonnées de données dans les actions longues - Closes #1582
by Tony CHEMIT 17 Jul '20

17 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6b3bd20d by Tony Chemit at 2020-07-17T18:33:33+02:00 Amélioration de la représentation des sonnées de données dans les actions longues - Closes #1582 - - - - - 30 changed files: - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/DataSelectionTreePaneActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6b3bd20d89132c417e84bd252… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6b3bd20d89132c417e84bd252… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Les rapports FOB ne fonctionnent pas - Closes #1581
by Tony CHEMIT 17 Jul '20

17 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e2af824e by Tony Chemit at 2020-07-17T14:13:49+02:00 Les rapports FOB ne fonctionnent pas - Closes #1581 - - - - - 1 changed file: - services/src/main/resources/observe-reports.properties Changes: ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -137,9 +137,9 @@ report.fobUsageMinimal.repeatVariable.typeObjetId=java.lang.String|\ Where standardCode is not null \ And standardCode != '' \ And (Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ @@ -156,70 +156,70 @@ report.fobUsageMinimal.request.1.repeat=typeObjetId|column # rencontres + peches report.fobUsageMinimal.request.2=1,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' \ - and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ + and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') report.fobUsageMinimal.request.2.repeat=typeObjetId|column # rencontres - peches report.fobUsageMinimal.request.3=2,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' -and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' +and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') report.fobUsageMinimal.request.3.repeat=typeObjetId|column # deployes report.fobUsageMinimal.request.4=3,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' report.fobUsageMinimal.request.4.repeat=typeObjetId|column # Nombre de tortues report.fobUsageMinimal.request.5=4,0|row| \ Select Sum(efo.count) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' + and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.fobUsageMinimal.request.5.repeat=typeObjetId|column ################################################################################ ## Utilisation des FOB, tableau detaille @@ -252,9 +252,9 @@ report.fobUsageExtended.repeatVariable.typeObjetId=java.lang.String|\ Where standardCode is not null \ And standardCode != '' \ And (Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ @@ -271,241 +271,241 @@ report.fobUsageExtended.request.1.repeat=typeObjetId|column # visite + peche report.fobUsageExtended.request.2=1,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.2.repeat=typeObjetId|column # visite - peche report.fobUsageExtended.request.3=2,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.3.repeat=typeObjetId|column # Deploiement + peche report.fobUsageExtended.request.4=3,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.4.repeat=typeObjetId|column # Deploiement - peche report.fobUsageExtended.request.5=4,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.5.repeat=typeObjetId|column # Modifie + peche report.fobUsageExtended.request.6=5,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.6.repeat=typeObjetId|column # Modifie - peche report.fobUsageExtended.request.7=6,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.7.repeat=typeObjetId|column # Retire + peche report.fobUsageExtended.request.8=7,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.8.repeat=typeObjetId|column # Retire - peche report.fobUsageExtended.request.9=8,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.9.repeat=typeObjetId|column # Abandonne + peche report.fobUsageExtended.request.10=9,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.10.repeat=typeObjetId|column # Abandonne - peche report.fobUsageExtended.request.11=10,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.11.repeat=typeObjetId|column # Coule + peche report.fobUsageExtended.request.12=11,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.12.repeat=typeObjetId|column # Coule - peche report.fobUsageExtended.request.13=12,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.13.repeat=typeObjetId|column # Remplace + peche report.fobUsageExtended.request.14=13,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.14.repeat=typeObjetId|column # Remplace - peche report.fobUsageExtended.request.15=14,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.15.repeat=typeObjetId|column # Autre ou ancien peche + peche report.fobUsageExtended.request.16=15,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.16.repeat=typeObjetId|column # Autre ou ancien peche - peche report.fobUsageExtended.request.17=16,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.17.repeat=typeObjetId|column # Nombre de tortues report.fobUsageExtended.request.18=17,0|row| \ Select Sum(efo.count) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' + and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.fobUsageExtended.request.18.repeat=typeObjetId|column ################################################################################ ## Nombre des cal\u00e9es selon le type d'association View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e2af824ecbf88127e5e9fe9b9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e2af824ecbf88127e5e9fe9b9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 17 Jul '20

17 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 77a92938 by Tony Chemit at 2020-07-17T10:07:23+02:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.40</version> + <version>2020.41</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77a929382bf8d437f95eda612… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77a929382bf8d437f95eda612… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll...
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 02b07c8f by Tony Chemit at 2020-07-15T17:14:40+02:00 Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll logbook - Closes #1579 - - - - - cc7b92e8 by Tony Chemit at 2020-07-15T17:14:42+02:00 Clean i18n keys - - - - - cd3100bd by Tony Chemit at 2020-07-15T17:14:42+02:00 Optimize i18n keys - - - - - a6d10f20 by Tony Chemit at 2020-07-15T17:14:42+02:00 Optimize i18n keys (make better categories) - - - - - 9bb2049b by Tony Chemit at 2020-07-15T17:14:42+02:00 La suppresion de la date de début de l'opération de peche fait planter le calcul des activités candidates - - - - - 35dd83dd by Tony Chemit at 2020-07-15T17:14:42+02:00 Correction des listes qui ne sont pas active - - - - - 547b1107 by Tony Chemit at 2020-07-15T17:14:42+02:00 Simplification des composents applicatifs (il en reste très peu et on fera une seconde passe qui va encore simplifier : un component par couche sera bien suffisant et simple à gérer) - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTaskSupport.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTimer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerUI.jcss - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StartH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopServerMode.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToEnglishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToFrenchAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToSpanishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/CloseApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/GotoSiteAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/MainUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/main/actions/OpenLastFeedBackAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/78793b28f9f44d84ad217092… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/78793b28f9f44d84ad217092… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll...
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7fede0aa by Tony Chemit at 2020-07-15T17:04:38+02:00 Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll logbook - Closes #1579 - - - - - 93d62035 by Tony Chemit at 2020-07-15T17:04:39+02:00 Clean i18n keys - - - - - dbdb609d by Tony Chemit at 2020-07-15T17:04:39+02:00 Optimize i18n keys - - - - - 7dfac522 by Tony Chemit at 2020-07-15T17:04:39+02:00 Optimize i18n keys (make better categories) - - - - - 133424a2 by Tony Chemit at 2020-07-15T17:04:39+02:00 La suppresion de la date de début de l'opération de peche fait planter le calcul des activités candidates - - - - - 3e04a49a by Tony Chemit at 2020-07-15T17:04:39+02:00 Correction des listes qui ne sont pas active - - - - - 78793b28 by Tony Chemit at 2020-07-15T17:04:39+02:00 Simplification des composents applicatifs (il en reste très peu et on fera une seconde passe qui va encore simplifier : un component par couche sera bien suffisant et simple à gérer) - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTaskSupport.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTimer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerUI.jcss - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StartH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopServerMode.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToEnglishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToFrenchAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToSpanishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/CloseApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/GotoSiteAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/MainUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/main/actions/OpenLastFeedBackAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/57b88df8f2aa99930352fe79… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/57b88df8f2aa99930352fe79… You're receiving this email because of your account on gitlab.com.

1 0