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

[Git][ultreiaio/ird-observe][develop] 4 commits: Fix JLabel init (never assign LabelFor if JLabel is not design for (his name...
by Tony CHEMIT 07 Jan '21

07 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 55be320c by Tony Chemit at 2021-01-07T12:07:36+01:00 Fix JLabel init (never assign LabelFor if JLabel is not design for (his name must ends by Label) : because otherwise nasty StackOverFlow can happen! - - - - - 88cfaf49 by Tony Chemit at 2021-01-07T13:29:59+01:00 If no row selected, then do nothing - - - - - d63a83d8 by Tony Chemit at 2021-01-07T14:27:22+01:00 Avoid costy log - - - - - c03d89aa by Tony Chemit at 2021-01-07T14:37:30+01:00 Consultation du tableau des débarquements lorsque le formulaire est verrouillé - Closes #1739 - - - - - 15 changed files: - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableEditorLayerUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/NotStandaloneContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/ContentTableUIEntryActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectFirst.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectLast.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectNext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectPrevious.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/BranchlineUIHandler.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java ===================================== @@ -24,18 +24,21 @@ package fr.ird.observe.client.util.init; import org.jdesktop.swingx.painter.Painter; +import javax.swing.ActionMap; import javax.swing.InputMap; import javax.swing.JComponent; import javax.swing.JScrollBar; import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JTabbedPane; +import javax.swing.JTable; import javax.swing.JToolBar; import javax.swing.JTree; import javax.swing.KeyStroke; import javax.swing.UIDefaults; import java.awt.Color; import java.awt.event.KeyEvent; +import java.util.Arrays; /** * To manage init of our ui. @@ -62,7 +65,7 @@ public class UIInitHelper { "fr.ird.observe.client.ui.admin.actions.CopyToClipBoard" }; public static final Class<?>[] ACCEPTABLE_COMPONENTS_TYPE = { - JScrollBar.class, JTabbedPane.class + JScrollBar.class, JTabbedPane.class, JTable.class }; public static void init(JScrollPane selectedTreePane, JTree tree) { @@ -97,4 +100,14 @@ public class UIInitHelper { editor.setOpaque(false); } + public static void cleanInputMapAndSet(JComponent editor, KeyStroke[] keyStrokes, InputMap newInputMap, ActionMap newActionMap) { + cleanInputMap(editor, keyStrokes); + editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).setParent(newInputMap); + editor.getActionMap().setParent(newActionMap); + } + + public static void cleanInputMap(JComponent editor, KeyStroke[] keyStrokes) { + InputMap map = editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + Arrays.stream(keyStrokes).forEach(uiActionKeyStroke -> map.put(uiActionKeyStroke, "none")); + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -134,8 +134,6 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe log.info(String.format("%sInit ui", prefix)); DefaultUIInitializerResult initializerResult = contentOpen.init(initializer); - onInit(ui); - installFocusTraversalPolicy(); model.getStates().addPropertyChangeListener(ContentUIModelStates.PROPERTY_FORM_FOCUS_OWNER, evt -> onFormFocusOwnerChanged((JComponent) evt.getNewValue())); installPermanentFocusOwnerListener(); @@ -181,14 +179,11 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe action.doAction(); } + @SuppressWarnings("unchecked") public final void resetFromPreviousUi(ContentUI ui) { contentOpen.resetFromPreviousUi((U) ui); } - public final void restartEditUI() { - contentOpen.restartEditUI(); - } - public final void destroyUI() { if (ui == null) { return; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -78,12 +78,12 @@ import javax.swing.JList; import javax.swing.JScrollBar; import javax.swing.JSplitPane; import javax.swing.JTabbedPane; +import javax.swing.JTable; import javax.swing.JToolBar; import javax.swing.KeyStroke; import javax.swing.ListCellRenderer; import java.awt.Component; import java.awt.Dimension; -import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -125,11 +125,12 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup NormalTextEditor.class, ContentUI.class, Table.class, + JTable.class, JTabbedPane.class }; protected final UI ui; protected final DecoratorService decoratorService; - private final Class<?>[] acceptedClassesInBlockingLayer = new Class[]{TripMapUI.class, ObserveMapPane.class, JScrollBar.class, JTabbedPane.class}; + protected final Class<?>[] acceptedClassesInBlockingLayer = new Class[]{TripMapUI.class, JTable.class, /*NotStandaloneContentUI.class,*/ ObserveMapPane.class, JScrollBar.class, JTabbedPane.class}; private final boolean isParentUI; public ContentUIInitializer(UI ui) { @@ -202,6 +203,7 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup .onComponents(NormalTextEditor.class, this::init) .onSubComponents(ContentUI.class, this::init) .onComponents(Table.class, this::init) + .onComponents(JTable.class, true, this::init) .startSecondPass() .onSubComponents(JTabbedPane.class, this::init) .onSubComponents(BlockingLayerUI.class, this::init); @@ -278,10 +280,13 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup private void init(JLabel editor) { initializerContext.checkFirstPass(); - String editorName = StringUtils.removeEnd(editor.getName(), "Label"); - Object objectById = ui.getObjectById(editorName); - if (objectById instanceof JComponent) { - editor.setLabelFor((Component) objectById); + String editorName = editor.getName(); + if (editorName.endsWith("Label")) { + editorName = StringUtils.removeEnd(editorName, "Label"); + Object objectById = ui.getObjectById(editorName); + if (objectById instanceof JComponent) { + editor.setLabelFor((Component) objectById); + } } } @@ -309,13 +314,13 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup JTextComponents.addAutoSelect(editor.getTextField()); } + public JComponent getActionContainer() { + return ui; + } + @SuppressWarnings({"unchecked", "rawtypes"}) protected void init(JaxxComboBox editor) { initializerContext.checkFirstPass(); - InputMap inputMap = editor.getCombobox().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); - inputMap.setParent(ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)); - editor.getCombobox().getActionMap().setParent(ui.getActionMap()); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0), "none"); @SuppressWarnings({"RawTypeCanBeGeneric", "rawtypes"}) Class referenceType = editor.getBeanType(); editor.setI18nPrefix("observe.common."); editor.setAutoSelectContent(true); @@ -471,6 +476,11 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup initializerContext.checkFirstPass(); } + private void init(JTable editor) { + initializerContext.checkFirstPass(); +// UIInitHelper.init(editor); + } + @SuppressWarnings({"unchecked", "rawtypes"}) private <R extends DataDtoReference> void prepareDataFilterableDoubleList(Class<R> dtoClass, FilterableDoubleList<R> editor) { DataReferenceDecorator<R> decorator = decoratorService.getDataReferenceDecorator(dtoClass); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java ===================================== @@ -40,13 +40,16 @@ import fr.ird.observe.client.datasource.validation.ClientValidationContext; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.init.DefaultUIInitializer; import fr.ird.observe.client.util.init.DefaultUIInitializerResult; +import fr.ird.observe.client.util.init.UIInitHelper; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.spi.module.ObserveBusinessProject; import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.JVetoableTabbedPane; +import org.nuiton.jaxx.runtime.swing.action.MenuAction; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.jaxx.validator.swing.tab.JTabbedPaneValidator; import org.nuiton.jaxx.widgets.datetime.DateTimeEditor; @@ -57,14 +60,21 @@ import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditorModel; import org.nuiton.jaxx.widgets.hidor.HidorButton; import org.nuiton.jaxx.widgets.temperature.TemperatureEditor; +import javax.swing.Action; +import javax.swing.ActionMap; +import javax.swing.InputMap; import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.KeyStroke; import javax.swing.MenuElement; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import javax.swing.plaf.ActionMapUIResource; +import javax.swing.plaf.InputMapUIResource; import java.beans.PropertyChangeListener; import java.util.LinkedHashMap; import java.util.List; @@ -101,6 +111,9 @@ public class ContentOpen<U extends ContentUI> { private JTabbedPaneValidator tabbedPaneValidator; private JTabbedPaneValidator subTabbedPaneValidator; private ArrayListMultimap<String, JComponent> focusComponents; + private List<JTable> tables; + private ActionMap newActionMap; + private InputMap newInputMap; public ContentOpen(U ui, ContentOpenExecutor<U> contentOpenExecutor) { this(ui, contentOpenExecutor, null); @@ -126,6 +139,7 @@ public class ContentOpen<U extends ContentUI> { public DefaultUIInitializerResult init(ContentUIInitializer<U> initializer) { DefaultUIInitializerResult initializerResult = initializer.initUI(); + tables = initializerResult.getComponentsList(JTable.class); tabbedPaneValidator = initializerResult.getTabbedPaneValidator(); subTabbedPaneValidator = initializerResult.getSubTabbedPaneValidator(); coordinateEditors = initializerResult.getCoordinateEditors(); @@ -136,9 +150,18 @@ public class ContentOpen<U extends ContentUI> { dateTimeEditors.forEach(e -> e.getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToggleDateTimeEditorSliderChangedListener)); timeEditors.forEach(e -> e.getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToggleTimeEditorSliderChangedListener)); coordinateEditors.forEach(e -> e.getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener)); - initActions(); + ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).setParent(null); + ui.getActionMap().setParent(null); + JComponent actionContainer = initializer.getActionContainer(); + initActions(actionContainer, initializerResult); ContentUIModel model = ui.getModel(); + + @SuppressWarnings("unchecked") ContentUIHandler<U> handler = (ContentUIHandler<U>) ui.getHandler(); model.init(ui, initializerResult); + handler.onInit(ui); + + postInstallActions(actionContainer, newInputMap, newActionMap, initializerResult); + model.getStates().addPropertyChangeListener(ContentUIModelStates.PROPERTY_MODE, evt -> { ContentMode newValue = (ContentMode) evt.getNewValue(); ui.getHandler().onModeChanged(newValue); @@ -179,8 +202,6 @@ public class ContentOpen<U extends ContentUI> { if (contentEditExecutor != null) { contentEditExecutor.doEditOnOpen(ui); } - //FIXME:Action We got ComboBox actions here... Side effecrt JaxxComboBox :( - ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).setParent(null); } public boolean doClose() { @@ -458,6 +479,8 @@ public class ContentOpen<U extends ContentUI> { ContentTableUIModel<?, ?> model = subUi.getModel(); if (!model.getStates().isStandalone()) { log.info(String.format("%sInit not standalone table ui: %s", ui.getModel().getPrefix(), subUi.getClass().getSimpleName())); + InputMap inputMap = ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = ui.getActionMap(); ui.getTitleRightToolBar().add(subUi.getSelectToolbar(), 0); subUi.getSelectToolbar().setVisible(false); MenuElement[] subElements = subUi.getInsertPopup().getSubElements(); @@ -518,10 +541,29 @@ public class ContentOpen<U extends ContentUI> { return ui; } - private void initActions() { + public void initActions(JComponent actionContainer, DefaultUIInitializerResult initializerResult) { ContentUIHandler<?> handler = ui.getHandler(); handler.initActions(); handler.installChangeModeAction(); + + InputMap inputMap = actionContainer.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + KeyStroke[] uiActionKeyStrokes = inputMap.allKeys(); + log.info(String.format("%sFound %d actions to share", ui.getModel().getPrefix(), uiActionKeyStrokes.length)); + ActionMap actionMap = actionContainer.getActionMap(); + newActionMap = new ActionMapUIResource(); + newInputMap = new InputMapUIResource(); + for (KeyStroke actionKeyStroke : uiActionKeyStrokes) { + Object actionMapKey = inputMap.get(actionKeyStroke); + newInputMap.put(actionKeyStroke, actionMapKey); + Action action = actionMap.get(actionMapKey); + if (action instanceof MenuAction) { + log.info(String.format("Skip menu action %s → %s", actionKeyStroke, actionMapKey)); + continue; + } + newActionMap.put(actionMapKey, action); + log.info(String.format("Register action %s → %s", actionKeyStroke, actionMapKey)); + } + ContentUIModel model = ui.getModel(); NodeCapability<?> capability = model.getSource().getCapability(); if (capability instanceof ContainerCapability) { @@ -540,6 +582,17 @@ public class ContentOpen<U extends ContentUI> { handler.updateToggleInsertVisibility(); } + protected void postInstallActions(JComponent actionContainer, InputMap newInputMap, ActionMap newActionMap, DefaultUIInitializerResult initializerResult) { + KeyStroke[] keyStrokes = newInputMap.allKeys(); + initializerResult.getComponents(JaxxComboBox.class).forEach(editor -> UIInitHelper.cleanInputMapAndSet(editor, keyStrokes, newInputMap, newActionMap)); + initializerResult.getComponents(JTable.class).forEach(editor -> UIInitHelper.cleanInputMap(editor, keyStrokes)); + for (Map.Entry<ContentTableUI<?, ?, ?>, JPanel> entry : subUiMap.entrySet()) { + ContentTableUI<?, ?, ?> subUi = entry.getKey(); + subUi.getHandler().getContentOpen().getTables().forEach(editor -> UIInitHelper.cleanInputMap(editor, keyStrokes)); + //FIXME:Actions We should define some scope only for subUi ? + } + } + private void onToggleDateTimeEditorSliderChanged(boolean newValue) { if (!toggleDateTimeEditorSliderIsChanging) { toggleDateTimeEditorSliderIsChanging = true; @@ -555,6 +608,10 @@ public class ContentOpen<U extends ContentUI> { } } + public List<JTable> getTables() { + return tables; + } + private void onToggleTimeEditorSliderChanged(boolean newValue) { if (!toggleTimeEditorSliderIsChanging) { toggleTimeEditorSliderIsChanging = true; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java ===================================== @@ -51,18 +51,13 @@ public class ContentEditUIOpenExecutor<D extends DataDto, U extends ContentEditU // chaque arrive sur un écran invalide le cache de validation getClientValidationContext().reset(); - openModel(ui); - - handler.fixFormSize(); - handler.onEndOpenUI(); - } - - public void openModel(U ui) { ContentEditUIModel<D> model = ui.getModel(); Form<D> form = model.openForm(model.getStates().getSelectedId()); - ContentEditUIHandler<D, U> handler = ui.getHandler(); handler.getContentOpen().onOpenForm(form); handler.onOpenAfterOpenModel(); + + handler.fixFormSize(); + handler.onEndOpenUI(); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableEditorLayerUI.java ===================================== @@ -69,7 +69,7 @@ public class ContentTableEditorLayerUI extends ObserveBlockingLayerUI implements try { log.trace("Set focus on table editor"); Component focusComponent = editor.getModel().getStates().getFormFocusOwner(); - log.debug(String.format("Set focus on table editor - initial form focus owner: %s", focusComponent)); + log.debug(String.format("Set focus on table editor - initial form focus owner: %s", focusComponent == null ? null : focusComponent.getName())); boolean readingMode = editor.getModel().getStates().isReadingMode(); if (focusComponent != null) { // if not reading, then we can try to have a more accurate focus owner @@ -88,17 +88,17 @@ public class ContentTableEditorLayerUI extends ObserveBlockingLayerUI implements // compute focus owner FocusTraversalPolicy focusTraversalPolicy = editor.getFocusTraversalPolicy(); focusComponent = Objects.requireNonNull(focusTraversalPolicy).getFirstComponent(editor); - log.debug(String.format("compute new form focus owner: %s", focusComponent)); + log.debug(String.format("compute new form focus owner: %s", focusComponent==null?null:focusComponent.getName())); } if (focusComponent == null) { focusComponent = editor.getMode(); - } else if (focusComponent.hasFocus()) { + } + if (Objects.requireNonNull(focusComponent).hasFocus()) { return; } - log.debug(String.format("Set focus on table editor: %s", focusComponent)); + log.debug(String.format("Set focus on table editor: %s", focusComponent.getName())); // this will change the focus editor.getModel().getStates().setFormFocusOwner(focusComponent); -// editor.getHandler().setFormFocusOwner(focusComponent); } finally { focusAdjusting = false; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java ===================================== @@ -40,6 +40,12 @@ import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.en import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.ResetEntry; import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.SaveAndNewEntry; import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.SaveTableEntry; +import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectFirst; +import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectLast; +import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectNext; +import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectPrevious; +import fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.AutoSelectWithMoveUpAndDownShowPopupAction; +import fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.SortableTableUI; import fr.ird.observe.client.datasource.editor.api.content.ui.ObserveLayoutFocusTraversalPolicy; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.dto.data.DataDto; @@ -138,6 +144,16 @@ public abstract class ContentTableUIHandler<D extends DataDto, C extends DataDto getComponent(JButton.class, "importData").ifPresent(e -> ImportDataFile.installAction(ui, e)); getComponent(JButton.class, "deleteData").ifPresent(e -> DeleteDataFile.installAction(ui, e)); getComponent(JButton.class, "exportData").ifPresent(e -> ExportDataFile.installAction(ui, e)); + + SelectFirst.init(ui, ui.getSelectFirstTableEntry(), SelectFirst.class); + SelectPrevious.init(ui, ui.getSelectPreviousTableEntry(), SelectPrevious.class); + SelectNext.init(ui, ui.getSelectNextTableEntry(), SelectNext.class); + SelectLast.init(ui, ui.getSelectLastTableEntry(), SelectLast.class); + + if (ui instanceof SortableTableUI) { + log.info(String.format("%sInstall sortable popup actions", ui.getModel().getPrefix())); + new AutoSelectWithMoveUpAndDownShowPopupAction(ui); + } } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java ===================================== @@ -23,12 +23,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.table; */ import fr.ird.observe.client.datasource.editor.api.content.ContentUIInitializer; -import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectFirst; -import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectLast; -import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectNext; -import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.entry.select.SelectPrevious; -import fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.AutoSelectWithMoveUpAndDownShowPopupAction; -import fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.SortableTableUI; +import fr.ird.observe.client.datasource.editor.api.content.NotStandaloneContentUI; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.init.DefaultUIInitializerResult; import fr.ird.observe.dto.data.DataDto; @@ -36,7 +31,6 @@ import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.swing.ActionMap; import javax.swing.InputMap; import javax.swing.JComponent; import javax.swing.KeyStroke; @@ -100,32 +94,11 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e ui.getSelectNextTableEntry().setEnabled(false); ui.getSelectLastTableEntry().setEnabled(false); InputMap inputMap = ui.getTable().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); - inputMap.put(KeyStroke.getKeyStroke("pressed UP"), "none"); inputMap.put(KeyStroke.getKeyStroke("pressed DOWN"), "none"); inputMap.put(KeyStroke.getKeyStroke("pressed LEFT"), "none"); inputMap.put(KeyStroke.getKeyStroke("pressed RIGHT"), "none"); - ActionMap actionMap = ui.getTable().getActionMap(); - -// inputMap = ui.getTable().getInputMap(JComponent.WHEN_FOCUSED); - SelectFirst selectFirst = SelectFirst.init(ui, ui.getSelectFirstTableEntry(), SelectFirst.class); - inputMap.put(selectFirst.getKeyStroke(), "selectFirstRow"); - actionMap.put("selectFirstRow", selectFirst); - SelectPrevious selectPrevious = SelectPrevious.init(ui, ui.getSelectPreviousTableEntry(), SelectPrevious.class); - inputMap.put(selectPrevious.getKeyStroke(), "selectPreviousRow"); - actionMap.put("selectPreviousRow", selectPrevious); - SelectNext selectNext = SelectNext.init(ui, ui.getSelectNextTableEntry(), SelectNext.class); - inputMap.put(selectNext.getKeyStroke(), "selectNextRow"); - actionMap.put("selectNextRow", selectNext); - SelectLast selectLast = SelectLast.init(ui, ui.getSelectLastTableEntry(), SelectLast.class); - inputMap.put(selectLast.getKeyStroke(), "selectLastRow"); - actionMap.put("selectLastRow", selectLast); - - if (ui instanceof SortableTableUI) { - log.info(String.format("%sInstall sortable popup actions", ui.getModel().getPrefix())); - new AutoSelectWithMoveUpAndDownShowPopupAction(ui); - } ui.getTitleRightToolBar().add(ui.getSelectToolbar(), 0); String message = I18n.t("observe.data.Data.list.message.none", ContentTableUII18nHelper.getType(getModel().getScope().getMainType())); @@ -146,7 +119,7 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e log.debug("<<<<<<<<<< has clear selection..."); } else { // on met a jour le modele de selection - log.info(String.format(">>>>>>>>>> will set selection to %d", selectedRow)); + log.debug(String.format(">>>>>>>>>> will set selection to %d", selectedRow)); ui.getSelectionModel().setSelectionInterval(selectedRow, selectedRow); } FocusTraversalPolicy focusTraversalPolicy = ui.getFocusTraversalPolicy(); @@ -157,7 +130,6 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e if (focusComponent != null) { log.info(String.format("New form focus owner: %s", focusComponent)); ui.getModel().getStates().setFormFocusOwner(focusComponent); -// ui.getHandler().setFormFocusOwner(focusComponent); } } @@ -173,4 +145,11 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e ui.getEditorBlockLayerUI().setAcceptedComponentNames(doNotBlockComponentIds); } + @Override + public JComponent getActionContainer() { + if (!ui.getModel().getStates().isStandalone()) { + return (JComponent) ((NotStandaloneContentUI<?>) ui).getParentUI(); + } + return super.getActionContainer(); + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/NotStandaloneContentTableUIHandler.java ===================================== @@ -37,6 +37,7 @@ public abstract class NotStandaloneContentTableUIHandler<D extends DataDto, C ex private EditableContentUI<D> parent; + @Override public EditableContentUI<D> getParentUI() { if (parent == null) { parent = NotStandaloneContentUIHandler.getParentUI(ui); @@ -50,23 +51,8 @@ public abstract class NotStandaloneContentTableUIHandler<D extends DataDto, C ex return new ContentOpen<>(ui, executor, executor); } -// @Override -// public void startEditUI() { -// ui.getValidatorTable().setParentValidator(ui.getValidator()); -// super.startEditUI(); -// } - -// @Override -// public void stopEditUI() { -// ui.getValidatorTable().setParentValidator(null); -// super.stopEditUI(); -// } - -// @Override -// public void onEndOpenUI() { -// super.onEndOpenUI(); -// if (!getModel().getStates().isUpdatingMode()) { -// reselectRow(); -// } -// } + @Override + public void installChangeModeAction() { + // not for this one + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/ContentTableUIEntryActionSupport.java ===================================== @@ -23,16 +23,17 @@ package fr.ird.observe.client.datasource.editor.api.content.data.table.actions.e */ import fr.ird.observe.client.WithClientUIContext; +import fr.ird.observe.client.datasource.editor.api.content.NotStandaloneContentUI; import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI; import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUITableModel; import fr.ird.observe.client.datasource.editor.api.content.data.table.actions.ContentTableUIActionSupport; -import fr.ird.observe.client.main.MainUIModel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.JAXXObject; import org.nuiton.jaxx.runtime.swing.action.JAXXObjectActionSupport; import javax.swing.AbstractButton; +import javax.swing.JComponent; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; import java.beans.PropertyChangeListener; @@ -49,7 +50,6 @@ public abstract class ContentTableUIEntryActionSupport extends ContentTableUIAct private boolean canExecuteFromRead; public static <U extends JAXXObject, A extends JAXXObjectActionSupport<U>> A init(U ui, AbstractButton editor, Class<A> actionType) { - A action = JAXXObjectActionSupport.init(ui, editor, actionType); editor.putClientProperty(ACTIVATE_FROM_POPUP, true); return action; @@ -61,11 +61,19 @@ public abstract class ContentTableUIEntryActionSupport extends ContentTableUIAct boolean b = computeEnabled(this.ui.getTableModel().getSelectedRow(), this.ui.getTableModel().getRowCount()); log.debug("Set enabled? " + b + " on " + getActionCommandKey()); setEnabled(b); -// editor.setEnabled(b); }; setEnabled(false); } + @Override + protected JComponent getContainer(ContentTableUI<?, ?, ?> ui) { + if (ui.getModel().getStates().isStandalone()) { + return super.getContainer(ui); + } + // if not standalone, attach to body since this is the only part which will be displayed and action aware + return (JComponent) ((NotStandaloneContentUI<?>) ui).getParentUI(); + } + public abstract boolean computeEnabled(int selectedRow, int rowCount); protected abstract void actionPerformed(ContentTableUITableModel<?, ?, ?> tableModel, int selectedRow); @@ -79,34 +87,15 @@ public abstract class ContentTableUIEntryActionSupport extends ContentTableUIAct } @Override - protected void doActionPerformed(ActionEvent e, ContentTableUI<?,?,?> contentTableUI) { + protected void doActionPerformed(ActionEvent e, ContentTableUI<?, ?, ?> contentTableUI) { if (!isEnabled()) { //FIXME should not have to check this here... log.info(String.format("Reject action: %s :: %s", getActionCommandKey(), this)); return; } log.info(String.format("Accept action: %s :: %s", getActionCommandKey(), this)); -// boolean focusOwner = ui.getTable().isFocusOwner(); -// log.debug("table has focus? " + focusOwner); -// MainUIModel mainUIModel = getClientUIContext().getMainUIModel(); -// boolean blockFocus = mainUIModel.isBlockFocus(); -// if (focusOwner) { -// mainUIModel.blockFocus(); -// } - try { - int selectedRow = ui.getTable().getSelectedRow(); - actionPerformed(ui.getTableModel(), selectedRow); - } finally { -// //FIXME:Focus -// if (focusOwner) { -// if (!blockFocus) { -// mainUIModel.unblockFocus(); -// } -// log.debug("Add focus back to table"); -// //ui.getTable().requestFocusInWindow(); -// ui.getHandler().setFormFocusOwner(ui.getTable()); -// } - } + int selectedRow = ui.getTable().getSelectedRow(); + actionPerformed(ui.getTableModel(), selectedRow); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectFirst.java ===================================== @@ -45,6 +45,9 @@ public final class SelectFirst extends ContentTableUIEntryActionSupport { @Override protected void actionPerformed(ContentTableUITableModel<?, ?, ?> tableModel, int selectedRow) { + if (selectedRow == -1) { + return; + } tableModel.selectFirst(); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectLast.java ===================================== @@ -45,6 +45,9 @@ public final class SelectLast extends ContentTableUIEntryActionSupport { @Override protected void actionPerformed(ContentTableUITableModel<?, ?, ?> tableModel, int selectedRow) { + if (selectedRow==-1) { + return; + } tableModel.selectLast(); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectNext.java ===================================== @@ -46,6 +46,9 @@ public final class SelectNext extends ContentTableUIEntryActionSupport { @Override protected void actionPerformed(ContentTableUITableModel<?, ?, ?> tableModel, int selectedRow) { + if (selectedRow==-1) { + return; + } tableModel.selectNext(selectedRow); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectPrevious.java ===================================== @@ -45,6 +45,9 @@ public final class SelectPrevious extends ContentTableUIEntryActionSupport { @Override protected void actionPerformed(ContentTableUITableModel<?, ?, ?> tableModel, int selectedRow) { + if (selectedRow==-1) { + return; + } tableModel.selectPrevious(selectedRow); } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/BranchlineUIHandler.java ===================================== @@ -89,6 +89,11 @@ public class BranchlineUIHandler extends GeneratedBranchlineUIHandler { }; } + @Override + public void installChangeModeAction() { + // not for this one (not standalone) + } + @Override protected void installResetAction() { ResetAction<BranchlineUI> action = ResetAction.prepareAction(new DefaultResetAdapter<BranchlineUI>() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ee15c404dd2b873acc83a01… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ee15c404dd2b873acc83a01… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve safe focus on form
by Tony CHEMIT 07 Jan '21

07 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0ee15c40 by Tony Chemit at 2021-01-07T02:36:06+01:00 Improve safe focus on form - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java ===================================== @@ -179,6 +179,8 @@ public class ContentOpen<U extends ContentUI> { if (contentEditExecutor != null) { contentEditExecutor.doEditOnOpen(ui); } + //FIXME:Action We got ComboBox actions here... Side effecrt JaxxComboBox :( + ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).setParent(null); } public boolean doClose() { @@ -487,6 +489,14 @@ public class ContentOpen<U extends ContentUI> { tableUI.stopEdit(); } } +// +// public final void doRead() { +// ui.getInputMap(1).setParent(null); +//// for (ContentTableUI<?, ?, ?> tableUI : subUiMap.keySet()) { +//// tableUI.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).setParent(ui.getInputMap(1)); +//// tableUI.getModel().getStates().setMode(ContentMode.READ); +//// } +// } public final void selectFirstTab() { selectTab(0); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0ee15c404dd2b873acc83a018… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0ee15c404dd2b873acc83a018… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Nettoyage des modèles : on doit appeler directement les states (à terme ils...
by Tony CHEMIT 07 Jan '21

07 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1b0c5030 by Tony Chemit at 2021-01-07T01:16:34+01:00 Nettoyage des modèles : on doit appeler directement les states (à terme ils seront générés et c'est là qu'on fera des extensions de modèle...) Nettoyage de l'API de focus sur les tableaux : trop compliqués et ne fonctionne pas bien - - - - - 35eeddae by Tony Chemit at 2021-01-07T01:16:34+01:00 Verrouillage/déverouillage des formulaires - Closes #1740 - - - - - f7933258 by Tony Chemit at 2021-01-07T01:33:43+01:00 Fix ask to quit on read mode - - - - - dc15e4f9 by Tony Chemit at 2021-01-07T01:34:08+01:00 Fix focus goes to form on read mode - - - - - e02d4abe by Tony Chemit at 2021-01-07T01:34:32+01:00 Improve safe focus on form - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorLayerUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleConfigure.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewContentTableUIEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/reset/DefaultResetAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableEditorLayerUI.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableNavigationLayerUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0c01dd99440f068d4fa0aaba… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0c01dd99440f068d4fa0aaba… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Valider tous les écrans du modèle LL - See #1665
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0c01dd99 by Tony Chemit at 2021-01-06T20:39:13+01:00 Valider tous les écrans du modèle LL - See #1665 Fix ContentTable - first table entry is not selected if in reading mode - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentEditExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIOpenExecutor.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentEditExecutor.java ===================================== @@ -42,6 +42,7 @@ public interface ContentEditExecutor<U extends ContentUI> { if (mode != null) { switch (mode) { case READ: + doRead(ui); break; case CREATE: case UPDATE: @@ -50,4 +51,8 @@ public interface ContentEditExecutor<U extends ContentUI> { } } } + + default void doRead(U ui) { + // do nothing + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIOpenExecutor.java ===================================== @@ -145,4 +145,10 @@ public class ContentTableUIOpenExecutor<D extends DataDto, C extends DataDto, U } } } + + @Override + public void doRead(U ui) { + // select first row + ui.getHandler().reselectRow(); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0c01dd99440f068d4fa0aabac… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0c01dd99440f068d4fa0aabac… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Happy new year commit!
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 36a35df1 by Tony Chemit at 2021-01-06T19:51:07+01:00 Happy new year commit! - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/filtered-resources/observe-application.properties - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/configuration/src/main/i18n/templates/about_es_ES.ftl - client/configuration/src/main/i18n/templates/about_fr_FR.ftl - client/configuration/src/main/java/fr/ird/observe/client/ClientConfigFinderInstance.java - client/configuration/src/main/java/fr/ird/observe/client/ObServeSwingSessionConfig.java - client/configuration/src/main/java/fr/ird/observe/client/ObserveClientResourceManager.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfigFinder.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - client/configuration/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java - client/configuration/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java - client/configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - client/configuration/src/main/java/fr/ird/observe/client/constants/DbMode.java - client/configuration/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java - client/configuration/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java - client/configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client/configuration/src/main/resources/log4j2.xml - client/configuration/src/main/resources/observe-log4j2.xml - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/pom.xml - client/core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client/core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client/core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client/core/src/main/i18n/templates/initStorage_en_GB.ftl - client/core/src/main/i18n/templates/initStorage_es_ES.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36a35df1b83ad396bc9820942… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36a35df1b83ad396bc9820942… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix some bad binding in jaxx :(
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 75460181 by Tony Chemit at 2021-01-06T18:34:40+01:00 Fix some bad binding in jaxx :( - - - - - 16179a26 by Tony Chemit at 2021-01-06T18:38:41+01:00 Problème si on supprime l'unique commentaire d'une commentaire, ça ne fonctionne pas bien! - Closes #1725 - - - - - 8 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - pom.xml Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx ===================================== @@ -25,6 +25,8 @@ <import> fr.ird.observe.dto.data.DataDto + + fr.ird.observe.client.datasource.validation.ObserveSwingValidator </import> <ContentEditUIModel id='model' genericType='D'/> @@ -34,6 +36,9 @@ @Override public abstract ContentEditUIHandler<D, U> getHandler(); + @Override + public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx ===================================== @@ -25,6 +25,7 @@ <import> fr.ird.observe.dto.data.DataDto + fr.ird.observe.client.datasource.validation.ObserveSwingValidator </import> <ContentOpenableUIModel id='model' genericType='D'/> @@ -35,6 +36,9 @@ @Override public abstract ContentOpenableUIHandler<D, U> getHandler(); + @Override + public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jaxx ===================================== @@ -25,6 +25,7 @@ <import> fr.ird.observe.dto.data.DataDto + fr.ird.observe.client.datasource.validation.ObserveSwingValidator </import> <ContentSimpleUIModel id='model' genericType='D'/> @@ -35,6 +36,9 @@ @Override public abstract ContentSimpleUIHandler<D, U> getHandler(); + @Override + public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx ===================================== @@ -46,8 +46,7 @@ <DataDto id='tableEditBean' initializer='getStates().getTableEditBean()'/>  - <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' - onValueChanged='getHandler().updateEditor(event)'/> + <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/>  <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> @@ -57,6 +56,9 @@ @Override public abstract ContentTableUIHandler<D, C, U> getHandler(); +@Override +public abstract ObserveSwingValidator<D> getValidator(); + public abstract SwingValidator<C> getValidatorTable(); @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx ===================================== @@ -60,6 +60,9 @@ public abstract NormalTextEditor getUri(); @Override public abstract ContentReferentialUIHandler<D, R, U> getHandler(); +@Override +public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx ===================================== @@ -45,6 +45,12 @@ static io.ultreia.java4all.i18n.I18n.n </import> + <script><![CDATA[ + @Override + public ObserveSwingValidator<LandingDto> getValidator() { + return getParentUI().getValidator(); + } +]]></script> <LandingPartUIModel id='model' initializer="getContextValue(LandingPartUIModel.class)"/> <LandingPartUITableModel id='tableModel' initializer="getContextValue(LandingPartUITableModel.class)"/> <LandingDto id='bean'/> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx ===================================== @@ -47,6 +47,12 @@ static io.ultreia.java4all.i18n.I18n.n </import> + <script><![CDATA[ + @Override + public ObserveSwingValidator<SampleDto> getValidator() { + return getParentUI().getValidator(); + } +]]></script> <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/> <ContentTableUIModelStates id='states' genericType='SampleDto, SamplePartDto'/> <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/> ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@   - <lib.version.java4all.jaxx>3.0-alpha-88</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0-alpha-89-SNAPSHOT</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4aac1786a41449b6c15c0130… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4aac1786a41449b6c15c0130… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Bouton 'infos techniques' sur formulaire captures - Closes #1732
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4aac1786 by Tony Chemit at 2021-01-06T17:14:52+01:00 Bouton 'infos techniques' sur formulaire captures - Closes #1732 - - - - - 7 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java ===================================== @@ -107,10 +107,6 @@ public abstract class ContentUIModel extends AbstractJavaBean implements Closeab states.setFormFocusOwner(formFocusOwner); } - public void setCanShowTechnicalInformation(boolean canShowTechnicalInformation) { - states.setCanShowTechnicalInformation(canShowTechnicalInformation); - } - public String getPrefix() { return getSource().getInitializer().getLogPrefix(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java ===================================== @@ -54,7 +54,6 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable public static final String PROPERTY_UPDATING_MODE = "updatingMode"; public static final String PROPERTY_OPENED = "opened"; private static final String PROPERTY_ENABLED = "enabled"; - private static final String PROPERTY_CAN_SHOW_TECHNICAL_INFORMATION = "canShowTechnicalInformation"; /** * Mode of the content. */ @@ -87,10 +86,6 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable * Is content opened? */ private boolean opened; - /** - * Is can show technical information? - */ - private boolean canShowTechnicalInformation; /** * Is a reset edit in progress? */ @@ -288,16 +283,6 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable firePropertyChange(PROPERTY_FORM_FOCUS_OWNER, formFocusOwner); } - public boolean isCanShowTechnicalInformation() { - return canShowTechnicalInformation; - } - - public void setCanShowTechnicalInformation(boolean canShowTechnicalInformation) { - boolean oldValue = isCanShowTechnicalInformation(); - this.canShowTechnicalInformation = canShowTechnicalInformation; - firePropertyChange(PROPERTY_CAN_SHOW_TECHNICAL_INFORMATION, oldValue, canShowTechnicalInformation); - } - @Override public void close() { setOpened(false); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java ===================================== @@ -32,6 +32,9 @@ import fr.ird.observe.client.datasource.editor.api.content.data.list.ContentList import fr.ird.observe.client.datasource.editor.api.content.data.list.ContentListUIModelStates; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUIModelStates; +import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI; +import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUIModelStates; +import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUITableModel; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUIModelStates; import fr.ird.observe.dto.reference.ReferentialDtoReference; @@ -74,6 +77,15 @@ public class ShowTechnicalInformations<U extends ContentUI> extends ContentUIAct ShowTechnicalInformations.init(ui, ui.getShowTechnicalInformations(), action); } + public static <U extends ContentTableUI<?, ?, U>> void installAction(U ui) { + ShowIdRequest request = ui.getModel().getShowIdRequest(); + ShowTechnicalInformations<U> action = new ShowTechnicalInformations<>(request, new ShowIdExecutor(ui.getHandler().getDecoratorService(), ui.getToggleConfigure())); + ui.getTableModel().addPropertyChangeListener(ContentTableUITableModel.SELECTED_ROW_PROPERTY, evt -> request.reset()); + ui.getModel().getStates().addPropertyChangeListener(ContentTableUIModelStates.PROPERTY_CAN_SAVE_ROW, evt -> request.reset()); + ui.getModel().getStates().addPropertyChangeListener(ContentTableUIModelStates.PROPERTY_MODIFIED, evt -> request.reset()); + ShowTechnicalInformations.init(ui, ui.getShowTechnicalInformations(), action); + } + public static <U extends ContentListUI<?, ?, U>> void installAction(U ui) { ShowIdRequest request = ui.getModel().getShowIdRequest(); ShowTechnicalInformations<U> action = new ShowTechnicalInformations<>(request, new ShowIdExecutor(ui.getHandler().getDecoratorService(), ui.getToggleConfigure())); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx ===================================== @@ -19,39 +19,40 @@ --> <fr.ird.observe.client.datasource.editor.api.content.ContentUI - abstract='true' - genericType='D extends DataDto, C extends DataDto, U extends ContentTableUI<D, C, U>' - implements="fr.ird.observe.client.datasource.editor.api.content.EditableContentUI<D>"> + abstract='true' + genericType='D extends DataDto, C extends DataDto, U extends ContentTableUI<D, C, U>' + implements="fr.ird.observe.client.datasource.editor.api.content.EditableContentUI<D>"> - <import> + <import> - fr.ird.observe.client.util.ObserveBlockingLayerUI - fr.ird.observe.client.datasource.validation.ObserveSwingValidator + fr.ird.observe.client.util.ObserveBlockingLayerUI + fr.ird.observe.client.datasource.validation.ObserveSwingValidator - org.nuiton.jaxx.validator.swing.SwingValidator - fr.ird.observe.dto.data.DataDto + org.nuiton.jaxx.validator.swing.SwingValidator + fr.ird.observe.dto.data.DataDto - java.awt.Dimension + java.awt.Dimension - javax.swing.UIManager + javax.swing.UIManager - static io.ultreia.java4all.i18n.I18n.n - static io.ultreia.java4all.i18n.I18n.t - </import> + static io.ultreia.java4all.i18n.I18n.n + static io.ultreia.java4all.i18n.I18n.t + </import> - <ContentTableUIModel id='model' genericType='D, C'/> - <ContentTableUIModelStates id='states' genericType='D, C'/> - <ContentTableUITableModel id='tableModel' genericType='D, C, U' initializer='null'/> - <DataDto id='bean' initializer='getStates().getBean()'/> - <DataDto id='tableEditBean' initializer='getStates().getTableEditBean()'/> + <ContentTableUIModel id='model' genericType='D, C'/> + <ContentTableUIModelStates id='states' genericType='D, C'/> + <ContentTableUITableModel id='tableModel' genericType='D, C, U' initializer='null'/> + <DataDto id='bean' initializer='getStates().getBean()'/> + <DataDto id='tableEditBean' initializer='getStates().getTableEditBean()'/> -  - <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/> +  + <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' + onValueChanged='getHandler().updateEditor(event)'/> -  - <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> +  + <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> - <script><![CDATA[ + <script><![CDATA[ @Override public abstract ContentTableUIHandler<D, C, U> getHandler(); @@ -64,94 +65,94 @@ public void resetEdit() { } ]]> - </script> - - <JPanel id="body" layout='{new BorderLayout()}'> - - <JPanel id='hideForm' layout='{new BorderLayout()}' constraints="BorderLayout.CENTER"> - <JLabel id='hideFormInformation'/> - </JPanel> - <JPanel id='emptyForm' layout='{new BorderLayout()}' constraints="BorderLayout.CENTER"> - <JLabel id='emptyFormInformation'/> - </JPanel> - - <Table id='showForm' insets="0" weightx="1" constraints="BorderLayout.CENTER"> - - <row weighty="0.3"> - <cell fill="both"> -  - <JScrollPane id='tableScrollPane' decorator="boxed"> - <JTable id='table'/> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="both"> - -  - <Table id='editor' fill='both' insets='0' decorator='boxed'> - -  + </script> + + <JPanel id="body" layout='{new BorderLayout()}'> + + <JPanel id='hideForm' layout='{new BorderLayout()}' constraints="BorderLayout.CENTER"> + <JLabel id='hideFormInformation'/> + </JPanel> + <JPanel id='emptyForm' layout='{new BorderLayout()}' constraints="BorderLayout.CENTER"> + <JLabel id='emptyFormInformation'/> + </JPanel> + + <Table id='showForm' insets="0" weightx="1" constraints="BorderLayout.CENTER"> + + <row weighty="0.3"> + <cell fill="both"> +  + <JScrollPane id='tableScrollPane' decorator="boxed"> + <JTable id='table'/> + </JScrollPane> + </cell> + </row> <row> - <cell fill='both' weightx='1'> - <Table id='editorPanel' decorator='boxed'/> - </cell> + <cell fill="both"> + +  + <Table id='editor' fill='both' insets='0' decorator='boxed'> + +  + <row> + <cell fill='both' weightx='1'> + <Table id='editorPanel' decorator='boxed'/> + </cell> + </row> + +  + <row> + <cell> + <Table fill='both' id='editorActions'> + <row> + <cell weightx='1'> +  + <JButton id='resetEntry'/> + </cell> + <cell weightx='1'> + <JPanel layout="{new GridLayout(1,0)}"> +  + <JButton id='saveEntry'/> +  + <JButton id='saveAndNewEntry'/> + </JPanel> + </cell> + <cell weightx='1'> +  + <JButton id='deleteEntry'/> + </cell> + </row> + </Table> + </cell> + </row> + </Table> + </cell> </row> - -  <row> - <cell> - <Table fill='both' id='editorActions'> - <row> - <cell weightx='1'> -  - <JButton id='resetEntry'/> - </cell> - <cell weightx='1'> - <JPanel layout="{new GridLayout(1,0)}"> -  - <JButton id='saveEntry'/> -  - <JButton id='saveAndNewEntry'/> - </JPanel> - </cell> - <cell weightx='1'> -  - <JButton id='deleteEntry'/> - </cell> - </row> - </Table> - </cell> + <cell fill="both"> + <Table id='extraZone' decorator='boxed'/> + </cell> </row> - </Table> - </cell> - </row> - <row> - <cell fill="both"> - <Table id='extraZone' decorator='boxed'/> - </cell> - </row> + </Table> + </JPanel> +  + <Table id="actions" weightx='1' insets='0' fill="both"> + <row fill="both"> + <cell weightx="0.5"> + <JButton id='reset'/> + </cell> + <cell weightx="0.5"> + <JButton id='save'/> + </cell> + </row> </Table> - </JPanel> -  - <Table id="actions" weightx='1' insets='0' fill="both"> - <row fill="both"> - <cell weightx="0.5"> - <JButton id='reset'/> - </cell> - <cell weightx="0.5"> - <JButton id='save'/> - </cell> - </row> - </Table> - <JPanel id="invisible"> -  - <JToolBar id="selectToolbar"> - <JButton id="selectFirstTableEntry"/> - <JButton id="selectPreviousTableEntry"/> - <JButton id="selectNextTableEntry"/> - <JButton id="selectLastTableEntry"/> - </JToolBar> - </JPanel> - + <JPanel id="invisible"> +  + <JToolBar id="selectToolbar"> + <JButton id="selectFirstTableEntry"/> + <JButton id="selectPreviousTableEntry"/> + <JButton id="selectNextTableEntry"/> + <JButton id="selectLastTableEntry"/> + </JToolBar> + </JPanel> + <JMenuItem id='showTechnicalInformations'/> </fr.ird.observe.client.datasource.editor.api.content.ContentUI> ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss ===================================== @@ -112,3 +112,7 @@ verticalAlignment:"center"; horizontalAlignment:"center"; } + +#showTechnicalInformations { + enabled:{!states.isCreatingMode() && !tableModel.isCreate() && tableModel.getSelectedRow() > -1}; +} ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.ContentMode; import fr.ird.observe.client.datasource.editor.api.content.ContentUIHandler; import fr.ird.observe.client.datasource.editor.api.content.actions.InsertMenuAction; import fr.ird.observe.client.datasource.editor.api.content.actions.create.CreateNewContentTableUIEntry; +import fr.ird.observe.client.datasource.editor.api.content.actions.id.ShowTechnicalInformations; import fr.ird.observe.client.datasource.editor.api.content.actions.mode.ChangeMode; import fr.ird.observe.client.datasource.editor.api.content.actions.mode.ChangeModeExecutor; import fr.ird.observe.client.datasource.editor.api.content.actions.mode.ChangeModeProducer; @@ -132,7 +133,7 @@ public abstract class ContentTableUIHandler<D extends DataDto, C extends DataDto ResetEntry.init(ui, ui.getResetEntry(), ResetEntry.class); SaveAndNewEntry.init(ui, ui.getSaveAndNewEntry(), SaveAndNewEntry.class); DeleteEntry.init(ui, ui.getDeleteEntry(), DeleteEntry.class); - + ShowTechnicalInformations.installAction(ui); getComponent(JButton.class, "importData").ifPresent(e -> ImportDataFile.installAction(ui, e)); getComponent(JButton.class, "deleteData").ifPresent(e -> DeleteDataFile.installAction(ui, e)); getComponent(JButton.class, "exportData").ifPresent(e -> ExportDataFile.installAction(ui, e)); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.table; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; +import fr.ird.observe.client.datasource.editor.api.content.actions.id.ShowIdRequest; import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveRequest; import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelSupport; import fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.SortableTableUI; @@ -29,6 +30,7 @@ import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNod import fr.ird.observe.client.util.init.DefaultUIInitializerResult; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.services.service.data.SimpleDataService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -174,4 +176,11 @@ public abstract class ContentTableUIModel<D extends DataDto, C extends DataDto> } return super.openForm(selectedId); } + + public ShowIdRequest getShowIdRequest() { + return new ShowIdRequest(() -> { + C tableEditBean = ContentTableUIModel.this.getStates().getTableEditBean(); + return tableEditBean == null ? null : DtoReference.toReference(getClientUIContext().getDecoratorService().getReferentialLocale(), tableEditBean); + }); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4aac1786a41449b6c15c0130a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4aac1786a41449b6c15c0130a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Consultation du tableau de captures - Closes #1731
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a741dd77 by Tony Chemit at 2021-01-06T16:37:19+01:00 Consultation du tableau de captures - Closes #1731 Review ContentTable actions (before focus refactor) Review ContentUI actions scope (never be able to use them if not in content zone) - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleConfigure.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MakeActionsEnabledOnlyIfMenuItemParentIsOpenedPopupMenuListener.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/DeleteDataFile.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/datafile/DeleteDataFile.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ExportDataFile.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/datafile/ExportDataFile.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ImportDataFile.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/datafile/ImportDataFile.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/WithDataFileActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/datafile/WithDataFileActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ContentTableUIEntryActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/ContentTableUIEntryActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/DeleteEntry.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/DeleteEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ResetEntry.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/ResetEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveAndNewEntry.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveAndNewEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveTableEntry.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveTableEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MoveBottom.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveBottom.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MoveDown.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveDown.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MoveTop.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveTop.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MoveUp.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveUp.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SelectFirst.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectFirst.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SelectLast.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectLast.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SelectNext.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectNext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SelectPrevious.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectPrevious.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/AddNewRow.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/inline/AddNewRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/DeleteSelectedRow.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/inline/DeleteSelectedRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/popup/InlineTableAutoSelectRowAndShowPopupAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/inline/InlineTableAutoSelectRowAndShowPopupAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ResetSizeMeasureType.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/sample/ResetSizeMeasureType.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a741dd7757d28c63a49144760… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a741dd7757d28c63a49144760… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Valider tous les écrans du modèle LL - See #1665
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ce3b613b by Tony Chemit at 2021-01-06T11:35:22+01:00 Valider tous les écrans du modèle LL - See #1665 Problème de restitution de la position sur la ligne LL-Observation-Catch/Tdr - - - - - 46bd55b1 by Tony Chemit at 2021-01-06T11:41:34+01:00 Peaufinage de la table ll_common.onboardprocessing 2 - Closes #1735 - - - - - 10 changed files: - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/observation/SetImpl.java - models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql - models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/empty_h2.sql.gz - tests/test/src/main/resources/db/8.0/empty_pg.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/src/main/java/fr/ird/observe/entities/data/ll/observation/SetImpl.java ===================================== @@ -25,12 +25,15 @@ package fr.ird.observe.entities.data.ll.observation; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.ll.observation.BasketReference; import fr.ird.observe.dto.data.ll.observation.BranchlineReference; +import fr.ird.observe.dto.data.ll.observation.LonglinePositionAware; import fr.ird.observe.dto.data.ll.observation.LonglinePositionContainerAware; import fr.ird.observe.dto.data.ll.observation.SectionReference; import fr.ird.observe.dto.referential.ReferentialLocale; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; public class SetImpl extends SetAbstract { @@ -48,6 +51,8 @@ public class SetImpl extends SetAbstract { private void loadDtoReferenceParents(LonglinePositionContainerAware dto, ReferentialLocale referentialLocale) { List<SectionReference> sections = new LinkedList<>(); List<BasketReference> baskets = new LinkedList<>(); + Map<String, BasketReference> basketsParents = new LinkedHashMap<>(); + Map<String, BranchlineReference> branchlinesParents = new LinkedHashMap<>(); List<BranchlineReference> branchlines = new LinkedList<>(); getSection().forEach(section -> { section.setParentId(getTopiaId()); @@ -59,15 +64,31 @@ public class SetImpl extends SetAbstract { basket.setParentId(sectionId); BasketReference basketReference = basket.toReference(referentialLocale); baskets.add(basketReference); + basketsParents.put(basketId, basketReference); basket.getBranchline().forEach(branchline -> { branchline.setParentId(basketId); BranchlineReference branchlineReference = branchline.toReference(referentialLocale); branchlines.add(branchlineReference); + branchlinesParents.put(branchline.getTopiaId(), branchlineReference); }); }); }); dto.setSections(sections); dto.setBaskets(baskets); dto.setBranchlines(branchlines); + for (LonglinePositionAware datum : dto.getData()) { + BranchlineReference branchline = datum.getBranchline(); + if (branchline != null) { + BranchlineReference branchlineWithParentId = branchlinesParents.get(branchline.getId()); + datum.setBranchline(branchlineWithParentId); + } else { + BasketReference basket = datum.getBasket(); + if (basket != null) { + BasketReference basketWithParentId = basketsParents.get(basket.getId()); + datum.setBasket(basketWithParentId); + } + } + } + } } ===================================== models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql ===================================== @@ -71,8 +71,7 @@ INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.22', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FILLET', 1, false, null, 'Filleted', 'Filet', 'Filleted #TODO', null, null, null, null, null, null); INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.23', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GIL', 1, false, null, 'Gilled', 'Sans branchies', 'Gilled #TODO', null, null, null, null, null, null); INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609847952719#0.41927756421927587', 1, '2021-01-05 11:57:13.019', '2021-01-05 11:59:12.746', 'SALT', null, null, FALSE, 1, 'Salted', 'Salé', 'Salado', null, null, null, null, null); -INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848016239#0.8310203513100917', 1, '2021-01-05 11:59:25.268', '2021-01-05 12:00:16.241', 'LIVE', null, null, FALSE, 1, 'Kept alive', 'Gardé vivant', 'Mantenido vivo', null, null, null, null, null); -INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848457257#0.12756593660166082', 1, '2021-01-05 12:00:19.234', '2021-01-05 12:07:37.259', 'DEAD', null, null, FALSE, 1, 'Kept dead', 'Conservé mort', 'Mantenido muerto', null, null, null, null, null); + INSERT INTO ll_common.linetype (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.LineType#1239832686157#0.9', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido'); UPDATE ll_common.trip SET observationsAvailability = TRUE; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties ===================================== @@ -47,6 +47,6 @@ ll_common.weightcategory=0 ll_landing.company=30 ll_landing.datasource=20 ll_common.triptype=2 -ll_common.onboardprocessing=16 +ll_common.onboardprocessing=14 ll_landing.conservation=3 ll_common.weightdeterminationmethod=0 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -57,7 +57,7 @@ fr.ird.observe.entities.referential.ll.common.LightsticksType=2 fr.ird.observe.entities.referential.ll.common.LineType=9 fr.ird.observe.entities.referential.ll.common.MitigationType=15 fr.ird.observe.entities.referential.ll.common.ObservationMethod=2 -fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=16 +fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=14 fr.ird.observe.entities.referential.ll.common.SettingShape=6 fr.ird.observe.entities.referential.ll.common.TripType=2 fr.ird.observe.entities.referential.ll.common.VesselActivity=27 ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161 # for fr.ird.observe.spi.DbModelHelperTest REFERENCE_DATA_COUNT=53 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3034 +REFERENTIAL_COUNT=3032 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95738c1218839ce135799e34… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95738c1218839ce135799e34… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Peaufinage de la table ll_common.onboardprocessing - Closes #1733
by Tony CHEMIT 05 Jan '21

05 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f661eff4 by Tony Chemit at 2021-01-05T13:58:42+01:00 Peaufinage de la table ll_common.onboardprocessing - Closes #1733 - - - - - 95738c12 by Tony Chemit at 2021-01-05T14:00:16+01:00 Gestion du champ 'numéro au virage' - Closes #1729 Erreur sur validateur 'numéro au virage' - Closes #1730 - - - - - 10 changed files: - models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql - models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - pom.xml - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/empty_h2.sql.gz - tests/test/src/main/resources/db/8.0/empty_pg.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql ===================================== @@ -62,15 +62,17 @@ INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.3' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'HG', 'Headed and gutted', 'Etêté et vidé', 'Etêté et vidé #TODO'); INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.4' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'GG', 'Gilled and gutted', 'Vidé et sans branchies', 'Vidé et sans branchies #TODO'); INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.5' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.16', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'UNK', 1, 'f', null, 'Unknown', 'Inconnu', 'Unknown #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.17', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GUT', 1, 'f', null, 'Gutted', 'Vidé', 'Gutted #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.18', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FIN', 1, 'f', null, 'Finned', 'Aileron coupé', 'Finned #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.19', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'SUMMEAT', 1, 'f', null, 'Total Meat Retained for all species', 'Chair conservée pour toutes les espèces', 'Total Meat Retained for all species #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.20', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DOGFD', 1, 'f', null, 'Fish used for animal feed', 'Alimentation pour animal', 'Fish used for animal feed #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.21', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DR', 1, 'f', null, 'Dried', 'Séché', 'Dried #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.22', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FILLET', 1, 'f', null, 'Filleted', 'Filet', 'Filleted #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.23', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GIL', 1, 'f', null, 'Gilled', 'Sans branchies', 'Gilled #TODO', null, null, null, null, null, null); - +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid)VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.16', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'UNK', 1, false, null, 'Unknown', 'Inconnu', 'Unknown #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.17', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GUT', 1, false, null, 'Gutted', 'Vidé', 'Gutted #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.18', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FIN', 1, false, null, 'Finned', 'Aileron coupé', 'Finned #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.19', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'SUMMEAT', 1, false, null, 'Total Meat Retained for all species', 'Chair conservée pour toutes les espèces', 'Total Meat Retained for all species #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.20', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DOGFD', 1, false, null, 'Fish used for animal feed', 'Alimentation pour animal', 'Fish used for animal feed #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.21', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DR', 1, false, null, 'Dried', 'Séché', 'Dried #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.22', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FILLET', 1, false, null, 'Filleted', 'Filet', 'Filleted #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.23', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GIL', 1, false, null, 'Gilled', 'Sans branchies', 'Gilled #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609847952719#0.41927756421927587', 1, '2021-01-05 11:57:13.019', '2021-01-05 11:59:12.746', 'SALT', null, null, FALSE, 1, 'Salted', 'Salé', 'Salado', null, null, null, null, null); +INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848016239#0.8310203513100917', 1, '2021-01-05 11:59:25.268', '2021-01-05 12:00:16.241', 'LIVE', null, null, FALSE, 1, 'Kept alive', 'Gardé vivant', 'Mantenido vivo', null, null, null, null, null); +INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848457257#0.12756593660166082', 1, '2021-01-05 12:00:19.234', '2021-01-05 12:07:37.259', 'DEAD', null, null, FALSE, 1, 'Kept dead', 'Conservé mort', 'Mantenido muerto', null, null, null, null, null); INSERT INTO ll_common.linetype (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.LineType#1239832686157#0.9', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido'); UPDATE ll_common.trip SET observationsAvailability = TRUE; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties ===================================== @@ -47,6 +47,6 @@ ll_common.weightcategory=0 ll_landing.company=30 ll_landing.datasource=20 ll_common.triptype=2 -ll_common.onboardprocessing=13 +ll_common.onboardprocessing=16 ll_landing.conservation=3 ll_common.weightdeterminationmethod=0 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -57,7 +57,7 @@ fr.ird.observe.entities.referential.ll.common.LightsticksType=2 fr.ird.observe.entities.referential.ll.common.LineType=9 fr.ird.observe.entities.referential.ll.common.MitigationType=15 fr.ird.observe.entities.referential.ll.common.ObservationMethod=2 -fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=13 +fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=16 fr.ird.observe.entities.referential.ll.common.SettingShape=6 fr.ird.observe.entities.referential.ll.common.TripType=2 fr.ird.observe.entities.referential.ll.common.VesselActivity=27 ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@   -  + <lib.version.java4all.jaxx>3.0-alpha-88</lib.version.java4all.jaxx>    ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161 # for fr.ird.observe.spi.DbModelHelperTest REFERENCE_DATA_COUNT=53 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3031 +REFERENTIAL_COUNT=3034 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5cc43cee176f684d39c56877… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5cc43cee176f684d39c56877… You're receiving this email because of your account on gitlab.com.

1 0