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

[Git][ultreiaio/ird-observe][release/9.0.16] [jgitflow-maven-plugin]updating poms for branch'release/9.0.16' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 24 Oct '22

24 Oct '22

Tony CHEMIT pushed to branch release/9.0.16 at ultreiaio / ird-observe Commits: caef4c75 by Tony Chemit at 2022-10-24T23:27:56+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.16' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/caef4c751d31f0f7bee95de3c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/caef4c751d31f0f7bee95de3c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-9.0.x] 61 commits: [jgitflow-maven-plugin]updating poms for 9.0.16-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 24 Oct '22

24 Oct '22

Tony CHEMIT pushed to branch master-9.0.x at ultreiaio / ird-observe Commits: df76f14c by Tony Chemit at 2022-10-18T21:15:50+02:00 [jgitflow-maven-plugin]updating poms for 9.0.16-SNAPSHOT development[skip ci] - - - - - b9b55703 by Tony Chemit at 2022-10-18T21:37:13+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 9ca76777 by Tony Chemit at 2022-10-18T21:37:14+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - f3b9e061 by Tony Chemit at 2022-10-18T21:37:15+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - e4891b4e by Tony Chemit at 2022-10-19T10:55:54+02:00 Pom - Move to branch 9.0.x - - - - - 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 - - - - - 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 - - - - - 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 - - - - - 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 - - - - - 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 - - - - - 211f8ac0 by Tony Chemit at 2022-10-24T15:21:05+02:00 Formulaire équipements - Closes #2494 - - - - - e53e3d91 by Tony Chemit at 2022-10-24T23:20:03+02:00 Fix validation message i18n key - - - - - caef4c75 by Tony Chemit at 2022-10-24T23:27:56+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.16' with non-snapshot versions[skip ci] - - - - - e49d4146 by Tony Chemit at 2022-10-24T23:47:14+02:00 [jgitflow-maven-plugin]merging 'release/9.0.16' into 'master-9.0.x' - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - CHANGELOG.md - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.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/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/.mvn/pom.gitflow.develop - client/datasource/.mvn/pom.gitflow.master - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - client/datasource/editor/.mvn/pom.gitflow.develop - client/datasource/editor/.mvn/pom.gitflow.master - client/datasource/editor/api-test/.mvn/pom.gitflow.develop - client/datasource/editor/api-test/.mvn/pom.gitflow.master - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f7e458d7ebd39e6a7669d2f7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f7e458d7ebd39e6a7669d2f7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.16' with non-snapshot versions[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: caef4c75 by Tony Chemit at 2022-10-24T23:27:56+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.16' with non-snapshot versions[skip ci] - - - - - e49d4146 by Tony Chemit at 2022-10-24T23:47:14+02:00 [jgitflow-maven-plugin]merging 'release/9.0.16' into 'master-9.0.x' - - - - - 3ddb2ff9 by Tony Chemit at 2022-10-24T23:47:19+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 51892a0b by Tony Chemit at 2022-10-24T23:47:20+02:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - 52bf0b30 by Tony Chemit at 2022-10-24T23:47:22+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/858366d2792a4a560f2281c5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/858366d2792a4a560f2281c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Fix validation message i18n key
by Tony CHEMIT (＠tchemit) 24 Oct '22

24 Oct '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: e53e3d91 by Tony Chemit at 2022-10-24T23:20:03+02:00 Fix validation message i18n key - - - - - 858366d2 by Tony Chemit at 2022-10-24T23:27:33+02:00 [jgitflow-maven-plugin]updating poms for 9.0.17-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/dto/src/main/java/fr/ird/observe/spi/validation/validators/ps/common/TripCheckEndDate.java - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/211f8ac0676cf5d700f101d6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/211f8ac0676cf5d700f101d6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.16
by Tony CHEMIT (＠tchemit) 24 Oct '22

24 Oct '22

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

1 0

[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