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

[Git][ultreiaio/ird-observe][develop-9.0.x] Deleted 1 commit: Problème de time zone le retour - Closes #2016
by Tony CHEMIT (＠tchemit) 24 Oct '22

24 Oct '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 6a212e9b by Tony Chemit at 2022-10-24T21:56:28+02:00 Problème de time zone le retour - Closes #2016 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -114,6 +114,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> + <lib.version.java4all.java-util>1.1.6</lib.version.java4all.java-util> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6a212e9b00db2cee45d0d0441… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6a212e9b00db2cee45d0d0441… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Deleted 1 commit: Problème de time zone le retour - Closes #2016
by Tony CHEMIT (＠tchemit) 24 Oct '22

24 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 1582f292 by Tony Chemit at 2022-10-24T22:25:06+02:00 Problème de time zone le retour - Closes #2016 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -114,6 +114,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> + <lib.version.java4all.java-util>1.1.6</lib.version.java4all.java-util> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1582f29269294c59de408ed11… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1582f29269294c59de408ed11… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Formulaire équipements - Closes #2494
by Tony CHEMIT (＠tchemit) 24 Oct '22

24 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5108e2da by Tony Chemit at 2022-10-24T22:24:54+02:00 Formulaire équipements - Closes #2494 - - - - - 1582f292 by Tony Chemit at 2022-10-24T22:25:06+02:00 Problème de time zone le retour - Closes #2016 - - - - - 5 changed files: - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java - model/src/main/models/Observe/dto/class/decorator.properties - pom.xml - toolkit/api/src/main/java/fr/ird/observe/spi/decoration/DefaultDecoratorRenderer.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java ===================================== @@ -30,14 +30,18 @@ import io.ultreia.java4all.decoration.Decorator; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.renderer.DefaultTableRenderer; import org.jdesktop.swingx.renderer.StringValue; +import org.nuiton.jaxx.runtime.swing.SwingUtil; +import org.nuiton.jaxx.widgets.number.NumberCellEditor; import javax.swing.JComponent; import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; +import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.util.Collection; @@ -190,6 +194,16 @@ public class JXTableUtil { return getDefaultTableRenderer(sv, true); } + //FIXME Move this back to JAXX (NumberCellEditor) + public static TableCellEditor newInteger4ColumnEditor(boolean useSign) { + NumberCellEditor<Integer> editor = new NumberCellEditor<>(Integer.class, useSign); + editor.getNumberEditor().setSelectAllTextOnError(true); + editor.getNumberEditor().getTextField().setBorder(new LineBorder(Color.GRAY, 2)); + editor.getNumberEditor().setNumberPattern(SwingUtil.INT_4_DIGITS_PATTERN); + return editor; + + } + private static DefaultTableRenderer getDefaultTableRenderer(StringValue sv, boolean useStringValue) { return new DefaultTableRenderer(sv) { @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data; * #L% */ +import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.ProtectedIdsCommon; import fr.ird.observe.dto.referential.common.GearCharacteristicReference; import fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference; @@ -86,9 +87,9 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { editorsByGearCharacteristicId = new TreeMap<>(); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_TEXT, table.getDefaultEditor(Object.class)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_BOOLEAN, table.getDefaultEditor(Boolean.class)); - editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_SIGNED, NumberCellEditor.newIntegerColumnEditor(true)); + editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_SIGNED, JXTableUtil.newInteger4ColumnEditor(true)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_SIGNED, NumberCellEditor.newFloatColumnEditor(true)); - editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_UNSIGNED, NumberCellEditor.newIntegerColumnEditor(false)); + editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_UNSIGNED, JXTableUtil.newInteger4ColumnEditor(false)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_UNSIGNED, NumberCellEditor.newFloatColumnEditor(false)); } return editorsByGearCharacteristicId; ===================================== model/src/main/models/Observe/dto/class/decorator.properties ===================================== @@ -101,6 +101,7 @@ data.ps.pairing.ActivityPairingResultItem=${observationActivity}##$(observe.data presets.RemoteDataSourceConfiguration=${name} presets.ServerDataSourceConfiguration=${name} referential.common.FpaZone=${code}##${this::label} +referential.common.GearCharacteristic=${code}##${this::label}##${unit::onUnit} referential.common.Harbour=${this::label}##${code}##${locode} referential.common.LengthLengthParameter=${speciesFaoCode}##${speciesLabel::speciesSimpleLabel}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${inputSizeMeasureType::labelOrUnknown}##${outputSizeMeasureType::labelOrUnknown} referential.common.LengthWeightParameter=${speciesFaoCode}##${speciesLabel::speciesSimpleLabel}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${sizeMeasureType::labelOrUnknown} ===================================== pom.xml ===================================== @@ -114,6 +114,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> + <lib.version.java4all.java-util>1.1.6</lib.version.java4all.java-util> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> ===================================== toolkit/api/src/main/java/fr/ird/observe/spi/decoration/DefaultDecoratorRenderer.java ===================================== @@ -32,8 +32,6 @@ import io.ultreia.java4all.i18n.I18n; import java.util.Date; import java.util.Locale; -import static io.ultreia.java4all.i18n.I18n.t; - /** * Created on 20/07/2021. * @@ -49,9 +47,6 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { @Override public String onNullValue(String propertyName, Locale locale, Object value) { if (value == null) { - if (propertyName.equals("unit")) { - return t("observe.Common.no.unit"); - } return I18n.l(locale, "observe.Common.none"); } if (propertyName.equals(WithStartEndDate.PROPERTY_VALIDITY_RANGE_LABEL)) { @@ -60,6 +55,13 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { return value.toString(); } + public String onUnit(Locale locale, String value) { + if (value == null) { + return I18n.l(locale, "observe.Common.no.unit"); + } + return value; + } + @Override public String onNullValue(Locale locale, Object value) { if (value == null) return I18n.l(locale, "observe.Common.none"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0068d0bd3eec85ca26cf8d92… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0068d0bd3eec85ca26cf8d92… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Formulaire équipements - Closes #2494
by Tony CHEMIT (＠tchemit) 24 Oct '22

24 Oct '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 211f8ac0 by Tony Chemit at 2022-10-24T15:21:05+02:00 Formulaire équipements - Closes #2494 - - - - - 6a212e9b by Tony Chemit at 2022-10-24T21:56:28+02:00 Problème de time zone le retour - Closes #2016 - - - - - 5 changed files: - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java - model/src/main/models/Observe/dto/class/decorator.properties - pom.xml - toolkit/api/src/main/java/fr/ird/observe/spi/decoration/DefaultDecoratorRenderer.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java ===================================== @@ -30,14 +30,18 @@ import io.ultreia.java4all.decoration.Decorator; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.renderer.DefaultTableRenderer; import org.jdesktop.swingx.renderer.StringValue; +import org.nuiton.jaxx.runtime.swing.SwingUtil; +import org.nuiton.jaxx.widgets.number.NumberCellEditor; import javax.swing.JComponent; import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; +import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.util.Collection; @@ -190,6 +194,16 @@ public class JXTableUtil { return getDefaultTableRenderer(sv, true); } + //FIXME Move this back to JAXX (NumberCellEditor) + public static TableCellEditor newInteger4ColumnEditor(boolean useSign) { + NumberCellEditor<Integer> editor = new NumberCellEditor<>(Integer.class, useSign); + editor.getNumberEditor().setSelectAllTextOnError(true); + editor.getNumberEditor().getTextField().setBorder(new LineBorder(Color.GRAY, 2)); + editor.getNumberEditor().setNumberPattern(SwingUtil.INT_4_DIGITS_PATTERN); + return editor; + + } + private static DefaultTableRenderer getDefaultTableRenderer(StringValue sv, boolean useStringValue) { return new DefaultTableRenderer(sv) { @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data; * #L% */ +import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.ProtectedIdsCommon; import fr.ird.observe.dto.referential.common.GearCharacteristicReference; import fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference; @@ -86,9 +87,9 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { editorsByGearCharacteristicId = new TreeMap<>(); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_TEXT, table.getDefaultEditor(Object.class)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_BOOLEAN, table.getDefaultEditor(Boolean.class)); - editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_SIGNED, NumberCellEditor.newIntegerColumnEditor(true)); + editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_SIGNED, JXTableUtil.newInteger4ColumnEditor(true)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_SIGNED, NumberCellEditor.newFloatColumnEditor(true)); - editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_UNSIGNED, NumberCellEditor.newIntegerColumnEditor(false)); + editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_UNSIGNED, JXTableUtil.newInteger4ColumnEditor(false)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_UNSIGNED, NumberCellEditor.newFloatColumnEditor(false)); } return editorsByGearCharacteristicId; ===================================== model/src/main/models/Observe/dto/class/decorator.properties ===================================== @@ -99,6 +99,7 @@ data.ps.pairing.ActivityPairingResultItem=${observationActivity}##$(observe.data presets.RemoteDataSourceConfiguration=${name} presets.ServerDataSourceConfiguration=${name} referential.common.FpaZone=${code}##${this::label} +referential.common.GearCharacteristic=${code}##${this::label}##${unit::onUnit} referential.common.Harbour=${this::label}##${code}##${locode} referential.common.LengthLengthParameter=${speciesFaoCode}##${speciesLabel::speciesSimpleLabel}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${inputSizeMeasureType::labelOrUnknown}##${outputSizeMeasureType::labelOrUnknown} referential.common.LengthWeightParameter=${speciesFaoCode}##${speciesLabel::speciesSimpleLabel}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${sizeMeasureType::labelOrUnknown} ===================================== pom.xml ===================================== @@ -114,6 +114,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> + <lib.version.java4all.java-util>1.1.6</lib.version.java4all.java-util> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> ===================================== toolkit/api/src/main/java/fr/ird/observe/spi/decoration/DefaultDecoratorRenderer.java ===================================== @@ -32,8 +32,6 @@ import io.ultreia.java4all.i18n.I18n; import java.util.Date; import java.util.Locale; -import static io.ultreia.java4all.i18n.I18n.t; - /** * Created on 20/07/2021. * @@ -49,9 +47,6 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { @Override public String onNullValue(String propertyName, Locale locale, Object value) { if (value == null) { - if (propertyName.equals("unit")) { - return t("observe.Common.no.unit"); - } return I18n.l(locale, "observe.Common.none"); } if (propertyName.equals(WithStartEndDate.PROPERTY_VALIDITY_RANGE_LABEL)) { @@ -60,6 +55,13 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { return value.toString(); } + public String onUnit(Locale locale, String value) { + if (value == null) { + return I18n.l(locale, "observe.Common.no.unit"); + } + return value; + } + @Override public String onNullValue(Locale locale, Object value) { if (value == null) return I18n.l(locale, "observe.Common.none"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72c4c7dac72ad14369e93549… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72c4c7dac72ad14369e93549… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: On a pu en créer une capture sans devenir - Closes #2491
by Tony CHEMIT (＠tchemit) 24 Oct '22

24 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ff1f74b8 by Tony Chemit at 2022-10-24T14:45:09+02:00 On a pu en créer une capture sans devenir - Closes #2491 - - - - - 0068d0bd by Tony Chemit at 2022-10-24T14:45:14+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 - - - - - 7 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 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 ===================================== @@ -11981,7 +11981,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" ] }, { @@ -12129,7 +12130,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 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/05a95b7a9d96332f36afeb34… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/05a95b7a9d96332f36afeb34… You're receiving this email because of your account on gitlab.com.

1 0

[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) 24 Oct '22

24 Oct '22

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) 24 Oct '22

24 Oct '22

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) 24 Oct '22

24 Oct '22

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) 24 Oct '22

24 Oct '22

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) 24 Oct '22

24 Oct '22

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