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

[Git][ultreiaio/ird-observe][develop] Mise en place d'un cache avdth pour les données de tests. Il n'y a plus rien dans le projet :)
by Tony CHEMIT (＠tchemit) Nov. 29, 2021

Nov. 29, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7405c000 by Tony Chemit at 2021-11-29T12:38:18+01:00 Mise en place d'un cache avdth pour les données de tests. Il n'y a plus rien dans le projet :) - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -142,7 +142,7 @@ <persistence.previous.model.version>8.0</persistence.previous.model.version> <tck.filename>tck-v${persistence.model.version}.zip</tck.filename> <tck.updated.filename>updated-${tck.filename}</tck.updated.filename> - <tck.remote.path>/var/www/html/private/ird-observe/db</tck.remote.path> + <tck.remote.path>/var/www/html/private/ird-observe/tck</tck.remote.path> <tck.cache.path>${user.home}/.mvn/tck-cache/${model.name}/tck</tck.cache.path>  <avdth.filename>avdth-v${persistence.model.version}.zip</avdth.filename> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7405c000bfee62a3d3d2dbf38… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7405c000bfee62a3d3d2dbf38… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: En création d'échantillon LL logbook, le bouton Annuler n'est pas...
by Tony CHEMIT (＠tchemit) Nov. 29, 2021

Nov. 29, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ab8d238d by Tony Chemit at 2021-11-29T11:02:35+01:00 En création d'échantillon LL logbook, le bouton Annuler n'est pas immédiatement disponible - Closes #2128 - - - - - 68c17bcc by Tony Chemit at 2021-11-29T12:26:26+01:00 Mise en place d'un cache avdth pour les données de tests. Il n'y a plus rien dans le projet :) - - - - - 13 changed files: - .gitignore - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/AvdthFixtures.java - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthReferentialBuilderTest.java - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthWeightCategoryBuilderTest.java - pom.xml - tests/test/src/main/filtered-resources/observetest.properties Changes: ===================================== .gitignore ===================================== @@ -20,9 +20,3 @@ /src/site/markdown/CHANGELOG.md /src/site/markdown/*Config.md /src/site/resources/*Config.properties -/tests/test/src/main/resources/tck/ -/tests/test/src/main/resources/tck/* -/tests/test/src/main/resources/tck/*/* -/tests/test/src/main/resources/tck-update/ -/models/persistence/java/src/test/resources/avdth/ -/models/persistence/.mvn/avdth/ ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jcss ===================================== @@ -22,14 +22,13 @@ #states { editable:true; - modified:{getValidator().isChanged()}; - valid:{getValidator().isValid()}; enabled:{!states.isReadingMode()}; } #actions { visible:{states.isEditable()}; } + #extraActions { visible:false; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss ===================================== @@ -24,7 +24,7 @@ valid:{getValidator().isValid() && getValidatorTable().isValid()}; modified:{tableModel.isModified() || getValidator().isChanged()}; canSaveRow:{getValidatorTable().isChanged() && getValidatorTable().isValid()}; - canResetRow:{getValidatorTable().isChanged()}; + canResetRow:{tableModel.isCreate() || getValidatorTable().isChanged()}; editable:true; enabled:{!states.isReadingMode()}; } @@ -70,8 +70,8 @@ } #resetEntry { - enabled:{tableModel.isCreate() || states.isCanResetRow()}; visible:{tableModel.isEditable() && (tableModel.isCreate() || !tableModel.isEmpty())}; + enabled:{states.isCanResetRow()}; } #saveEntry { @@ -94,7 +94,7 @@ #reset { visible:{states.isEnabled()}; - enabled:{states.isModified()}; + enabled:{states.isModified() || tableModel.isCreate()}; } #save { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUI.jcss ===================================== @@ -22,7 +22,7 @@ #states { samplePartUIModel:{samplePartUI.getModel()}; - modified:{validator.isChanged() || samplePartStates.isModified()}; + modified:{validator.isChanged() || samplePartStates.isModified() || samplePartStates.isCanResetRow()}; valid:{validator.isValid() && samplePartStates.isValid()}; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jcss ===================================== @@ -20,6 +20,11 @@ * #L% */ +#states { + modified:{getValidator().isChanged()}; + valid:{getValidator().isValid()}; +} + DateTimeEditor { showReset:true; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.jcss ===================================== @@ -20,6 +20,11 @@ * #L% */ +#states { + modified:{getValidator().isChanged()}; + valid:{getValidator().isValid()}; +} + #shooterSpeed { enabled:{Objects.equals(true, bean.getShooterUsed())}; } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUI.jcss ===================================== @@ -20,6 +20,11 @@ * #L% */ +#states { + modified:{getValidator().isChanged()}; + valid:{getValidator().isValid()}; +} + #startTime { propertyDayDate: {SetDto.PROPERTY_START_SET_DATE}; propertyTimeDate: {SetDto.PROPERTY_START_SET_TIME}; ===================================== models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/AvdthFixtures.java ===================================== @@ -23,7 +23,9 @@ package fr.ird.observe.persistence.avdth; */ import fr.ird.observe.test.ObserveFixtures; +import fr.ird.observe.test.ObserveTestConfiguration; +import java.nio.file.Path; import java.util.Map; /** @@ -35,7 +37,7 @@ import java.util.Map; public class AvdthFixtures extends ObserveFixtures { public static final Map<String, String> AVDTH = loadFixturesMap("avdth"); - + public static final String AVDTH_CACHE_PATH = "observetest.avdth.cache.path"; /** * To force prepare even if prepare step is not valid. */ @@ -48,9 +50,21 @@ public class AvdthFixtures extends ObserveFixtures { * To launch import for all years. */ public static final boolean IMPORT_ALL_YEARS = Boolean.parseBoolean(System.getProperty("test_allYears", "false")); + /** + * Root path of avdth databases. + */ + private static Path avdthCachePath; + + public static Path getAvdthCachePath() { + if (avdthCachePath == null) { + avdthCachePath = Path.of(ObserveTestConfiguration.getTestPropertyAsString(AVDTH_CACHE_PATH)); + } + return avdthCachePath; + } public static void assertAvdthFixture(String fixtureName, Object actual) { String expected = AVDTH.get(fixtureName); assertFixture(fixtureName, expected, actual); } + } ===================================== models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java ===================================== @@ -47,7 +47,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -97,11 +96,7 @@ public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupport } public static Path getPath(String type) { - return new File("").getAbsoluteFile().toPath() - .getParent() - .resolve(".mvn") - .resolve("avdth") - .resolve(type); + return AvdthFixtures.getAvdthCachePath().resolve(type); } protected abstract Path getRootPath(); ===================================== models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthReferentialBuilderTest.java ===================================== @@ -36,7 +36,6 @@ import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Test; -import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.sql.Connection; @@ -53,10 +52,7 @@ public class AvdthReferentialBuilderTest extends PersistenceTestSupportRead { @Test public void build() throws SQLException, IOException { - Path avdthFile = new File("").getAbsoluteFile().toPath() - .getParent() - .resolve(".mvn") - .resolve("avdth") + Path avdthFile = AvdthFixtures.getAvdthCachePath() .resolve("OA") .resolve("OA_2020_V35.mdb"); Path scriptPath = localTestMethodResource.getTestDirectory().toPath().resolve("export-" + avdthFile.toFile().getName().replace(".mdb", ".sql")); ===================================== models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthWeightCategoryBuilderTest.java ===================================== @@ -35,7 +35,6 @@ import fr.ird.observe.test.spi.DatabaseNameConfiguration; import org.junit.Assert; import org.junit.Test; -import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.sql.Connection; @@ -52,10 +51,7 @@ public class AvdthWeightCategoryBuilderTest extends PersistenceTestSupportRead { @Test public void build() throws SQLException, IOException { - Path avdthFile = new File("").getAbsoluteFile().toPath() - .getParent() - .resolve(".mvn") - .resolve("avdth") + Path avdthFile = AvdthFixtures.getAvdthCachePath() .resolve("avdth-gen-35_74.mdb"); Path scriptPath = localTestMethodResource.getTestDirectory().toPath().resolve("export-" + avdthFile.toFile().getName().replace(".mdb", ".sql")); Path scriptTemporaryDirectory = scriptPath.getParent().resolve(scriptPath.toFile().getName().replace(".sql", "-tmp")); ===================================== pom.xml ===================================== @@ -140,11 +140,15 @@ <persistence.model.version>9.0</persistence.model.version>  <persistence.previous.model.version>8.0</persistence.previous.model.version> -  <tck.filename>tck-v${persistence.model.version}.zip</tck.filename> <tck.updated.filename>updated-${tck.filename}</tck.updated.filename> <tck.remote.path>/var/www/html/private/ird-observe/db</tck.remote.path> <tck.cache.path>${user.home}/.mvn/tck-cache/${model.name}/tck</tck.cache.path> +  + <avdth.filename>avdth-v${persistence.model.version}.zip</avdth.filename> +  + <avdth.remote.path>/var/www/html/private/ird-observe/avdth</avdth.remote.path> + <avdth.cache.path>${user.home}/.mvn/tck-cache/${model.name}/avdth</avdth.cache.path>  <test.skipAsserts>false</test.skipAsserts> <runner.modelName>${model.name}</runner.modelName> ===================================== tests/test/src/main/filtered-resources/observetest.properties ===================================== @@ -24,6 +24,7 @@ observetest.build.version=${project.version} observetest.model.version=${persistence.model.version} observetest.previous.model.version=${persistence.previous.model.version} observetest.tck.cache.path=${tck.cache.path} +observetest.avdth.cache.path=${avdth.cache.path} observetest.first.model.version=7.0 observetest.h2.login=sa observetest.h2.password=sa View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8c797b044b3dcc441d978015… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8c797b044b3dcc441d978015… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: make migration deterministic.
by Tony CHEMIT (＠tchemit) Nov. 29, 2021

Nov. 29, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2e0d94ef by Tony Chemit at 2021-11-28T19:11:28+01:00 make migration deterministic. - - - - - 62f9ff24 by Tony Chemit at 2021-11-28T22:53:32+01:00 update pom - - - - - 0f06b77b by Tony Chemit at 2021-11-28T22:58:49+01:00 Modifier des codes de références ajoutées par la migration V7/8/9 - See ultreiaio/ird-observe#2125 - - - - - cb4617bb by Tony Chemit at 2021-11-28T22:59:17+01:00 Modifier des codes de références ajoutées par la migration V7/8/9 - See ultreiaio/ird-observe#2125 - - - - - edeb7dba by Tony Chemit at 2021-11-28T23:00:56+01:00 Modifier des codes de références ajoutées par la migration V7/8/9 - See ultreiaio/ird-observe#2125 - - - - - a4b0e03e by Tony Chemit at 2021-11-28T23:32:27+01:00 add new mojo to delete tck cache - - - - - 381d8b02 by Tony Chemit at 2021-11-28T23:34:58+01:00 tidy poms - - - - - a8941318 by Tony Chemit at 2021-11-28T23:57:50+01:00 set log to debug in NodeContentBuilder - - - - - def0ba21 by Tony Chemit at 2021-11-29T00:09:50+01:00 skip some avdth test (the one for all) - - - - - 320597f1 by Tony Chemit at 2021-11-29T00:31:21+01:00 bad files!!! - - - - - 8c797b04 by Tony Chemit at 2021-11-29T01:52:42+01:00 Il faut consolider le code de migration concernant les relations many-to-many - See ultreiaio/ird-observe#2129 - - - - - 30 changed files: - client/datasource/editor/spi/pom.xml - models/definition/pom.xml - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthAtlanticDataBuilderAllTest.java - models/persistence/avdth/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthIndianDataBuilderAllTest.java - models/persistence/java/src/main/java/fr/ird/observe/spi/tree/navigation/NodeContentBuilder.java - models/persistence/migration/pom.xml - models/persistence/migration/src/main/java/fr/ird/observe/entities/migration/v8/DataSourceMigrationForVersion_8_0.java - models/persistence/migration/src/main/java/fr/ird/observe/entities/migration/v8/DataSourceMigrationForVersion_8_1.java - models/persistence/migration/src/main/java/fr/ird/observe/entities/migration/v9/DataSourceMigrationForVersion_9_0.java - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_common_VesselType_14-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_common_VesselType_15-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_common_VesselType_16-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_common_VesselType_17-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_ll_common_VesselActivity_CRUISE-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_ll_common_VesselActivity_DRIFT-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_ll_common_VesselActivity_OUTZEE-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_ll_common_VesselActivity_PORT-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_ll_common_VesselActivity_REPAIR-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_ll_common_VesselActivity_TRANSSHIP-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_add_referential_ll_common_VesselActivity_UNK-common.sql - − models/persistence/migration/src/main/resources/db/migration/v8/8.0/01_update_referential-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/30_add_referential_common_Country_92-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/30_add_referential_common_Country_93-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/30_add_referential_common_Person_Augustin-Emilie-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/30_add_referential_common_Person_Bamboche-Nattyfa-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/30_add_referential_common_Person_Boniface-Breta-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/30_add_referential_common_Person_Claude-Samantha-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/30_add_referential_common_Person_Dogley-Ruby-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/30_add_referential_common_Person_Julienne-Cynthia-common.sql - + models/persistence/migration/src/main/resources/db/migration/v8/8.0/30_add_referential_common_Person_Labrosse-Valentina-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/88bf4b77858260fc82981713… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/88bf4b77858260fc82981713… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Move to correct layer script producers API
by Tony CHEMIT (＠tchemit) Nov. 28, 2021

Nov. 28, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ecb2098a by Tony Chemit at 2021-11-28T06:58:14+01:00 Move to correct layer script producers API - - - - - 2b4babd8 by Tony Chemit at 2021-11-28T09:10:08+01:00 Review tck API and tests - See ultreiaio/ird-observe-toolkit#109 - - - - - d4262e56 by Tony Chemit at 2021-11-28T09:14:54+01:00 En mode serveur les échantillons LL logbook rattachés à une activité retournent une erreur JSON - Closes #2127 - - - - - 88bf4b77 by Tony Chemit at 2021-11-28T10:02:41+01:00 update pom - - - - - 30 changed files: - client/configuration/src/main/filtered-resources/observe-client.conf - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/test/java/fr/ird/observe/client/datasource/api/TemplateClassResource.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/Start.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java - client/datasource/editor/spi/pom.xml - + client/runner/.mvn/need-tck - client/runner/src/test/java/fr/ird/observe/client/ClientTestClassResource.java - client/runner/src/test/java/fr/ird/observe/client/ObserveTextGeneratorTest.java - client/runner/src/test/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionValidatorServiceTest.java - models/definition/pom.xml - models/definition/src/main/models/Observe/dto/00-common.model - models/definition/src/main/models/Observe/dto/31-data-ll-logbook.model - models/definition/src/main/models/Observe/persistence/00-common.model - models/dto/java/src/test/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPresetStorageTest.java - + models/persistence/avdth/.mvn/need-tck - models/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - + models/persistence/migration/.mvn/need-tck-archive - models/persistence/migration/pom.xml - − models/persistence/migration/src/main/resources/db/migration/v9/9.0/05_full-schema-ps_logbook-H2.sql - − models/persistence/migration/src/main/resources/db/migration/v9/9.0/05_full-schema-ps_logbook-PG.sql - − models/persistence/migration/src/main/resources/db/migration/v9/9.0/06_full-schema-ps_landing-H2.sql - − models/persistence/migration/src/main/resources/db/migration/v9/9.0/06_full-schema-ps_landing-PG.sql - − models/persistence/migration/src/main/resources/db/migration/v9/9.0/07_full-schema-ps_localmarket-H2.sql - − models/persistence/migration/src/main/resources/db/migration/v9/9.0/07_full-schema-ps_localmarket-PG.sql - models/persistence/test-api/src/main/java/fr/ird/observe/persistence/test/api/PersistenceTestClassResource.java - models/persistence/test-api/src/main/java/fr/ird/observe/persistence/test/api/PersistenceTestSupportRead.java - models/persistence/test-api/src/main/java/fr/ird/observe/persistence/test/api/PersistenceTestSupportWrite.java - + models/persistence/test-impl/.mvn/need-tck The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2f40bf875b684badf94b8780… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2f40bf875b684badf94b8780… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT (＠tchemit) Nov. 25, 2021

Nov. 25, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ad288785 by Tony Chemit at 2021-11-25T15:05:50+01:00 update pom - - - - - 2f40bf87 by Tony Chemit at 2021-11-25T17:00:33+01:00 Il manque des orber-by dans le modèle de persistence - See ultreiaio/ird-observe#2123 - - - - - 30 changed files: - models/definition/src/main/models/Observe/persistence/attribute/notNull.properties - models/definition/src/main/models/Observe/persistence/attribute/orderBy.properties - models/definition/src/main/models/Observe/persistence/attribute/unique.properties - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ll/common/Trip/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ll/landing/Landing/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ll/logbook/Catch/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ll/logbook/Set/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ll/observation/Activity/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ll/observation/Catch/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ll/observation/Set/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ll/observation/Tdr/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ps/common/GearUseFeatures/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ps/common/Trip/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ps/localmarket/Sample/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ps/localmarket/SampleSpecies/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ps/localmarket/Survey/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ps/logbook/Sample/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ps/logbook/SampleSpecies/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ps/observation/FloatingObject/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/data/ps/observation/Set/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/referential/common/Gear/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/referential/common/Species/definition.json - models/persistence/java/src/main/definition/fr/ird/observe/entities/referential/common/SpeciesList/definition.json - models/persistence/migration/src/main/java/fr/ird/observe/entities/migration/v9/DataSourceMigrationForVersion_9_0.java - models/persistence/migration/src/main/resources/db/migration/v9/9.0/05_create-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/05_create-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/05_full-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/05_full-schema-ps_logbook-PG.sql - + models/persistence/migration/src/main/resources/db/migration/v9/9.0/15_add_missing_primary_key-common.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/empty-schema-H2.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0c8efe7341fd1afb89d13860… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0c8efe7341fd1afb89d13860… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Add SpringLayout support to ContentUIHandler
by Tony CHEMIT (＠tchemit) Nov. 25, 2021

Nov. 25, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bc434066 by Tony Chemit at 2021-11-25T10:28:57+01:00 Add SpringLayout support to ContentUIHandler - - - - - 061bb2ef by Tony Chemit at 2021-11-25T10:29:09+01:00 Fix some ui layout - - - - - 0c8efe73 by Tony Chemit at 2021-11-25T10:59:19+01:00 Revoir la couleurs des noeuds non chargés (bleus actuellement) - See #2095 - - - - - 6 changed files: - client/configuration/src/main/config/Client.ini - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselUI.jaxx - client/runner/src/main/resources/META-INF/configuration/ClientConfig.md - client/runner/src/main/resources/META-INF/configuration/ClientConfig.properties Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -898,7 +898,7 @@ defaultValue = java.awt.Color[r=255,g=0,b=0] description = observe.config.ui.tree.node.unloaded.color key = ui.tree.node.unloaded.color type = color -defaultValue = java.awt.Color[r=0,g=0,b=255] +defaultValue = java.awt.Color[r=144,g=144,b=241] [option nodeEmptyColor] description = observe.config.ui.tree.node.empty.color ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.GoToTab; import fr.ird.observe.client.datasource.editor.api.content.ui.DataReferenceListCellRenderer; import fr.ird.observe.client.datasource.editor.api.content.ui.ReferentialReferenceListCellRenderer; import fr.ird.observe.client.datasource.validation.ObserveSwingValidator; +import fr.ird.observe.client.util.SpringUtilities; import fr.ird.observe.client.util.init.DefaultUIInitializer; import fr.ird.observe.client.util.init.DefaultUIInitializerContext; import fr.ird.observe.client.util.init.DefaultUIInitializerResult; @@ -70,6 +71,8 @@ import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JToolBar; import javax.swing.ListCellRenderer; +import javax.swing.SpringLayout; +import java.awt.Container; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -88,6 +91,7 @@ import static io.ultreia.java4all.i18n.I18n.t; public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSupport<UI, DefaultUIInitializerContext<UI>> implements WithClientUIContextApi { public static final String CLIENT_PROPERTY_FOCUS_COMPONENT = "focusComponent"; + public static final String SPRING_LAYOUT = "SpringLayout"; public static final Class<?>[] MANAGED_TYPES = new Class<?>[]{ JComponent.class, JToolBar.class, @@ -364,6 +368,10 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(JComponent editor) { initializerContext.checkFirstPass(); + Object springLayout = editor.getClientProperty(SPRING_LAYOUT); + if (springLayout != null) { + setSpringLayout(editor, 2); + } Object property = editor.getClientProperty(CLIENT_PROPERTY_FOCUS_COMPONENT); if (property == null) { return; @@ -396,7 +404,14 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup editor.getColumnHeader().setFocusable(false); } } - + public static void setSpringLayout(Container container, int columnCount) { + int rowCount = container.getComponentCount() / columnCount; + container.setLayout(new SpringLayout()); + SpringUtilities.makeCompactGrid(container, + rowCount, columnCount, //rows, cols + 3, 3, //initX, initY + 3, 3); //xPad, yPad + } //FIXME Add more methods to use ToolkitIdLabel @SuppressWarnings({"unchecked", "rawtypes"}) private <R extends DataDtoReference> void prepareDataDoubleList(Class<R> dtoClass, DoubleList<R> editor) { ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/LengthLengthParameterUI.jaxx ===================================== @@ -105,7 +105,7 @@ </cell> </row> <row> - <cell columns="2" weighty="1"> + <cell columns="2" fill="both" weighty="1"> <BigTextEditor id="source"/> </cell> </row> ===================================== client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselUI.jaxx ===================================== @@ -138,138 +138,48 @@ <tab id='otherTab' i18nProperty=""> <Table fill="both"> <row> - <cell anchor="west"> - <JLabel id='lengthLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='length' styleClass="float2"/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='capacityLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='capacity' styleClass="float2"/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='powerCvLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='powerCv' styleClass="int6"/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='powerKWLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='powerKW' styleClass="float2"/> + <cell weightx="1"> + <JPanel id="otherTabPanel" _SpringLayout="true"> + <JLabel id='lengthLabel'/> + <NumberEditor id='length' styleClass="float2"/> + <JLabel id='capacityLabel'/> + <NumberEditor id='capacity' styleClass="float2"/> + <JLabel id='powerCvLabel'/> + <NumberEditor id='powerCv' styleClass="int6"/> + <JLabel id='powerKWLabel'/> + <NumberEditor id='powerKW' styleClass="float2"/> + <JLabel id='searchMaximumLabel'/> + <NumberEditor id='searchMaximum' styleClass="float2"/> + <JLabel id='yearServiceLabel'/> + <NumberEditor id='yearService' styleClass="int6"/> + <JLabel id='changeDateLabel'/> + <DateEditor id='changeDate'/> + <JLabel id='iotcIdLabel'/> + <NormalTextEditor id='iotcId'/> + <JLabel id='comIdLabel'/> + <NormalTextEditor id='comId'/> + <JLabel id='iccatLabel'/> + <NormalTextEditor id='iccat'/> + <JLabel id='imoIdLabel'/> + <NormalTextEditor id='imoId'/> + <JLabel id='nationalIdLabel'/> + <NormalTextEditor id='nationalId'/> + <JLabel id='radioCallSignIdLabel'/> + <NormalTextEditor id='radioCallSignId'/> + <JLabel id='tuviIdLabel'/> + <NormalTextEditor id='tuviId'/> + <JLabel id='lloydIdLabel'/> + <NormalTextEditor id='lloydId'/> + <JLabel id='shipOwnerLabel'/> + <FilterableComboBox id='shipOwner' genericType='ShipOwnerReference'/> + </JPanel> </cell> </row> <row> - <cell anchor="west"> - <JLabel id='searchMaximumLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='searchMaximum' styleClass="float2"/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='yearServiceLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='yearService' styleClass="int6"/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='changeDateLabel'/> - </cell> - <cell anchor='west'> - <DateEditor id='changeDate'/> - </cell> - </row> - <row> - <cell columns="2" weighty="1"> + <cell weighty="1"> <JLabel styleClass="skipI18n"/> </cell> </row> - <row> - <cell anchor="west"> - <JLabel id='iotcIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='iotcId'/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='comIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='comId'/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='iccatLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='iccat'/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='imoIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='imoId'/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='nationalIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='nationalId'/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='radioCallSignIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='radioCallSignId'/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='tuviIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='tuviId'/> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel id='lloydIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='lloydId'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='shipOwnerLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='shipOwner' genericType='ShipOwnerReference'/> - </cell> - </row> </Table> </tab> </JTabbedPane> ===================================== client/runner/src/main/resources/META-INF/configuration/ClientConfig.md ===================================== @@ -2165,7 +2165,7 @@ Description : **Configuration d'ObServe** | Modifiable ? | Oui | | Sauvegardable ? | Oui | | Type | ```color``` | -| Valeur par défaut | ```java.awt.Color[r=0,g=0,b=255]``` | +| Valeur par défaut | ```java.awt.Color[r=144,g=144,b=241]``` | ### <a name="detail_option_ui.tree.node.empty.color"></a> ===================================== client/runner/src/main/resources/META-INF/configuration/ClientConfig.properties ===================================== @@ -1480,12 +1480,12 @@ # Clef : ui.tree.node.unloaded.color # Description : Couleur pour un nœud non chargé # Type : color -# Valeur par défaut : java.awt.Color[r=0,g=0,b=255] +# Valeur par défaut : java.awt.Color[r=144,g=144,b=241] # Modifiable ? : Oui # Sauvegardable ? : Oui # # Pour modifier l'option, veuillez décommenter la ligne suivante -# ui.tree.node.unloaded.color=java.awt.Color[r=0,g=0,b=255] +# ui.tree.node.unloaded.color=java.awt.Color[r=144,g=144,b=241] # Option : nodeEmptyColor # Clef : ui.tree.node.empty.color View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/12df740ac4a0b82df47a9861… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/12df740ac4a0b82df47a9861… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-19)
by Tony CHEMIT (＠tchemit) Nov. 25, 2021

Nov. 25, 2021

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 11a121bd by Tony Chemit at 2021-11-25T02:02:18+01:00 Site checkin for project ObServe (version 9.0.0-RC-19) - - - - - 1 changed file: - + 9.0.0-RC-19/CHANGELOG.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/11a121bde6d1035bc9e267d55… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/11a121bde6d1035bc9e267d55… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-19
by Tony CHEMIT (＠tchemit) Nov. 25, 2021

Nov. 25, 2021

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

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.0-RC-19
by Tony CHEMIT (＠tchemit) Nov. 25, 2021

Nov. 25, 2021

Tony CHEMIT pushed new tag v9.0.0-RC-19 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.0.0-RC-19 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.0.0-RC-19] [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-19' with...
by Tony CHEMIT (＠tchemit) Nov. 25, 2021

Nov. 25, 2021

Tony CHEMIT pushed to branch release/9.0.0-RC-19 at ultreiaio / ird-observe Commits: 1f1ba277 by Tony Chemit at 2021-11-25T01:44:09+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-19' 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/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/i18n/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/java/pom.xml - models/navigation/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml - observe/pom.xml - pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1f1ba27767cff563124d79523… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1f1ba27767cff563124d79523… You're receiving this email because of your account on gitlab.com.

1 0