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

[Git][ultreiaio/ird-observe][develop] 2 commits: Amélioration de l'écran marée - onglet Livre de bords - See #2279
by Tony CHEMIT (＠tchemit) April 19, 2022

April 19, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 12d2c551 by Tony Chemit at 2022-04-19T11:30:08+02:00 Amélioration de l'écran marée - onglet Livre de bords - See #2279 - - - - - 35e92c2b by Tony Chemit at 2022-04-19T11:30:08+02:00 Déplacement des routes d’observation depuis le nœud ‘Observations’ - Closes ultreiaio/ird-observe#2267 - - - - - 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/move/layout/MoveLayoutAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUI.jaxx - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/common/TripLocalmarketUI.capabilities - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUIModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteUIMoveAllTreeAdapter.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketSurveySamplingAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketWellsSamplingAcquisitionStatus.java - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripLocalmarketUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripLogbookUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripUINavigationNode.scope - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/GenerateContentUISupport.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/layout/GenerateContentLayoutUINavigationScope.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/ropen/GenerateContentRootOpenableUINavigationScope.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIHandlerHelper.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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c1d3199775cb1da16abc61e7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c1d3199775cb1da16abc61e7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Déplacement des routes d’observation depuis le nœud ‘Observations’ - Closes...
by Tony CHEMIT (＠tchemit) April 19, 2022

April 19, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c1d31997 by Tony Chemit at 2022-04-19T11:05:28+02:00 Déplacement des routes d’observation depuis le nœud ‘Observations’ - Closes ultreiaio/ird-observe#2267 - - - - - 24 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/move/layout/MoveLayoutAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUIModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteUIMoveAllTreeAdapter.java - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripLocalmarketUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripLogbookUINavigationNode.scope - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripUINavigationNode.scope - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/GenerateContentUISupport.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/layout/GenerateContentLayoutUINavigationScope.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/ropen/GenerateContentRootOpenableUINavigationScope.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIHandlerHelper.java - core/api/services/src/main/i18n/getters/labels.getter - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/class/i18nLabels.properties Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java ===================================== @@ -88,7 +88,8 @@ public class ObserveKeyStrokesEditorApi extends ObserveKeyStrokesSupport { public static final KeyStroke KEY_STROKE_SAVE_DATA = KeyStroke.getKeyStroke("pressed F5"); public static final KeyStroke KEY_STROKE_DELETE_DATA_GLOBAL = KeyStroke.getKeyStroke("pressed F6"); public static final KeyStroke KEY_STROKE_MOVE = KeyStroke.getKeyStroke("pressed F7"); - public static final KeyStroke KEY_STROKE_DUPLICATE = KeyStroke.getKeyStroke("pressed F7"); + + public static final KeyStroke KEY_STROKE_MOVE_LAYOUT = KeyStroke.getKeyStroke("pressed F8"); public static final KeyStroke KEY_STROKE_ADD_PRESET = KeyStroke.getKeyStroke("pressed F9"); public static final KeyStroke KEY_STROKE_FIX = KeyStroke.getKeyStroke("pressed F9"); public static final KeyStroke KEY_STROKE_GENERATE = KeyStroke.getKeyStroke("pressed F9"); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutAction.java ===================================== @@ -116,10 +116,10 @@ public class MoveLayoutAction<D extends DataDto, U extends ContentUI> extends Co } protected MoveLayoutAction(Class<D> dataType, MoveLayoutExecutor executor) { - super(null, null, "move", ObserveKeyStrokesEditorApi.KEY_STROKE_MOVE); + super(null, null, "move", ObserveKeyStrokesEditorApi.KEY_STROKE_MOVE_LAYOUT); this.executor = Objects.requireNonNull(executor); - setText(I18n.t(I18nDecoratorHelper.getPropertyI18nKey(dataType, "action.move"))); - setTooltipText(I18n.t(I18nDecoratorHelper.getPropertyI18nKey(dataType, "action.move"))); + setText(I18n.t(I18nDecoratorHelper.getPropertyI18nKey(dataType, "action.move.all"))); + setTooltipText(I18n.t(I18nDecoratorHelper.getPropertyI18nKey(dataType, "action.move.all"))); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java ===================================== @@ -248,10 +248,10 @@ public class MoveLayoutRequestBuilder { parentTargetDtoType = oldParentId.getType(); } if (askNewParentTitle == null) { - askNewParentTitle = I18nDecoratorHelper.getPropertyI18nKey(dtoType, "action.move.choose.parent.title"); + askNewParentTitle = I18nDecoratorHelper.getPropertyI18nKey(dtoType, "action.move.all.choose.parent.title"); } if (askNewParentMessage == null) { - askNewParentMessage = I18nDecoratorHelper.getPropertyI18nKey(dtoType, "action.move.choose.parent.message"); + askNewParentMessage = I18nDecoratorHelper.getPropertyI18nKey(dtoType, "action.move.all.choose.parent.message"); } Objects.requireNonNull(availableLayoutTypes, "No availableLayoutTypes declared in builder"); DataGroupByParameter groupBy = Objects.requireNonNull(this.groupByValueSupplier, "No groupByValue supplier set.").get(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUI.jaxx ===================================== @@ -60,6 +60,6 @@ public void resetEdit() { <JPanel id='showForm' decorator="boxed"/> </JPanel> <JMenuItem id='delete' styleClass='showData'/> - <JMenuItem id='move' styleClass='showData'/> + <JMenuItem id='moveAll' styleClass='showData'/> <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/ropen/ContentRootOpenableUI.jaxx ===================================== @@ -63,7 +63,7 @@ public void resetEdit() { </row> </Table> <JMenuItem id='delete' styleClass='editableAndNotModified'/> - <JMenuItem id='move' styleClass='editableAndNotModified'/> + <JMenuItem id='moveAll' styleClass='editableAndNotModified'/> <JMenuItem id='showTechnicalInformations'/> </fr.ird.observe.client.datasource.editor.api.content.ContentUI> ===================================== client/datasource/editor/ps/src/main/i18n/getters/navigation.getter ===================================== @@ -41,7 +41,16 @@ observe.data.Trip.message.not.open observe.data.Trip.navigation.unsaved observe.data.Trip.title observe.data.Trip.type +observe.data.ps.common.Trip.action.move.all +observe.data.ps.common.Trip.action.move.all.choose.parent.message +observe.data.ps.common.Trip.action.move.all.choose.parent.title +observe.data.ps.common.TripLocalmarket.action.move.all +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title observe.data.ps.common.TripLocalmarket.type +observe.data.ps.common.TripLogbook.action.move.all +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title observe.data.ps.common.TripLogbook.type observe.data.ps.landing.Landing.action.create observe.data.ps.landing.Landing.action.save ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripGearUseFeaturesUI.jaxx ===================================== @@ -110,5 +110,5 @@ </cell> </row> </Table> - <JMenuItem id='move' styleClass='editableAndNotModifiedAndTableNotEmpty'/> + <JMenuItem id='moveAll' styleClass='editableAndNotModifiedAndTableNotEmpty'/> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx ===================================== @@ -121,5 +121,5 @@ </cell> </row> </Table> - <JMenuItem id='move' styleClass='editableAndNotModifiedAndTableNotEmpty'/> + <JMenuItem id='moveAll' styleClass='editableAndNotModifiedAndTableNotEmpty'/> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUI.jaxx ===================================== @@ -28,4 +28,5 @@ <RouteListUIModel id='model' constructorParams='@override:getNavigationSource(this)'/> <RouteListUIModelStates id='states'/> <TripDto id='bean'/> + <JMenuItem id='moveAll' styleClass='editableAndNotModified'/> </fr.ird.observe.client.datasource.editor.api.content.data.list.ContentListUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUIHandler.java ===================================== @@ -0,0 +1,48 @@ +package fr.ird.observe.client.datasource.editor.ps.data.observation; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + + +import fr.ird.observe.client.datasource.editor.api.content.actions.move.layout.MoveLayoutAction; +import fr.ird.observe.dto.data.ps.common.TripDto; +import fr.ird.observe.dto.data.ps.observation.RouteDto; + +/** + * Created on 19/04/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +public class RouteListUIHandler extends GeneratedRouteListUIHandler { + + @Override + protected void installMoveAction() { + super.installMoveAction(); + MoveLayoutAction + .create(ui, RouteDto.class) + .on(() -> ui.getModel().toMoveAllRequest().setParentCandidates((groupBy, parentId) -> getRootOpenableService().getBrothers(groupBy, parentId))) + .call(r -> getRootOpenableService().moveLayout(TripDto.class, r)) + .then(RouteUIMoveAllTreeAdapter::create) + .install(ui::getMoveAll); + } +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteListUIModel.java ===================================== @@ -0,0 +1,49 @@ +package fr.ird.observe.client.datasource.editor.ps.data.observation; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + + +import fr.ird.observe.client.datasource.editor.api.content.actions.move.layout.MoveLayoutRequestBuilder; +import fr.ird.observe.dto.data.ps.observation.RouteDto; + +/** + * Created on 19/04/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +public class RouteListUIModel extends GeneratedRouteListUIModel { + + public RouteListUIModel(RouteListUINavigationNode source) { + super(source); + } + + public MoveLayoutRequestBuilder.StepSetParentCandidates toMoveAllRequest() { + return MoveLayoutRequestBuilder + .create(RouteDto.class, getStates().selectedParent()) + .setAvailableLayoutType(RouteDto.class) + .setEditNode(getSource().getInitializer().getEditNode()) + .setGroupByValue(this::getGroupByValue); + } + +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteUIMoveAllTreeAdapter.java ===================================== @@ -0,0 +1,57 @@ +package fr.ird.observe.client.datasource.editor.ps.data.observation; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.api.content.actions.move.layout.MoveLayoutTreeAdapter; +import fr.ird.observe.client.datasource.editor.ps.data.common.TripUINavigationNode; +import fr.ird.observe.services.service.data.MoveLayoutRequest; + +import java.util.function.Function; + +/** + * Created on 19/04/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +public class RouteUIMoveAllTreeAdapter extends MoveLayoutTreeAdapter<TripUINavigationNode, RouteListUINavigationNode> { + + public static Function<MoveLayoutRequest, RouteUIMoveAllTreeAdapter> create(RouteListUI ui) { + return r -> new RouteUIMoveAllTreeAdapter(ui.getModel().getSource()); + } + + public RouteUIMoveAllTreeAdapter(RouteListUINavigationNode incomingNode) { + super(incomingNode::getParent); + } + + @Override + public final TripUINavigationNode getNewParentNode(TripUINavigationNode oldParentNode, String newParentId) { + return oldParentNode.findSibling(newParentId); + } + + @Override + public final RouteListUINavigationNode getNodeToSelect(TripUINavigationNode parentNode) { + return parentNode.getRouteObsListUINavigationNode(); + } + +} ===================================== client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripLocalmarketUINavigationNode.scope ===================================== @@ -5,6 +5,9 @@ "ui.iconPath": "navigation.ps.data.common.TripLocalmarket" }, "i18nMapping": { + "action.move.all": "observe.data.ps.common.TripLocalmarket.action.move.all", + "action.move.all.choose.parent.message": "observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message", + "action.move.all.choose.parent.title": "observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title", "type": "observe.data.ps.common.TripLocalmarket.type" }, "types": { ===================================== client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripLogbookUINavigationNode.scope ===================================== @@ -5,6 +5,9 @@ "ui.iconPath": "navigation.ps.data.common.TripLogbook" }, "i18nMapping": { + "action.move.all": "observe.data.ps.common.TripLogbook.action.move.all", + "action.move.all.choose.parent.message": "observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message", + "action.move.all.choose.parent.title": "observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title", "type": "observe.data.ps.common.TripLogbook.type" }, "types": { ===================================== client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/common/TripUINavigationNode.scope ===================================== @@ -7,6 +7,9 @@ }, "i18nMapping": { "action.create": "observe.data.Trip.action.create", + "action.move.all": "observe.data.ps.common.Trip.action.move.all", + "action.move.all.choose.parent.message": "observe.data.ps.common.Trip.action.move.all.choose.parent.message", + "action.move.all.choose.parent.title": "observe.data.ps.common.Trip.action.move.all.choose.parent.title", "message.not.open": "observe.data.Trip.message.not.open", "navigation.unsaved": "observe.data.Trip.navigation.unsaved", "title": "observe.data.Trip.title", ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/GenerateContentUISupport.java ===================================== @@ -159,6 +159,7 @@ public abstract class GenerateContentUISupport extends GenerateJavaFileSupport { && !getClass().getSimpleName().endsWith("OpenableUIHandler") && !getClass().getSimpleName().endsWith("OpenableUIMoveTreeAdapter") && !getClass().getSimpleName().endsWith("OpenableUIModelStates") + && !getClass().getSimpleName().endsWith("ListUIModel") && !getClass().getSimpleName().endsWith("ListUIHandler") && !getClass().getSimpleName().endsWith("ListUINavigationCapability") && !getClass().getSimpleName().endsWith("SimpleUIHandler") ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/layout/GenerateContentLayoutUINavigationScope.java ===================================== @@ -88,6 +88,9 @@ public class GenerateContentLayoutUINavigationScope extends GenerateContentLayou @Override protected String generateConcreteContent(Path path, String packageName, String namePrefix) { addI118nProperty(dtoType, "type"); + addI118nProperty(dtoType, "action.move.all"); + addI118nProperty(dtoType, "action.move.all.choose.parent.message"); + addI118nProperty(dtoType, "action.move.all.choose.parent.title"); NavigationScopeDescriptor descriptor = scopeBuilder.build(i18nMapping, iconPath); return serializeDescriptor(descriptor); } ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/ropen/GenerateContentRootOpenableUINavigationScope.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpen import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope; import fr.ird.observe.client.datasource.editor.spi.content.NavigationScopeBuilder; import fr.ird.observe.client.datasource.editor.spi.content.NavigationScopeDescriptor; +import fr.ird.observe.dto.data.UsingLayout; import java.nio.file.Path; @@ -78,6 +79,11 @@ public class GenerateContentRootOpenableUINavigationScope extends GenerateConten addI118nProperty(dtoType, "message.not.open"); addI118nProperty(dtoType, "navigation.unsaved"); addI118nProperty(dtoType, "action.create"); + if (UsingLayout.class.isAssignableFrom(dtoType)) { + addI118nProperty(dtoType, "action.move.all"); + addI118nProperty(dtoType, "action.move.all.choose.parent.message"); + addI118nProperty(dtoType, "action.move.all.choose.parent.title"); + } NavigationScopeDescriptor descriptor = scopeBuilder.build(i18nMapping, iconPath); return serializeDescriptor(descriptor); } ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIHandlerHelper.java ===================================== @@ -93,7 +93,7 @@ public class ContentUIHandlerHelper extends ContentUIHelperSupport { " .on(() -> ui.getModel().toMoveRequest().setParentCandidates((groupBy, parentId) -> getRootOpenableService().getBrothers(groupBy, parentId)))\n" + " .call(r -> getRootOpenableService().moveLayout(%1$s.class, r))\n" + " .then(%3$sMoveTreeAdapter::create)\n" + - " .install(ui::getMove);\n" + + " .install(ui::getMoveAll);\n" + " }\n\n"; public static final String INSTALL_DELETE_SIMPLE_ACTION = "" + " @Override\n" + @@ -203,7 +203,7 @@ public class ContentUIHandlerHelper extends ContentUIHelperSupport { " .on(() -> ui.getModel().toMoveRequest().setParentCandidates((groupBy, parentId) -> getRootOpenableService().getBrothers(groupBy, parentId)))\n" + " .call(r -> getRootOpenableService().moveLayout(%1$s.class, r))\n" + " .then(%2$sMoveTreeAdapter::create)\n" + - " .install(ui::getMove);\n" + + " .install(ui::getMoveAll);\n" + " }\n\n"; public static String generateCreateNewAction(List<String> imports, GenerateJavaFileSupport generator) { ===================================== core/api/services/src/main/i18n/getters/labels.getter ===================================== @@ -754,9 +754,9 @@ observe.data.ll.observation.Tdr.type observe.data.ll.observation.WeightMeasure.type observe.data.ll.observation.WeightMeasure.weight observe.data.ll.observation.WeightMeasure.weight.short -observe.data.ps.common.Trip.action.move -observe.data.ps.common.Trip.action.move.choose.parent.message -observe.data.ps.common.Trip.action.move.choose.parent.title +observe.data.ps.common.Trip.action.move.all +observe.data.ps.common.Trip.action.move.all.choose.parent.message +observe.data.ps.common.Trip.action.move.all.choose.parent.title observe.data.ps.common.Trip.action.openLinkFormsUrl.tip observe.data.ps.common.Trip.action.openLinkReportsUrl.tip observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus @@ -779,13 +779,13 @@ observe.data.ps.common.Trip.routeObs observe.data.ps.common.Trip.routeObsSize observe.data.ps.common.Trip.targetWellsSamplingAcquisitionStatusLabel.tip observe.data.ps.common.Trip.timeAtSea -observe.data.ps.common.TripGearUseFeatures.action.move -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.message -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.title +observe.data.ps.common.TripGearUseFeatures.action.move.all +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.message +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.title observe.data.ps.common.TripGearUseFeatures.type -observe.data.ps.common.TripLocalmarket.action.move -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.message -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.title +observe.data.ps.common.TripLocalmarket.action.move.all +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title observe.data.ps.common.TripLocalmarket.type observe.data.ps.common.TripLocalmarketCommon.localMarketAcquisitionStatus observe.data.ps.common.TripLocalmarketCommon.localMarketSurveySamplingAcquisitionStatus @@ -793,9 +793,9 @@ observe.data.ps.common.TripLocalmarketCommon.localMarketWellsSamplingAcquisition observe.data.ps.common.TripLocalmarketCommon.localmarketBatchSize observe.data.ps.common.TripLocalmarketCommon.localmarketSampleSize observe.data.ps.common.TripLocalmarketCommon.localmarketSurveySize -observe.data.ps.common.TripLogbook.action.move -observe.data.ps.common.TripLogbook.action.move.choose.parent.message -observe.data.ps.common.TripLogbook.action.move.choose.parent.title +observe.data.ps.common.TripLogbook.action.move.all +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title observe.data.ps.common.TripLogbook.type observe.data.ps.common.TripLogbookCommon.logbookAcquisitionStatus observe.data.ps.common.TripLogbookCommon.routeLogbookSize @@ -815,9 +815,9 @@ observe.data.ps.landing.Landing.title observe.data.ps.landing.Landing.type observe.data.ps.landing.Landing.weight observe.data.ps.landing.Landing.weight.short -observe.data.ps.landing.TripLanding.action.move -observe.data.ps.landing.TripLanding.action.move.choose.parent.message -observe.data.ps.landing.TripLanding.action.move.choose.parent.title +observe.data.ps.landing.TripLanding.action.move.all +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.message +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.title observe.data.ps.landing.TripLanding.type observe.data.ps.localmarket.Batch.action.create observe.data.ps.localmarket.Batch.action.save @@ -1079,6 +1079,9 @@ observe.data.ps.observation.ObjectSchoolEstimate.totalWeight.short observe.data.ps.observation.ObjectSchoolEstimate.type observe.data.ps.observation.Route.action.create observe.data.ps.observation.Route.action.move +observe.data.ps.observation.Route.action.move.all +observe.data.ps.observation.Route.action.move.all.choose.parent.message +observe.data.ps.observation.Route.action.move.all.choose.parent.title observe.data.ps.observation.Route.action.move.choose.parent.message observe.data.ps.observation.Route.action.move.choose.parent.title observe.data.ps.observation.Route.action.move.tip ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -879,9 +879,9 @@ observe.data.ps.Route.validation.duplicated.date=There is already another route observe.data.ps.Route.validation.invalid.quadrant=Activity quadrant at position %1$s is not consistent with trip ocean (%2$s) of trip (indian\: 1 or 2, atlantic\: 1,2,3 or 4). observe.data.ps.Route.validation.invalid.time=Observation time cant' be after the one of the previous activity (activity at position %1$s is not correct). observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Measure count (%s) must be the sum of frequencies count (%s) -observe.data.ps.common.Trip.action.move=Change trip -observe.data.ps.common.Trip.action.move.choose.parent.message=Select target trip -observe.data.ps.common.Trip.action.move.choose.parent.title=Move data to another trip +observe.data.ps.common.Trip.action.move.all=Change trip +observe.data.ps.common.Trip.action.move.all.choose.parent.message=Select target trip +observe.data.ps.common.Trip.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=View forms in a web browser observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=View reports in a web browser observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling @@ -906,13 +906,13 @@ observe.data.ps.common.Trip.routeObs=Observations observe.data.ps.common.Trip.routeObsSize=Count of observation routes observe.data.ps.common.Trip.targetWellsSamplingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for well sampling on target catches observe.data.ps.common.Trip.timeAtSea=Time at sea (h) -observe.data.ps.common.TripGearUseFeatures.action.move=Change trip -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.message=Select target trip -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.title=Move data to another trip +observe.data.ps.common.TripGearUseFeatures.action.move.all=Change trip +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.message=Select target trip +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.common.TripGearUseFeatures.type=Trip Gear uses features -observe.data.ps.common.TripLocalmarket.action.move=Change trip -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.message=Select target trip -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.title=Move data to another trip +observe.data.ps.common.TripLocalmarket.action.move.all=Change trip +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message=Select target trip +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.common.TripLocalmarket.type=Local market observe.data.ps.common.TripLocalmarketCommon.localMarketAcquisitionStatus=Local market collection observe.data.ps.common.TripLocalmarketCommon.localMarketSurveySamplingAcquisitionStatus=Local market dock survey @@ -920,9 +920,9 @@ observe.data.ps.common.TripLocalmarketCommon.localMarketWellsSamplingAcquisition observe.data.ps.common.TripLocalmarketCommon.localmarketBatchSize=Count of batches observe.data.ps.common.TripLocalmarketCommon.localmarketSampleSize=Count of samples observe.data.ps.common.TripLocalmarketCommon.localmarketSurveySize=Count of survey -observe.data.ps.common.TripLogbook.action.move=Change trip -observe.data.ps.common.TripLogbook.action.move.choose.parent.message=Select target trip -observe.data.ps.common.TripLogbook.action.move.choose.parent.title=Move data to another trip +observe.data.ps.common.TripLogbook.action.move.all=Change trip +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message=Select target trip +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.common.TripLogbook.type=Logbook and associate data observe.data.ps.common.TripLogbookCommon.logbookAcquisitionStatus=Logbook collection observe.data.ps.common.TripLogbookCommon.routeLogbookSize=Count of logbook routes @@ -945,9 +945,9 @@ observe.data.ps.landing.Landing.validation.date.after.currentPsCommonTrip.startD observe.data.ps.landing.Landing.validation.date.delay.too.long=Delay in days with trip end date is %d and can not be more than %s days. observe.data.ps.landing.Landing.weight=Weight (t) observe.data.ps.landing.Landing.weight.short=Weight -observe.data.ps.landing.TripLanding.action.move=Change trip -observe.data.ps.landing.TripLanding.action.move.choose.parent.message=Select target trip -observe.data.ps.landing.TripLanding.action.move.choose.parent.title=Move data to another trip +observe.data.ps.landing.TripLanding.action.move.all=Change trip +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.message=Select target trip +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.landing.TripLanding.type=Trip landing observe.data.ps.localmarket.Batch.action.create=Add a new batch observe.data.ps.localmarket.Batch.action.save=Insert this batch @@ -1251,6 +1251,9 @@ observe.data.ps.observation.ObjectSchoolEstimate.totalWeight.short=Total weight observe.data.ps.observation.ObjectSchoolEstimate.type=Object school estimate observe.data.ps.observation.Route.action.create=Next road observe.data.ps.observation.Route.action.move=Change trip +observe.data.ps.observation.Route.action.move.all=Change trip +observe.data.ps.observation.Route.action.move.all.choose.parent.message=Select target trip +observe.data.ps.observation.Route.action.move.all.choose.parent.title=Move routes to another trip observe.data.ps.observation.Route.action.move.choose.parent.message=Select target trip observe.data.ps.observation.Route.action.move.choose.parent.title=Move routes to another trip observe.data.ps.observation.Route.action.move.tip=Change trip of route(s) ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -879,9 +879,9 @@ observe.data.ps.Route.validation.duplicated.date=Ya existe otra ruta en esa fech observe.data.ps.Route.validation.invalid.quadrant=El cuadrante de la actividad %1$s no es coherente con el océano (%2$s) de la marea (indico \: 1,2, atlántico \: 1, 2, 3, 4) observe.data.ps.Route.validation.invalid.time=La hora de la observación de la actividad debe ser superior a la de la actividad anterior (actividad %1$s incorrecta). observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Measure count (%s) must be the sum of frequencies count (%s) -observe.data.ps.common.Trip.action.move=Change trip -observe.data.ps.common.Trip.action.move.choose.parent.message=Select target trip -observe.data.ps.common.Trip.action.move.choose.parent.title=Move data to another trip +observe.data.ps.common.Trip.action.move.all=Change trip +observe.data.ps.common.Trip.action.move.all.choose.parent.message=Select target trip +observe.data.ps.common.Trip.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=Acceder a los formularios en un navegador web observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling TODO @@ -906,13 +906,13 @@ observe.data.ps.common.Trip.routeObs=Observations \#TODO observe.data.ps.common.Trip.routeObsSize=Count of observation routes observe.data.ps.common.Trip.targetWellsSamplingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for well sampling on target catches observe.data.ps.common.Trip.timeAtSea=Time at sea (h) -observe.data.ps.common.TripGearUseFeatures.action.move=Change trip -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.message=Select target trip -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.title=Move data to another trip +observe.data.ps.common.TripGearUseFeatures.action.move.all=Change trip +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.message=Select target trip +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.common.TripGearUseFeatures.type=Trip Gear uses features -observe.data.ps.common.TripLocalmarket.action.move=Cambiar de marea -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.message=Select target trip -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.title=Move data to another trip +observe.data.ps.common.TripLocalmarket.action.move.all=Cambiar de marea +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message=Select target trip +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.common.TripLocalmarket.type=Local market observe.data.ps.common.TripLocalmarketCommon.localMarketAcquisitionStatus=Local market collection observe.data.ps.common.TripLocalmarketCommon.localMarketSurveySamplingAcquisitionStatus=Local market dock survey TODO @@ -920,9 +920,9 @@ observe.data.ps.common.TripLocalmarketCommon.localMarketWellsSamplingAcquisition observe.data.ps.common.TripLocalmarketCommon.localmarketBatchSize=Count of batches observe.data.ps.common.TripLocalmarketCommon.localmarketSampleSize=Count of samples observe.data.ps.common.TripLocalmarketCommon.localmarketSurveySize=Count of survey -observe.data.ps.common.TripLogbook.action.move=Cambiar de marea -observe.data.ps.common.TripLogbook.action.move.choose.parent.message=Select target trip -observe.data.ps.common.TripLogbook.action.move.choose.parent.title=Move data to another trip +observe.data.ps.common.TripLogbook.action.move.all=Cambiar de marea +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message=Select target trip +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.common.TripLogbook.type=Logbook and associate data observe.data.ps.common.TripLogbookCommon.logbookAcquisitionStatus=Logbook collection TODO observe.data.ps.common.TripLogbookCommon.routeLogbookSize=Count of logbook routes @@ -945,9 +945,9 @@ observe.data.ps.landing.Landing.validation.date.after.currentPsCommonTrip.startD observe.data.ps.landing.Landing.validation.date.delay.too.long=Delay in days with trip end date is %d and can not be more than %s days. observe.data.ps.landing.Landing.weight=Weight (t) \#TODO observe.data.ps.landing.Landing.weight.short=Weight \#TODO -observe.data.ps.landing.TripLanding.action.move=Change trip -observe.data.ps.landing.TripLanding.action.move.choose.parent.message=Select target trip -observe.data.ps.landing.TripLanding.action.move.choose.parent.title=Move data to another trip +observe.data.ps.landing.TripLanding.action.move.all=Change trip +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.message=Select target trip +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.title=Move data to another trip observe.data.ps.landing.TripLanding.type=TripLanding observe.data.ps.localmarket.Batch.action.create=Add a new batch observe.data.ps.localmarket.Batch.action.save=Insert this batch @@ -1251,6 +1251,9 @@ observe.data.ps.observation.ObjectSchoolEstimate.totalWeight.short=total weight observe.data.ps.observation.ObjectSchoolEstimate.type=Estimación banco de objetos observe.data.ps.observation.Route.action.create=Ruta siguiente observe.data.ps.observation.Route.action.move=Cambiar de marea +observe.data.ps.observation.Route.action.move.all=Cambiar de marea +observe.data.ps.observation.Route.action.move.all.choose.parent.message=A qué marea quierer asociar las rutas seleccionadas ? +observe.data.ps.observation.Route.action.move.all.choose.parent.title=Cambiar la marea de las rutas observe.data.ps.observation.Route.action.move.choose.parent.message=A qué marea quierer asociar las rutas seleccionadas ? observe.data.ps.observation.Route.action.move.choose.parent.title=Cambiar la marea de las rutas observe.data.ps.observation.Route.action.move.tip=Cambiar la marea de las rutas seleccionadas ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -879,9 +879,9 @@ observe.data.ps.Route.validation.duplicated.date=Il existe déjà une autre rout observe.data.ps.Route.validation.invalid.quadrant=Le quadrant de l’activité à la position %1$s n'est pas cohérent par rapport à l'océan (%2$s) de la marée (indien \: 1 observe.data.ps.Route.validation.invalid.time=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente (activité de position %1$s incorrecte). observe.data.ps.SampleSpecies.validation.mismatch.measuredCount=Le nombre mesuré (%s) doit valoir la somme des effectifs de fréquences (%s) -observe.data.ps.common.Trip.action.move=Changer de marée -observe.data.ps.common.Trip.action.move.choose.parent.message=À quelle marée voulez-vous associer les données sélectionnées ? -observe.data.ps.common.Trip.action.move.choose.parent.title=Changer la marée des données sélectionnées +observe.data.ps.common.Trip.action.move.all=Déplacer des données +observe.data.ps.common.Trip.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les données sélectionnées ? +observe.data.ps.common.Trip.action.move.all.choose.parent.title=Changer la marée des données sélectionnées observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=Accéder aux formulaires dans un navigateur web observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Échantillonnage avancé @@ -906,13 +906,13 @@ observe.data.ps.common.Trip.routeObs=Route « Observations » observe.data.ps.common.Trip.routeObsSize=Nombre de routes « Observation » observe.data.ps.common.Trip.targetWellsSamplingAcquisitionStatusLabel.tip=Seuls les choix reflétant l'existence des données permettront la saisie de l'échantillonnage des cuves d'espèces cibles observe.data.ps.common.Trip.timeAtSea=Heures en mer -observe.data.ps.common.TripGearUseFeatures.action.move=Changer de marée -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.message=À quelle marée voulez-vous associer les équipements ? -observe.data.ps.common.TripGearUseFeatures.action.move.choose.parent.title=Changer la marée des équipements +observe.data.ps.common.TripGearUseFeatures.action.move.all=Tout déplacer +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les équipements ? +observe.data.ps.common.TripGearUseFeatures.action.move.all.choose.parent.title=Changer la marée des équipements observe.data.ps.common.TripGearUseFeatures.type=Équipement -observe.data.ps.common.TripLocalmarket.action.move=Changer de marée -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.message=À quelle marée voulez-vous associer les données du marché local . -observe.data.ps.common.TripLocalmarket.action.move.choose.parent.title=Changer la marée des données du marché local +observe.data.ps.common.TripLocalmarket.action.move.all=Tout déplacer +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les données du marché local ? +observe.data.ps.common.TripLocalmarket.action.move.all.choose.parent.title=Changer la marée des données du marché local observe.data.ps.common.TripLocalmarket.type=Marché local observe.data.ps.common.TripLocalmarketCommon.localMarketAcquisitionStatus=Collecte du marché local observe.data.ps.common.TripLocalmarketCommon.localMarketSurveySamplingAcquisitionStatus=Échantillonnage du marché local à quai (sondages) @@ -920,9 +920,9 @@ observe.data.ps.common.TripLocalmarketCommon.localMarketWellsSamplingAcquisition observe.data.ps.common.TripLocalmarketCommon.localmarketBatchSize=Nombre de lots observe.data.ps.common.TripLocalmarketCommon.localmarketSampleSize=Nombre d'échantillonnages observe.data.ps.common.TripLocalmarketCommon.localmarketSurveySize=Nombre d'enquètes -observe.data.ps.common.TripLogbook.action.move=Changer de marée -observe.data.ps.common.TripLogbook.action.move.choose.parent.message=A quelle marée voulez-vous associer les données du livre de bord ? -observe.data.ps.common.TripLogbook.action.move.choose.parent.title=Changer la marée des données du livre de bord +observe.data.ps.common.TripLogbook.action.move.all=Tout déplacer +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.message=A quelle marée voulez-vous associer les données du livre de bord ? +observe.data.ps.common.TripLogbook.action.move.all.choose.parent.title=Changer la marée des données du livre de bord observe.data.ps.common.TripLogbook.type=Livre de bord et données associées observe.data.ps.common.TripLogbookCommon.logbookAcquisitionStatus=Collecte du logbook observe.data.ps.common.TripLogbookCommon.routeLogbookSize=Nombre de routes « Livre de Bord » @@ -945,9 +945,9 @@ observe.data.ps.landing.Landing.validation.date.after.currentPsCommonTrip.startD observe.data.ps.landing.Landing.validation.date.delay.too.long=Le délai avec la date de fin de marée est de %s jour(s) et ne doit pas dépasser %s jour(s). observe.data.ps.landing.Landing.weight=Poids (en t) observe.data.ps.landing.Landing.weight.short=Poids (en t) -observe.data.ps.landing.TripLanding.action.move=Changer de marée -observe.data.ps.landing.TripLanding.action.move.choose.parent.message=À quelle marée voulez-vous associer les débarquements ? -observe.data.ps.landing.TripLanding.action.move.choose.parent.title=Changer la marée des débarquements +observe.data.ps.landing.TripLanding.action.move.all=Tout déplacer +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.message=À quelle marée voulez-vous associer les débarquements ? +observe.data.ps.landing.TripLanding.action.move.all.choose.parent.title=Changer la marée des débarquements observe.data.ps.landing.TripLanding.type=Débarquement observe.data.ps.localmarket.Batch.action.create=Nouveau lot observe.data.ps.localmarket.Batch.action.save=Insérer ce lot @@ -967,7 +967,7 @@ observe.data.ps.localmarket.Batch.weight.observed.tip=Le poids estimé a été o observe.data.ps.localmarket.Batch.weight.short=Poids observe.data.ps.localmarket.Batch.weight.validation.required=Le nombre ou le poids doit être renseigné (mais pas les deux). observe.data.ps.localmarket.Sample.action.create=Échantillonnage au port suivant -observe.data.ps.localmarket.Sample.action.move=Changer de marée +observe.data.ps.localmarket.Sample.action.move=Changer de marée observe.data.ps.localmarket.Sample.action.move.choose.parent.message=A quelle marée voulez-vous associer les échantillonnages sélectionnés ? observe.data.ps.localmarket.Sample.action.move.choose.parent.title=Changer la marée des échantillonnages observe.data.ps.localmarket.Sample.action.move.tip=Changer la marée des échantillonnages sélectionnés @@ -1251,6 +1251,9 @@ observe.data.ps.observation.ObjectSchoolEstimate.totalWeight.short=Poids total observe.data.ps.observation.ObjectSchoolEstimate.type=Estimation banc objet observe.data.ps.observation.Route.action.create=Route suivante observe.data.ps.observation.Route.action.move=Changer de marée +observe.data.ps.observation.Route.action.move.all=Tout déplacer +observe.data.ps.observation.Route.action.move.all.choose.parent.message=A quelle marée voulez-vous associer toutes les routes ? +observe.data.ps.observation.Route.action.move.all.choose.parent.title=Changer la marée des routes observe.data.ps.observation.Route.action.move.choose.parent.message=A quelle marée voulez-vous associer les routes sélectionnées ? observe.data.ps.observation.Route.action.move.choose.parent.title=Changer la marée des routes observe.data.ps.observation.Route.action.move.tip=Changer la marée des routes sélectionnées ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -86,7 +86,7 @@ data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselN data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,lengthMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod -data.ps.observation.Route=activity,comment,date,endLogValue,startLogValue,choice.create.fin.veille.activity,choice.not.create.fin.veille.activity.and.continue,message.need.fin.veille.activity +data.ps.observation.Route=activity,comment,date,endLogValue,startLogValue,choice.create.fin.veille.activity,choice.not.create.fin.veille.activity.and.continue,message.need.fin.veille.activity,action.move.all,action.move.all.choose.parent.message,action.move.all.choose.parent.title data.ps.observation.Sample=species,sampleMeasure,speciesFate,length.computed.tip,length.observed.tip,message.cantAdd,weight.computed.tip,weight.observed.tip data.ps.observation.SampleMeasure=comment,count,length,lengthMeasureMethod,picturesReferences,sex,sizeMeasureType,species,speciesFate,tagNumber,weight,weightMeasureMethod,weightMeasureType,type data.ps.observation.SchoolEstimate=meanWeight,species,totalWeight,weightMeasureMethod View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1d3199775cb1da16abc61e72… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1d3199775cb1da16abc61e72… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: toolkit in snapshot
by Tony CHEMIT (＠tchemit) April 18, 2022

April 18, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 867a0423 by Tony Chemit at 2022-04-18T18:25:54+02:00 toolkit in snapshot - - - - - 2171f4c6 by Tony Chemit at 2022-04-18T18:25:54+02:00 Tooltip non pertinente - Closes #2262 - - - - - 3f7bef84 by Tony Chemit at 2022-04-18T18:25:54+02:00 Déplacement de routes d’observation : gestion incomplète - Closes #2271 Déplacement des données logbook et associées : gestion incomplète - Closes #2272 Déplacement des débarquements : gestion incomplète - Closes #2273 Déplacement du marché local : gestion incomplète - Closes #2274 - - - - - fe0af77b by Tony Chemit at 2022-04-18T18:25:54+02:00 Des FloattingObjectMaterial à rajouter dans le référentiel - Closes ultreiaio/ird-observe#2260 - - - - - a1c366c9 by Tony Chemit at 2022-04-18T18:25:54+02:00 Amélioration de l'écran marée - onglet Livre de bords - See #2279 - - - - - 30 changed files: - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/UseConfigurationSupport.java - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/common/TripLocalmarketUI.capabilities - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketSurveySamplingAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketWellsSamplingAcquisitionStatus.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripCommon.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripLocalmarketCommon.java - core/persistence/java/src/main/java/fr/ird/observe/entities/Entities.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripGroupByReferentialHelper.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v8/DataSourceMigrationForVersion_8_1.java - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-1-2-6-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-1-3-6-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-2-4-6-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-2-4-7-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_4-12-1-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/958f132b39d72a9347cfc0bd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/958f132b39d72a9347cfc0bd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: update pom
by Tony CHEMIT (＠tchemit) April 18, 2022

April 18, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 79d60ffe by Tony Chemit at 2022-04-18T18:14:07+02:00 update pom - - - - - 3c1e27b0 by Tony Chemit at 2022-04-18T18:14:07+02:00 toolkit in snapshot - - - - - 1737af9f by Tony Chemit at 2022-04-18T18:14:07+02:00 Tooltip non pertinente - Closes #2262 - - - - - d940600c by Tony Chemit at 2022-04-18T18:14:07+02:00 Déplacement de routes d’observation : gestion incomplète - Closes #2271 Déplacement des données logbook et associées : gestion incomplète - Closes #2272 Déplacement des débarquements : gestion incomplète - Closes #2273 Déplacement du marché local : gestion incomplète - Closes #2274 - - - - - 84f6dcb5 by Tony Chemit at 2022-04-18T18:14:07+02:00 Des FloattingObjectMaterial à rajouter dans le référentiel - Closes ultreiaio/ird-observe#2260 - - - - - 958f132b by Tony Chemit at 2022-04-18T18:14:07+02:00 Amélioration de l'écran marée - onglet Livre de bords - See #2279 - - - - - 30 changed files: - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/UseConfigurationSupport.java - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/common/TripLocalmarketUI.capabilities - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketSurveySamplingAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketWellsSamplingAcquisitionStatus.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripCommon.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripLocalmarketCommon.java - core/persistence/java/src/main/java/fr/ird/observe/entities/Entities.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripGroupByReferentialHelper.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v8/DataSourceMigrationForVersion_8_1.java - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-1-2-6-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-1-3-6-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-2-4-6-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-2-4-7-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_4-12-1-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/29cd1c588743893116104d08… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/29cd1c588743893116104d08… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Déplacement de routes d’observation : gestion incomplète - Closes #2271
by Tony CHEMIT (＠tchemit) April 18, 2022

April 18, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 23067d3d by Tony Chemit at 2022-04-18T18:07:28+02:00 Déplacement de routes d’observation : gestion incomplète - Closes #2271 Déplacement des données logbook et associées : gestion incomplète - Closes #2272 Déplacement des débarquements : gestion incomplète - Closes #2273 Déplacement du marché local : gestion incomplète - Closes #2274 - - - - - 8f31d03a by Tony Chemit at 2022-04-18T18:07:28+02:00 Des FloattingObjectMaterial à rajouter dans le référentiel - Closes ultreiaio/ird-observe#2260 - - - - - 29cd1c58 by Tony Chemit at 2022-04-18T18:07:28+02:00 Amélioration de l'écran marée - onglet Livre de bords - Closes #2279 - - - - - 30 changed files: - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/common/TripLocalmarketUI.capabilities - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketSurveySamplingAcquisitionStatus.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/predicates/CheckTripLocalMarketWellsSamplingAcquisitionStatus.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripCommon.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripLocalmarketCommon.java - core/persistence/java/src/main/java/fr/ird/observe/entities/Entities.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripGroupByReferentialHelper.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v8/DataSourceMigrationForVersion_8_1.java - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-1-2-6-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-1-3-6-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-2-4-6-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_1-1-2-4-7-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_4-12-1-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_4-12-2-common.sql - + core/persistence/resources/src/main/resources/db/migration/v8/8.1/01_2260_add_referential_ps_common_ObjectMaterial_4-12-3-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/16643296be980896293c7840… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/16643296be980896293c7840… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: update pom
by Tony CHEMIT (＠tchemit) April 16, 2022

April 16, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80bf93fd by Tony Chemit at 2022-04-16T11:38:55+02:00 update pom - - - - - a46512a1 by Tony Chemit at 2022-04-16T11:38:54+02:00 toolkit in snapshot - - - - - 16643296 by Tony Chemit at 2022-04-16T11:38:54+02:00 Tooltip non pertinente - Closes #2262 - - - - - 3 changed files: - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/UseConfigurationSupport.java - pom.xml Changes: ===================================== client/core/src/main/i18n/getters/java.getter ===================================== @@ -184,4 +184,3 @@ observe.ui.title.reload.i18n observe.ui.title.show.data.aggregations.usage observe.ui.title.show.data.compositions.usage observe.ui.title.welcome.admin -observe.ui.tree.action.configure.tip ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/UseConfigurationSupport.java ===================================== @@ -44,7 +44,7 @@ public abstract class UseConfigurationSupport<U extends ConfigSupport> extends C private static final Logger log = LogManager.getLogger(UseConfigurationSupport.class); public UseConfigurationSupport(String name, String label) { - super(name, label, n("observe.ui.tree.action.configure.tip"), null, null); + super(name, label, label, null, null); } public abstract void toModel(U ui); ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.43</version> + <version>2022.44</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -121,6 +121,7 @@ </site> </distributionManagement> <properties> + <lib.version.java4all.topia>1.75-SNAPSHOT</lib.version.java4all.topia> <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> <stageId>frirdobserve</stageId> @@ -155,7 +156,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>6.0.8</lib.version.toolkit> + <lib.version.toolkit>6.0.9-SNAPSHOT</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/be131c063abbcd19a44e3866… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/be131c063abbcd19a44e3866… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Tooltip non pertinente - Closes #2262
by Tony CHEMIT (＠tchemit) April 16, 2022

April 16, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: be131c06 by Tony Chemit at 2022-04-16T11:34:34+02:00 Tooltip non pertinente - Closes #2262 - - - - - 2 changed files: - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/UseConfigurationSupport.java Changes: ===================================== client/core/src/main/i18n/getters/java.getter ===================================== @@ -184,4 +184,3 @@ observe.ui.title.reload.i18n observe.ui.title.show.data.aggregations.usage observe.ui.title.show.data.compositions.usage observe.ui.title.welcome.admin -observe.ui.tree.action.configure.tip ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/UseConfigurationSupport.java ===================================== @@ -44,7 +44,7 @@ public abstract class UseConfigurationSupport<U extends ConfigSupport> extends C private static final Logger log = LogManager.getLogger(UseConfigurationSupport.class); public UseConfigurationSupport(String name, String label) { - super(name, label, n("observe.ui.tree.action.configure.tip"), null, null); + super(name, label, label, null, null); } public abstract void toModel(U ui); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/be131c063abbcd19a44e38664… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/be131c063abbcd19a44e38664… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Tooltip non pertinente - Closes #2262
by Tony CHEMIT (＠tchemit) April 16, 2022

April 16, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3b5e455f by Tony Chemit at 2022-04-16T11:23:39+02:00 Tooltip non pertinente - Closes #2262 - - - - - 1 changed file: - client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/UseConfigurationSupport.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/UseConfigurationSupport.java ===================================== @@ -44,7 +44,7 @@ public abstract class UseConfigurationSupport<U extends ConfigSupport> extends C private static final Logger log = LogManager.getLogger(UseConfigurationSupport.class); public UseConfigurationSupport(String name, String label) { - super(name, label, n("observe.ui.tree.action.configure.tip"), null, null); + super(name, label, label, null, null); } public abstract void toModel(U ui); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3b5e455f314bd351af7a14a6f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3b5e455f314bd351af7a14a6f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Stats dans la nouvelle présentation de l'arbre - Closes ultreiaio/ird-observe#2263
by Tony CHEMIT (＠tchemit) April 16, 2022

April 16, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d553e3ff by Tony Chemit at 2022-04-16T10:58:42+02:00 Stats dans la nouvelle présentation de l'arbre - Closes ultreiaio/ird-observe#2263 - - - - - 3898e8a3 by Tony Chemit at 2022-04-16T10:59:18+02:00 Amélioration de l'action déplacer des données - Closes ultreiaio/ird-observe#2102 - - - - - 486c6ed9 by Tony Chemit at 2022-04-16T11:10:25+02:00 update pom - - - - - 3a4e870a by Tony Chemit at 2022-04-16T11:14:57+02:00 toolkit in snapshot - - - - - 15 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationInitializer.java - core/api/dto/src/test/resources/fixtures/api.properties - core/persistence/java/src/main/java/fr/ird/observe/entities/Entities.java - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java - core/persistence/java/src/test/resources/fixtures/persistence.properties - model/src/main/models/Observe/dto/class/decorator.properties - model/src/main/models/Observe/dto/class/decoratorWithClassifier.properties - pom.xml Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationHandler.java ===================================== @@ -53,7 +53,7 @@ public abstract class ContentLayoutUINavigationHandler<N extends ContentLayoutUI @Override public final String getText() { - return getNode().getScope().getI18nTranslation("type"); + return getNode().getInitializer().getText(); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/layout/ContentLayoutUINavigationInitializer.java ===================================== @@ -28,6 +28,8 @@ import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationSco import fr.ird.observe.dto.data.DataGroupByDto; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; +import io.ultreia.java4all.decoration.Decorator; +import io.ultreia.java4all.util.SingletonSupplier; import java.util.Objects; import java.util.function.Function; @@ -43,18 +45,37 @@ public class ContentLayoutUINavigationInitializer extends NavigationInitializer< * How to get show data information. */ private final Function<DtoReference, Boolean> showData; + private final SingletonSupplier<String> textSupplier; private DataDtoReference reference; + private Decorator decorator; public ContentLayoutUINavigationInitializer(NavigationScope scope, DataDtoReference reference) { super(scope); this.reference = Objects.requireNonNull(reference); String showDataPropertyName = scope.getShowDataPropertyName(); this.showData = showDataPropertyName == null ? e -> true : e -> e.get(showDataPropertyName); + this.textSupplier = SingletonSupplier.of(this::computeText); + + } + + private String computeText() { + String result; + if (isShowData()) { + // add statistics + result = decorator.decorate(reference); + } else { + result = getScope().getI18nTranslation("type"); + + } + return result; } @Override protected Object init(NavigationContext<ContentLayoutUINavigationContext> context) { context.initReference(reference); + String decoratorClassifier = getScope().getMainType().getSimpleName().replace("Dto", ""); + decorator = context.getDecoratorService().getDecoratorByType(reference.getReferenceType(), decoratorClassifier); + return getScope().getMainType(); } @@ -65,6 +86,7 @@ public class ContentLayoutUINavigationInitializer extends NavigationInitializer< @Override protected void reload(NavigationContext<ContentLayoutUINavigationContext> context) { // parentReference = context.reloadReference(parentReference); + textSupplier.clear(); } public boolean isShowData() { @@ -94,6 +116,10 @@ public class ContentLayoutUINavigationInitializer extends NavigationInitializer< return reference; } + public String getText() { + return textSupplier.get(); + } + public String getSelectedId() { return getReference().getId(); } ===================================== core/api/dto/src/test/resources/fixtures/api.properties ===================================== @@ -21,7 +21,7 @@ ### DATA_FORM_COUNT=57 REFERENTIAL_FORM_COUNT=91 -DECORATOR_DEFINITIONS_COUNT=569 +DECORATOR_DEFINITIONS_COUNT=573 DataGroupByDtoToDefinitionMapping.count=24 ReferenceDtoToDtoClassMapping.count=157 DtoToReferenceDtoMapping.count=157 ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/Entities.java ===================================== @@ -62,4 +62,22 @@ public class Entities { java.sql.Date date = resultSet.getDate(dateColumnIndex); return createPoint(type, date, resultSet, dateColumnIndex + 1); } + + public static String updateLlTripVersion(String id, String now) { + return String.format("UPDATE ll_common.Trip SET" + + " topiaVersion = topiaVersion + 1," + + " lastUpdateDate = '%s'::timestamp WHERE topiaId = '%s';", now, id); + } + + public static String updatePsTripVersion(String id, String now) { + return String.format("UPDATE ps_common.Trip SET" + + " topiaVersion = topiaVersion + 1," + + " lastUpdateDate = '%s'::timestamp WHERE topiaId = '%s';", now, id); + } + + public static String updateLastUpdateDate(String id, String now) { + return String.format("UPDATE common.LastUpdateDate SET" + + " topiaVersion = topiaVersion + 1," + + " lastUpdateDate = '%s'::timestamp WHERE type = '%s';", now, id); + } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java ===================================== @@ -49,6 +49,7 @@ import org.nuiton.topia.service.sql.plan.copy.TopiaEntitySqlCopyPlanModel; import org.nuiton.topia.service.sql.plan.delete.TopiaEntitySqlDeletePlanModel; import org.nuiton.topia.service.sql.plan.replicate.TopiaEntitySqlReplicatePlanModel; import org.nuiton.topia.service.sql.request.ReplicatePartialRequestCallback; +import org.nuiton.topia.service.sql.request.ReplicateRequestCallback; import org.nuiton.topia.service.sql.usage.TopiaEntitySqlUsageModel; import java.util.Date; @@ -116,6 +117,11 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat return ObserveTopiaEntitySqlModelResource.get().getReplicatePartialRequestCallbacks(); } + @Override + public Set<ReplicateRequestCallback> getReplicateRequestCallbacks() { + return ObserveTopiaEntitySqlModelResource.get().getReplicateRequestCallbacks(); + } + @Override public final TagValues getDtoTagValues() { return ObserveTopiaEntitySqlModelResource.get().getDtoTagValues(); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java ===================================== @@ -32,13 +32,15 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.dto.referential.ll.common.VesselActivityReference; import fr.ird.observe.entities.data.ll.logbook.Activity; +import fr.ird.observe.entities.referential.common.DataQuality; import fr.ird.observe.entities.referential.common.Ocean; +import fr.ird.observe.entities.referential.common.Person; import fr.ird.observe.entities.referential.common.Species; import fr.ird.observe.entities.referential.common.SpeciesList; +import fr.ird.observe.entities.referential.ll.common.ObservationMethod; +import fr.ird.observe.entities.referential.ll.common.Program; import fr.ird.observe.spi.service.ServiceContext; import io.ultreia.java4all.util.Dates; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.util.Date; import java.util.LinkedHashSet; @@ -53,36 +55,49 @@ import java.util.stream.Stream; * @since 9.0.0 */ public class TripSpi extends GeneratedTripSpi { - private static final Logger log = LogManager.getLogger(TripSpi.class); - - @SuppressWarnings("UnusedReturnValue") - public static boolean copyTripLogbookMetaData(Trip oldTrip, Trip newTrip) { - if (!newTrip.isLogbookAvailability()) { - // copy logbook meta-data to new trip - log.info(String.format("Add logbook metadata to trip: %s", newTrip.getTopiaId())); - newTrip.setLogbookAvailability(true); - newTrip.setLogbookComment(oldTrip.getLogbookComment()); - newTrip.setLogbookDataEntryOperator(oldTrip.getLogbookDataEntryOperator()); - newTrip.setLogbookDataQuality(oldTrip.getLogbookDataQuality()); - return true; - } - return false; + + public String copyLogbookMetadata(Trip trip, String newId) { + Program logbookProgram = trip.getLogbookProgram(); + String logbookComment = trip.getLogbookComment(); + Person logbookDataEntryOperator = trip.getLogbookDataEntryOperator(); + DataQuality logbookDataQuality = trip.getLogbookDataQuality(); + return String.format("UPDATE ll_common.Trip SET" + + " logbookProgram = %s," + + " logbookAvailability = TRUE," + + " logbookDataEntryOperator = %s," + + " logbookDataQuality = %s," + + " logbookComment = %s" + + " WHERE topiaId = '%s';", + toId(logbookProgram), + toId(logbookDataEntryOperator), + toId(logbookDataQuality), + escapeComment(logbookComment), + newId); } - @SuppressWarnings("UnusedReturnValue") - public static boolean copyTripObservationMetaData(Trip oldTrip, Trip newTrip) { - if (!newTrip.isObservationsAvailability()) { - // copy observation meta-data to new trip - log.info(String.format("Add observation metadata to trip: %s", newTrip.getTopiaId())); - newTrip.setObservationsAvailability(true); - newTrip.setObservationsComment(oldTrip.getObservationsComment()); - newTrip.setObservationMethod(oldTrip.getObservationMethod()); - newTrip.setObserver(oldTrip.getObserver()); - newTrip.setObservationsDataEntryOperator(oldTrip.getObservationsDataEntryOperator()); - newTrip.setObservationsDataQuality(oldTrip.getObservationsDataQuality()); - return true; - } - return false; + public String copyObservationsMetadata(Trip trip, String newId) { + Program observationsProgram = trip.getObservationsProgram(); + String observationsComment = trip.getObservationsComment(); + Person observationsDataEntryOperator = trip.getObservationsDataEntryOperator(); + DataQuality observationsDataQuality = trip.getObservationsDataQuality(); + ObservationMethod observationMethod = trip.getObservationMethod(); + Person observer = trip.getObserver(); + return String.format("UPDATE ll_common.Trip SET" + + " observationsProgram = %s," + + " observationsAvailability = TRUE," + + " observationsDataEntryOperator = %s," + + " observationsDataQuality = %s," + + " observationsMethod = %s," + + " observer = %s," + + " observationsComment = %s" + + " WHERE topiaId = '%s';", + toId(observationsProgram), + toId(observationsDataEntryOperator), + toId(observationsDataQuality), + toId(observationMethod), + toId(observer), + escapeComment(observationsComment), + newId); } @Override ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivitySampleReplicateRequestCallback.java ===================================== @@ -0,0 +1,78 @@ +package fr.ird.observe.entities.data.ll.logbook; + +/*- + * #%L + * ObServe Core :: Persistence :: Java + * %% + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.auto.service.AutoService; +import fr.ird.observe.entities.Entities; +import fr.ird.observe.entities.ToolkitTopiaPersistenceContextSupport; +import fr.ird.observe.entities.data.ll.common.Trip; +import fr.ird.observe.entities.data.ll.common.TripTopiaDao; +import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext; +import org.nuiton.topia.persistence.script.SqlScriptWriter; +import org.nuiton.topia.service.sql.internal.SqlRequestSetConsumerContext; +import org.nuiton.topia.service.sql.request.ReplicateRequest; +import org.nuiton.topia.service.sql.request.ReplicateRequestCallback; + +import static fr.ird.observe.spi.context.DataDtoEntityContext.timestamp; + +/** + * Replicate call back for Activity Sample to a Trip. + * <p> + * Created on 15/04/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +(a)AutoService(ReplicateRequestCallback.class) +public class ActivitySampleReplicateRequestCallback implements ReplicateRequestCallback { + + @Override + public boolean accept(ReplicateRequest request) { + return !request.getOldParentId().contains(".Trip#") + && request.getNewParentId().contains(".Trip#") + && request.getDataType().equals(Sample.class.getName()); + } + + @Override + public void consume(ReplicateRequest request, SqlRequestSetConsumerContext sourcePersistenceContext) { + SqlScriptWriter writer = sourcePersistenceContext.getWriter(); + + AbstractTopiaPersistenceContext persistenceContext = sourcePersistenceContext.getSourcePersistenceContext(); + TripTopiaDao tripDao = Trip.getDao(persistenceContext); + boolean newTripModified = false; + String oldId = request.getOldParentId(); + String oldTripId = Activity.SPI.getParentId((ToolkitTopiaPersistenceContextSupport) persistenceContext, oldId).getId(); + Trip oldTrip = tripDao.forTopiaIdEquals(oldTripId).findUnique(); + String newId = request.getNewParentId(); + Trip newTrip = tripDao.forTopiaIdEquals(newId).findUnique(); + if (!newTrip.isLogbookAvailability()) { + newTripModified = true; + writer.writeSql(Trip.SPI.copyLogbookMetadata(oldTrip, newId)); + } + String now = timestamp(sourcePersistenceContext.now()); + writer.writeSql(Entities.updateLlTripVersion(oldId, now)); + if (newTripModified) { + writer.writeSql(Entities.updateLlTripVersion(newId, now)); + } + } +} ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java ===================================== @@ -0,0 +1,73 @@ +package fr.ird.observe.entities.data.ll.logbook; + +/*- + * #%L + * ObServe Core :: Persistence :: Java + * %% + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.auto.service.AutoService; +import fr.ird.observe.entities.Entities; +import fr.ird.observe.entities.data.ll.common.Trip; +import fr.ird.observe.entities.data.ll.common.TripTopiaDao; +import org.nuiton.topia.persistence.script.SqlScriptWriter; +import org.nuiton.topia.service.sql.internal.SqlRequestSetConsumerContext; +import org.nuiton.topia.service.sql.request.ReplicateRequest; +import org.nuiton.topia.service.sql.request.ReplicateRequestCallback; + +import static fr.ird.observe.spi.context.DataDtoEntityContext.timestamp; + +/** + * Replicate call back for any logbook data from a Trip to a Trip. + * <p> + * Created on 15/04/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +(a)AutoService(ReplicateRequestCallback.class) +public class LogbookReplicateRequestCallback implements ReplicateRequestCallback { + + @Override + public boolean accept(ReplicateRequest request) { + return request.getOldParentId().contains(".Trip#") + && request.getNewParentId().contains(".Trip#") + && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.logbook.BusinessDataPackage.get().getPackageName()); + } + + @Override + public void consume(ReplicateRequest request, SqlRequestSetConsumerContext sourcePersistenceContext) { + SqlScriptWriter writer = sourcePersistenceContext.getWriter(); + TripTopiaDao dao = Trip.getDao(sourcePersistenceContext.getSourcePersistenceContext()); + boolean newTripModified = false; + String oldId = request.getOldParentId(); + Trip oldTrip = dao.forTopiaIdEquals(oldId).findUnique(); + String newId = request.getNewParentId(); + Trip newTrip = dao.forTopiaIdEquals(newId).findUnique(); + if (!newTrip.isLogbookAvailability()) { + newTripModified = true; + writer.writeSql(Trip.SPI.copyLogbookMetadata(oldTrip, newId)); + } + String now = timestamp(sourcePersistenceContext.now()); + writer.writeSql(Entities.updateLlTripVersion(oldId, now)); + if (newTripModified) { + writer.writeSql(Entities.updateLlTripVersion(newId, now)); + } + } +} ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java ===================================== @@ -0,0 +1,73 @@ +package fr.ird.observe.entities.data.ll.observation; + +/*- + * #%L + * ObServe Core :: Persistence :: Java + * %% + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.auto.service.AutoService; +import fr.ird.observe.entities.Entities; +import fr.ird.observe.entities.data.ll.common.Trip; +import fr.ird.observe.entities.data.ll.common.TripTopiaDao; +import org.nuiton.topia.persistence.script.SqlScriptWriter; +import org.nuiton.topia.service.sql.internal.SqlRequestSetConsumerContext; +import org.nuiton.topia.service.sql.request.ReplicateRequest; +import org.nuiton.topia.service.sql.request.ReplicateRequestCallback; + +import static fr.ird.observe.spi.context.DataDtoEntityContext.timestamp; + +/** + * Replicate call back for any observation data from a Trip to a Trip. + * <p> + * Created on 15/04/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +(a)AutoService(ReplicateRequestCallback.class) +public class ObservationReplicateRequestCallback implements ReplicateRequestCallback { + + @Override + public boolean accept(ReplicateRequest request) { + return request.getOldParentId().contains(".Trip#") + && request.getNewParentId().contains(".Trip#") + && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get().getPackageName()); + } + + @Override + public void consume(ReplicateRequest request, SqlRequestSetConsumerContext sourcePersistenceContext) { + SqlScriptWriter writer = sourcePersistenceContext.getWriter(); + TripTopiaDao dao = Trip.getDao(sourcePersistenceContext.getSourcePersistenceContext()); + boolean newTripModified = false; + String oldId = request.getOldParentId(); + Trip oldTrip = dao.forTopiaIdEquals(oldId).findUnique(); + String newId = request.getNewParentId(); + Trip newTrip = dao.forTopiaIdEquals(newId).findUnique(); + if (!newTrip.isObservationsAvailability()) { + newTripModified = true; + writer.writeSql(Trip.SPI.copyObservationsMetadata(oldTrip, newId)); + } + String now = timestamp(sourcePersistenceContext.now()); + writer.writeSql(Entities.updateLlTripVersion(oldId, now)); + if (newTripModified) { + writer.writeSql(Entities.updateLlTripVersion(newId, now)); + } + } +} ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripReplicatePartialRequestCallback.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.entities.data.ps.common; */ import com.google.auto.service.AutoService; +import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.data.DataEntity; import fr.ird.observe.entities.data.ps.landing.Landing; import org.nuiton.topia.persistence.script.SqlScriptWriter; @@ -131,25 +132,13 @@ public class TripReplicatePartialRequestCallback implements ReplicatePartialRequ newTripModified = true; } String now = timestamp(sourcePersistenceContext.now()); - writer.writeSql(updateTripVersion(oldId, now)); + writer.writeSql(Entities.updatePsTripVersion(oldId, now)); if (newTripModified) { - writer.writeSql(updateTripVersion(newId, now)); + writer.writeSql(Entities.updatePsTripVersion(newId, now)); } for (Class<? extends DataEntity> lastUpdateDate : lastUpdateDates) { - writer.writeSql(updateLastUpdateDate(lastUpdateDate.getName(), now)); + writer.writeSql(Entities.updateLastUpdateDate(lastUpdateDate.getName(), now)); } } - public String updateTripVersion(String id, String now) { - return String.format("UPDATE ps_common.Trip SET" + - " topiaVersion = topiaVersion + 1," + - " lastUpdateDate = '%s'::timestamp WHERE topiaId = '%s';", now, id); - } - - public String updateLastUpdateDate(String id, String now) { - return String.format("UPDATE common.LastUpdateDate SET" + - " topiaVersion = topiaVersion + 1," + - " lastUpdateDate = '%s'::timestamp WHERE type = '%s';", now, id); - } - } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java ===================================== @@ -0,0 +1,73 @@ +package fr.ird.observe.entities.data.ps.observation; + +/*- + * #%L + * ObServe Core :: Persistence :: Java + * %% + * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.auto.service.AutoService; +import fr.ird.observe.entities.Entities; +import fr.ird.observe.entities.data.ps.common.Trip; +import fr.ird.observe.entities.data.ps.common.TripTopiaDao; +import org.nuiton.topia.persistence.script.SqlScriptWriter; +import org.nuiton.topia.service.sql.internal.SqlRequestSetConsumerContext; +import org.nuiton.topia.service.sql.request.ReplicateRequest; +import org.nuiton.topia.service.sql.request.ReplicateRequestCallback; + +import static fr.ird.observe.spi.context.DataDtoEntityContext.timestamp; + +/** + * Replicate call back for any observation data from a Trip to a Trip. + * <p> + * Created on 15/04/2022. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +(a)AutoService(ReplicateRequestCallback.class) +public class ObservationReplicateRequestCallback implements ReplicateRequestCallback { + + @Override + public boolean accept(ReplicateRequest request) { + return request.getOldParentId().contains(".Trip#") + && request.getNewParentId().contains(".Trip#") + && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get().getPackageName()); + } + + @Override + public void consume(ReplicateRequest request, SqlRequestSetConsumerContext sourcePersistenceContext) { + SqlScriptWriter writer = sourcePersistenceContext.getWriter(); + TripTopiaDao dao = Trip.getDao(sourcePersistenceContext.getSourcePersistenceContext()); + boolean newTripModified = false; + String oldId = request.getOldParentId(); + Trip oldTrip = dao.forTopiaIdEquals(oldId).findUnique(); + String newId = request.getNewParentId(); + Trip newTrip = dao.forTopiaIdEquals(newId).findUnique(); + if (!newTrip.isObservationsFilled()) { + newTripModified = true; + writer.writeSql(Trip.SPI.copyObservationsMetadata(oldTrip, newId)); + } + String now = timestamp(sourcePersistenceContext.now()); + writer.writeSql(Entities.updatePsTripVersion(oldId, now)); + if (newTripModified) { + writer.writeSql(Entities.updatePsTripVersion(newId, now)); + } + } +} ===================================== core/persistence/java/src/test/resources/fixtures/persistence.properties ===================================== @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -DECORATOR_DEFINITIONS_COUNT=785 +DECORATOR_DEFINITIONS_COUNT=791 DataGroupByEntityToDefinitionMapping.count=24 EntityToDtoClassMapping.count=308 DtoToEntityContextMapping.count=185 ===================================== model/src/main/models/Observe/dto/class/decorator.properties ===================================== @@ -55,10 +55,10 @@ data.ll.observation.WeightMeasure=${weightMeasureType::label}##${weight} data.ll.pairing.ActivityPairingResultItem=${observationActivity}##$(observe.data.ll.pairing.ActivityPairingResultItem.computedDistance) ${computedDistance}##$(observe.data.ll.pairing.ActivityPairingResultItem.computedTime) ${computedTimeStr} data.ps.common.GearUseFeatures=${gear::label}##${number} data.ps.common.GearUseFeaturesMeasurement=${gearCharacteristic::label}##${measurementValue} -data.ps.common.Trip=${startDate::date}##${endDate::date}##${vessel::label}##${vesselCode}##${routeObsSize}##${routeLogbookSize}##${sampleSize} +data.ps.common.Trip=${startDate::date}##${endDate::date}##${vessel::label}##${vesselCode}##( ${routeObsSize}##${routeLogbookSize}##${sampleSize} ) data.ps.common.TripGearUseFeatures=$(observe.data.ps.common.TripGearUseFeatures.type)##${gearUseFeaturesSize} -data.ps.common.TripLocalmarket=$(observe.data.ps.common.TripLocalmarket.type)##${localmarketBatchSize}##${localmarketSurveySize}##${localmarketSampleSize} -data.ps.common.TripLogbook=$(observe.data.ps.common.TripLogbook.type)##${routeLogbookSize}##${sampleSize}##${wellPlanSize} +data.ps.common.TripLocalmarket=$(observe.data.ps.common.TripLocalmarket.type)##( ${localmarketBatchSize}##${localmarketSurveySize}##${localmarketSampleSize} ) +data.ps.common.TripLogbook=$(observe.data.ps.common.TripLogbook.type)##( ${routeLogbookSize}##${sampleSize}##${wellPlanSize} ) data.ps.dcp.FloatingObjectPreset=${this::label} data.ps.landing.Landing=${species::speciesLabel}##${weightCategory::label}##${weight} data.ps.landing.TripLanding=$(observe.data.ps.landing.TripLanding.type)##${landingSize} ===================================== model/src/main/models/Observe/dto/class/decoratorWithClassifier.properties ===================================== @@ -23,7 +23,7 @@ data.ll.common.Trip=Short|${startDate::date}##${endDate::date}##${vessel::label} data.ll.observation.Basket=OnlyHaulingIdentifier|${haulingIdentifier} data.ll.observation.Branchline=OnlyHaulingIdentifier|${haulingIdentifier} data.ll.observation.Section=OnlyHaulingIdentifier|${haulingIdentifier} -data.ps.common.Trip=Short|${startDate::date}##${endDate::date}##${vessel::label}##${vesselCode} +data.ps.common.Trip=Short|${startDate::date}##${endDate::date}##${vessel::label}##${vesselCode}~TripLocalmarket|$(observe.data.ps.common.TripLocalmarket.type)##( ${localmarketBatchSize}##${localmarketSurveySize}##${localmarketSampleSize} )~TripLogbook|$(observe.data.ps.common.TripLogbook.type)##( ${routeLogbookSize}##${sampleSize}##${wellPlanSize} ) data.ps.logbook.Activity=WithRoute|${date::date}##${time::niceTime}##${number}##${vesselActivity::label} data.ps.observation.Activity=WithRoute|${date::date}##${time::niceTime}##${vesselActivity::label} presets.RemoteDataSourceConfiguration=WithUrl|${name}##${url} ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.43</version> + <version>2022.44</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -121,6 +121,7 @@ </site> </distributionManagement> <properties> + <lib.version.java4all.topia>1.75-SNAPSHOT</lib.version.java4all.topia> <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> <stageId>frirdobserve</stageId> @@ -155,7 +156,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>6.0.8</lib.version.toolkit> + <lib.version.toolkit>6.0.9-SNAPSHOT</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7d9dfc2dbd871ee29c77ac59… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7d9dfc2dbd871ee29c77ac59… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Arbre - option "regrouper par période temporelle" - Closes #2256
by Tony CHEMIT (＠tchemit) April 15, 2022

April 15, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7d9dfc2d by Tony Chemit at 2022-04-15T12:52:46+02:00 Arbre - option "regrouper par période temporelle" - Closes #2256 - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java ===================================== @@ -233,8 +233,10 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha allModules.values().forEach(e -> e.setEnabled(newValue)); allGroupBy.values().forEach(e -> e.setEnabled(newValue)); groupByOptions.values().forEach(e -> e.setEnabled(newValue)); - boolean temporal = newValue && ui.getModel().getBean().isLoadTemporalGroupBy(); - updateTemporalOptionsEnabled(temporal); + String groupByName = ui.getModel().getBean().getGroupByName(); + if (groupByName != null) { + changeGroupByName(groupByName); + } return; } case TreeConfig.LOAD_REFERENTIAL: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7d9dfc2dbd871ee29c77ac599… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7d9dfc2dbd871ee29c77ac599… You're receiving this email because of your account on gitlab.com.

1 0