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

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-29
by Tony CHEMIT (＠tchemit) April 27, 2022

April 27, 2022

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

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.0-RC-30-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) April 27, 2022

April 27, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 423da467 by Tony Chemit at 2022-04-27T07:17:35+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-30-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/423da467b3404b7b5f73f457f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/423da467b3404b7b5f73f457f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.0-RC-29 [skip CI]
by Tony CHEMIT (＠tchemit) April 27, 2022

April 27, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a6a67256 by Tony Chemit at 2022-04-27T07:16:52+02:00 Update changelog for v.9.0.0-RC-29 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,28 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-04-20 17:38. + * Last generated at 2022-04-27 07:15. + +## Version [9.0.0-RC-29](https://gitlab.com/ultreiaio/ird-observe/-/milestones/221) + +**Closed at 2022-04-27.** + +### Download +* [Client (observe-9.0.0-RC-29-client.zip)](https://repo1.maven.org/maven2/fr/ird/obse…) +* [Serveur (observe-9.0.0-RC-29.war)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) +* [Serveur (observe-9.0.0-RC-29-server.zip)](https://repo1.maven.org/maven2/fr/ird/obse…) + + +### Issues + * [[Type::Anomalie 2282]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2282) **Problème lors des déplacements, changement de programme intempestif de la marée cible** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2284]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2284) **Erreur non explicitée s'il manque l'information de base par défaut** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2287]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2287) **Statistique bizarre sur plan de cuves** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2291]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2291) **Problème performance sur l'écran Plan de cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2292]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2292) **Sur écran échantillon espèce (livre de bord PS), si on change l'ordre dans le tableau, les fréquences ne sont plus bien rattachés à la bonne ligne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2258]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2258) **Base IEO ouverture en V9 à tester** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2264]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2264) **Normaliser la présentation des statistiques dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2278]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2278) **Lisibilité des erreurs retournées par le service web** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2281]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2281) **Libellé sur UI déplacements** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.0-RC-28](https://gitlab.com/ultreiaio/ird-observe/-/milestones/220) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6a6725628f5dda215061fc96… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a6a6725628f5dda215061fc96… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Erreur non explicitée s'il manque l'information de base par défaut - Closes #2284
by Tony CHEMIT (＠tchemit) April 27, 2022

April 27, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 953f4cbe by Tony Chemit at 2022-04-26T14:05:31+02:00 Erreur non explicitée s'il manque l'information de base par défaut - Closes #2284 - - - - - b090ae7c by Tony Chemit at 2022-04-26T14:33:33+02:00 update pom - - - - - 9b4f96e9 by Tony Chemit at 2022-04-26T15:55:35+02:00 fix not composite relation - - - - - 3c94bea0 by Tony Chemit at 2022-04-26T16:26:05+02:00 fix not composite relation - - - - - 0ea354f2 by Tony Chemit at 2022-04-27T07:11:20+02:00 update topia extension - - - - - 7 changed files: - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/logbook/ActivityImpl.hbm.xml - model/src/main/models/Observe/persistence/21-data-ps-logbook.model - model/src/main/models/Observe/persistence/31-data-ll-logbook.model - pom.xml - server/configuration/src/test/java/fr/ird/observe/dto/server/ServerModelTest.java - + server/configuration/src/test/resources/META-INF/configuration/security-2284-3.yml Changes: ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml ===================================== @@ -56,7 +56,7 @@ <many-to-one name="vesselActivity" class="fr.ird.observe.entities.referential.ll.common.VesselActivityImpl" column="vesselActivity" foreign-key="fk_ll_logbook_activity_vesselactivity" lazy="false" not-null="true" /> <many-to-one name="dataQuality" class="fr.ird.observe.entities.referential.common.DataQualityImpl" column="dataQuality" foreign-key="fk_ll_logbook_activity_dataquality" /> <many-to-one name="fpaZone" class="fr.ird.observe.entities.referential.common.FpaZoneImpl" column="fpaZone" foreign-key="fk_ll_logbook_activity_fpazone" /> - <many-to-one name="relatedObservedActivity" class="fr.ird.observe.entities.data.ll.observation.ActivityImpl" column="relatedObservedActivity" cascade="delete" foreign-key="fk_ll_logbook_activity_relatedobservedactivity" /> + <many-to-one name="relatedObservedActivity" class="fr.ird.observe.entities.data.ll.observation.ActivityImpl" column="relatedObservedActivity" foreign-key="fk_ll_logbook_activity_relatedobservedactivity" /> <many-to-one name="set" class="fr.ird.observe.entities.data.ll.logbook.SetImpl" column="set" cascade="delete-orphan" foreign-key="fk_ll_logbook_activity_set" not-null="false" unique="true" unique-key="uk_ll_logbook_activity_set" /> <many-to-one name="sample" class="fr.ird.observe.entities.data.ll.logbook.SampleImpl" column="sample" cascade="delete-orphan" foreign-key="fk_ll_logbook_activity_sample" not-null="false" unique="true" unique-key="uk_ll_logbook_activity_sample" /> </class> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/logbook/ActivityImpl.hbm.xml ===================================== @@ -74,7 +74,7 @@ </property> <property name="currentDirection" access="field" type="java.lang.Integer" column="currentDirection"/> <many-to-one name="schoolType" class="fr.ird.observe.entities.referential.ps.common.SchoolTypeImpl" column="schoolType" foreign-key="fk_ps_logbook_activity_schooltype" /> - <many-to-one name="relatedObservedActivity" class="fr.ird.observe.entities.data.ps.observation.ActivityImpl" column="relatedObservedActivity" cascade="delete" foreign-key="fk_ps_logbook_activity_relatedobservedactivity" /> + <many-to-one name="relatedObservedActivity" class="fr.ird.observe.entities.data.ps.observation.ActivityImpl" column="relatedObservedActivity" foreign-key="fk_ps_logbook_activity_relatedobservedactivity" /> <list name="catches" lazy="true" cascade="all,delete-orphan" > <key column="activity" foreign-key="fk_ps_logbook_activity_catches" not-null="true" /> <list-index column="activity_idx"/> ===================================== model/src/main/models/Observe/persistence/21-data-ps-logbook.model ===================================== @@ -20,7 +20,7 @@ totalWeight + {*:1} Float currentSpeed + {*:1} Float currentDirection + {*:1} Integer schoolType {*:1} referential.ps.common.SchoolType -relatedObservedActivity + {0..1} data.ps.observation.Activity +relatedObservedActivity {0..1} data.ps.observation.Activity catches + {*} data.ps.logbook.Catch floatingObject + {*} data.ps.logbook.FloatingObject observedSystem {*:*} referential.ps.common.ObservedSystem ===================================== model/src/main/models/Observe/persistence/31-data-ll-logbook.model ===================================== @@ -14,7 +14,7 @@ currentDirection + {*:1} Integer vesselActivity {*:1} referential.ll.common.VesselActivity dataQuality {*:0..1} referential.common.DataQuality fpaZone {*:1} referential.common.FpaZone -relatedObservedActivity + {0..1} data.ll.observation.Activity +relatedObservedActivity {0..1} data.ll.observation.Activity set + {0..1} data.ll.logbook.Set sample + {0..1} data.ll.logbook.Sample ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.44</version> + <version>2022.45</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -156,6 +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.10</lib.version.toolkit> + <lib.version.java4all.topia>1.75</lib.version.java4all.topia> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> ===================================== server/configuration/src/test/java/fr/ird/observe/dto/server/ServerModelTest.java ===================================== @@ -73,6 +73,17 @@ public class ServerModelTest { } catch (InvalidServerModelException e) { Assert.assertEquals("Should have found this message error", "No default databases defined", e.getMessage()); } + + securityConfiguration = new ServerResources.ConfigResource2("/META-INF/configuration/security-2284-3.yml"); + + content = String.join("\n", securityConfiguration.readLines()); + model = ServerModelHelper.load(content); + try { + ServerModelHelper.validate(model); + Assert.fail("Should have an error"); + } catch (InvalidServerModelException e) { + Assert.assertEquals("Should have found this message error", "No default databases defined", e.getMessage()); + } } @Test ===================================== server/configuration/src/test/resources/META-INF/configuration/security-2284-3.yml ===================================== @@ -0,0 +1,43 @@ +roles: + - &role-admin + password: a + - &role-technicien + password: a + - &role-referentiel + password: a + - &role-test + password: a +databases: + - &db-production + url: jdbc:postgresql://localhost:5432/obstuna-production + defaultDatabase: false + roles: + - *role-admin + - *role-technicien + - *role-referentiel + - &db-test + url: jdbc:postgresql://localhost:5432/obstuna-test + roles: + - *role-admin + - *role-technicien + - *role-referentiel + - *role-test +users: + - login: utilisateur-technicien + password: a + permissions: + - database: *db-production + role: *role-technicien + apiAccess: ALL + validationMode: STRONG + - database: *db-test + role: *role-technicien + apiAccess: PUBLIC + validationMode: PERMISSIVE + - login: utilisateur-referentiel + password: a + permissions: + - database: *db-production + role: *role-referentiel + apiAccess: CLIENT + validationMode: NONE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ef773d124164437c4e7ee27… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ef773d124164437c4e7ee27… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: split changelog
by Tony CHEMIT (＠tchemit) April 26, 2022

April 26, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9ee64b18 by Tony Chemit at 2022-04-26T10:02:13+02:00 split changelog - - - - - f98757d6 by Tony Chemit at 2022-04-26T10:30:07+02:00 Normaliser la présentation des statistiques dans l'arbre - Closes #2264 - - - - - 6905073a by Tony Chemit at 2022-04-26T13:37:39+02:00 Problème performance sur l'écran Plan de cuve - Closes ultreiaio/ird-observe#2291 - - - - - d8f99de5 by Tony Chemit at 2022-04-26T13:46:04+02:00 Sur écran échantillon espèce (livre de bord PS), si on change l'ordre dans le tableau, les fréquences ne sont plus bien rattachés à la bonne ligne - Closes #2292 - - - - - 1ef773d1 by Tony Chemit at 2022-04-26T13:50:58+02:00 update toolkit - - - - - 1 changed file: - + CHANGELOG-old.md The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/29d2d56ebd4b259f1851abb0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/29d2d56ebd4b259f1851abb0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Problème lors des déplacements, changement de programme intempestif de la marée cible - See #2282
by Tony CHEMIT (＠tchemit) April 25, 2022

April 25, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 49f40106 by Tony Chemit at 2022-04-25T19:31:31+02:00 Problème lors des déplacements, changement de programme intempestif de la marée cible - See #2282 - - - - - 29d2d56e by Tony Chemit at 2022-04-25T19:59:30+02:00 Problème lors des déplacements, changement de programme intempestif de la marée cible - See #2282 - - - - - 12 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - 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/actions/move/layout/MoveLayoutTreeAdapter.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteUIMoveAllTreeAdapter.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/layout/GenerateContentLayoutUIMoveTreeAdapter.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/ropen/GenerateContentRootOpenableUIMoveTreeAdapter.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUIMoveTreeAdapter.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 - 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/TripSpi.java Changes: ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -167,6 +167,7 @@ observe.ui.action.info.storage.tip observe.ui.action.load.from.file observe.ui.action.load.from.file.tip observe.ui.action.move.layout.multiple.message +observe.ui.action.move.layout.select.data observe.ui.action.move.layout.single.message observe.ui.action.move.message observe.ui.action.open.screen @@ -293,6 +294,7 @@ observe.ui.title.save.remoteDB observe.ui.title.show.referential.usage observe.ui.title.storage.info observe.ui.title.unique.key +observe.ui.tree.action.all.tip observe.ui.tree.action.collapseAll.tip observe.ui.tree.action.configure.tip observe.ui.tree.action.expandAll.tip ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutRequestBuilder.java ===================================== @@ -83,6 +83,7 @@ import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -444,9 +445,13 @@ public class MoveLayoutRequestBuilder implements WithClientUIContextApi { parentEditor.getModel().addPropertyChangeListener("selectedItem", evt -> jButton.setEnabled(canMove(evt.getNewValue()))); if (!single) { JPanel typesPanel = new JPanel(new GridLayout(0, 1)); + typesPanel.setBorder(BorderFactory.createTitledBorder(/*BorderFactory.createLoweredBevelBorder(),*/t("observe.ui.action.move.layout.select.data") + " ")); + int index = 1; + List<JCheckBox> editors = new LinkedList<>(); for (Class<? extends DataDto> type : availableLayoutTypes) { JCheckBox typeEditor = new JCheckBox(); + editors.add(typeEditor); Action typeAction = new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { @@ -469,6 +474,29 @@ public class MoveLayoutRequestBuilder implements WithClientUIContextApi { typesPanel.add(typeEditor); index++; } + typesPanel.add(new JSeparator(JSeparator.HORIZONTAL)); + JCheckBox typeEditor = new JCheckBox(); + editors.add(typeEditor); + Action typeAction = new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + jButton.setEnabled(updateSelectedAll(editors, parentEditor)); + } + }; + String actionName = "Select-all"; + typeAction.putValue(Action.ACTION_COMMAND_KEY, actionName); + String label = t("observe.ui.tree.action.all.tip"); + KeyStroke keyStroke = ObserveKeyStrokesEditorApi.getFunctionKeyStroke(index + 24); + String text = ObserveKeyStrokesEditorApi.suffixTextWithKeyStroke(label, keyStroke); + typeAction.putValue(Action.SHORT_DESCRIPTION, text); + typeAction.putValue(Action.NAME, text); + typeAction.putValue(Action.ACCELERATOR_KEY, keyStroke); + + typeEditor.setAction(typeAction); + actionMap.put(actionName, typeAction); + inputMap.put(keyStroke, actionName); + typesPanel.add(typeEditor); + panelMessages.add(BorderLayout.CENTER, typesPanel); } panelMessages.add(BorderLayout.SOUTH, new JLabel("")); @@ -573,6 +601,17 @@ public class MoveLayoutRequestBuilder implements WithClientUIContextApi { return canMove(editor.getModel().getSelectedItem()); } + private boolean updateSelectedAll(List<JCheckBox> typeEditor, FilterableComboBox<ToolkitIdLabel> editor) { + if (selectedLayoutTypes.isEmpty()) { + selectedLayoutTypes.addAll(availableLayoutTypes); + typeEditor.forEach(e -> e.setSelected(true)); + } else { + selectedLayoutTypes.clear(); + typeEditor.forEach(e -> e.setSelected(false)); + } + return canMove(editor.getModel().getSelectedItem()); + } + private boolean canMove(Object selectedItem) { return selectedItem != null && !selectedLayoutTypes.isEmpty(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutTreeAdapter.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.content.actions.move.layout; import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUINavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; +import fr.ird.observe.navigation.tree.navigation.NavigationTreeConfig; import fr.ird.observe.services.service.data.MoveLayoutRequest; import javax.swing.SwingUtilities; @@ -45,14 +46,15 @@ public abstract class MoveLayoutTreeAdapter<ParentNode extends ContentRootOpenab this.oldParentSupplier = Objects.requireNonNull(oldParentSupplier); } - public abstract ParentNode getNewParentNode(ParentNode oldParentNode, String newParentId); - public abstract SourceNode getNodeToSelect(ParentNode parentNode); public final void adaptTree(MoveLayoutRequest request, NavigationTree tree) { boolean selectTarget = request.isSelectTarget(); ParentNode oldParentNode = oldParentSupplier.get(); - ParentNode newParentNode = getNewParentNode(oldParentNode, request.getNewParentId()); + NavigationTreeConfig config = tree.getModel().getConfig(); + String newParentId = request.getNewParentId(); + String groupByValue = oldParentNode.getContext().getServicesProvider().getRootOpenableService().getGroupByValue(config.getGroupByName(), config.getGroupByFlavor(), newParentId); + @SuppressWarnings("unchecked") ParentNode newParentNode = (ParentNode) tree.getModel().getNodeFromPath(new String[]{groupByValue, newParentId}, true); oldParentNode.updateNode(); newParentNode.updateNode(); if (selectTarget) { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/RouteUIMoveAllTreeAdapter.java ===================================== @@ -44,11 +44,6 @@ public class RouteUIMoveAllTreeAdapter extends MoveLayoutTreeAdapter<TripUINavig 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/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/layout/GenerateContentLayoutUIMoveTreeAdapter.java ===================================== @@ -47,11 +47,6 @@ public class GenerateContentLayoutUIMoveTreeAdapter extends GenerateContentLayou " super(incomingNode::getParent);\n" + " }\n\n" + " @Override\n" + - " public final %2$s getNewParentNode(%2$s oldParentNode, String newParentId) {\n" + - " return oldParentNode.findSibling(newParentId);\n" + - " }\n" + - "\n" + - " @Override\n" + " public final %3$s getNodeToSelect(%2$s parentNode) {\n" + " return parentNode.get%3$s();\n" + " }\n\n" + ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/ropen/GenerateContentRootOpenableUIMoveTreeAdapter.java ===================================== @@ -48,10 +48,6 @@ public class GenerateContentRootOpenableUIMoveTreeAdapter extends GenerateConten " super(() -> incomingNode);\n" + " }\n\n" + " @Override\n" + - " public final %2$s getNewParentNode(%2$s oldParentNode, String newParentId) {\n" + - " return oldParentNode.findSibling(newParentId);\n" + - " }\n\n" + - " @Override\n" + " public final %2$s getNodeToSelect(%2$s parentNode) {\n" + " return parentNode;\n" + " }\n\n" + ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUIMoveTreeAdapter.java ===================================== @@ -49,11 +49,6 @@ public class GenerateContentTableUIMoveTreeAdapter extends GenerateContentTableU " super(incomingNode::getParent);\n" + " }\n\n" + " @Override\n" + - " public final %2$s getNewParentNode(%2$s oldParentNode, String newParentId) {\n" + - " return oldParentNode.findSibling(newParentId);\n" + - " }\n" + - "\n" + - " @Override\n" + " public final %3$s getNodeToSelect(%2$s parentNode) {\n" + " return parentNode.get%3$s();\n" + " }\n\n" + ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -374,7 +374,8 @@ observe.ui.action.locale.fr.tip=Change application's language in french observe.ui.action.locale.uk=English observe.ui.action.locale.uk.tip=Change application's language in english observe.ui.action.move.groupBy.configuration=Criteria configuration\: -observe.ui.action.move.layout.multiple.message=Your are about to move some object from type '%s' beyond the following list\: +observe.ui.action.move.layout.multiple.message=Your are about to move some object from type '%s' +observe.ui.action.move.layout.select.data=Data to move observe.ui.action.move.layout.single.message=Your are about to move all object of type '%s'. observe.ui.action.move.message=Your are about to move %d object(s) of type '%s'\: observe.ui.action.open.last.feedback=Feed back @@ -836,6 +837,7 @@ observe.ui.title.show.referential.usage=Show referential usages observe.ui.title.storage.info=Storage details observe.ui.title.unique.key=Unique keys used in a referentiel observe.ui.title.welcome.admin=ObServe +observe.ui.tree.action.all.tip=All observe.ui.tree.action.collapseAll.tip=Collapse all observe.ui.tree.action.configure.tip=Configure observe.ui.tree.action.expandAll.tip=Expand all ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -374,7 +374,8 @@ observe.ui.action.locale.fr.tip=Cambiar el idioma de la applicación al francés observe.ui.action.locale.uk=Inglés observe.ui.action.locale.uk.tip=Cambiar el idioma de la applicación al inglés observe.ui.action.move.groupBy.configuration=Criteria configuration\: -observe.ui.action.move.layout.multiple.message=Your are about to move some object from type '%s' beyond the fowolling list\: +observe.ui.action.move.layout.multiple.message=Your are about to move some object from type '%s' +observe.ui.action.move.layout.select.data=Data to move observe.ui.action.move.layout.single.message=Your are about to move all object of type '%s'. observe.ui.action.move.message=Your are about to move %d object(s) of type '%s'\: \#TODO observe.ui.action.open.last.feedback=Feed back \#TODO @@ -836,6 +837,7 @@ observe.ui.title.show.referential.usage=Listas de las utilizaciones de un refere observe.ui.title.storage.info=Información sobre la fuente de datos observe.ui.title.unique.key=Ids de negocio del referencial %1$s observe.ui.title.welcome.admin=ObServe +observe.ui.tree.action.all.tip=All observe.ui.tree.action.collapseAll.tip=Cerrar los nudos observe.ui.tree.action.configure.tip=Configure \#TODO observe.ui.tree.action.expandAll.tip=Abrir los nudos ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -374,7 +374,8 @@ observe.ui.action.locale.fr.tip=Changer la langue de l'application en français observe.ui.action.locale.uk=Anglais observe.ui.action.locale.uk.tip=Changer la langue de l'application en anglais observe.ui.action.move.groupBy.configuration=Configuration des critères \: -observe.ui.action.move.layout.multiple.message=Vous êtes sur le point de déplacer un ensemble de données sur le type '%s' à sélectionner dans la liste suivante \: +observe.ui.action.move.layout.multiple.message=Vous êtes sur le point de déplacer un ensemble de données sur le type '%s' +observe.ui.action.move.layout.select.data=Données à déplacer observe.ui.action.move.layout.single.message=Vous êtes sur le point de déplacer toutes les données de type '%s'. observe.ui.action.move.message=Vous êtes sur le point de déplacer %d donnée(s) de type '%s'\: observe.ui.action.open.last.feedback=Retour d'expérience @@ -836,6 +837,7 @@ observe.ui.title.show.referential.usage=Listes des utilisations d'un référenti observe.ui.title.storage.info=Information sur la source de données observe.ui.title.unique.key=Clefs métier du référentiel %1$s observe.ui.title.welcome.admin=ObServe +observe.ui.tree.action.all.tip=Tout observe.ui.tree.action.collapseAll.tip=Tout grouper observe.ui.tree.action.configure.tip=Configurer observe.ui.tree.action.expandAll.tip=Tout déplier ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripImpl.java ===================================== @@ -34,6 +34,38 @@ public class TripImpl extends TripAbstract { private static final long serialVersionUID = 1L; + public static boolean shouldCopyObservationsMetaData(Trip trip) { + return trip.getObservationsAcquisitionStatus() == null || !trip.getObservationsAcquisitionStatus().isFieldEnabler(); + } + + public static boolean shouldRemoveObservationsMetaData(Trip trip) { + return !trip.isObservationsFilled(); + } + + public static boolean shouldCopyLandingMetaData(Trip trip) { + return trip.getLandingAcquisitionStatus() == null || !trip.getLandingAcquisitionStatus().isFieldEnabler(); + } + + public static boolean shouldRemoveLandingMetaData(Trip trip) { + return !trip.isLandingFilled(); + } + + public static boolean shouldCopyLogbookMetaData(Trip trip) { + return trip.getLogbookAcquisitionStatus() == null || !trip.getLogbookAcquisitionStatus().isFieldEnabler(); + } + + public static boolean shouldRemoveLogbookMetaData(Trip trip) { + return !trip.isLogbookFilled(); + } + + public static boolean shouldCopyLocalmarketMetaData(Trip trip) { + return trip.getLocalMarketAcquisitionStatus() == null || !trip.getLocalMarketAcquisitionStatus().isFieldEnabler(); + } + + public static boolean shouldRemoveLocalmarketMetaData(Trip trip) { + return !trip.isLocalmarketFilled(); + } + @Override public Date getTheoreticalEndDate() { Date lastActivityDate = isRouteObsEmpty() ? null : getRouteObs().stream().map(Route::getDate).max(Date::compareTo).orElse(null); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java ===================================== @@ -263,10 +263,10 @@ public class TripSpi extends GeneratedTripSpi { public void updateObservationsMetadata(SqlScriptWriter writer, Set<Class<? extends DataEntity>> lastUpdateDates, Trip oldTrip, Trip newTrip) { - if (shouldCopyObservationsMetaData(newTrip)) { + if (TripImpl.shouldCopyObservationsMetaData(newTrip)) { writer.writeSql(copyObservationsMetadata(oldTrip, newTrip.getId())); } - if (shouldRemoveObservationsMetaData(newTrip)) { + if (TripImpl.shouldRemoveObservationsMetaData(oldTrip)) { writer.writeSql(removeObservationsMetadata(oldTrip.getId())); } lastUpdateDates.add(fr.ird.observe.entities.data.ps.observation.Route.class); @@ -284,14 +284,6 @@ public class TripSpi extends GeneratedTripSpi { lastUpdateDates.add(fr.ird.observe.entities.data.ps.observation.ObjectObservedSpecies.class); } - private boolean shouldCopyObservationsMetaData(Trip trip) { - return trip.getObservationsAcquisitionStatus() == null || !trip.getObservationsAcquisitionStatus().isFieldEnabler(); - } - - private boolean shouldRemoveObservationsMetaData(Trip trip) { - return !trip.isObservationsFilled(); - } - private String copyObservationsMetadata(Trip trip, String newId) { Program observationsProgram = trip.getObservationsProgram(); AcquisitionStatus observationsAcquisitionStatus = trip.getObservationsAcquisitionStatus(); @@ -339,24 +331,16 @@ public class TripSpi extends GeneratedTripSpi { public void updateLandingMetadata(SqlScriptWriter writer, Set<Class<? extends DataEntity>> lastUpdateDates, Trip oldTrip, Trip newTrip) { String newTripId = newTrip.getTopiaId(); - if (shouldCopyLandingMetaData(newTrip)) { + if (TripImpl.shouldCopyLandingMetaData(newTrip)) { writer.writeSql(copyLandingMetadata(oldTrip, newTripId)); } updateLogbookCommonMetadata(writer, oldTrip, newTrip); - if (shouldRemoveLandingMetaData(newTrip)) { + if (TripImpl.shouldRemoveLandingMetaData(oldTrip)) { writer.writeSql(removeLandingMetadata(oldTrip.getTopiaId())); } lastUpdateDates.add(Landing.class); } - private boolean shouldCopyLandingMetaData(Trip trip) { - return trip.getLandingAcquisitionStatus() == null || !trip.getLandingAcquisitionStatus().isFieldEnabler(); - } - - private boolean shouldRemoveLandingMetaData(Trip trip) { - return !trip.isLandingFilled(); - } - private String copyLandingMetadata(Trip trip, String newId) { AcquisitionStatus landingAcquisitionStatus = trip.getLandingAcquisitionStatus(); Float landingTotalWeight = trip.getLandingTotalWeight(); @@ -379,7 +363,7 @@ public class TripSpi extends GeneratedTripSpi { } public void updateLogbookMetadata(SqlScriptWriter writer, Set<Class<? extends DataEntity>> lastUpdateDates, Trip oldTrip, Trip newTrip) { - if (shouldCopyLogbookMetaData(newTrip)) { + if (TripImpl.shouldCopyLogbookMetaData(newTrip)) { writer.writeSql(copyLogbookMetadata(oldTrip, newTrip.getId())); } // This avoid in others update to do it again @@ -389,7 +373,7 @@ public class TripSpi extends GeneratedTripSpi { // This avoid in others update to do it again newTrip.setLogbookDataQuality(oldTrip.getLogbookDataQuality()); - if (shouldRemoveLogbookMetaData(newTrip)) { + if (TripImpl.shouldRemoveLogbookMetaData(oldTrip)) { writer.writeSql(removeLogbookMetadata(oldTrip.getId())); } if (lastUpdateDates != null) { @@ -407,14 +391,6 @@ public class TripSpi extends GeneratedTripSpi { } } - private boolean shouldCopyLogbookMetaData(Trip trip) { - return trip.getLogbookAcquisitionStatus() == null || !trip.getLogbookAcquisitionStatus().isFieldEnabler(); - } - - private boolean shouldRemoveLogbookMetaData(Trip trip) { - return !trip.isLogbookFilled(); - } - private String copyLogbookMetadata(Trip trip, String newId) { Program logbookProgram = trip.getLogbookProgram(); AcquisitionStatus logbookAcquisitionStatus = trip.getLogbookAcquisitionStatus(); @@ -506,10 +482,10 @@ public class TripSpi extends GeneratedTripSpi { public void updateLocalmarketMetadata(SqlScriptWriter writer, Set<Class<? extends DataEntity>> lastUpdateDates, Trip oldTrip, Trip newTrip) { String newTripId = newTrip.getId(); - if (shouldCopyLocalmarketMetaData(newTrip)) { + if (TripImpl.shouldCopyLocalmarketMetaData(newTrip)) { writer.writeSql(copyLocalmarketMetadata(oldTrip, newTripId)); } - if (shouldRemoveLocalmarketMetaData(newTrip)) { + if (TripImpl.shouldRemoveLocalmarketMetaData(oldTrip)) { writer.writeSql(removeLocalmarketMetadata(oldTrip.getId())); } updateLogbookCommonMetadata(writer, oldTrip, newTrip); @@ -521,14 +497,6 @@ public class TripSpi extends GeneratedTripSpi { lastUpdateDates.add(fr.ird.observe.entities.data.ps.localmarket.SurveyPart.class); } - private boolean shouldCopyLocalmarketMetaData(Trip trip) { - return trip.getLocalMarketAcquisitionStatus() == null || !trip.getLocalMarketAcquisitionStatus().isFieldEnabler(); - } - - private boolean shouldRemoveLocalmarketMetaData(Trip trip) { - return !trip.isLocalmarketFilled(); - } - private String copyLocalmarketMetadata(Trip trip, String newId) { AcquisitionStatus localMarketAcquisitionStatus = trip.getLocalMarketAcquisitionStatus(); AcquisitionStatus localMarketSurveySamplingAcquisitionStatus = trip.getLocalMarketSurveySamplingAcquisitionStatus(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adfa7553972217e57b47cf46… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adfa7553972217e57b47cf46… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Statistique bizarre sur plan de cuves - Closes #2287
by Tony CHEMIT (＠tchemit) April 25, 2022

April 25, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: adfa7553 by Tony Chemit at 2022-04-25T17:35:39+02:00 Statistique bizarre sur plan de cuves - Closes #2287 - - - - - 1 changed file: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java ===================================== @@ -254,15 +254,13 @@ public class ImportEngineExecution extends ImportEngine { ResultSet wellRow = tables.wellTableReader.next(); WellPlan fictiveWellPlan = wellPlanReader.read(context, wellRow); tables.wellSetTableReader.setPrimaryKey(tables.wellTableReader.lastPrimaryKey()); - int tripIdx = 0; while (tables.wellSetTableReader.hasNext()) { ResultSet wellSetRow = tables.wellSetTableReader.next(); WellPlan wellPlan = wellPlanReader.readExtra(context, fictiveWellPlan, wellSetRow); if (wellPlan != null) { - wellPlanWriter.write(wellPlan, tripId, tripIdx++); + wellPlanWriter.write(wellPlan, tripId, wellPlanCount++); } } - wellPlanCount += tripIdx; } if (wellPlanCount > 0) { // found some wellPlan, update targetWellsSamplingAcquisitionStatus View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/adfa7553972217e57b47cf46a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/adfa7553972217e57b47cf46a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Dans le gestionnaire de connexions, l'onglet serveurs pourrait être le premier - Closes #2286
by Tony CHEMIT (＠tchemit) April 24, 2022

April 24, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 65625bbb by Tony Chemit at 2022-04-24T11:26:10+02:00 Dans le gestionnaire de connexions, l'onglet serveurs pourrait être le premier - Closes #2286 - - - - - 39d09581 by Tony Chemit at 2022-04-24T11:26:22+02:00 update i18n - - - - - 12bb3774 by Tony Chemit at 2022-04-24T11:59:07+02:00 Erreur non explicitée s'il manque l'information de base par défaut - Closes #2284 - - - - - 762fb804 by Tony Chemit at 2022-04-24T12:42:47+02:00 Libellé sur UI déplacements - Closes #2281 - - - - - 9 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsUI.jaxx - client/datasource/editor/api/src/main/i18n/getters/java.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 - server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerResources.java - server/configuration/src/test/java/fr/ird/observe/dto/server/ServerModelTest.java - + server/configuration/src/test/resources/META-INF/configuration/security-2284-2.yml - + server/configuration/src/test/resources/META-INF/configuration/security-2284.yml Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsUI.jaxx ===================================== @@ -28,20 +28,20 @@ <RemotePresetsUIModel id="model" initializer="getContextValue(RemotePresetsUIModel.class)"/> <JTabbedPane id='tabs' constraints='BorderLayout.CENTER'> - <tab id='remoteTab' title="observe.ui.datasource.storage.remote.presets.title"> - <JPanel id="remotePanel" layout="{new BorderLayout()}"> - <JScrollPane id='remoteConfigurationsPane' constraints='BorderLayout.CENTER'> - <JList id='remoteConfigurations' genericType="RemoteDataSourceConfiguration"/> + <tab id='serverTab' title="observe.ui.datasource.storage.server.presets.title"> + <JPanel id="serverPanel" layout="{new BorderLayout()}"> + <JScrollPane id='serverConfigurationsPane' constraints='BorderLayout.CENTER'> + <JList id='serverConfigurations' genericType="ServerDataSourceConfiguration"/> </JScrollPane> - <JPanel id="remoteContentPanel" layout="{new CardLayout()}" constraints='BorderLayout.SOUTH' border='{new TitledBorder("")}'> - <JLabel id="noRemoteSelected" constraints='"empty"'/> - <Table id="remoteForm" constraints='"form"' fill="both"> + <JPanel id="serverContentPanel" layout="{new CardLayout()}" constraints='BorderLayout.SOUTH' border='{new TitledBorder("")}'> + <JLabel id="noServerSelected" constraints='"empty"'/> + <Table id="serverForm" constraints='"form"' fill="both"> <row> <cell anchor='west'> <JLabel text='observe.ui.datasource.storage.remote.name'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteName" onKeyReleased="handler.setRemoteModified(event);"/> + <JTextField id="serverName" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> <row> @@ -49,7 +49,7 @@ <JLabel text='observe.ui.datasource.storage.remote.url'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteUrl" onKeyReleased="handler.setRemoteModified(event);"/> + <JTextField id="serverUrl" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> <row> @@ -57,7 +57,7 @@ <JLabel text='observe.ui.datasource.storage.remote.login'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remoteLogin" onKeyReleased="handler.setRemoteModified(event);"/> + <JTextField id="serverLogin" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> <row> @@ -65,24 +65,27 @@ <JLabel text='observe.ui.datasource.storage.remote.password'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="remotePassword" onKeyReleased="handler.setRemoteModified(event);"/> + <JTextField id="serverPassword" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> <row> - <cell columns='2'> - <JCheckBox id="remoteUseSsl" onActionPerformed="model.setRemoteModified(true);"/> + <cell anchor='west'> + <JLabel id="serverDataBaseLabel" text='observe.ui.datasource.storage.server.dataBase'/> + </cell> + <cell weightx='1' fill="both" anchor='east'> + <JTextField id="serverDataBase" onKeyReleased="handler.setServerModified(event);"/> </cell> </row> <row> <cell columns='2'> - <JPanel id="remoteActions" layout="{new GridLayout(1, 0)}"> - <JButton id="cancelRemoteAction"/> - <JButton id="resetRemoteAction"/> - <JButton id="saveRemoteAction"/> - <JButton id="deleteRemoteAction"/> - <JButton id="testRemoteAction"/> - <JButton id="duplicateRemoteAction"/> + <JPanel id="serverActions" layout="{new GridLayout(1, 0)}"> + <JButton id="cancelServerAction"/> + <JButton id="resetServerAction"/> + <JButton id="saveServerAction"/> + <JButton id="deleteServerAction"/> + <JButton id="testServerAction"/> + <JButton id="duplicateServerAction"/> </JPanel> </cell> </row> @@ -90,21 +93,20 @@ </JPanel> </JPanel> </tab> - <tab id='serverTab' title="observe.ui.datasource.storage.server.presets.title"> - - <JPanel id="serverPanel" layout="{new BorderLayout()}"> - <JScrollPane id='serverConfigurationsPane' constraints='BorderLayout.CENTER'> - <JList id='serverConfigurations' genericType="ServerDataSourceConfiguration"/> + <tab id='remoteTab' title="observe.ui.datasource.storage.remote.presets.title"> + <JPanel id="remotePanel" layout="{new BorderLayout()}"> + <JScrollPane id='remoteConfigurationsPane' constraints='BorderLayout.CENTER'> + <JList id='remoteConfigurations' genericType="RemoteDataSourceConfiguration"/> </JScrollPane> - <JPanel id="serverContentPanel" layout="{new CardLayout()}" constraints='BorderLayout.SOUTH' border='{new TitledBorder("")}'> - <JLabel id="noServerSelected" constraints='"empty"'/> - <Table id="serverForm" constraints='"form"' fill="both"> + <JPanel id="remoteContentPanel" layout="{new CardLayout()}" constraints='BorderLayout.SOUTH' border='{new TitledBorder("")}'> + <JLabel id="noRemoteSelected" constraints='"empty"'/> + <Table id="remoteForm" constraints='"form"' fill="both"> <row> <cell anchor='west'> <JLabel text='observe.ui.datasource.storage.remote.name'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverName" onKeyReleased="handler.setServerModified(event);"/> + <JTextField id="remoteName" onKeyReleased="handler.setRemoteModified(event);"/> </cell> </row> <row> @@ -112,7 +114,7 @@ <JLabel text='observe.ui.datasource.storage.remote.url'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverUrl" onKeyReleased="handler.setServerModified(event);"/> + <JTextField id="remoteUrl" onKeyReleased="handler.setRemoteModified(event);"/> </cell> </row> <row> @@ -120,7 +122,7 @@ <JLabel text='observe.ui.datasource.storage.remote.login'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverLogin" onKeyReleased="handler.setServerModified(event);"/> + <JTextField id="remoteLogin" onKeyReleased="handler.setRemoteModified(event);"/> </cell> </row> <row> @@ -128,27 +130,23 @@ <JLabel text='observe.ui.datasource.storage.remote.password'/> </cell> <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverPassword" onKeyReleased="handler.setServerModified(event);"/> + <JTextField id="remotePassword" onKeyReleased="handler.setRemoteModified(event);"/> </cell> </row> <row> - <cell anchor='west'> - <JLabel id="serverDataBaseLabel" text='observe.ui.datasource.storage.server.dataBase'/> - </cell> - <cell weightx='1' fill="both" anchor='east'> - <JTextField id="serverDataBase" onKeyReleased="handler.setServerModified(event);"/> + <cell columns='2'> + <JCheckBox id="remoteUseSsl" onActionPerformed="model.setRemoteModified(true);"/> </cell> </row> - <row> <cell columns='2'> - <JPanel id="serverActions" layout="{new GridLayout(1, 0)}"> - <JButton id="cancelServerAction"/> - <JButton id="resetServerAction"/> - <JButton id="saveServerAction"/> - <JButton id="deleteServerAction"/> - <JButton id="testServerAction"/> - <JButton id="duplicateServerAction"/> + <JPanel id="remoteActions" layout="{new GridLayout(1, 0)}"> + <JButton id="cancelRemoteAction"/> + <JButton id="resetRemoteAction"/> + <JButton id="saveRemoteAction"/> + <JButton id="deleteRemoteAction"/> + <JButton id="testRemoteAction"/> + <JButton id="duplicateRemoteAction"/> </JPanel> </cell> </row> ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -34,6 +34,7 @@ observe.Common.id observe.Common.label observe.Common.lastUpdateDate observe.Common.list.message.none +observe.Common.navigation.config.groupByName observe.Common.needComment observe.Common.storage.not.valid observe.Common.technicalInformation @@ -165,7 +166,6 @@ observe.ui.action.info.storage observe.ui.action.info.storage.tip observe.ui.action.load.from.file observe.ui.action.load.from.file.tip -observe.ui.action.move.groupBy.configuration observe.ui.action.move.layout.multiple.message observe.ui.action.move.layout.single.message observe.ui.action.move.message ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1262,14 +1262,14 @@ observe.data.ps.observation.Route.choice.create.fin.veille.activity=Create end a observe.data.ps.observation.Route.choice.not.create.fin.veille.activity.and.continue=do not create end watch activity and continue observe.data.ps.observation.Route.date=Date observe.data.ps.observation.Route.endLogValue=End log value -observe.data.ps.observation.Route.list.navigation.node=Observations -observe.data.ps.observation.Route.list.title=Observations - List of roads +observe.data.ps.observation.Route.list.navigation.node=Onboard observationsOnboard observations +observe.data.ps.observation.Route.list.title=Onboard observations - List of roads observe.data.ps.observation.Route.message.need.fin.veille.activity=No end watch activity was found in route to close.\n You can\:\n\n\t- Close route without creating the end watch activity\n\t- Create and go the end watch activity\n\t- Cancel and go back to route observe.data.ps.observation.Route.message.not.open=Current route is not open, no modification is possible. observe.data.ps.observation.Route.navigation.unsaved=New route observe.data.ps.observation.Route.startLogValue=Start log value -observe.data.ps.observation.Route.title=Route -observe.data.ps.observation.Route.type=Route +observe.data.ps.observation.Route.title=Onboard observations +observe.data.ps.observation.Route.type=Onboard observations observe.data.ps.observation.Route.validation.activityEndOfSearching.notAvailable=There is already an end watch activity on trip. observe.data.ps.observation.Route.validation.date.after.currentPsCommonTrip.startDate=Date (%2$s) must be after trip start date (%1$s). observe.data.ps.observation.Route.validation.invalid.endLogValue.maximum=End log can't be before start log. ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1262,14 +1262,14 @@ observe.data.ps.observation.Route.choice.create.fin.veille.activity=Crear la act observe.data.ps.observation.Route.choice.not.create.fin.veille.activity.and.continue=No crear la actividad de fin de guardia y continuar observe.data.ps.observation.Route.date=Día de observación observe.data.ps.observation.Route.endLogValue=Corredera de tarde (millas) -observe.data.ps.observation.Route.list.navigation.node=Observations +observe.data.ps.observation.Route.list.navigation.node=Observaciones observe.data.ps.observation.Route.list.title=List of roads \#TODO observe.data.ps.observation.Route.message.need.fin.veille.activity=Ninguna actividad de fin de guardia registrada en la ruta a cerrar.\n Puede \:\n\n\t- Continuar con el cierra de la ruta sin crear la actividad de fin de guardia\n\t- Crear la actividad de fin de guardia e ir a ella\n\t- Cancelar el cierre y continuar con la ruta observe.data.ps.observation.Route.message.not.open=la ruta actual no está abierta, no se pueden hacer modificaciones. observe.data.ps.observation.Route.navigation.unsaved=New ruta observe.data.ps.observation.Route.startLogValue=Corredera de mañana (millas) -observe.data.ps.observation.Route.title=Ruta -observe.data.ps.observation.Route.type=Ruta +observe.data.ps.observation.Route.title=Observaciones +observe.data.ps.observation.Route.type=Observaciones observe.data.ps.observation.Route.validation.activityEndOfSearching.notAvailable=Existe una actividad de fin de guardia en la ruta. observe.data.ps.observation.Route.validation.date.after.currentPsCommonTrip.startDate=El día de observación (%2$s) debe ser superior o igual a la fecha de comienzo de marea (%1$s). observe.data.ps.observation.Route.validation.invalid.endLogValue.maximum=La corredera de tarde no puede ser superior en %1$s a la de mañana. ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1262,14 +1262,14 @@ observe.data.ps.observation.Route.choice.create.fin.veille.activity=Créer l'act observe.data.ps.observation.Route.choice.not.create.fin.veille.activity.and.continue=Ne pas créer l'activité de fin de veille et continuer observe.data.ps.observation.Route.date=Jour d'observation observe.data.ps.observation.Route.endLogValue=Loch du soir (milles) -observe.data.ps.observation.Route.list.navigation.node=Observations -observe.data.ps.observation.Route.list.title=Liste des routes +observe.data.ps.observation.Route.list.navigation.node=Observations embarquées +observe.data.ps.observation.Route.list.title=Liste des observations emabrquées observe.data.ps.observation.Route.message.need.fin.veille.activity=Aucune activité de fin de veille enregistrée sur la route à clôturer.\nVous pouvez \:\n\n\t- Continuer la clôture de la route sans créer cette activité de fin de veille\n\t- Créer l'activité de fin de veille et vous y rendre\n\t- Annuler la fermeture et rester sur la route observe.data.ps.observation.Route.message.not.open=La route courante n'est pas ouverte, aucune modification possible. observe.data.ps.observation.Route.navigation.unsaved=Nouvelle route observe.data.ps.observation.Route.startLogValue=Loch du matin (milles) -observe.data.ps.observation.Route.title=Route -observe.data.ps.observation.Route.type=Route +observe.data.ps.observation.Route.title=Observations embarquées +observe.data.ps.observation.Route.type=Observations embarquées observe.data.ps.observation.Route.validation.activityEndOfSearching.notAvailable=Il existe déjà une activité de fin de veille sur la route observe.data.ps.observation.Route.validation.date.after.currentPsCommonTrip.startDate=Le jour d'observation (%2$s) doit être supérieure ou égale à la date de début de la marée (%1$s). observe.data.ps.observation.Route.validation.invalid.endLogValue.maximum=Le loch du soir ne peut pas être supérieur de %1$s à celui du matin. ===================================== server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerResources.java ===================================== @@ -40,7 +40,7 @@ public class ServerResources { public static final ConfigResource2 SECURITY_CONFIGURATION = new ConfigResource2("/META-INF/configuration/security.yml"); public static final ConfigResource2 LOG_CONFIGURATION = new ConfigResource2("/META-INF/configuration/log.xml"); - static class ConfigResource2 extends ConfigResource { + public static class ConfigResource2 extends ConfigResource { private boolean strict; private boolean forWindows; ===================================== server/configuration/src/test/java/fr/ird/observe/dto/server/ServerModelTest.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.dto.server; */ import fr.ird.observe.server.configuration.ServerConfig; +import fr.ird.observe.server.configuration.ServerResources; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -47,6 +48,33 @@ public class ServerModelTest { configuration = ServerConfig.forTest(); } + + @Test + public void testLoad_issue_2284() { + + ServerResources.ConfigResource2 securityConfiguration = new ServerResources.ConfigResource2("/META-INF/configuration/security-2284.yml"); + + String content = String.join("\n", securityConfiguration.readLines()); + ServerModel model = ServerModelHelper.load(content); + try { + ServerModelHelper.validate(model); + Assert.fail("Should have an error"); + } catch (InvalidServerModelException e) { + Assert.assertEquals("Should have found this message error", "Found two default databases: production and test", e.getMessage()); + } + + securityConfiguration = new ServerResources.ConfigResource2("/META-INF/configuration/security-2284-2.yml"); + + content = String.join("\n", securityConfiguration.readLines()); + model = ServerModelHelper.load(content); + try { + ServerModelHelper.validate(model); + Assert.fail("Should have an error"); + } catch (InvalidServerModelException e) { + Assert.assertEquals("Should have found this message error", "No default databases defined", e.getMessage()); + } + } + @Test public void testLoad() throws Exception { ===================================== server/configuration/src/test/resources/META-INF/configuration/security-2284-2.yml ===================================== @@ -0,0 +1,42 @@ +roles: + - &role-admin + password: a + - &role-technicien + password: a + - &role-referentiel + password: a + - &role-test + password: a +databases: + - &db-production + url: jdbc:postgresql://localhost:5432/obstuna-production + roles: + - *role-admin + - *role-technicien + - *role-referentiel + - &db-test + url: jdbc:postgresql://localhost:5432/obstuna-test + roles: + - *role-admin + - *role-technicien + - *role-referentiel + - *role-test +users: + - login: utilisateur-technicien + password: a + permissions: + - database: *db-production + role: *role-technicien + apiAccess: ALL + validationMode: STRONG + - database: *db-test + role: *role-technicien + apiAccess: PUBLIC + validationMode: PERMISSIVE + - login: utilisateur-referentiel + password: a + permissions: + - database: *db-production + role: *role-referentiel + apiAccess: CLIENT + validationMode: NONE ===================================== server/configuration/src/test/resources/META-INF/configuration/security-2284.yml ===================================== @@ -0,0 +1,44 @@ +roles: + - &role-admin + password: a + - &role-technicien + password: a + - &role-referentiel + password: a + - &role-test + password: a +databases: + - &db-production + url: jdbc:postgresql://localhost:5432/obstuna-production + defaultDatabase: true + roles: + - *role-admin + - *role-technicien + - *role-referentiel + - &db-test + url: jdbc:postgresql://localhost:5432/obstuna-test + defaultDatabase: true + roles: + - *role-admin + - *role-technicien + - *role-referentiel + - *role-test +users: + - login: utilisateur-technicien + password: a + permissions: + - database: *db-production + role: *role-technicien + apiAccess: ALL + validationMode: STRONG + - database: *db-test + role: *role-technicien + apiAccess: PUBLIC + validationMode: PERMISSIVE + - login: utilisateur-referentiel + password: a + permissions: + - database: *db-production + role: *role-referentiel + apiAccess: CLIENT + validationMode: NONE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2376af0a38b08350d2c33e3e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2376af0a38b08350d2c33e3e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-28)
by Tony CHEMIT (＠tchemit) April 20, 2022

April 20, 2022

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 01bd114e by Tony Chemit at 2022-04-20T18:11:28+02:00 Site checkin for project ObServe (version 9.0.0-RC-28) - - - - - 8 changed files: - + 9.0.0-RC-28/CHANGELOG.html - + 9.0.0-RC-28/architecture-logicielle.html - + 9.0.0-RC-28/avdth/common.html - + 9.0.0-RC-28/avdth/index.html - + 9.0.0-RC-28/avdth/landing.html - + 9.0.0-RC-28/avdth/local_market.html - + 9.0.0-RC-28/avdth/logbook.html - + 9.0.0-RC-28/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/01bd114e281368e208847924a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/01bd114e281368e208847924a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-28
by Tony CHEMIT (＠tchemit) April 20, 2022

April 20, 2022

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

1 0