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

[Git][ultreiaio/ird-observe][develop] 3 commits: Introduce IdAndLastUpdateDate and IdState (will be used to compute differential on selection model)
by Tony CHEMIT (＠tchemit) 28 Jul '23

28 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 87d5045f by Tony Chemit at 2023-07-28T16:07:09+02:00 Introduce IdAndLastUpdateDate and IdState (will be used to compute differential on selection model) - - - - - b7a9069e by Tony Chemit at 2023-07-28T16:07:10+02:00 Review actions ui code to implements the filter on IdState, and make the code much clear - - - - - 82b0c64e by Tony Chemit at 2023-07-28T16:10:49+02:00 Merge branch 'feature/issue_2750' into develop Effectuer un différentiel sur l'UI de synchro de marées - Closes #2750 - - - - - 30 changed files: - client/core/src/main/resources/observe-ui.properties - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePane.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneModel.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/SynchroSelectionTreeCellRenderer.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/SynchroSelectionTreeNodeRendererContext.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/DataSelectionTreePaneActionSupport.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/ToggleIdState.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - toolkit/api-i18n/src/main/i18n/translations/toolkit-api-i18n_en_GB.properties - toolkit/api-i18n/src/main/i18n/translations/toolkit-api-i18n_es_ES.properties - toolkit/api-i18n/src/main/i18n/translations/toolkit-api-i18n_fr_FR.properties - toolkit/api/src/main/i18n/getters/java-enumeration.getter - toolkit/api/src/main/java/fr/ird/observe/navigation/tree/ToolkitTreeNodeBean.java - + toolkit/api/src/main/java/fr/ird/observe/navigation/tree/selection/IdAndLastUpdateDate.java - + toolkit/api/src/main/java/fr/ird/observe/navigation/tree/selection/IdState.java - toolkit/api/src/main/java/fr/ird/observe/navigation/tree/selection/bean/RootOpenSelectionTreeNodeBean.java - + toolkit/api/src/main/resources/icons/data-state.added-small.png - + toolkit/api/src/main/resources/icons/data-state.added.png - + toolkit/api/src/main/resources/icons/data-state.equals-small.png - + toolkit/api/src/main/resources/icons/data-state.equals.png - + toolkit/api/src/main/resources/icons/data-state.obsolete-small.png - + toolkit/api/src/main/resources/icons/data-state.obsolete.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22e5721c5cf70bd17d0bc148… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22e5721c5cf70bd17d0bc148… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Fix migration - See #2762
by Tony CHEMIT (＠tchemit) 28 Jul '23

28 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bea39d78 by Tony Chemit at 2023-07-26T16:56:52+02:00 Fix migration - See #2762 - - - - - ab18e1d6 by Tony Chemit at 2023-07-28T16:05:34+02:00 On ne voit pas les toolTip dans les arbres des assistants de synchronisation - Closes #2768 - - - - - 984a29d2 by Tony Chemit at 2023-07-28T16:05:34+02:00 Add a new classifier «action» on enumeration I18n constants (will be used by new actions based on enumration) - - - - - f1602cd3 by Tony Chemit at 2023-07-28T16:05:34+02:00 Open API in ToolkitTreeModelSupport to be able to build first the flatModel and then build the root node from it (will be used when we want to keep the flatModel and do some filter on it to produce root node without having to make a service call, since the flatModel won't have changed) - - - - - 5f94b023 by Tony Chemit at 2023-07-28T16:05:34+02:00 Review method SelectionTreeModelSupport.allDataIds to be able to use it outside of the model scope - - - - - acd770bf by Tony Chemit at 2023-07-28T16:05:34+02:00 Improve SelectionTreeNodeRendererContext API to be able to extend it - - - - - 22e5721c by Tony Chemit at 2023-07-28T16:05:34+02:00 Ne plus afficher le label L'opération requière des corrections sur les interfaces de certains assistants - Closes #2767 - - - - - 15 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreeCellRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - core/persistence/migration/src/main/resources/db/migration/v9/9.2/07_issue-2762-PG.sql - toolkit/api/src/main/java/fr/ird/observe/dto/I18nDecoratorHelper.java - toolkit/api/src/main/java/fr/ird/observe/navigation/tree/ToolkitTreeModelSupport.java - toolkit/api/src/main/java/fr/ird/observe/navigation/tree/selection/SelectionTreeCellRenderer.java - toolkit/api/src/main/java/fr/ird/observe/navigation/tree/selection/SelectionTreeModelSupport.java - toolkit/api/src/main/java/fr/ird/observe/navigation/tree/selection/SelectionTreeNodeRendererContext.java Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx ===================================== @@ -64,6 +64,7 @@ protected AdminTabUI(AdminUI parentContext) { } public void destroy() { + getHandler().destroy(); description.setText(""); leftSourceModel = null; rightSourceModel = null; ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java ===================================== @@ -28,6 +28,8 @@ import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; import javax.swing.JButton; import javax.swing.JTextArea; import javax.swing.SwingUtilities; +import java.awt.GridBagConstraints; +import java.awt.Insets; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Objects; @@ -169,4 +171,15 @@ public class AdminTabUIHandler<U extends AdminTabUI> implements WithClientUICont progression.append(text + "\n"); progression.setCaretPosition(progression.getDocument().getLength()); } + + protected void hideFixedPanelLabel(AdminTabUI ui) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2767 + // FIXME Maybe we should use a simple JPanel instead? + ui.getNEED_FIX_panel().removeAll(); + ui.getNEED_FIX_panel().add(ui.getNEED_FIX_content(), new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, 10, 1, new Insets(3, 3, 3, 3), 0, 0)); + } + + public void destroy() { + + } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java ===================================== @@ -36,5 +36,6 @@ public class ActivityPairingUIHandler extends AdminTabUIHandler<ActivityPairingU public void afterInit(ActivityPairingUI ui) { super.afterInit(ui); setAutoStart(ui.getPrepare()); + hideFixedPanelLabel(ui); } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java ===================================== @@ -122,6 +122,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa } } + @Override public void destroy() { ObserveSwingDataSource dataSource = ui.getModel().getConfigModel().getLeftSourceModel().getSafeSource(false); if (dataSource.isOpen()) { ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java ===================================== @@ -32,6 +32,7 @@ import fr.ird.observe.client.util.init.UIInitHelper; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.JScrollPane; +import javax.swing.ToolTipManager; import static io.ultreia.java4all.i18n.I18n.t; @@ -54,6 +55,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple SelectUnselectWithOpposite.init(ui.getLeftTreePane().getTree(), null, new SelectUnselectWithOpposite(ui.getRightTreePane().getTree())); JScrollPane descriptionPane = ui.getDescriptionPane(); descriptionPane.getParent().remove(descriptionPane); + + hideFixedPanelLabel(ui); } @Override @@ -64,4 +67,9 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple configModel.addPropertyChangeListener(StorageUIModel.VALID_PROPERTY_NAME, evt -> getModel().validate()); } + @Override + public void destroy() { + ToolTipManager.sharedInstance().unregisterComponent(ui.getLeftTreePane().getTree().getTree()); + ToolTipManager.sharedInstance().unregisterComponent(ui.getRightTreePane().getTree().getTree()); + } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java ===================================== @@ -45,6 +45,7 @@ import javax.swing.JLabel; import javax.swing.JPopupMenu; import javax.swing.JSeparator; import javax.swing.SwingUtilities; +import javax.swing.ToolTipManager; import javax.swing.tree.TreePath; import java.awt.Color; import java.awt.event.MouseAdapter; @@ -123,7 +124,7 @@ public class DataSelectionTreePaneHandler implements UIHandler<DataSelectionTree Consumer<TreeConfigUI> consumer = TreeConfigUIHandler::hideOptions; Consumer<TreeConfigUI> apply = u -> initPanel(parent, ui); SelectionTreePaneHandler.init(treePane, consumer, apply); - + ToolTipManager.sharedInstance().registerComponent(tree); if (isLeft) { stepModel.setLeftSelectionDataModel(treeModel); } else { ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUIHandler.java ===================================== @@ -32,6 +32,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; +import javax.swing.ToolTipManager; import java.util.EnumSet; import static io.ultreia.java4all.i18n.I18n.t; @@ -59,6 +60,9 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy parentUI.getTabs().setTitleAt(1, t("observe.ui.datasource.editor.actions.synchro.referential.withMode", newValue.getLabel())); } }); + hideFixedPanelLabel(ui); + ToolTipManager.sharedInstance().registerComponent(ui.getLeftTreePane().getTree()); + ToolTipManager.sharedInstance().registerComponent(ui.getRightTreePane().getTree()); } @Override ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreeCellRenderer.java ===================================== @@ -75,7 +75,7 @@ public class ReferentialSelectionTreeCellRenderer extends DefaultXTreeCellRender super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus); setIcon(icon); - setToolTipText(text); + panel.setToolTipText(text); boolean selectedState; Icon selectedIcon = unselectedIcon; if (node.isLeaf()) { ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java ===================================== @@ -127,6 +127,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements Set<ValidatorDto> validators = getValidatorsManager().getValidators(); ValidateModel stepModel = model.getValidateModel(); stepModel.setAllValidators(validators); + hideFixedPanelLabel(ui); } @Override ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/07_issue-2762-PG.sql ===================================== @@ -19,8 +19,8 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -ALTER TABLE ps_common.ObservedSystem RENAME allwObservation TO observation; -ALTER TABLE ps_common.ObservedSystem RENAME allwLogbook TO logbook; -ALTER TABLE ps_common.WeightCategory RENAME allwLanding TO landing; -ALTER TABLE ps_common.WeightCategory RENAME allwLogbook TO logbook; -ALTER TABLE ps_common.WeightCategory RENAME allwWellPlan TO wellPlan; +ALTER TABLE ps_common.ObservedSystem RENAME allowObservation TO observation; +ALTER TABLE ps_common.ObservedSystem RENAME allowLogbook TO logbook; +ALTER TABLE ps_common.WeightCategory RENAME allowLanding TO landing; +ALTER TABLE ps_common.WeightCategory RENAME allowLogbook TO logbook; +ALTER TABLE ps_common.WeightCategory RENAME allowWellPlan TO wellPlan; ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/I18nDecoratorHelper.java ===================================== @@ -49,6 +49,8 @@ public abstract class I18nDecoratorHelper extends BeanPropertyI18nKeyProducerPro public static final String I18N_CONSTANT_LABEL = "label"; public static final String I18N_CONSTANT_LABEL_PATTERN = "observe.constant.@CLASS_SIMPLE_NAME@.@NAME@"; public static final String I18N_CONSTANT_DESCRIPTION_PATTERN = "observe.constant.@CLASS_SIMPLE_NAME@.@NAME@.description"; + public static final String I18N_CONSTANT_ACTION = "action"; + public static final String I18N_CONSTANT_ACTION_PATTERN = "observe.constant.@CLASS_SIMPLE_NAME@.@NAME@.action"; public static final String I18N_CONSTANT_STORAGE_LABEL_PATTERN = "observe.constant.storage.@CLASS_SIMPLE_NAME@.@NAME@"; public static final String I18N_CONSTANT_NAVIGATION_LABEL_PATTERN = "observe.Common.navigation.config.@CLASS_SIMPLE_NAME@.@NAME@"; public static final String I18N_CONSTANT_NAVIGATION_DESCRIPTION_PATTERN = "observe.Common.navigation.config.@CLASS_SIMPLE_NAME@.@NAME@.description"; ===================================== toolkit/api/src/main/java/fr/ird/observe/navigation/tree/ToolkitTreeModelSupport.java ===================================== @@ -38,6 +38,7 @@ import java.beans.PropertyChangeSupport; import java.util.Enumeration; import java.util.List; import java.util.Objects; +import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -87,16 +88,32 @@ public abstract class ToolkitTreeModelSupport<R extends ToolkitTreeNode> extends this.editIds = editIds; } - public final void populate(Function<ToolkitTreeFlatModelRootRequest, ToolkitTreeFlatModel> service) { + public final ToolkitTreeFlatModel buildFlatModel(Function<ToolkitTreeFlatModelRootRequest, ToolkitTreeFlatModel> service) { request = toRequest(); ToolkitTreeFlatModel flatModel = service.apply(request); dataCount = flatModel.getDataCount(); augmentsModel(flatModel); + return flatModel; + } + + public final void populate(ToolkitTreeFlatModel flatModel, Consumer<R> rootConsumer) { R rootNode = new ToolkitTreeNodeBuilder().load(rootSupplier.get(), flatModel.getMapping()); augmentsRoot(rootNode); + if (rootConsumer != null) { + rootConsumer.accept(rootNode); + } setRoot(rootNode); } + public final void populate(Function<ToolkitTreeFlatModelRootRequest, ToolkitTreeFlatModel> service) { + populate(service, null); + } + + public final void populate(Function<ToolkitTreeFlatModelRootRequest, ToolkitTreeFlatModel> service, Consumer<R> rootConsumer) { + ToolkitTreeFlatModel flatModel = buildFlatModel(service); + populate(flatModel, rootConsumer); + } + public final ToolkitTreeFlatModelRootRequest getRequest() { return request; } ===================================== toolkit/api/src/main/java/fr/ird/observe/navigation/tree/selection/SelectionTreeCellRenderer.java ===================================== @@ -75,7 +75,7 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { this.selected.setIcon(context.selectionState.getIcon()); setForeground(context.color); setIcon(context.icon); - setToolTipText(context.tip); + panel.setToolTipText(context.tip); if (context.open) { setFont(getFont().deriveFont(Font.BOLD)); } else { ===================================== toolkit/api/src/main/java/fr/ird/observe/navigation/tree/selection/SelectionTreeModelSupport.java ===================================== @@ -65,6 +65,20 @@ public class SelectionTreeModelSupport<R extends SelectionTreeNode> extends Tool */ private int selectedCount = -1; + public static List<String> allDataIds(TreeNode root) { + Enumeration<?> children = root.children(); + List<String> result = new LinkedList<>(); + while (children.hasMoreElements()) { + SelectionTreeNode topNode = (SelectionTreeNode) children.nextElement(); + Enumeration<TreeNode> dataEnum = topNode.children(); + while (dataEnum.hasMoreElements()) { + SelectionTreeNode treeNode = (SelectionTreeNode) dataEnum.nextElement(); + result.add(treeNode.getUserObject().getId()); + } + } + return result; + } + public SelectionTreeModelSupport(BusinessProject businessProject, SelectionTreeConfig config, Supplier<R> rootSupplier) { super(businessProject, config, rootSupplier); selectedData = new LinkedList<>(); @@ -163,20 +177,6 @@ public class SelectionTreeModelSupport<R extends SelectionTreeNode> extends Tool recomputeSelectedCount(); } - public List<String> allDataIds() { - Enumeration<?> children = getRoot().children(); - List<String> result = new LinkedList<>(); - while (children.hasMoreElements()) { - SelectionTreeNode topNode = (SelectionTreeNode) children.nextElement(); - Enumeration<TreeNode> dataEnum = topNode.children(); - while (dataEnum.hasMoreElements()) { - SelectionTreeNode treeNode = (SelectionTreeNode) dataEnum.nextElement(); - result.add(treeNode.getUserObject().getId()); - } - } - return result; - } - public long allDataCount() { Enumeration<?> children = getRoot().children(); long result = 0; @@ -287,7 +287,7 @@ public class SelectionTreeModelSupport<R extends SelectionTreeNode> extends Tool public void augmentsExistIds(List<String> otherSideIds) { if (otherSideIds != null) { - List<String> thisSideIds = allDataIds(); + List<String> thisSideIds = allDataIds(getRoot()); // optimization: only deal with this ids that are also on this side otherSideIds.removeIf(id -> !thisSideIds.contains(id)); // augments exist state ===================================== toolkit/api/src/main/java/fr/ird/observe/navigation/tree/selection/SelectionTreeNodeRendererContext.java ===================================== @@ -53,16 +53,30 @@ public class SelectionTreeNodeRendererContext { } else { this.count = node.getChildCount(); } - this.icon = node.getIcon(); + this.icon = buildIcon(node); + this.text = buildText(node); + this.tip = buildTip(node, text); + this.color = enabled && (!node.getUserObject().isReferentialType() || count > 0) ? Color.BLACK : Color.GRAY; + this.selectionState = node.getSelectionState(); + } + + protected Icon buildIcon(SelectionTreeNode node) { + return node.getIcon(); + } + + protected String buildText(SelectionTreeNode node) { String text = node.getUserObject().getText(); - String tip = text; if (exist) { text = t("observe.common.exist.on.remote", text); - tip = t("observe.ui.message.warning.will.be.delete", text); } - this.text = text; - this.tip = tip; - this.color = enabled && (!node.getUserObject().isReferentialType() || count > 0) ? Color.BLACK : Color.GRAY; - this.selectionState = node.getSelectionState(); + return text; + } + + protected String buildTip(SelectionTreeNode node, String text) { + String tip = text; + if (exist) { + tip += t("observe.ui.message.warning.will.be.delete", text); + } + return tip; } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8703f6994cf71bbe0fa14ab2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8703f6994cf71bbe0fa14ab2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 18 commits: Remove obsolete file ToolkitEntitySqlScriptModel.json
by Tony CHEMIT (＠tchemit) 26 Jul '23

26 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1abf4cdc by Tony Chemit at 2023-07-26T12:24:37+02:00 Remove obsolete file ToolkitEntitySqlScriptModel.json - - - - - edf719d9 by Tony Chemit at 2023-07-26T12:24:44+02:00 Ignore more test with magic IgnoreTestClassRule - - - - - b47673fb by Tony Chemit at 2023-07-26T12:24:47+02:00 Ajout de scripts pour les tck - - - - - 24de337e by Tony Chemit at 2023-07-26T12:24:51+02:00 Champs comment manquant sur le formulaire du référentiel GearCharacteristicListItem - - - - - f9cb0e9f by Tony Chemit at 2023-07-26T14:55:40+02:00 update site skin - - - - - b46267ee by Tony Chemit at 2023-07-26T14:55:43+02:00 Remove FIXME (code was moved to JAXX) - - - - - 7110cc10 by Tony Chemit at 2023-07-26T14:55:45+02:00 update pom - - - - - 36252c2f by Tony Chemit at 2023-07-26T14:55:49+02:00 fix CI cache - - - - - f0670d65 by Tony Chemit at 2023-07-26T15:31:08+02:00 Revert "Do not generate again generateIds fixtures if already existing" This reverts commit 97d6dd6c94424bd171f43ee9cbe2b2ef1cee42ae. - - - - - aadc2452 by Tony Chemit at 2023-07-26T15:31:08+02:00 Do not generate again generateIds fixtures if already existing - - - - - a9cf0e07 by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour des tables d'association de gear - - - - - 500dfe8d by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour de la migration - - - - - c45d4b5c by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour des fixtures - - - - - 3a8de752 by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour du formulaire du réferentiel - - - - - 3eab40b9 by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise en place du filtre sur les caractéristiques autorisées d'un équipement dans le formulaire de données - - - - - bd6113a6 by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour des fixtures (pour la documentation de l'API publique) - - - - - 830e6cbd by Tony Chemit at 2023-07-26T15:31:32+02:00 Mise à jour de la documentation de l'API publique - - - - - 8703f699 by Tony Chemit at 2023-07-26T15:31:49+02:00 Merge branch 'feature/issue_2765' into develop Contraindre les caractéristiques d'équipement (common.gearcharacteristic) autorisées pour un équipement (common.gear) donné. - Closes #2765 - - - - - 30 changed files: - .gitlab-ci.yml - + .mvn/scripts/tck/delete.sh - + .mvn/scripts/tck/test.sh - + .mvn/scripts/tck/update.sh - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearCharacteristicListItemUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearUI.jcss - + client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearUIHandler.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ObserveI18nLabelsBuilder.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/GearUseFeaturesMeasurementAware.java - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearDto-update-warning-validation.xml - − core/persistence/java/src/main/resources/META-INF/persistence/Observe/ToolkitEntitySqlScriptModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlDeletePlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlScriptModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlUsageModel.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d20f873ae6b9e33570cfa235… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d20f873ae6b9e33570cfa235… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: Do not generate again generateIds fixtures if already existing
by Tony CHEMIT (＠tchemit) 26 Jul '23

26 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 97d6dd6c by Tony Chemit at 2023-07-25T13:54:30+02:00 Do not generate again generateIds fixtures if already existing - - - - - 15b0f453 by Tony Chemit at 2023-07-25T13:54:34+02:00 Be able to add some filter on referentialCache for Referential UI - - - - - 6b8584bb by Tony Chemit at 2023-07-26T08:53:22+02:00 Ajout de GearCharacteristicListItem dans le modèle - - - - - d04270b1 by Tony Chemit at 2023-07-26T08:53:58+02:00 Ajout dans l'api de méthodes pour lire et écrire une caractéristique de type list - - - - - 3c8fed9a by Tony Chemit at 2023-07-26T08:54:39+02:00 Mise à jour de la migration - - - - - 88a04f00 by Tony Chemit at 2023-07-26T08:55:05+02:00 Mise à jour des fixtures - - - - - c911ab39 by Tony Chemit at 2023-07-26T08:55:05+02:00 Ajout du nouveau formulaire de référentiel - - - - - 4a9642df by Tony Chemit at 2023-07-26T08:55:05+02:00 Adaptation des ui pour rendre et éditer des caractéristiques de type liste - - - - - b1067c62 by Tony Chemit at 2023-07-26T08:55:05+02:00 Mise à jour des fixtures (pour la documentation de l'API publique) - - - - - c569eebd by Tony Chemit at 2023-07-26T08:55:05+02:00 Mise à jour de la documentation de l'API publique - - - - - d20f873a by Tony Chemit at 2023-07-26T08:55:31+02:00 Merge branch 'feature/issue_2764' into develop Rajouter un type 'Liste de choix' dans GearCharacteristicType et une nouvelle table gearCharacteristicListItem et remplissage des listes utilisées à l'AZTI - Closes #2764 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellRenderer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java - client/datasource/editor/common/pom.xml - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/i18n/getters/navigation.getter - + client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearCharacteristicListItemUI.jaxx - + client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearCharacteristicListItemUIModelStates.java - + client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/GearCharacteristicListItemUINavigationNode.scope - client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/ReferentialHomeUINavigationNode.scope - core/api/dto-decoration/src/main/i18n/getters/labels.getter - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDtoDecoratorDefinition.java - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicListItemReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsCommon.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/GearUseFeaturesMeasurementAware.java - core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicTypeAware.java - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json - core/api/tree/src/test/resources/fixtures/api-tree.properties - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDto-create-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDto-create-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDto-update-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDto-update-warning-validation.xml - core/api/validation/src/test/resources/fixtures/api-validation.properties - core/api/validation/src/test/resources/fixtures/validation/bean-validator-detector-n1-create.list - core/api/validation/src/test/resources/fixtures/validation/bean-validator-detector-n1-update.list The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5bd6877ea0ccc2e606591fdf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5bd6877ea0ccc2e606591fdf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue_2764
by Tony CHEMIT (＠tchemit) 26 Jul '23

26 Jul '23

Tony CHEMIT deleted branch feature/issue_2764 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue_2764] 8 commits: Ajout de GearCharacteristicListItem dans le modèle
by Tony CHEMIT (＠tchemit) 26 Jul '23

26 Jul '23

Tony CHEMIT pushed to branch feature/issue_2764 at ultreiaio / ird-observe Commits: 6b8584bb by Tony Chemit at 2023-07-26T08:53:22+02:00 Ajout de GearCharacteristicListItem dans le modèle - - - - - d04270b1 by Tony Chemit at 2023-07-26T08:53:58+02:00 Ajout dans l'api de méthodes pour lire et écrire une caractéristique de type list - - - - - 3c8fed9a by Tony Chemit at 2023-07-26T08:54:39+02:00 Mise à jour de la migration - - - - - 88a04f00 by Tony Chemit at 2023-07-26T08:55:05+02:00 Mise à jour des fixtures - - - - - c911ab39 by Tony Chemit at 2023-07-26T08:55:05+02:00 Ajout du nouveau formulaire de référentiel - - - - - 4a9642df by Tony Chemit at 2023-07-26T08:55:05+02:00 Adaptation des ui pour rendre et éditer des caractéristiques de type liste - - - - - b1067c62 by Tony Chemit at 2023-07-26T08:55:05+02:00 Mise à jour des fixtures (pour la documentation de l'API publique) - - - - - c569eebd by Tony Chemit at 2023-07-26T08:55:05+02:00 Mise à jour de la documentation de l'API publique - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellRenderer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java - client/datasource/editor/common/pom.xml - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/i18n/getters/navigation.getter - + client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearCharacteristicListItemUI.jaxx - + client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/GearCharacteristicListItemUIModelStates.java - + client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/GearCharacteristicListItemUINavigationNode.scope - client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/ReferentialHomeUINavigationNode.scope - core/api/dto-decoration/src/main/i18n/getters/labels.getter - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDtoDecoratorDefinition.java - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicListItemReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsCommon.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/GearUseFeaturesMeasurementAware.java - core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicTypeAware.java - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json - core/api/tree/src/test/resources/fixtures/api-tree.properties - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDto-create-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDto-create-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDto-update-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/GearCharacteristicListItemDto-update-warning-validation.xml - core/api/validation/src/test/resources/fixtures/api-validation.properties - core/api/validation/src/test/resources/fixtures/validation/bean-validator-detector-n1-create.list - core/api/validation/src/test/resources/fixtures/validation/bean-validator-detector-n1-update.list - + core/persistence/decoration/src/main/java/fr/ird/observe/entities/referential/common/GearCharacteristicListItemDecoratorDefinition.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/da34a93f760ae3ae0b1d6014… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/da34a93f760ae3ae0b1d6014… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue_2764
by Tony CHEMIT (＠tchemit) 25 Jul '23

25 Jul '23

Tony CHEMIT pushed new branch feature/issue_2764 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/issue_2764 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Ajout via la migration
by Tony CHEMIT (＠tchemit) 24 Jul '23

24 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1eb81a8b by Tony Chemit at 2023-07-24T17:32:39+02:00 Ajout via la migration - - - - - d501503a by Tony Chemit at 2023-07-24T17:32:46+02:00 Mise à jour des fixtures - - - - - f9db81d7 by Tony Chemit at 2023-07-24T17:54:18+02:00 Ajout dans l'api de méthodes pour lire et écrire une caractéristique de type date - - - - - d2a67dd3 by Tony Chemit at 2023-07-24T17:54:18+02:00 Adaptation des ui pour rendre et éditer des caractéristiques de type date - - - - - 5bd6877e by Tony Chemit at 2023-07-24T17:54:29+02:00 Merge branch 'feature/issue_2763' into develop Rajouter un type Date (simple et sans time zone) dans GearCharacteristicType - Closes #2763 - - - - - 11 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellRenderer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsCommon.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/GearUseFeaturesMeasurementAware.java - core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicTypeAware.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/10_issue-2763-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.2/10_issue-2763-tck-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - model/src/main/resources/fixtures/global.properties Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -26,13 +26,17 @@ import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.ProtectedIdsCommon; import fr.ird.observe.dto.referential.common.GearCharacteristicReference; import fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference; +import io.ultreia.java4all.i18n.I18n; +import org.jdesktop.swingx.table.DatePickerCellEditor; import org.nuiton.jaxx.widgets.number.NumberCellEditor; import javax.swing.JTable; import javax.swing.event.CellEditorListener; import javax.swing.table.TableCellEditor; import java.awt.Component; +import java.text.SimpleDateFormat; import java.util.EventObject; +import java.util.Locale; import java.util.Map; import java.util.TreeMap; @@ -91,6 +95,8 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_SIGNED, NumberCellEditor.newFloatColumnEditor(true)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_UNSIGNED, JXTableUtil.newInteger4ColumnEditor(false)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_UNSIGNED, NumberCellEditor.newFloatColumnEditor(false)); + boolean french = I18n.getDefaultLocale().equals(Locale.FRANCE); + editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_DATE, new DatePickerCellEditor(new SimpleDateFormat(french ? "dd/MM/yyyy" : "yyyy-MM-dd"))); } return editorsByGearCharacteristicId; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellRenderer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data; * #L% */ +import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.ProtectedIdsCommon; import fr.ird.observe.dto.referential.common.GearCharacteristicReference; import fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference; @@ -47,6 +48,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer this.renderersByCharacteristicTypeId = new TreeMap<>(); TableCellRenderer booleanRenderer = table.getDefaultRenderer(Boolean.class); renderersByCharacteristicTypeId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_BOOLEAN, booleanRenderer); + renderersByCharacteristicTypeId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_DATE, JXTableUtil.newDateTableCellRenderer()); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java ===================================== @@ -46,6 +46,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.JScrollPane; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * Created on 05/08/2021. @@ -165,7 +166,7 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus return new ArrayList<>(); } GearDto gearDto = gearsById.get(gearId); - return GearUseFeaturesMeasurementAware.getDefaultGearUseFeaturesMeasurement(gearDto, this::createNewRow); + return GearUseFeaturesMeasurementAware.getDefaultGearUseFeaturesMeasurement(Objects.requireNonNull(gearDto), this::createNewRow); } } ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsCommon.java ===================================== @@ -36,6 +36,7 @@ public interface ProtectedIdsCommon { String COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_SIGNED = "fr.ird.referential.common.GearCharacteristicType#1239832686123#0.4"; String COMMON_GEAR_CHARACTERISTIC_TYPE_BOOLEAN = "fr.ird.referential.common.GearCharacteristicType#1239832686123#0.2"; String COMMON_GEAR_CHARACTERISTIC_TYPE_TEXT = "fr.ird.referential.common.GearCharacteristicType#1239832686123#0.1"; + String COMMON_GEAR_CHARACTERISTIC_TYPE_DATE = "fr.ird.referential.common.GearCharacteristicType#1464000000000#0.7"; String COMMON_OCEAN_ATLANTIC = "fr.ird.referential.common.Ocean#1239832686151#0.17595105505051245"; String COMMON_OCEAN_INDIAN = "fr.ird.referential.common.Ocean#1239832686152#0.8325731048817705"; } ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/GearUseFeaturesMeasurementAware.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.dto.referential.common.GearDto; import io.ultreia.java4all.lang.Strings; import java.util.Comparator; +import java.util.Date; import java.util.List; import java.util.Objects; import java.util.function.Supplier; @@ -78,7 +79,11 @@ public interface GearUseFeaturesMeasurementAware extends InlineDataDto { if (aValue == null) { value = null; } else { - value = String.valueOf(aValue).trim(); + if (measure.getGearCharacteristic().getGearCharacteristicType().isDate()) { + value = String.valueOf(((Date)aValue).getTime()); + } else { + value = String.valueOf(aValue).trim(); + } if (value.isBlank()) { value = null; } ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicTypeAware.java ===================================== @@ -28,8 +28,10 @@ import fr.ird.observe.dto.reference.DtoReferenceAware; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.time.Instant; import java.util.Arrays; import java.util.Collections; +import java.util.Date; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -58,6 +60,10 @@ public interface GearCharacteristicTypeAware extends DtoReferenceAware, DtoAndRe return FLOAT_IDS.contains(getTopiaId()); } + default boolean isDate() { + return ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_DATE.equals(getTopiaId()); + } + default Object getTypeValue(Object value) { if (value != null && !value.toString().isEmpty()) { if (isBoolean()) { @@ -66,6 +72,8 @@ public interface GearCharacteristicTypeAware extends DtoReferenceAware, DtoAndRe value = Float.valueOf(value.toString()).intValue(); } else if (isFloat()) { value = Float.valueOf(value.toString()); + } else if (isDate()) { + value = Date.from(Instant.ofEpochMilli(Long.parseLong(value.toString()))); } } return value; ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java ===================================== @@ -70,6 +70,13 @@ public class DataSourceMigrationForVersion_9_2 extends ByMajorMigrationVersionRe executor.addScript("08", "issue-2497"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2725 executor.addScript("09", "issue-2725"); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2763 + if (withIds) { + executor.addScript("10", "issue-2763"); + if (isForTck()) { + executor.addScript("10", "issue-2763-tck"); + } + } } private void issue2714(MigrationVersionResourceExecutor executor) { ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/10_issue-2763-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +INSERT INTO common.GearCharacteristicType (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, code, uri, homeid, needComment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.common.GearCharacteristicType#${REFERENTIAL_PREFIX}0.7', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 'DATE', null, null, false, 1, 'Date', 'Date', 'Fecha', null, null, null, null, null); +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.GearCharacteristicType'; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/10_issue-2763-tck-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}0.11', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '1', null, null, false, 1, 'create date', 'Date de création', 'fecha', null, null, null, null, null, null, 'fr.ird.referential.common.GearCharacteristicType#1464000000000#0.7'); +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.GearCharacteristic'; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -23,8 +23,8 @@ common.country=91 common.dataQuality=5 common.fpaZone=45 common.gear=28 -common.gearCharacteristic=26 -common.gearCharacteristicType=6 +common.gearCharacteristic=27 +common.gearCharacteristicType=7 common.harbour=98 common.lastUpdateDate=158 common.lengthLengthParameter=1 ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4104 +REFERENTIAL_COUNT=4106 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfadd9ccba799a5b9ca5d4ff… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfadd9ccba799a5b9ca5d4ff… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Ajout du champs ps_common.TransmittingBuoyType.regex
by Tony CHEMIT (＠tchemit) 24 Jul '23

24 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cb43bdc0 by Tony Chemit at 2023-07-24T12:02:58+02:00 Ajout du champs ps_common.TransmittingBuoyType.regex - - - - - f931d13b by Tony Chemit at 2023-07-24T12:02:58+02:00 Mise à jour Mise à jour de la migration - - - - - 8eae2c7e by Tony Chemit at 2023-07-24T12:02:58+02:00 Mise à jour du formulaire du référentiel - - - - - e2923ae5 by Tony Chemit at 2023-07-24T12:02:58+02:00 Mise à jour de la documentation de l'API publique - - - - - dfadd9cc by Tony Chemit at 2023-07-24T12:03:08+02:00 Merge branch 'feature/issue_2725' into develop Contrôler la syntaxe des id balises par une expression régulière propre à chaque modèle de balise - Closes #2725 - - - - - 30 changed files: - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/TransmittingBuoyTypeUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/referential/common/TransmittingBuoyTypeUI.jcss - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDtoDecoratorDefinition.java - core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeReferenceDecoratorDefinition.java - + core/api/dto/src/main/java/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeReference.java - + core/api/dto/src/test/java/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeReferenceTest.java - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDto-update-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-create-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/TransmittingBuoyDto-update-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-create-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/observation/TransmittingBuoyDto-update-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDto-create-error-validation.xml - + core/api/validation/src/main/validation/fr/ird/observe/dto/referential/ps/common/TransmittingBuoyTypeDto-update-error-validation.xml - core/persistence/decoration/src/main/java/fr/ird/observe/entities/referential/ps/common/TransmittingBuoyTypeDecoratorDefinition.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/ps/common/TransmittingBuoyTypeImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_2.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e190facf632c03544d774316… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e190facf632c03544d774316… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix persistence test API (dataSourceConfiguration is not remove at the end of a test...)
by Tony CHEMIT (＠tchemit) 24 Jul '23

24 Jul '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e190facf by Tony Chemit at 2023-07-24T10:17:57+02:00 Fix persistence test API (dataSourceConfiguration is not remove at the end of a test...) - - - - - 1 changed file: - core/persistence/test/src/main/java/fr/ird/observe/persistence/test/PersistenceTestMethodResourceRead.java Changes: ===================================== core/persistence/test/src/main/java/fr/ird/observe/persistence/test/PersistenceTestMethodResourceRead.java ===================================== @@ -80,10 +80,10 @@ public class PersistenceTestMethodResourceRead extends PersistenceTestClassResou super.after(description); try { if (applicationContext != null && applicationContext.isOpen()) { - dataSourceConfiguration = null; applicationContext.close(); } } finally { + dataSourceConfiguration = null; applicationContext = null; } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e190facf632c03544d7743161… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e190facf632c03544d7743161… You're receiving this email because of your account on gitlab.com.

1 0