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

[Git][ultreiaio/ird-observe][develop-9.0.x] 3 commits: On a pu en créer une capture sans devenir - Closes #2491
by Tony CHEMIT (＠tchemit) Oct. 24, 2022

Oct. 24, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 71530937 by Tony Chemit at 2022-10-24T13:58:42+02:00 On a pu en créer une capture sans devenir - Closes #2491 - - - - - 12fd40a9 by Tony Chemit at 2022-10-24T14:00:08+02:00 Update Public API doc - - - - - 72c4c7da by Tony Chemit at 2022-10-24T14:26:57+02:00 Lorsque l'on veut créer une nouvelle donnée, on fait **F3**, on peut alors s'affranchir de choisir quoi créer si une seule possibilité existe (cela evite un clic) - Closes #2493 - - - - - 15 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleInsert.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-update-error-validation.xml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Catch/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Catch/validation-update.json - model/src/main/models/Observe/dto/attribute/notNull.properties - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-update.json Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleInsert.java ===================================== @@ -26,11 +26,13 @@ import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; import org.nuiton.jaxx.runtime.swing.action.MenuAction; +import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuListener; +import java.awt.Component; import java.awt.event.ActionEvent; import static io.ultreia.java4all.i18n.I18n.n; @@ -72,9 +74,18 @@ public class ToggleInsert<U extends ContentUI> extends ContentUIActionSupport<U> protected void doActionPerformed(ActionEvent e, U ui) { ui.getToggleInsert().setSelected(true); SwingUtilities.invokeLater(() -> { - JComponent c = ui.getToggleInsert(); JPopupMenu p = ui.getInsertPopup(); - MenuAction.preparePopup(p, c, false); + int componentCount = p.getComponentCount(); + if (componentCount == 1) { + Component component = p.getComponent(0); + if (component.isEnabled() && component instanceof AbstractButton) { + ((AbstractButton) component).doClick(); + ui.getToggleInsert().setSelected(false); + } + } else { + JComponent c = ui.getToggleInsert(); + MenuAction.preparePopup(p, c, false); + } }); } ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -11897,7 +11897,8 @@ { "name": "speciesFate", "comments": [ - "check if referential speciesFate is disabled (only if validation is strong)" + "check if referential speciesFate is disabled (only if validation is strong)", + "speciesFate is mandatory" ] }, { @@ -12045,7 +12046,8 @@ { "name": "speciesFate", "comments": [ - "check if referential speciesFate is disabled (only if validation is strong)" + "check if referential speciesFate is disabled (only if validation is strong)", + "speciesFate is mandatory" ] }, { ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-create-error-validation.xml ===================================== @@ -118,6 +118,11 @@ </field> <field name="speciesFate"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/CatchDto-update-error-validation.xml ===================================== @@ -123,6 +123,11 @@ </field> <field name="speciesFate"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Catch/validation-create.json ===================================== @@ -68,7 +68,8 @@ }, "speciesFate": { "errors": [ - "check if referential speciesFate is disabled (only if validation is strong)" + "check if referential speciesFate is disabled (only if validation is strong)", + "speciesFate is mandatory" ], "warnings": [ "check if referential speciesFate is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/Catch/validation-update.json ===================================== @@ -68,7 +68,8 @@ }, "speciesFate": { "errors": [ - "check if referential speciesFate is disabled (only if validation is strong)" + "check if referential speciesFate is disabled (only if validation is strong)", + "speciesFate is mandatory" ], "warnings": [ "check if referential speciesFate is disabled (only if validation is not strong)" ===================================== model/src/main/models/Observe/dto/attribute/notNull.properties ===================================== @@ -167,6 +167,7 @@ data.ps.observation.Activity.attribute.time=true data.ps.observation.Activity.attribute.vesselActivity=true data.ps.observation.Catch.attribute.informationSource=true data.ps.observation.Catch.attribute.species=true +data.ps.observation.Catch.attribute.speciesFate=true data.ps.observation.FloatingObjectPart.attribute.objectMaterial=true data.ps.observation.NonTargetCatchRelease.attribute.count=true data.ps.observation.NonTargetCatchRelease.attribute.sex=true ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml ===================================== @@ -231,6 +231,12 @@ </field> <field name="schoolType"> +  + <field-validator type="mandatory" short-circuit="true"> + <param name="skip"><![CDATA[ !setEnabled ]]></param> + <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create.json ===================================== @@ -122,7 +122,8 @@ }, "schoolType": { "errors": [ - "check if referential schoolType is disabled (only if validation is strong)" + "check if referential schoolType is disabled (only if validation is strong)", + "schoolType is mandatory except if !setEnabled" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update-error.xml ===================================== @@ -231,6 +231,12 @@ </field> <field name="schoolType"> +  + <field-validator type="mandatory" short-circuit="true"> + <param name="skip"><![CDATA[ !setEnabled ]]></param> + <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json ===================================== @@ -122,7 +122,8 @@ }, "schoolType": { "errors": [ - "check if referential schoolType is disabled (only if validation is strong)" + "check if referential schoolType is disabled (only if validation is strong)", + "schoolType is mandatory except if !setEnabled" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-create-error.xml ===================================== @@ -118,6 +118,11 @@ </field> <field name="speciesFate"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-create.json ===================================== @@ -68,7 +68,8 @@ }, "speciesFate": { "errors": [ - "check if referential speciesFate is disabled (only if validation is strong)" + "check if referential speciesFate is disabled (only if validation is strong)", + "speciesFate is mandatory" ], "warnings": [ "check if referential speciesFate is disabled (only if validation is not strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-update-error.xml ===================================== @@ -123,6 +123,11 @@ </field> <field name="speciesFate"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/Catch/validation-update.json ===================================== @@ -68,7 +68,8 @@ }, "speciesFate": { "errors": [ - "check if referential speciesFate is disabled (only if validation is strong)" + "check if referential speciesFate is disabled (only if validation is strong)", + "speciesFate is mandatory" ], "warnings": [ "check if referential speciesFate is disabled (only if validation is not strong)" View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/372fccbe4dae7df2f2636b0e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/372fccbe4dae7df2f2636b0e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 23 commits: Création relation taille-poids impossible - champ espèce est grisé - Closes #2483
by Tony CHEMIT (＠tchemit) Oct. 24, 2022

Oct. 24, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ee075aa0 by Tony Chemit at 2022-10-24T11:26:07+02:00 Création relation taille-poids impossible - champ espèce est grisé - Closes #2483 - - - - - a3164534 by Tony Chemit at 2022-10-24T11:26:13+02:00 Dto - Always use getId() instead of just this.id (DataGroupByDto simulate id) - - - - - bb5db90a by Tony Chemit at 2022-10-24T11:26:16+02:00 Dto - Add DataGroupByDtoSet.indexOf method Dto - Add DataGroupByDtoSet.propertyType property - - - - - 0ece5605 by Tony Chemit at 2022-10-24T11:26:32+02:00 UI Content - Be able to customize resetFromPreviousUi method and does it for Referential node (try to reselect the reference if found in previous ui model) - - - - - c4539318 by Tony Chemit at 2022-10-24T11:26:47+02:00 UI Content - Add method ContentReferentialUIModelStates.toReference (will be used - - - - - 26f71ecb by Tony Chemit at 2022-10-24T11:26:57+02:00 UI Content Navigation - Do not sort Navigation result data (it has been done by persistence layer) UI Content Navigation - Improve RootNavigationContext and have now a unique method in RootNavigationNode to create new groupBy node UI Content Referential - Improve how to adapt navigation tree after a save or delete of a referential UI Content Navigation - Improve GroupByContainerCapability and move all his logic to his only implementation RootNavigationCapability, be also able to change ContentRootListUINavigationInitializer parentReference UI Content Navigation - Move NavigationResult loading logic to tree model and add a way to update Navigation ui statistics by the model :) UI Content Navigation - Improve NavigationTree code (move out some code from NavigationUIInitializer) and remove some not used code UI Content Navigation - Review method NavigationNode.getChildrenReferences UI Content Navigation - Replace method RootNavigationNode.dataExists by dataNotExists UI Content Navigation - Make NavigationNode without WithClientUIContextApi - - - - - 1d3611c9 by Tony Chemit at 2022-10-24T11:27:03+02:00 UI Content Navigation - Move loadNavigationUI method to a better place and clean DataSourceEditorHandler - - - - - ce898e3f by Tony Chemit at 2022-10-24T11:27:09+02:00 Service - use magic method on entity to get his contract type :) - - - - - f3cf34cf by Tony Chemit at 2022-10-24T11:27:15+02:00 Persistence - Be able to sort DataGroupByValue in correct order (using decorator as natural order) - - - - - 02f7eb54 by Tony Chemit at 2022-10-24T11:27:25+02:00 Decorator - Review DecoratorProviderInitializer, DataGroupByDecoratorDefinition and fix DataGroupBy sortable issues - - - - - 061184f0 by Tony Chemit at 2022-10-24T11:27:31+02:00 Dto ReferentialLocale - introduce property naturalDateSortOrder and used it in decorator to have deterministic code - - - - - 3a30ba72 by Tony Chemit at 2022-10-24T11:27:38+02:00 Decorator - use last decorator api with locale in sort API and ReferentialLocale new property - - - - - d9042aa6 by Tony Chemit at 2022-10-24T11:27:43+02:00 update pom - - - - - 4cccde3a by Tony Chemit at 2022-10-24T11:27:48+02:00 Le schooltype devrait être obligatoire en cas d'activité PS logbook de type 6 - Pêche - Closes #2484 - - - - - 8b730578 by Tony Chemit at 2022-10-24T11:27:58+02:00 update referential validation result - - - - - 34b5b4ec by Tony Chemit at 2022-10-24T11:28:06+02:00 Quadrants des océans Méditerranée et Multiples non initialisés - Closes ultreiaio/ird-observe#2488 - - - - - cc7f64ad by Tony Chemit at 2022-10-24T11:28:13+02:00 Update changelog for v.9.0.16 [skip CI] - - - - - abf6bd65 by Tony Chemit at 2022-10-24T11:28:21+02:00 Meilleur gestion des raccourcis clavier dans le gestionnaire de connexions et du focus - Closes #2489 - - - - - 5b23712b by Tony Chemit at 2022-10-24T11:33:31+02:00 Log - Reduce log level for org.nuiton.topia.persistence.TopiaApplicationContextFactory - - - - - 04cf538e by Tony Chemit at 2022-10-24T11:33:37+02:00 Templates - Fix ToolkitEntityToDtoMapping for RootOpenableEntity - - - - - e1382afb by Tony Chemit at 2022-10-24T11:33:43+02:00 Log - Improve persistence tests log - - - - - 5f89293b by Tony Chemit at 2022-10-24T12:25:32+02:00 Merge branch 'feature/report_v9_0_16' into develop - - - - - 05a95b7a by Tony Chemit at 2022-10-24T12:27:54+02:00 Add ps_logbook Well new model (fix persistence migration (since removal of trip_idx and well_idx) + let a topia id factory do the job) - - - - - 30 changed files: - CHANGELOG.md - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsUIHandler.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/RemoteActionSupport.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/ServerActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyNavigationConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/DeleteReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/SaveContentReferentialUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/CreateNewData.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/capability/GroupByCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/capability/GroupByContainerCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/01612862f7d627bfdf5609b5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/01612862f7d627bfdf5609b5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Update changelog for v.9.0.16 [skip CI]
by Tony CHEMIT (＠tchemit) Oct. 24, 2022

Oct. 24, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 6c41b473 by Tony Chemit at 2022-10-24T11:22:39+02:00 Update changelog for v.9.0.16 [skip CI] - - - - - 372fccbe by Tony Chemit at 2022-10-24T11:22:39+02:00 Meilleur gestion des raccourcis clavier dans le gestionnaire de connexions et du focus - Closes #2489 - - - - - 4 changed files: - CHANGELOG.md - client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsUIHandler.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/RemoteActionSupport.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/ServerActionSupport.java Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,24 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-10-18 21:14. + * Last generated at 2022-10-24 11:21. + +## Version [9.0.16](https://gitlab.com/ultreiaio/ird-observe/-/milestones/242) + +**Closed at 2022-10-24.** + +### Download +* [Client (observe-9.0.16-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.16.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.16-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2483]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2483) **Création relation taille-poids impossible - champ espèce est grisé** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Type::Anomalie 2484]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2484) **Le schooltype devrait être obligatoire en cas d'activité PS logbook de type 6 - Pêche** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2486]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2486) **problème de sauvegarde des échantillons ps logbook** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2487]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2487) **L'ajout d'un référentiel ne met pas à jour l'arbre de navigation** (Thanks to ) (Reported by Tony CHEMIT) + * [[Type::Evolution 2488]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2488) **Quadrants des océans Méditerranée et Multiples non initialisés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2489]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2489) **Meilleur gestion des raccourcis clavier dans le gestionnaire de connexions et du focus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.15](https://gitlab.com/ultreiaio/ird-observe/-/milestones/241) ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsUIHandler.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.presets; * #L% */ -import fr.ird.observe.client.ClientUIContextApplicationComponent; import fr.ird.observe.client.WithClientUIContextApi; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.dto.presets.RemoteDataSourceConfiguration; @@ -34,9 +33,9 @@ import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import javax.swing.DefaultListModel; import javax.swing.JComponent; import javax.swing.JPanel; -import javax.swing.JSplitPane; -import javax.swing.KeyStroke; +import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; +import javax.swing.event.ChangeEvent; import java.awt.CardLayout; import java.awt.event.KeyEvent; import java.util.List; @@ -64,60 +63,95 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC @Override public void afterInit(RemotePresetsUI ui) { - for (Object o : ui.get$objectMap().values()) { - if (o instanceof JSplitPane) { - init((JSplitPane) o); - } + initRemotePanel(ui); + initServerPanel(ui); + + ui.getTabs().addChangeListener(this::onTabChanged); + + onTabChanged(null); + } + + void setServerModified(KeyEvent event) { + if (event.isActionKey()) { + return; } + ui.getModel().setServerModified(true); + } - Decorator remoteDecorator = ClientConfig.getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class, RemoteDataSourceConfiguration.WITH_URL); + void setRemoteModified(KeyEvent event) { + if (event.isActionKey()) { + return; + } + ui.getModel().setRemoteModified(true); + } + + private void onTabChanged(ChangeEvent e) { + JTabbedPane tabbedPane = e == null ? ui.getTabs() : (JTabbedPane) e.getSource(); + int selectedIndex = tabbedPane.getSelectedIndex(); + JComponent toFocus = ui.getCreateAction(); + switch (selectedIndex) { + case 0: + if (ui.getServerForm().isVisible()) { + toFocus = ui.getServerName(); + } + break; + case 1: + if (ui.getRemoteForm().isVisible()) { + toFocus = ui.getRemoteName(); + } + break; + } + SwingUtilities.invokeLater(toFocus::requestFocusInWindow); + } + + private void initRemotePanel(RemotePresetsUI ui) { + Decorator remoteDecorator = getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class, RemoteDataSourceConfiguration.WITH_URL); ui.getRemoteConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(remoteDecorator)); DefaultListModel<RemoteDataSourceConfiguration> remoteModel = new DefaultListModel<>(); - ui.getModel().getRemoteDataSourceConfigurations().forEach(remoteModel::addElement); + RemotePresetsUIModel model = ui.getModel(); + model.getRemoteDataSourceConfigurations().forEach(remoteModel::addElement); ui.getRemoteConfigurations().setModel(remoteModel); ui.getRemoteConfigurations().addListSelectionListener(evt -> { if (ui.getRemoteConfigurations().isSelectionEmpty()) { - - ui.getModel().setRemoteDataSourceConfiguration(null); - ui.getModel().setRemoteModified(false); + model.setRemoteDataSourceConfiguration(null); + model.setRemoteModified(false); } else { - ui.getModel().setRemoteDataSourceConfiguration(ui.getRemoteConfigurations().getSelectedValue()); + model.setRemoteDataSourceConfiguration(ui.getRemoteConfigurations().getSelectedValue()); ui.getRemoteName().requestFocusInWindow(); } }); - ui.getModel().addPropertyChangeListener("remoteDataSourceConfigurations", evt -> { + model.addPropertyChangeListener("remoteDataSourceConfigurations", evt -> { @SuppressWarnings("unchecked") List<RemoteDataSourceConfiguration> newValue = (List<RemoteDataSourceConfiguration>) evt.getNewValue(); - DefaultListModel<RemoteDataSourceConfiguration> model = (DefaultListModel<RemoteDataSourceConfiguration>) ui.getRemoteConfigurations().getModel(); - model.clear(); + DefaultListModel<RemoteDataSourceConfiguration> listModel = (DefaultListModel<RemoteDataSourceConfiguration>) ui.getRemoteConfigurations().getModel(); + listModel.clear(); for (RemoteDataSourceConfiguration remoteDataSourceConfiguration : newValue) { - model.addElement(remoteDataSourceConfiguration); + listModel.addElement(remoteDataSourceConfiguration); } }); - ui.getModel().addPropertyChangeListener("remoteDataSourceConfiguration", evt -> { + model.addPropertyChangeListener("remoteDataSourceConfiguration", evt -> { RemoteDataSourceConfiguration oldValue = (RemoteDataSourceConfiguration) evt.getOldValue(); - - if (ui.getModel().getRemoteDataSourceConfiguration() == null) { + if (model.getRemoteDataSourceConfiguration() == null) { ((CardLayout) ui.getRemoteContentPanel().getLayout()).show(ui.getRemoteContentPanel(), "empty"); ui.getCreateAction().requestFocusInWindow(); } else { if (oldValue == null) { ((CardLayout) ui.getRemoteContentPanel().getLayout()).show(ui.getRemoteContentPanel(), "form"); } - ui.getModel().setRemoteModified(false); + model.setRemoteModified(false); } SwingUtilities.invokeLater(ui::repaint); }); - ui.getModel().addPropertyChangeListener("remoteCreateMode", evt -> { + model.addPropertyChangeListener("remoteCreateMode", evt -> { JPanel remoteActions = ui.getRemoteActions(); if ((Boolean) evt.getNewValue()) { remoteActions.remove(ui.getResetRemoteAction()); @@ -132,54 +166,60 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC } }); ui.getRemoteActions().remove(0); - Decorator serverDecorator = ClientUIContextApplicationComponent.value().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class, ServerDataSourceConfiguration.WITH_URL); + + if (ui.getRemoteConfigurations().getModel().getSize() > 0) { + ui.getRemoteConfigurations().setSelectedIndex(0); + } + } + + private void initServerPanel(RemotePresetsUI ui) { + RemotePresetsUIModel model = ui.getModel(); + Decorator serverDecorator = getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class, ServerDataSourceConfiguration.WITH_URL); ui.getServerConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(serverDecorator)); DefaultListModel<ServerDataSourceConfiguration> ServerModel = new DefaultListModel<>(); - ui.getModel().getServerDataSourceConfigurations().forEach(ServerModel::addElement); + model.getServerDataSourceConfigurations().forEach(ServerModel::addElement); ui.getServerConfigurations().setModel(ServerModel); ui.getServerConfigurations().addListSelectionListener(evt -> { - if (ui.getServerConfigurations().isSelectionEmpty()) { - - ui.getModel().setServerDataSourceConfiguration(null); - ui.getModel().setServerModified(false); + model.setServerDataSourceConfiguration(null); + model.setServerModified(false); } else { - ui.getModel().setServerDataSourceConfiguration(ui.getServerConfigurations().getSelectedValue()); + model.setServerDataSourceConfiguration(ui.getServerConfigurations().getSelectedValue()); ui.getServerName().requestFocusInWindow(); } }); - ui.getModel().addPropertyChangeListener("serverDataSourceConfigurations", evt -> { + model.addPropertyChangeListener("serverDataSourceConfigurations", evt -> { @SuppressWarnings("unchecked") List<ServerDataSourceConfiguration> newValue = (List<ServerDataSourceConfiguration>) evt.getNewValue(); - DefaultListModel<ServerDataSourceConfiguration> model = (DefaultListModel<ServerDataSourceConfiguration>) ui.getServerConfigurations().getModel(); - model.clear(); + DefaultListModel<ServerDataSourceConfiguration> listModel = (DefaultListModel<ServerDataSourceConfiguration>) ui.getServerConfigurations().getModel(); + listModel.clear(); for (ServerDataSourceConfiguration ServerDataSourceConfiguration : newValue) { - model.addElement(ServerDataSourceConfiguration); + listModel.addElement(ServerDataSourceConfiguration); } }); - ui.getModel().addPropertyChangeListener("serverDataSourceConfiguration", evt -> { + model.addPropertyChangeListener("serverDataSourceConfiguration", evt -> { ServerDataSourceConfiguration oldValue = (ServerDataSourceConfiguration) evt.getOldValue(); - if (ui.getModel().getServerDataSourceConfiguration() == null) { + if (model.getServerDataSourceConfiguration() == null) { ((CardLayout) ui.getServerContentPanel().getLayout()).show(ui.getServerContentPanel(), "empty"); ui.getCreateAction().requestFocusInWindow(); } else { if (oldValue == null) { ((CardLayout) ui.getServerContentPanel().getLayout()).show(ui.getServerContentPanel(), "form"); } - ui.getModel().setServerModified(false); + model.setServerModified(false); } SwingUtilities.invokeLater(ui::repaint); }); - ui.getModel().addPropertyChangeListener("serverCreateMode", evt -> { + model.addPropertyChangeListener("serverCreateMode", evt -> { JPanel serverActions = ui.getServerActions(); if ((Boolean) evt.getNewValue()) { serverActions.remove(ui.getResetServerAction()); @@ -196,33 +236,8 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC }); ui.getServerActions().remove(0); - ui.getCreateAction().requestFocusInWindow(); - - if (ui.getRemoteConfigurations().getModel().getSize() > 0) { - ui.getRemoteConfigurations().setSelectedIndex(0); - } - if (ui.getServerConfigurations().getModel().getSize() > 0) { ui.getServerConfigurations().setSelectedIndex(0); } } - - protected void init(JSplitPane editor) { - editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) - .put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), "none"); - } - - protected void setServerModified(KeyEvent event) { - if (event.isActionKey()) { - return; - } - ui.getModel().setServerModified(true); - } - - protected void setRemoteModified(KeyEvent event) { - if (event.isActionKey()) { - return; - } - ui.getModel().setRemoteModified(true); - } } ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/RemoteActionSupport.java ===================================== @@ -40,12 +40,12 @@ abstract class RemoteActionSupport extends RemotePresetsUIActionSupport { @Override protected InputMap getInputMap(RemotePresetsUI ui, int inputMapCondition) { - return ui.getRemoteContentPanel().getInputMap(inputMapCondition); + return ui.getRemotePanel().getInputMap(inputMapCondition); } @Override protected ActionMap getActionMap(RemotePresetsUI ui) { - return ui.getRemoteContentPanel().getActionMap(); + return ui.getRemotePanel().getActionMap(); } } ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/ServerActionSupport.java ===================================== @@ -40,12 +40,12 @@ abstract class ServerActionSupport extends RemotePresetsUIActionSupport { @Override protected InputMap getInputMap(RemotePresetsUI ui, int inputMapCondition) { - return ui.getServerContentPanel().getInputMap(inputMapCondition); + return ui.getServerPanel().getInputMap(inputMapCondition); } @Override protected ActionMap getActionMap(RemotePresetsUI ui) { - return ui.getServerContentPanel().getActionMap(); + return ui.getServerPanel().getActionMap(); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/33992b20948cb52c4ebc845a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/33992b20948cb52c4ebc845a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Meilleur gestion des raccourcis clavier dans le gestionnaire de connexions et...
by Tony CHEMIT (＠tchemit) Oct. 24, 2022

Oct. 24, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 33992b20 by Tony Chemit at 2022-10-24T11:20:54+02:00 Meilleur gestion des raccourcis clavier dans le gestionnaire de connexions et du focus - Closes #2489 - - - - - 3 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsUIHandler.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/RemoteActionSupport.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/ServerActionSupport.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsUIHandler.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.presets; * #L% */ -import fr.ird.observe.client.ClientUIContextApplicationComponent; import fr.ird.observe.client.WithClientUIContextApi; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.dto.presets.RemoteDataSourceConfiguration; @@ -34,9 +33,9 @@ import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import javax.swing.DefaultListModel; import javax.swing.JComponent; import javax.swing.JPanel; -import javax.swing.JSplitPane; -import javax.swing.KeyStroke; +import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; +import javax.swing.event.ChangeEvent; import java.awt.CardLayout; import java.awt.event.KeyEvent; import java.util.List; @@ -64,60 +63,95 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC @Override public void afterInit(RemotePresetsUI ui) { - for (Object o : ui.get$objectMap().values()) { - if (o instanceof JSplitPane) { - init((JSplitPane) o); - } + initRemotePanel(ui); + initServerPanel(ui); + + ui.getTabs().addChangeListener(this::onTabChanged); + + onTabChanged(null); + } + + void setServerModified(KeyEvent event) { + if (event.isActionKey()) { + return; } + ui.getModel().setServerModified(true); + } - Decorator remoteDecorator = ClientConfig.getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class, RemoteDataSourceConfiguration.WITH_URL); + void setRemoteModified(KeyEvent event) { + if (event.isActionKey()) { + return; + } + ui.getModel().setRemoteModified(true); + } + + private void onTabChanged(ChangeEvent e) { + JTabbedPane tabbedPane = e == null ? ui.getTabs() : (JTabbedPane) e.getSource(); + int selectedIndex = tabbedPane.getSelectedIndex(); + JComponent toFocus = ui.getCreateAction(); + switch (selectedIndex) { + case 0: + if (ui.getServerForm().isVisible()) { + toFocus = ui.getServerName(); + } + break; + case 1: + if (ui.getRemoteForm().isVisible()) { + toFocus = ui.getRemoteName(); + } + break; + } + SwingUtilities.invokeLater(toFocus::requestFocusInWindow); + } + + private void initRemotePanel(RemotePresetsUI ui) { + Decorator remoteDecorator = getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class, RemoteDataSourceConfiguration.WITH_URL); ui.getRemoteConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(remoteDecorator)); DefaultListModel<RemoteDataSourceConfiguration> remoteModel = new DefaultListModel<>(); - ui.getModel().getRemoteDataSourceConfigurations().forEach(remoteModel::addElement); + RemotePresetsUIModel model = ui.getModel(); + model.getRemoteDataSourceConfigurations().forEach(remoteModel::addElement); ui.getRemoteConfigurations().setModel(remoteModel); ui.getRemoteConfigurations().addListSelectionListener(evt -> { if (ui.getRemoteConfigurations().isSelectionEmpty()) { - - ui.getModel().setRemoteDataSourceConfiguration(null); - ui.getModel().setRemoteModified(false); + model.setRemoteDataSourceConfiguration(null); + model.setRemoteModified(false); } else { - ui.getModel().setRemoteDataSourceConfiguration(ui.getRemoteConfigurations().getSelectedValue()); + model.setRemoteDataSourceConfiguration(ui.getRemoteConfigurations().getSelectedValue()); ui.getRemoteName().requestFocusInWindow(); } }); - ui.getModel().addPropertyChangeListener("remoteDataSourceConfigurations", evt -> { + model.addPropertyChangeListener("remoteDataSourceConfigurations", evt -> { @SuppressWarnings("unchecked") List<RemoteDataSourceConfiguration> newValue = (List<RemoteDataSourceConfiguration>) evt.getNewValue(); - DefaultListModel<RemoteDataSourceConfiguration> model = (DefaultListModel<RemoteDataSourceConfiguration>) ui.getRemoteConfigurations().getModel(); - model.clear(); + DefaultListModel<RemoteDataSourceConfiguration> listModel = (DefaultListModel<RemoteDataSourceConfiguration>) ui.getRemoteConfigurations().getModel(); + listModel.clear(); for (RemoteDataSourceConfiguration remoteDataSourceConfiguration : newValue) { - model.addElement(remoteDataSourceConfiguration); + listModel.addElement(remoteDataSourceConfiguration); } }); - ui.getModel().addPropertyChangeListener("remoteDataSourceConfiguration", evt -> { + model.addPropertyChangeListener("remoteDataSourceConfiguration", evt -> { RemoteDataSourceConfiguration oldValue = (RemoteDataSourceConfiguration) evt.getOldValue(); - - if (ui.getModel().getRemoteDataSourceConfiguration() == null) { + if (model.getRemoteDataSourceConfiguration() == null) { ((CardLayout) ui.getRemoteContentPanel().getLayout()).show(ui.getRemoteContentPanel(), "empty"); ui.getCreateAction().requestFocusInWindow(); } else { if (oldValue == null) { ((CardLayout) ui.getRemoteContentPanel().getLayout()).show(ui.getRemoteContentPanel(), "form"); } - ui.getModel().setRemoteModified(false); + model.setRemoteModified(false); } SwingUtilities.invokeLater(ui::repaint); }); - ui.getModel().addPropertyChangeListener("remoteCreateMode", evt -> { + model.addPropertyChangeListener("remoteCreateMode", evt -> { JPanel remoteActions = ui.getRemoteActions(); if ((Boolean) evt.getNewValue()) { remoteActions.remove(ui.getResetRemoteAction()); @@ -132,54 +166,60 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC } }); ui.getRemoteActions().remove(0); - Decorator serverDecorator = ClientUIContextApplicationComponent.value().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class, ServerDataSourceConfiguration.WITH_URL); + + if (ui.getRemoteConfigurations().getModel().getSize() > 0) { + ui.getRemoteConfigurations().setSelectedIndex(0); + } + } + + private void initServerPanel(RemotePresetsUI ui) { + RemotePresetsUIModel model = ui.getModel(); + Decorator serverDecorator = getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class, ServerDataSourceConfiguration.WITH_URL); ui.getServerConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(serverDecorator)); DefaultListModel<ServerDataSourceConfiguration> ServerModel = new DefaultListModel<>(); - ui.getModel().getServerDataSourceConfigurations().forEach(ServerModel::addElement); + model.getServerDataSourceConfigurations().forEach(ServerModel::addElement); ui.getServerConfigurations().setModel(ServerModel); ui.getServerConfigurations().addListSelectionListener(evt -> { - if (ui.getServerConfigurations().isSelectionEmpty()) { - - ui.getModel().setServerDataSourceConfiguration(null); - ui.getModel().setServerModified(false); + model.setServerDataSourceConfiguration(null); + model.setServerModified(false); } else { - ui.getModel().setServerDataSourceConfiguration(ui.getServerConfigurations().getSelectedValue()); + model.setServerDataSourceConfiguration(ui.getServerConfigurations().getSelectedValue()); ui.getServerName().requestFocusInWindow(); } }); - ui.getModel().addPropertyChangeListener("serverDataSourceConfigurations", evt -> { + model.addPropertyChangeListener("serverDataSourceConfigurations", evt -> { @SuppressWarnings("unchecked") List<ServerDataSourceConfiguration> newValue = (List<ServerDataSourceConfiguration>) evt.getNewValue(); - DefaultListModel<ServerDataSourceConfiguration> model = (DefaultListModel<ServerDataSourceConfiguration>) ui.getServerConfigurations().getModel(); - model.clear(); + DefaultListModel<ServerDataSourceConfiguration> listModel = (DefaultListModel<ServerDataSourceConfiguration>) ui.getServerConfigurations().getModel(); + listModel.clear(); for (ServerDataSourceConfiguration ServerDataSourceConfiguration : newValue) { - model.addElement(ServerDataSourceConfiguration); + listModel.addElement(ServerDataSourceConfiguration); } }); - ui.getModel().addPropertyChangeListener("serverDataSourceConfiguration", evt -> { + model.addPropertyChangeListener("serverDataSourceConfiguration", evt -> { ServerDataSourceConfiguration oldValue = (ServerDataSourceConfiguration) evt.getOldValue(); - if (ui.getModel().getServerDataSourceConfiguration() == null) { + if (model.getServerDataSourceConfiguration() == null) { ((CardLayout) ui.getServerContentPanel().getLayout()).show(ui.getServerContentPanel(), "empty"); ui.getCreateAction().requestFocusInWindow(); } else { if (oldValue == null) { ((CardLayout) ui.getServerContentPanel().getLayout()).show(ui.getServerContentPanel(), "form"); } - ui.getModel().setServerModified(false); + model.setServerModified(false); } SwingUtilities.invokeLater(ui::repaint); }); - ui.getModel().addPropertyChangeListener("serverCreateMode", evt -> { + model.addPropertyChangeListener("serverCreateMode", evt -> { JPanel serverActions = ui.getServerActions(); if ((Boolean) evt.getNewValue()) { serverActions.remove(ui.getResetServerAction()); @@ -196,33 +236,8 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI>, WithC }); ui.getServerActions().remove(0); - ui.getCreateAction().requestFocusInWindow(); - - if (ui.getRemoteConfigurations().getModel().getSize() > 0) { - ui.getRemoteConfigurations().setSelectedIndex(0); - } - if (ui.getServerConfigurations().getModel().getSize() > 0) { ui.getServerConfigurations().setSelectedIndex(0); } } - - protected void init(JSplitPane editor) { - editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) - .put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), "none"); - } - - protected void setServerModified(KeyEvent event) { - if (event.isActionKey()) { - return; - } - ui.getModel().setServerModified(true); - } - - protected void setRemoteModified(KeyEvent event) { - if (event.isActionKey()) { - return; - } - ui.getModel().setRemoteModified(true); - } } ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/RemoteActionSupport.java ===================================== @@ -40,12 +40,12 @@ abstract class RemoteActionSupport extends RemotePresetsUIActionSupport { @Override protected InputMap getInputMap(RemotePresetsUI ui, int inputMapCondition) { - return ui.getRemoteContentPanel().getInputMap(inputMapCondition); + return ui.getRemotePanel().getInputMap(inputMapCondition); } @Override protected ActionMap getActionMap(RemotePresetsUI ui) { - return ui.getRemoteContentPanel().getActionMap(); + return ui.getRemotePanel().getActionMap(); } } ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/ServerActionSupport.java ===================================== @@ -40,12 +40,12 @@ abstract class ServerActionSupport extends RemotePresetsUIActionSupport { @Override protected InputMap getInputMap(RemotePresetsUI ui, int inputMapCondition) { - return ui.getServerContentPanel().getInputMap(inputMapCondition); + return ui.getServerPanel().getInputMap(inputMapCondition); } @Override protected ActionMap getActionMap(RemotePresetsUI ui) { - return ui.getServerContentPanel().getActionMap(); + return ui.getServerPanel().getActionMap(); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/33992b20948cb52c4ebc845a6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/33992b20948cb52c4ebc845a6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Update changelog for v.9.0.16 [skip CI]
by Tony CHEMIT (＠tchemit) Oct. 24, 2022

Oct. 24, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: f32170a5 by Tony Chemit at 2022-10-24T09:34:19+02:00 Update changelog for v.9.0.16 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,23 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-10-18 21:14. + * Last generated at 2022-10-24 09:32. + +## Version [9.0.16](https://gitlab.com/ultreiaio/ird-observe/-/milestones/242) + +**Closed at 2022-10-24.** + +### Download +* [Client (observe-9.0.16-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.16.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.16-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2483]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2483) **Création relation taille-poids impossible - champ espèce est grisé** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Type::Anomalie 2484]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2484) **Le schooltype devrait être obligatoire en cas d'activité PS logbook de type 6 - Pêche** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2486]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2486) **problème de sauvegarde des échantillons ps logbook** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2487]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2487) **L'ajout d'un référentiel ne met pas à jour l'arbre de navigation** (Thanks to ) (Reported by Tony CHEMIT) + * [[Type::Evolution 2488]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2488) **Quadrants des océans Méditerranée et Multiples non initialisés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.15](https://gitlab.com/ultreiaio/ird-observe/-/milestones/241) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f32170a505a875fb6cdb584db… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f32170a505a875fb6cdb584db… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 3 commits: Le schooltype devrait être obligatoire en cas d'activité PS logbook de type 6...
by Tony CHEMIT (＠tchemit) Oct. 24, 2022

Oct. 24, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: d284b07e by Tony Chemit at 2022-10-24T09:01:16+02:00 Le schooltype devrait être obligatoire en cas d'activité PS logbook de type 6 - Pêche - Closes #2484 - - - - - 2cbb9d2d by Tony Chemit at 2022-10-24T09:01:16+02:00 update referential validation result - - - - - ce412c8c by Tony Chemit at 2022-10-24T09:01:16+02:00 Quadrants des océans Méditerranée et Multiples non initialisés - Closes ultreiaio/ird-observe#2488 - - - - - 17 changed files: - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/persistence/resources/src/main/resources/db/migration/v9/9.0/100-tck_add_referential_for_delete_test-common.sql - core/persistence/resources/src/main/resources/db/migration/v9/9.0/21_0_adapt_table_common_ocean-common.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - 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 - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-dataResult.json - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult.json - model/src/main/models/Observe/dto/attribute/notNullIf.properties - model/src/main/resources/fixtures/global.properties - model/src/main/resources/fixtures/variables.properties Changes: ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -9438,7 +9438,8 @@ { "name": "schoolType", "comments": [ - "check if referential schoolType is disabled (only if validation is strong)" + "check if referential schoolType is disabled (only if validation is strong)", + "schoolType is mandatory except if !setEnabled" ] }, { @@ -9709,7 +9710,8 @@ { "name": "schoolType", "comments": [ - "check if referential schoolType is disabled (only if validation is strong)" + "check if referential schoolType is disabled (only if validation is strong)", + "schoolType is mandatory except if !setEnabled" ] }, { ===================================== core/api/validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -79,6 +79,7 @@ observe.data.ps.localmarket.Survey.validation.date.after.currentPsCommonTrip.end observe.data.ps.localmarket.Survey.validation.date.after.currentPsCommonTrip.startDate observe.data.ps.localmarket.Survey.validation.date.delay.too.long observe.data.ps.localmarket.Survey.validation.uniqueKey +observe.data.ps.logbook.Activity.schoolType.validation.required observe.data.ps.logbook.Activity.setCount.validation.required observe.data.ps.logbook.Activity.setSuccessStatus.validation.required observe.data.ps.logbook.Catch.weight.validation.required ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml ===================================== @@ -231,6 +231,12 @@ </field> <field name="schoolType"> +  + <field-validator type="mandatory" short-circuit="true"> + <param name="skip"><![CDATA[ !setEnabled ]]></param> + <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml ===================================== @@ -231,6 +231,12 @@ </field> <field name="schoolType"> +  + <field-validator type="mandatory" short-circuit="true"> + <param name="skip"><![CDATA[ !setEnabled ]]></param> + <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/100-tck_add_referential_for_delete_test-common.sql ===================================== @@ -20,7 +20,8 @@ -- #L% --- -- Ocean -INSERT INTO common.ocean(topiaId, topiaCreateDate, topiaVersion, lastUpdateDate, code, uri, homeId, needComment, status, label1, label2, label3, label4, label5, label6, label7, label8, northEastAllowed, southEastAllowed, southWestAllowed, northWestAllowed) VALUES ('fr.ird.referential.common.Ocean#0#0', '2009-04-15 00:00:00.002', 16, '2021-09-17 00:00:00.0', '32', NULL, NULL, false, 1, 'Med', 'Méditerranée', 'Méditerrano', NULL, NULL, NULL, NULL, NULL, true, true, true, true); +INSERT INTO common.ocean(topiaId, topiaCreateDate, topiaVersion, lastUpdateDate, code, uri, homeId, needComment, status, label1, label2, label3, label4, label5, label6, label7, label8, northEastAllowed, southEastAllowed, southWestAllowed, northWestAllowed) VALUES ('fr.ird.referential.common.Ocean#1651431107744#0.7000579392148572', '2009-04-15 00:00:00.002', 16, '2021-09-17 00:00:00.0', '4', NULL, NULL, false, 1, 'Med', 'Méditerranée', 'Méditerrano', NULL, NULL, NULL, NULL, NULL, true, false, false, true); +INSERT INTO common.ocean(topiaId, topiaCreateDate, topiaVersion, lastUpdateDate, code, uri, homeId, needComment, status, label1, label2, label3, label4, label5, label6, label7, label8, northEastAllowed, southEastAllowed, southWestAllowed, northWestAllowed) VALUES ('fr.ird.referential.common.Ocean#1651650345031#0.44320492543276846', '2009-04-15 00:00:00.002', 16, '2021-09-17 00:00:00.0', '99', NULL, NULL, false, 1, 'Multiple', 'Multiples', 'múltiple', NULL, NULL, NULL, NULL, NULL, true, true, true, true); -- Organism INSERT INTO common.organism(topiaId, topiaCreateDate, topiaVersion, lastUpdateDate, code, uri, homeId, needComment, status, label1, label2, label3, label4, label5, label6, label7, label8, description, country) VALUES ('fr.ird.referential.common.Organism#0#0', '2015-09-03 11:20:43.546', 2, '2018-10-19 13:30:23.388', '92', NULL, NULL, false, 1, 'Mayotte Marine National Parc 2', 'Parc Naturel Marin de Mayotte 2', 'Parc Naturel Marin de Mayotte 2', NULL, NULL, NULL, NULL, NULL, NULL, 'fr.ird.referential.common.Country#1239832675583#0.9493110781716075'); -- Sex ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/21_0_adapt_table_common_ocean-common.sql ===================================== @@ -31,8 +31,8 @@ UPDATE common.Ocean set lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = to -- For Ocean 3 Pacific UPDATE common.Ocean set lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, northEastAllowed = TRUE, southEastAllowed = TRUE, southWestAllowed = TRUE, northWestAllowed = TRUE WHERE topiaId = 'fr.ird.referential.common.Ocean#1239832686152#0.7039171539191688'; -- For Ocean 4 -UPDATE common.Ocean set lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, northEastAllowed = TRUE, northWestAllowed = TRUE WHERE topiaId = 'fr.ird.entities.referentiel.Ocean#1651431107744#0.7000579392148572'; +UPDATE common.Ocean set lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, northEastAllowed = TRUE, northWestAllowed = TRUE WHERE topiaId = 'fr.ird.entities.referential.common.Ocean#1651431107744#0.7000579392148572'; -- For Ocean 99 -UPDATE common.Ocean set lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, northEastAllowed = TRUE, southEastAllowed = TRUE, southWestAllowed = TRUE, northWestAllowed = TRUE WHERE topiaId = 'fr.ird.entities.referentiel.Ocean#1651650345031#0.44320492543276846'; +UPDATE common.Ocean set lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, northEastAllowed = TRUE, southEastAllowed = TRUE, southWestAllowed = TRUE, northWestAllowed = TRUE WHERE topiaId = 'fr.ird.entities.referential.common.Ocean#1651650345031#0.44320492543276846'; UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.Ocean'; \ No newline at end of file ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json ===================================== @@ -122,7 +122,8 @@ }, "schoolType": { "errors": [ - "check if referential schoolType is disabled (only if validation is strong)" + "check if referential schoolType is disabled (only if validation is strong)", + "schoolType is mandatory except if !setEnabled" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json ===================================== @@ -122,7 +122,8 @@ }, "schoolType": { "errors": [ - "check if referential schoolType is disabled (only if validation is strong)" + "check if referential schoolType is disabled (only if validation is strong)", + "schoolType is mandatory except if !setEnabled" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -29,7 +29,7 @@ common.harbour=98 common.lengthLengthParameter=1 common.lengthMeasureMethod=4 common.lengthWeightParameter=365 -common.ocean=4 +common.ocean=5 common.organism=11 common.person=741 common.sex=6 ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1079,6 +1079,7 @@ observe.data.ps.logbook.Activity.number=Order number observe.data.ps.logbook.Activity.observedSystemTab=Observed systems observe.data.ps.logbook.Activity.originalDataModified=Original data modified? observe.data.ps.logbook.Activity.physicalMeasurements=Physical measurements +observe.data.ps.logbook.Activity.schoolType.validation.required=Mandatory if set operation observe.data.ps.logbook.Activity.setCount=Set count observe.data.ps.logbook.Activity.setCount.validation.required=Mandatory if set operation observe.data.ps.logbook.Activity.setMeasurements=Set measurements ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1079,6 +1079,7 @@ observe.data.ps.logbook.Activity.number=Order number \#TODO observe.data.ps.logbook.Activity.observedSystemTab=Sistema observado observe.data.ps.logbook.Activity.originalDataModified=Original data modified?\#TODO observe.data.ps.logbook.Activity.physicalMeasurements=Physical measurements +observe.data.ps.logbook.Activity.schoolType.validation.required=Mandatory if set operation \#TODO observe.data.ps.logbook.Activity.setCount=Fishing operation count observe.data.ps.logbook.Activity.setCount.validation.required=Mandatory if set operation \#TODO observe.data.ps.logbook.Activity.setMeasurements=Fishing operation measurements ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1079,6 +1079,7 @@ observe.data.ps.logbook.Activity.number=Numéro d'ordre observe.data.ps.logbook.Activity.observedSystemTab=Systèmes observés observe.data.ps.logbook.Activity.originalDataModified=Données d'origine modifiées ? observe.data.ps.logbook.Activity.physicalMeasurements=Paramètres physiques +observe.data.ps.logbook.Activity.schoolType.validation.required=Obligatoire si opération de pêche observe.data.ps.logbook.Activity.setCount=Nombre de coups de pêche observe.data.ps.logbook.Activity.setCount.validation.required=Obligatoire si opération de pêche observe.data.ps.logbook.Activity.setMeasurements=Paramètres de calée ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-dataResult.json ===================================== @@ -39059,6 +39059,11 @@ "scope": "WARNING", "message": "Le champ n\u0027est pas renseigné." }, + { + "fieldName": "schoolType", + "scope": "ERROR", + "message": "Obligatoire si opération de pêche" + }, { "fieldName": "seaSurfaceTemperature", "scope": "WARNING", @@ -39133,6 +39138,11 @@ "scope": "WARNING", "message": "Le champ n\u0027est pas renseigné." }, + { + "fieldName": "schoolType", + "scope": "ERROR", + "message": "Obligatoire si opération de pêche" + }, { "fieldName": "seaSurfaceTemperature", "scope": "WARNING", @@ -39212,6 +39222,11 @@ "scope": "WARNING", "message": "Le champ n\u0027est pas renseigné." }, + { + "fieldName": "schoolType", + "scope": "ERROR", + "message": "Obligatoire si opération de pêche" + }, { "fieldName": "seaSurfaceTemperature", "scope": "WARNING", ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult.json ===================================== @@ -27309,7 +27309,7 @@ "content": { "code": "110", "label": "Chavirage de la poche", - "allowObservation": false, + "allowObservation": true, "allowLogbook": true, "needComment": false, "enabled": true, @@ -174033,7 +174033,7 @@ "localMarketWellsSampling": true, "localMarketSurveySampling": true, "advancedSampling": true, - "fieldEnabler": true, + "fieldEnabler": false, "needComment": false, "enabled": true, "id": "fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999", @@ -177677,6 +177677,54 @@ } ] }, + { + "reference": { + "type": "fr.ird.observe.dto.referential.ps.common.ObservedSystemReference", + "content": { + "code": "74", + "label": "Poisson à rostre", + "allowObservation": false, + "allowLogbook": true, + "needComment": false, + "enabled": true, + "id": "fr.ird.referential.ps.common.ObservedSystem#1464000000000#74", + "lastUpdateDate": "2021-09-17T00:00:00.000Z", + "topiaVersion": 0, + "topiaCreateDate": "2021-09-17T00:00:00.000Z" + } + }, + "messages": [ + { + "fieldName": "label3", + "scope": "WARNING", + "message": "Le libellé espagnol n\u0027est pas traduit." + } + ] + }, + { + "reference": { + "type": "fr.ird.observe.dto.referential.ps.common.ObservedSystemReference", + "content": { + "code": "81", + "label": "Charogne", + "allowObservation": false, + "allowLogbook": true, + "needComment": false, + "enabled": true, + "id": "fr.ird.referential.ps.common.ObservedSystem#1464000000000#81", + "lastUpdateDate": "2021-09-17T00:00:00.000Z", + "topiaVersion": 0, + "topiaCreateDate": "2021-09-17T00:00:00.000Z" + } + }, + "messages": [ + { + "fieldName": "label3", + "scope": "WARNING", + "message": "Le libellé espagnol n\u0027est pas traduit." + } + ] + }, { "reference": { "type": "fr.ird.observe.dto.referential.ps.common.ProgramReference", ===================================== model/src/main/models/Observe/dto/attribute/notNullIf.properties ===================================== @@ -46,6 +46,7 @@ data.ps.localmarket.Batch.attribute.weight=countOrWeightValid data.ps.logbook.Activity.attribute.latitude=floatingObjectEnabled && !setEnabled data.ps.logbook.Activity.attribute.longitude=floatingObjectEnabled && !setEnabled data.ps.logbook.Activity.attribute.quadrant=floatingObjectEnabled && !setEnabled +data.ps.logbook.Activity.attribute.schoolType=!setEnabled data.ps.logbook.Activity.attribute.setCount=!setEnabled data.ps.logbook.Activity.attribute.setSuccessStatus=!setEnabled || reasonForNoFishing != null data.ps.logbook.Catch.attribute.weight=count != null && count > 0 ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=66 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4092 +REFERENTIAL_COUNT=4093 ===================================== model/src/main/resources/fixtures/variables.properties ===================================== @@ -96,7 +96,7 @@ referential.common.common.Harbour.id=fr.ird.referential.common.Harbour#11#0.7 referential.common.common.LengthLengthParameter.id=fr.ird.referential.common.LengthLengthParameter#1464000000000#0 referential.common.common.LengthMeasureMethod.id=fr.ird.referential.common.LengthMeasureMethod#666#01 referential.common.common.LengthWeightParameter.id=fr.ird.referential.common.LengthWeightParameter#201008191245#0.63 -referential.common.common.Ocean.id.delete=fr.ird.referential.common.Ocean#0#0 +referential.common.common.Ocean.id.delete=fr.ird.referential.common.Ocean#1651431107744#0.7000579392148572 referential.common.common.Ocean.id=fr.ird.referential.common.Ocean#1239832686151#0.17595105505051245 referential.common.common.Organism.id.delete=fr.ird.referential.common.Organism#0#0 referential.common.common.Organism.id=fr.ird.referential.common.Organism#1267835067241#0.6705236825871838 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/771e64e4f9cb0d1362eeb6c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/771e64e4f9cb0d1362eeb6c4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 17 commits: Création relation taille-poids impossible - champ espèce est grisé - Closes #2483
by Tony CHEMIT (＠tchemit) Oct. 23, 2022

Oct. 23, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: d341a5d0 by Tony Chemit at 2022-10-22T09:52:58+02:00 Création relation taille-poids impossible - champ espèce est grisé - Closes #2483 - - - - - fc1870ac by Tony Chemit at 2022-10-23T11:28:06+02:00 Dto - Always use getId() instead of just this.id (DataGroupByDto simulate id) - - - - - 5115f29b by Tony Chemit at 2022-10-23T11:28:06+02:00 Dto - Add DataGroupByDtoSet.indexOf method Dto - Add DataGroupByDtoSet.propertyType property - - - - - d7c742df by Tony Chemit at 2022-10-23T11:28:06+02:00 missing i18n key - - - - - bc46c6be by Tony Chemit at 2022-10-23T11:28:06+02:00 UI Content - Be able to customize resetFromPreviousUi method and does it for Referential node (try to reselect the reference if found in previous ui model) - - - - - 3c35615e by Tony Chemit at 2022-10-23T11:28:06+02:00 UI Content - Add method ContentReferentialUIModelStates.toReference (will be used - - - - - 241416fd by Tony Chemit at 2022-10-23T19:20:12+02:00 UI Content Navigation - Do not sort Navigation result data (it has been done by persistence layer) UI Content Navigation - Improve RootNavigationContext and have now a unique method in RootNavigationNode to create new groupBy node UI Content Referential - Improve how to adapt navigation tree after a save or delete of a referential UI Content Navigation - Improve GroupByContainerCapability and move all his logic to his only implementation RootNavigationCapability, be also able to change ContentRootListUINavigationInitializer parentReference UI Content Navigation - Move NavigationResult loading logic to tree model and add a way to update Navigation ui statistics by the model :) UI Content Navigation - Improve NavigationTree code (move out some code from NavigationUIInitializer) and remove some not used code UI Content Navigation - Review method NavigationNode.getChildrenReferences UI Content Navigation - Replace method RootNavigationNode.dataExists by dataNotExists UI Content Navigation - Make NavigationNode without WithClientUIContextApi - - - - - 4eff07bb by Tony Chemit at 2022-10-23T19:20:12+02:00 UI Content Navigation - Move loadNavigationUI method to a better place and clean DataSourceEditorHandler - - - - - 07de1e2a by Tony Chemit at 2022-10-23T19:20:12+02:00 Service - use magic method on entity to get his contract type :) - - - - - 1648ff3f by Tony Chemit at 2022-10-23T19:20:12+02:00 Persistence - Be able to sort DataGroupByValue in correct order (using decorator as natural order) - - - - - cbf13aca by Tony Chemit at 2022-10-23T19:20:12+02:00 Decorator - Review DecoratorProviderInitializer, DataGroupByDecoratorDefinition and fix DataGroupBy sortable issues - - - - - 9bd4f07b by Tony Chemit at 2022-10-23T19:20:12+02:00 Dto ReferentialLocale - introduce property naturalDateSortOrder and used it in decorator to have deterministic code - - - - - 7972120d by Tony Chemit at 2022-10-23T19:20:12+02:00 Decorator - use last decorator api with locale in sort API and ReferentialLocale new property - - - - - 2d1c80eb by Tony Chemit at 2022-10-23T19:20:12+02:00 update pom - - - - - 9eda6e08 by Tony Chemit at 2022-10-23T19:33:41+02:00 Le schooltype devrait être obligatoire en cas d'activité PS logbook de type 6 - Pêche - Closes #2484 - - - - - 0b342a54 by Tony Chemit at 2022-10-23T20:00:32+02:00 Le schooltype devrait être obligatoire en cas d'activité PS logbook de type 6 - Pêche - Closes #2484 - - - - - 771e64e4 by Tony Chemit at 2022-10-23T20:12:12+02:00 update referential validation result - - - - - 30 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/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyNavigationConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/DeleteReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/SaveContentReferentialUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/CreateNewData.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/capability/GroupByCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/capability/GroupByContainerCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/select/SelectNodesByModelNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/select/SelectNodesByPath.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthWeightParameterUI.jaxx - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/referential/GenerateContentReferentialUI.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ab60cbba9c806e0fb3e6fdf5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ab60cbba9c806e0fb3e6fdf5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 30 commits: Persistence - activity date nay be null
by Tony CHEMIT (＠tchemit) Oct. 22, 2022

Oct. 22, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: d4ac0248 by Tony Chemit at 2022-10-19T12:16:22+02:00 Persistence - activity date nay be null - - - - - c5824186 by Tony Chemit at 2022-10-22T07:19:40+02:00 Persistence - Fix ScriptSplitter.filterTable (was taking too much result) - - - - - 5573291e by Tony Chemit at 2022-10-22T07:20:08+02:00 Persistence - Manage now replication task skip if his parent was skip - - - - - 247eb562 by Tony Chemit at 2022-10-22T07:20:47+02:00 Persistence - Manage more complex delete tasks (when a child entity of an entity with a mandatory reverse composition can now manage to be added to the delete tasks - - - - - 775e0be9 by Tony Chemit at 2022-10-22T07:21:00+02:00 Persistence - add date to activityStub - - - - - 964d3e20 by Tony Chemit at 2022-10-22T07:21:39+02:00 FIXME - add modified property to recompute actions (not sure this is necessary) - - - - - b2c03f5b by Tony Chemit at 2022-10-22T07:21:43+02:00 UI - add newCollectionTableCellRenderer - - - - - 1fb70e0b by Tony Chemit at 2022-10-22T07:21:53+02:00 UI - add rowDecorator to EditableTableModel - - - - - 0c84ef63 by Tony Chemit at 2022-10-22T07:22:04+02:00 UI - Open ContentTableUITableModel.moveTo method to deal with complex cases we can not program :( - - - - - d6ba18c7 by Tony Chemit at 2022-10-22T07:22:10+02:00 UI - Improve GenerateContentTableUITableModel to generate more render - - - - - 1a7fbd22 by Tony Chemit at 2022-10-22T07:22:17+02:00 update pom - - - - - 6fd36615 by Tony Chemit at 2022-10-22T07:22:31+02:00 Validation - Fix order in generated validators - - - - - fe52e48d by Tony Chemit at 2022-10-22T07:22:36+02:00 UI - Open SaveContentOpenableUIAdapter.adaptUi method ( - - - - - 293dfc15 by Tony Chemit at 2022-10-22T07:24:20+02:00 Review Usage model - Persistence (to get mandatory and optional data usages) - - - - - 160da4b3 by Tony Chemit at 2022-10-22T07:24:44+02:00 Review Usage model - Service (to get mandatory and optional data usages) - - - - - d3d8987a by Tony Chemit at 2022-10-22T07:24:52+02:00 Review Usage model - UI (to get mandatory and optional data usages) - - - - - a3b7fd3b by Tony Chemit at 2022-10-22T07:25:00+02:00 Review Usage model - RootOpenableService tests (to get mandatory and optional data usages) - - - - - 762a870e by Tony Chemit at 2022-10-22T07:25:18+02:00 Review Usage model - OpenableService tests (to get mandatory and optional data usages) - - - - - 85b0a602 by Tony Chemit at 2022-10-22T07:25:36+02:00 Review Usage model - UsageService tests (to get mandatory and optional data usages) - - - - - ce27ae82 by Tony Chemit at 2022-10-22T07:25:51+02:00 Review Usage model - UsageService tests (to get mandatory and optional data usages) - - - - - 2049b7d3 by Tony Chemit at 2022-10-22T07:26:19+02:00 UI - InLine Table - add move possible and improve focus a bit - - - - - 151f7c9f by Tony Chemit at 2022-10-22T07:44:59+02:00 Persistence - Fix ScriptSplitter.filterTable (was taking too much result) - - - - - 949d3a2e by Tony Chemit at 2022-10-22T07:44:59+02:00 Review Usage model - Persistence resources (to get mandatory and optional data usages) - - - - - 7f2cd161 by Tony Chemit at 2022-10-22T07:58:51+02:00 Log - Reduce log level for org.nuiton.topia.persistence.TopiaApplicationContextFactory - - - - - ffe3fb35 by Tony Chemit at 2022-10-22T08:43:14+02:00 Templates - Fix ToolkitEntityToDtoMapping for RootOpenableEntity - - - - - 2c85cf37 by Tony Chemit at 2022-10-22T08:43:31+02:00 Log - Improve persistence tests log - - - - - 16adf997 by Tony Chemit at 2022-10-22T08:55:54+02:00 Improve a test - - - - - 926a0080 by Tony Chemit at 2022-10-22T08:58:07+02:00 missing i18n key - - - - - a50dd05b by Tony Chemit at 2022-10-22T09:20:35+02:00 UI - Fix ps.logbook.SampleSampleSpecies form focus - - - - - ab60cbba by Tony Chemit at 2022-10-22T09:25:00+02:00 UI - Fix ps.logbook.SampleSampleSpecies form save - Closes #2486 - - - - - 30 changed files: - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/core/src/main/java/fr/ird/observe/client/datasource/usage/UsageForDisplayUIHandler.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - 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/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveContentOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/EditableTable.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/InlineAutoSelectWithMoveUpAndDownShowPopupAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/AddNewRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/DeleteSelectedRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/EditableTableAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveBottom.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveDown.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveTop.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveUp.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/SortableEditableTableAction.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUIHandler.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUITableModel.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIHandlerHelper.java - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/WeightCategoryDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityImpl.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/ActivityStubSpi.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSampleSpeciesSpi.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlUsageModel.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4891b4e9618739121aceca0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e4891b4e9618739121aceca0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 41 commits: Pom - move to version 9.1.0-RC-1-SNAPSHOT
by Tony CHEMIT (＠tchemit) Oct. 21, 2022

Oct. 21, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 512fb7ef by Tony Chemit at 2022-10-19T12:30:48+02:00 Pom - move to version 9.1.0-RC-1-SNAPSHOT - - - - - b4b4202d by Tony Chemit at 2022-10-19T12:30:48+02:00 Persistence - Fix ScriptSplitter.filterTable (was taking too much result) - - - - - 1838938f by Tony Chemit at 2022-10-19T12:30:48+02:00 Persistence - Manage now replication task skip if his parent was skip - - - - - e5f6be80 by Tony Chemit at 2022-10-19T12:30:48+02:00 Persistence - Manage more complex delete tasks (when a child entity of an entity with a mandatory reverse composition can now manage to be added to the delete tasks - - - - - 42b92823 by Tony Chemit at 2022-10-19T12:30:48+02:00 Persistence - Move to persistence model 9.1 - - - - - 38fad83b by Tony Chemit at 2022-10-19T12:59:01+02:00 Persistence - activity date nay be null - - - - - 9786c0fb by Tony Chemit at 2022-10-19T12:59:01+02:00 Persistence - add date to activityStub - - - - - 08c92aae by Tony Chemit at 2022-10-19T12:59:01+02:00 FIXME - add modified property to recompute actions (not sure this is necessary) - - - - - b46e19e4 by Tony Chemit at 2022-10-20T20:54:12+02:00 UI - add newCollectionTableCellRenderer - - - - - 84fdeb6f by Tony Chemit at 2022-10-20T20:54:20+02:00 UI - add rowDecorator to EditableTableModel - - - - - 80f3fd44 by Tony Chemit at 2022-10-20T20:54:24+02:00 UI - Open ContentTableUITableModel.moveTo method to deal with complex cases we can not program :( - - - - - 99767b26 by Tony Chemit at 2022-10-20T20:54:28+02:00 UI - Improve GenerateContentTableUITableModel to generate more render - - - - - cf232029 by Tony Chemit at 2022-10-20T20:54:32+02:00 update pom - - - - - acdd22d3 by Tony Chemit at 2022-10-21T03:11:52+02:00 Validation - Fix order in generated validators - - - - - cd59d0b3 by Tony Chemit at 2022-10-21T07:48:51+02:00 UI - Open SaveContentOpenableUIAdapter.adaptUi method ( - - - - - c9f9a807 by Tony Chemit at 2022-10-21T07:48:58+02:00 Review Usage model - Persistence (to get mandatory and optional data usages) - - - - - 7e84d4aa by Tony Chemit at 2022-10-21T07:58:47+02:00 Review Usage model - Service (to get mandatory and optional data usages) - - - - - 0abe6943 by Tony Chemit at 2022-10-21T07:59:23+02:00 Review Usage model - UI (to get mandatory and optional data usages) - - - - - 25a248d4 by Tony Chemit at 2022-10-21T08:08:46+02:00 Review Usage model - RootOpenableService tests (to get mandatory and optional data usages) - - - - - f772899e by Tony Chemit at 2022-10-21T08:11:34+02:00 Review Usage model - OpenableService tests (to get mandatory and optional data usages) - - - - - 8da1a888 by Tony Chemit at 2022-10-21T08:13:25+02:00 Review Usage model - UsageService tests (to get mandatory and optional data usages) - - - - - 142328f5 by Tony Chemit at 2022-10-21T08:21:58+02:00 Review Usage model - UsageService tests (to get mandatory and optional data usages) - - - - - fe4da298 by Tony Chemit at 2022-10-21T18:24:05+02:00 UI - InLine Table - add move possible and improve focus a bit - - - - - 0f35e6d3 by Tony Chemit at 2022-10-21T18:24:13+02:00 UI - Fix ps.logbook.SampleSampleSpecies form save - - - - - be5d30b8 by Tony Chemit at 2022-10-21T18:24:16+02:00 UI - Fix ps.logbook.SampleSampleSpecies form focus - - - - - a024e87e by Tony Chemit at 2022-10-21T18:24:25+02:00 Add ps_logbook Well new model (dto and persistence and i18n) - - - - - c0c84d7c by Tony Chemit at 2022-10-21T18:24:25+02:00 Add ps_logbook Well new model (api fixtures) - - - - - 7dbe68d2 by Tony Chemit at 2022-10-21T18:24:26+02:00 Add ps_logbook Well new model (server mapping) - - - - - add64814 by Tony Chemit at 2022-10-21T18:24:26+02:00 Add ps_logbook Well new model (persistence resources) - - - - - 9f658b49 by Tony Chemit at 2022-10-21T18:24:26+02:00 Add ps_logbook Well new model (persistence tests) - - - - - 308ce1e4 by Tony Chemit at 2022-10-21T18:24:26+02:00 Add ps_logbook Well new model (validation) - - - - - d09a77c6 by Tony Chemit at 2022-10-21T18:24:26+02:00 Add ps_logbook Well new model (services tests) - - - - - a1401e55 by Tony Chemit at 2022-10-21T18:24:26+02:00 Add ps_logbook Well new model (add new service TripService.getLogbookWellPlanActivities for future ui) - - - - - 82da3d49 by Tony Chemit at 2022-10-21T18:24:27+02:00 Add ps_logbook Well new model (fix ui generators, new cases... Should really rethink this generator) - - - - - 3e0efa5b by Tony Chemit at 2022-10-21T18:24:27+02:00 Add ps_logbook Well new model (persistence - avdth migration) - - - - - 0115d14f by Tony Chemit at 2022-10-21T18:24:27+02:00 Add ps_logbook Well new model (update server public doc) - - - - - d86fefac by Tony Chemit at 2022-10-21T18:24:27+02:00 Add ps_logbook Well new model (adapt reports) - - - - - ea32c790 by Tony Chemit at 2022-10-21T18:24:27+02:00 Add ps_logbook Well new model (ui) - - - - - 305369c3 by Tony Chemit at 2022-10-21T18:24:27+02:00 Add ps_logbook Well new model (specification) - - - - - eea0e65e by Tony Chemit at 2022-10-21T18:24:27+02:00 Add ps_logbook Well new model (ui) - - - - - 01612862 by Tony Chemit at 2022-10-21T18:55:39+02:00 Merge branch 'feature/issue_2478_well_plan' into develop Closes #2478 ^^ - - - - - 30 changed files: - .gitignore - client/configuration/pom.xml - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/usage/UsageForDisplayUIHandler.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveContentOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/EditableTable.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/InlineAutoSelectWithMoveUpAndDownShowPopupAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/AddNewRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/DeleteSelectedRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/EditableTableAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveBottom.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveDown.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveTop.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/MoveUp.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ui/table/action/SortableEditableTableAction.java - 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/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/common/TripLogbookUI.capabilities The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f3b9e06160e66d67bc688dca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f3b9e06160e66d67bc688dca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch develop-8.x
by Tony CHEMIT (＠tchemit) Oct. 21, 2022

Oct. 21, 2022

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

1 0