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

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-17-SNAPSHOT)
by Tony CHEMIT (＠tchemit) Oct. 26, 2021

Oct. 26, 2021

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: f3f41b7b by Tony Chemit at 2021-10-26T21:24:31+02:00 Site checkin for project ObServe (version 9.0.0-RC-17-SNAPSHOT) - - - - - 30 changed files: - 9.0.0-RC-17-SNAPSHOT/CHANGELOG.html - 9.0.0-RC-17-SNAPSHOT/ClientConfig.html - 9.0.0-RC-17-SNAPSHOT/ServerConfig.html - 9.0.0-RC-17-SNAPSHOT/administration-web.html - 9.0.0-RC-17-SNAPSHOT/architecture-logicielle.html - 9.0.0-RC-17-SNAPSHOT/avdth/common.html - 9.0.0-RC-17-SNAPSHOT/avdth/index.html - 9.0.0-RC-17-SNAPSHOT/avdth/landing.html - 9.0.0-RC-17-SNAPSHOT/avdth/local_market.html - 9.0.0-RC-17-SNAPSHOT/avdth/logbook.html - 9.0.0-RC-17-SNAPSHOT/avdth/referential.html - 9.0.0-RC-17-SNAPSHOT/avdth/sample.html - 9.0.0-RC-17-SNAPSHOT/changelog.html - 9.0.0-RC-17-SNAPSHOT/changes-report.html - 9.0.0-RC-17-SNAPSHOT/ci-management.html - 9.0.0-RC-17-SNAPSHOT/dependency-convergence.html - 9.0.0-RC-17-SNAPSHOT/dependency-info.html - 9.0.0-RC-17-SNAPSHOT/dependency-management.html - 9.0.0-RC-17-SNAPSHOT/dependency-updates-report.html - 9.0.0-RC-17-SNAPSHOT/dev-activity.html - 9.0.0-RC-17-SNAPSHOT/distribution-management.html - 9.0.0-RC-17-SNAPSHOT/file-activity.html - 9.0.0-RC-17-SNAPSHOT/index.html - 9.0.0-RC-17-SNAPSHOT/install-serverPG.html - 9.0.0-RC-17-SNAPSHOT/install.html - 9.0.0-RC-17-SNAPSHOT/issue-management.html - 9.0.0-RC-17-SNAPSHOT/licenses.html - 9.0.0-RC-17-SNAPSHOT/modules.html - 9.0.0-RC-17-SNAPSHOT/plugin-management.html - 9.0.0-RC-17-SNAPSHOT/plugin-updates-report.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f3f41b7b67d25d523b8eaa422… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f3f41b7b67d25d523b8eaa422… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: update pom
by Tony CHEMIT (＠tchemit) Oct. 26, 2021

Oct. 26, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b8b83c01 by Tony Chemit at 2021-10-26T20:44:47+02:00 update pom - - - - - bafa1586 by Tony Chemit at 2021-10-26T21:03:03+02:00 update fixtures - - - - - d1c53add by Tony Chemit at 2021-10-26T21:04:18+02:00 update public API doc - - - - - 21 changed files: - pom.xml - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/validation-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/validation.json - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/validation-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/validation.json - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-create-warning.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-update-warning.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-update.json - tests/test/src/main/resources/fixtures/referential/ps/common/WeightCategory/content.json - tests/test/src/main/resources/fixtures/referential/ps/common/WeightCategory/create.json Changes: ===================================== pom.xml ===================================== @@ -161,7 +161,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>5.0.51-SNAPSHOT</lib.version.toolkit> + <lib.version.toolkit>5.0.51</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  @@ -174,7 +174,7 @@    - <lib.version.java4all.jaxx>3.0.2-SNAPSHOT </lib.version.java4all.jaxx> +    ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/validation-error.xml ===================================== @@ -137,11 +137,11 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !targetWellsSamplingEnabled ]]></param> - <param name="min">0.1</param> - <param name="max">3000.0</param> + <param name="min">0.0</param> + <param name="max">2000.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/validation.json ===================================== @@ -78,7 +78,7 @@ "landingTotalWeight": { "errors": [ "landingTotalWeight is a positive number", - "0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled" + "0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled" ] }, "landingWellContentStatus": { ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/validation-error.xml ===================================== @@ -146,11 +146,11 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !targetWellsSamplingEnabled ]]></param> - <param name="min">0.1</param> - <param name="max">3000.0</param> + <param name="min">0.0</param> + <param name="max">2000.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/validation.json ===================================== @@ -79,7 +79,7 @@ "landingTotalWeight": { "errors": [ "landingTotalWeight is a positive number", - "0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled" + "0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled" ] }, "landingWellContentStatus": { ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create-error.xml ===================================== @@ -137,11 +137,11 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !targetWellsSamplingEnabled ]]></param> - <param name="min">0.1</param> - <param name="max">3000.0</param> + <param name="min">0.0</param> + <param name="max">2000.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create.json ===================================== @@ -78,7 +78,7 @@ "landingTotalWeight": { "errors": [ "landingTotalWeight is a positive number", - "0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled" + "0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled" ] }, "landingWellContentStatus": { ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update-error.xml ===================================== @@ -146,11 +146,11 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !targetWellsSamplingEnabled ]]></param> - <param name="min">0.1</param> - <param name="max">3000.0</param> + <param name="min">0.0</param> + <param name="max">2000.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update.json ===================================== @@ -79,7 +79,7 @@ "landingTotalWeight": { "errors": [ "landingTotalWeight is a positive number", - "0.1 <= landingTotalWeight <= 3000.0 except if !targetWellsSamplingEnabled" + "0.0 <= landingTotalWeight <= 2000.0 except if !targetWellsSamplingEnabled" ] }, "landingWellContentStatus": { ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create-error.xml ===================================== @@ -25,9 +25,9 @@ <validators> <field name="bigsWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ totalWeight != null && totalWeight > 0 ]]></param> + <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param> <message>observe.data.ps.logbook.Sample.bigsWeight.validation.required</message> </field-validator> @@ -119,9 +119,9 @@ </field> <field name="smallsWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ totalWeight != null && totalWeight > 0 ]]></param> + <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param> <message>observe.data.ps.logbook.Sample.smallsWeight.validation.required</message> </field-validator> @@ -153,9 +153,9 @@ </field> <field name="totalWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0 ]]></param> + <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) ]]></param> <message>observe.data.ps.logbook.Sample.totalWeight.validation.required</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-create.json ===================================== @@ -1,7 +1,7 @@ { "bigsWeight": { "errors": [ - "bigsWeight is mandatory except if totalWeight != null && totalWeight > 0", + "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", "bigsWeight is a positive number", "0.0 <= bigsWeight <= 150.0 except if !weightValid", "bigsWeight not allowed if totalWeight filled" @@ -52,7 +52,7 @@ }, "smallsWeight": { "errors": [ - "smallsWeight is mandatory except if totalWeight != null && totalWeight > 0", + "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", "smallsWeight is a positive number", "0.0 <= smallsWeight <= 150.0 except if !weightValid", "smallsWeight not allowed if totalWeight filled" @@ -65,7 +65,7 @@ }, "totalWeight": { "errors": [ - "totalWeight is mandatory except if bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0", + "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", "totalWeight is a positive number", "0.0 <= totalWeight <= 150.0 except if !weightValid", "totalWeight not allowed if bigsWeight and smallsWeight filled" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update-error.xml ===================================== @@ -25,9 +25,9 @@ <validators> <field name="bigsWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ totalWeight != null && totalWeight > 0 ]]></param> + <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param> <message>observe.data.ps.logbook.Sample.bigsWeight.validation.required</message> </field-validator> @@ -119,9 +119,9 @@ </field> <field name="smallsWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ totalWeight != null && totalWeight > 0 ]]></param> + <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0) ]]></param> <message>observe.data.ps.logbook.Sample.smallsWeight.validation.required</message> </field-validator> @@ -153,9 +153,9 @@ </field> <field name="totalWeight"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0 ]]></param> + <param name="skip"><![CDATA[ (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0) ]]></param> <message>observe.data.ps.logbook.Sample.totalWeight.validation.required</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Sample/validation-update.json ===================================== @@ -1,7 +1,7 @@ { "bigsWeight": { "errors": [ - "bigsWeight is mandatory except if totalWeight != null && totalWeight > 0", + "bigsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", "bigsWeight is a positive number", "0.0 <= bigsWeight <= 150.0 except if !weightValid", "bigsWeight not allowed if totalWeight filled" @@ -52,7 +52,7 @@ }, "smallsWeight": { "errors": [ - "smallsWeight is mandatory except if totalWeight != null && totalWeight > 0", + "smallsWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (totalWeight != null && totalWeight > 0)", "smallsWeight is a positive number", "0.0 <= smallsWeight <= 150.0 except if !weightValid", "smallsWeight not allowed if totalWeight filled" @@ -65,7 +65,7 @@ }, "totalWeight": { "errors": [ - "totalWeight is mandatory except if bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0", + "totalWeight is mandatory except if (smallsWeight == null && bigsWeight == null && totalWeight == null) || (bigsWeight != null && bigsWeight >= 0 && smallsWeight != null && smallsWeight >= 0)", "totalWeight is a positive number", "0.0 <= totalWeight <= 150.0 except if !weightValid", "totalWeight not allowed if bigsWeight and smallsWeight filled" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-create-error.xml ===================================== @@ -33,14 +33,9 @@ </field> <field name="weightedWeight"> -  - <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ dataEmpty ]]></param> - <message/> - </field-validator> - -  +  <field-validator type="positiveNumber"> + <param name="strict">true</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-create-warning.xml ===================================== @@ -31,11 +31,4 @@ </field-validator> </field> - <field name="weightedWeight"> -  - <field-validator type="dataEmpty" short-circuit="true"> - <message/> - </field-validator> - </field> - </validators> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-create.json ===================================== @@ -9,11 +9,7 @@ }, "weightedWeight": { "errors": [ - "weightedWeight is mandatory except if dataEmpty", - "weightedWeight is a positive number" - ], - "warnings": [ - "the hole data is empty" + "weightedWeight is a strictly positive number" ] } } \ No newline at end of file ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-update-error.xml ===================================== @@ -33,14 +33,9 @@ </field> <field name="weightedWeight"> -  - <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ dataEmpty ]]></param> - <message/> - </field-validator> - -  +  <field-validator type="positiveNumber"> + <param name="strict">true</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-update-warning.xml ===================================== @@ -31,11 +31,4 @@ </field-validator> </field> - <field name="weightedWeight"> -  - <field-validator type="dataEmpty" short-circuit="true"> - <message/> - </field-validator> - </field> - </validators> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/SampleActivity/validation-update.json ===================================== @@ -9,11 +9,7 @@ }, "weightedWeight": { "errors": [ - "weightedWeight is mandatory except if dataEmpty", - "weightedWeight is a positive number" - ], - "warnings": [ - "the hole data is empty" + "weightedWeight is a strictly positive number" ] } } \ No newline at end of file ===================================== tests/test/src/main/resources/fixtures/referential/ps/common/WeightCategory/content.json ===================================== @@ -2,7 +2,7 @@ "topiaId": "fr.ird.referential.ps.common.WeightCategory#1464000000000#001", "topiaCreateDate": "2021-09-17T00:00:00.000Z", "lastUpdateDate": "2021-09-17T00:00:00.000Z", - "code": "L-1-1", + "code": "L-YFT-1", "needComment": false, "status": "enabled", "label1": "[SOVETCO: Albacore -10] - [STARKIST: Yellowfin R1 + R2+ R3]", ===================================== tests/test/src/main/resources/fixtures/referential/ps/common/WeightCategory/create.json ===================================== @@ -1,5 +1,5 @@ { - "code": "L-1-1", + "code": "L-YFT-1", "needComment": false, "status": "enabled", "label1": "[SOVETCO: Albacore -10] - [STARKIST: Yellowfin R1 + R2+ R3]", View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ae83c34d806406b33e675b4e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ae83c34d806406b33e675b4e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Review TableReader API and finalize import \o/
by Tony CHEMIT (＠tchemit) Oct. 26, 2021

Oct. 26, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c6ca3ecf by Tony Chemit at 2021-10-26T20:06:47+02:00 Review TableReader API and finalize import \o/ Revue des catégories de poids pour utiliser le code FAO plutot que l'obscure code espèce venant d'AVDTH... Add missing species for avdth import Synthèse des espèces et catégories de poids dans l'import AVDTH - Closes ultreiaio/ird-observe#2068 - - - - - 7583b03d by Tony Chemit at 2021-10-26T20:06:47+02:00 sampleActivity.weightedWeight, sample.smallsWeight, sample.bigsWeight et sample.totalWeight - See ultreiaio/ird-observe#2069 - - - - - ae83c34d by Tony Chemit at 2021-10-26T20:36:01+02:00 update CHANGELOG [skip ci] - - - - - 30 changed files: - CHANGELOG.md - models/definition/src/main/models/Observe/dto/attribute/notNull.properties - models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties - models/definition/src/main/models/Observe/dto/attribute/positiveNumber.properties - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - models/definition/src/main/models/Observe/persistence/attribute/notNull.properties - models/persistence/avdth/pom.xml - + models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/AvdthQueries.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/TableReader.java → models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/Query.java - + models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/QueryDefinition.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataTableReader.java → models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataQuery.java - + models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataQueryDefinition.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataTables.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngine.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/BatchReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/BatchTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesMeasureTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleWellTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SurveyReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SurveyTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityObservedSystemTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ae0172ac22b883d4705bd1c5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ae0172ac22b883d4705bd1c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Review TableReader API and finalize import \o/
by Tony CHEMIT (＠tchemit) Oct. 26, 2021

Oct. 26, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc751624 by Tony Chemit at 2021-10-26T19:37:26+02:00 Review TableReader API and finalize import \o/ Revue des catégories de poids pour utiliser le code FAO plutot que l'obscure code espèce venant d'AVDTH... Add missing species for avdth import Synthèse des espèces et catégories de poids dans l'import AVDTH - Closes ultreiaio/ird-observe#2068 - - - - - ae0172ac by Tony Chemit at 2021-10-26T19:37:26+02:00 sampleActivity.weightedWeight, sample.smallsWeight, sample.bigsWeight et sample.totalWeight - See ultreiaio/ird-observe#2069 - - - - - 30 changed files: - models/definition/src/main/models/Observe/dto/attribute/notNull.properties - models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties - models/definition/src/main/models/Observe/dto/attribute/positiveNumber.properties - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - models/definition/src/main/models/Observe/persistence/attribute/notNull.properties - models/persistence/avdth/pom.xml - + models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/AvdthQueries.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/TableReader.java → models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/Query.java - + models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/QueryDefinition.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataTableReader.java → models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataQuery.java - + models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataQueryDefinition.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataTables.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngine.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/TripTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/BatchReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/BatchTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesMeasureTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleSpeciesTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SampleWellTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SurveyReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/localmarket/SurveyTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityObservedSystemTableReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityTableReader.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2e692a70208b678c40038a5f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2e692a70208b678c40038a5f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 37 commits: update pom
by Tony CHEMIT (＠tchemit) Oct. 26, 2021

Oct. 26, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 851cc31e by Tony Chemit at 2021-10-26T12:43:10+02:00 update pom - - - - - 02ae80a3 by Tony Chemit at 2021-10-26T12:43:10+02:00 fix bad focus in ContentListUI when not empty (list lost fpcus to header) - - - - - dc461b68 by Tony Chemit at 2021-10-26T12:43:10+02:00 Marché local : conseil à donner lorsque la liste des conditionnements est vide - See #1840 - - - - - 5c7cce3e by Tony Chemit at 2021-10-26T12:43:10+02:00 validator redundant - - - - - c5076944 by Tony Chemit at 2021-10-26T12:43:10+02:00 Passage ps local market SurveyPart en tableau inline Correction validation Survey - - - - - db2b20b8 by Tony Chemit at 2021-10-26T12:43:10+02:00 do not display messages coming from validator without ui - - - - - b00b8c00 by Tony Chemit at 2021-10-26T12:43:10+02:00 be able to change the bean on a ContentSimpleUI - - - - - cdf9c6d0 by Tony Chemit at 2021-10-26T12:43:10+02:00 improve ps landing date validation - - - - - e2135414 by Tony Chemit at 2021-10-26T12:43:10+02:00 add missing status in ps TripDto - - - - - 6c9ccad1 by Tony Chemit at 2021-10-26T12:43:10+02:00 improve extra decorators - - - - - 8f20d051 by Tony Chemit at 2021-10-26T12:43:10+02:00 Passage ps local market SurveyPart en tableau inline - - - - - db5d4721 by Tony Chemit at 2021-10-26T12:43:10+02:00 Improve ps local market batch form (use short packaging decorator) - - - - - 7eb2df11 by Tony Chemit at 2021-10-26T12:43:10+02:00 improve species decoration in data use at last decorator renderer defined in the concrete project (so can make any modification on them :)) - - - - - 56bef7d4 by Tony Chemit at 2021-10-26T12:43:10+02:00 use jaxx editors decorator classifier for table references render - - - - - 85f3389d by Tony Chemit at 2021-10-26T12:43:10+02:00 Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001 - - - - - f0678ca6 by Tony Chemit at 2021-10-26T12:43:10+02:00 revue layout ps logbook activity catch - - - - - 55a5f230 by Tony Chemit at 2021-10-26T12:43:10+02:00 fix default logbook value on trip create (ps) - - - - - c0eb415f by Tony Chemit at 2021-10-26T12:43:10+02:00 add tooltip on tables :) - - - - - 14099425 by Tony Chemit at 2021-10-26T12:43:10+02:00 Amélioration d'un libellé - Closes #2038 - - - - - ed558448 by Tony Chemit at 2021-10-26T12:43:10+02:00 Nouvelle marée : onglet focusé - Closes #2050 - - - - - 21d30810 by Tony Chemit at 2021-10-26T12:43:10+02:00 add missing Trip.departureWellContentStatus not null if validation - - - - - 5bbcd6de by Tony Chemit at 2021-10-26T12:43:10+02:00 update fixtures - - - - - 1891b9a1 by Tony Chemit at 2021-10-26T12:43:10+02:00 flags Program.observation(s) et Program.logbook(s) - See ultreiaio/ird-observe#2052 Rajouter un programme logbook sur la marée Review program and trip API, reduce the program API. See ultreiaio/ird-observe#1963 - - - - - 381588e1 by Tony Chemit at 2021-10-26T12:43:10+02:00 normalisation i18n sur validateur dayBefore et dayAfter pour pouvoir les génerer :) - - - - - 7dad36b4 by Tony Chemit at 2021-10-26T12:43:10+02:00 generation des validateurs temporels - - - - - 85208b4c by Tony Chemit at 2021-10-26T12:43:10+02:00 update public API doc remove short-circuit on generated validation update model use generated temporal validators - - - - - 73dfa540 by Tony Chemit at 2021-10-26T12:43:10+02:00 Fix Trip vessel validator when no vessel - - - - - f98e6ccb by Tony Chemit at 2021-10-26T12:43:10+02:00 clean and improve AVDTH Species management - - - - - e5c5e008 by Tony Chemit at 2021-10-26T12:43:10+02:00 generate decoratorWithClassifier from model fix decorator usage By default, do not see validate range label in referential decorations, only for referential forms. - - - - - 6b8ba129 by Tony Chemit at 2021-10-26T12:43:10+02:00 Amélioration des éditeurs de type combo-box - Closes #2057 - - - - - 88c6601b by Tony Chemit at 2021-10-26T12:43:10+02:00 Contrôle total marché local - Closes #2059 - - - - - b2b09f71 by Tony Chemit at 2021-10-26T12:43:10+02:00 Unicité Trip PS & LL - Closes #2060 - - - - - c20ee3c4 by Tony Chemit at 2021-10-26T12:43:10+02:00 Erreur sur ouverture des forms objet flottant en mode serveur, sur les logbooks et les observations - Closes #2055 - - - - - 7abf4b93 by Tony Chemit at 2021-10-26T12:43:10+02:00 Reconnexion - Closes #2067 - - - - - 5b608a74 by Tony Chemit at 2021-10-26T12:43:10+02:00 Exception sur modification des dates d'une marée PS existante - Closes #2057 - - - - - 6fb2751d by Tony Chemit at 2021-10-26T12:43:10+02:00 reduce log and add FIXME on EditableTable - - - - - 2e692a70 by Tony Chemit at 2021-10-26T19:01:19+02:00 Review TableReader API and finalize import \o/ Revue des catégories de poids pour utiliser le code FAO plutot que l'obscure code espèce venant d'AVDTH... Add missing species for avdth import Synthèse des espèces et catégories de poids dans l'import AVDTH - Closes ultreiaio/ird-observe#2068 - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ContentMessageTableModel.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/focus/FocusDispatcher.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerResult.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.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/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/ActivityLlPairingTreeTable.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUIHandler.java - client/datasource/api/pom.xml - client/datasource/editor/api/pom.xml - 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/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0b592f33a9ca7c4c6870d97d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0b592f33a9ca7c4c6870d97d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Contrôle total marché local - Closes #2059
by Tony CHEMIT (＠tchemit) Oct. 26, 2021

Oct. 26, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4a5ab584 by Tony Chemit at 2021-10-26T09:19:47+02:00 Contrôle total marché local - Closes #2059 - - - - - d8160b24 by Tony Chemit at 2021-10-26T09:19:47+02:00 Unicité Trip PS & LL - Closes #2060 - - - - - 085fabf1 by Tony Chemit at 2021-10-26T09:19:47+02:00 Erreur sur ouverture des forms objet flottant en mode serveur, sur les logbooks et les observations - Closes #2055 - - - - - 5c3622f5 by Tony Chemit at 2021-10-26T09:19:47+02:00 Reconnexion - Closes #2067 - - - - - 75588896 by Tony Chemit at 2021-10-26T09:19:47+02:00 Exception sur modification des dates d'une marée PS existante - Closes #2057 - - - - - fd4bc6b9 by Tony Chemit at 2021-10-26T09:19:47+02:00 reduce log and add FIXME on EditableTable - - - - - 0b592f33 by Tony Chemit at 2021-10-26T09:19:47+02:00 stash pom - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.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/content/ui/table/EditableTable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ReloadStorageAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/DcpUIAdapter.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/FloatingObjectUICommon.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIHandler.java - models/definition/src/main/models/Observe/dto/attribute/boundNumber.properties - models/dto/java/src/main/java/fr/ird/observe/dto/referential/ps/common/ObjectMaterialHierarchyDto.java - models/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/FloatingObjectSpi.java - pom.xml - server/core/src/main/filtered-resources/META-INF/mapping-api-v1.wm - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java - services/api/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/OpenableServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocalSupport.java - services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-create-error-validation.xml → services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-create-warning-validation.xml - services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-update-error-validation.xml - + services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-update-warning-validation.xml - services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-create-error-validation.xml - + services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-create-warning-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d810b36193a597b564fe3e8f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d810b36193a597b564fe3e8f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: generate decoratorLong from model
by Tony CHEMIT (＠tchemit) Oct. 25, 2021

Oct. 25, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 79b03c79 by Tony Chemit at 2021-10-25T23:56:41+02:00 generate decoratorLong from model fix decorator usage By default, do not see validate range label in referential decorations, only for referential forms. - - - - - 854ac5c6 by Tony Chemit at 2021-10-25T23:56:41+02:00 Amélioration des éditeurs de type combo-box - Closes #2057 - - - - - 1cde6183 by Tony Chemit at 2021-10-25T23:56:41+02:00 Contrôle total marché local - Closes #2059 - - - - - 04b493ee by Tony Chemit at 2021-10-25T23:56:41+02:00 Unicité Trip PS & LL - Closes #2060 - - - - - 618cdb77 by Tony Chemit at 2021-10-25T23:56:41+02:00 Erreur sur ouverture des forms objet flottant en mode serveur, sur les logbooks et les observations - Closes #2055 - - - - - 3a6b2250 by Tony Chemit at 2021-10-25T23:56:41+02:00 Reconnexion - Closes #2067 - - - - - e47487dc by Tony Chemit at 2021-10-25T23:56:41+02:00 Exception sur modification des dates d'une marée PS existante - Closes #2057 - - - - - ce9647b9 by Tony Chemit at 2021-10-25T23:56:41+02:00 reduce log and add FIXME on EditableTable - - - - - d810b361 by Tony Chemit at 2021-10-25T23:57:28+02:00 stash pom - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/focus/FocusDispatcher.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerResult.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.java - client/core/src/main/java/fr/ird/observe/client/util/table/EditableTableModel.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/ActivityLlPairingTreeTable.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUIHandler.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/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.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/sample/actions/ResetSizeMeasureType.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/ResetWeightMeasureType.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/de01efc2688a87221e4759e2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/de01efc2688a87221e4759e2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Exception sur modification des dates d'une marée PS existante - Closes #2057
by Tony CHEMIT (＠tchemit) Oct. 25, 2021

Oct. 25, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: de01efc2 by Tony Chemit at 2021-10-25T21:41:51+02:00 Exception sur modification des dates d'une marée PS existante - Closes #2057 - - - - - 1 changed file: - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/OpenableServiceLocalSupport.java Changes: ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/OpenableServiceLocalSupport.java ===================================== @@ -96,7 +96,7 @@ public class OpenableServiceLocalSupport extends ObserveServiceLocal implements @Override public <D extends OpenableDto, R extends DataDtoReference> DataDtoReferenceSet<R> getChildren(Class<D> dtoType, String parentId) { OpenableDtoEntityContext<?, D, R, DataEntity, ?> spi = ObservePersistenceBusinessProject.fromOpenableDto(dtoType); - return spi.getChildren(getTopiaPersistenceContext(), getReferentialLocale(), parentId, null); + return spi.getChildren(getTopiaPersistenceContext(), getReferentialLocale(), parentId, now()); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/de01efc2688a87221e4759e20… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/de01efc2688a87221e4759e20… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Reconnexion - Closes #2067
by Tony CHEMIT (＠tchemit) Oct. 25, 2021

Oct. 25, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cef03dd1 by Tony Chemit at 2021-10-25T21:30:21+02:00 Reconnexion - Closes #2067 - - - - - 4 changed files: - 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/menu/actions/ReloadStorageAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java ===================================== @@ -40,6 +40,7 @@ import fr.ird.observe.client.datasource.editor.api.menu.actions.CloseStorageActi import fr.ird.observe.client.datasource.editor.api.menu.actions.ImportAvdthFileAction; import fr.ird.observe.client.datasource.editor.api.menu.actions.ReloadStorageAction; import fr.ird.observe.client.datasource.editor.api.menu.actions.ShowDataSourcePresetsAction; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.main.ObserveMainUI; import fr.ird.observe.client.main.body.HideBodyContentNotAcceptedException; import fr.ird.observe.client.main.body.MainUIBodyContent; @@ -79,6 +80,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi private DataSourceEditorMenu editorMenu; private DataSourceEditorNavigationMenu navigationMenu; private ObserveSwingDataSource dataSource; + private NavigationNode previousNode; public DataSourceEditorBodyContent() { super(1, DataSourceEditor.class); @@ -86,6 +88,10 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi this.reload = e -> reload(); } + public void setPreviousNode(NavigationNode previousNode) { + this.previousNode = previousNode; + } + private Supplier<DataSourceEditor> createSupplier() { return () -> { ObserveMainUI mainUI = getClientUIContext().getMainUI(); @@ -193,7 +199,10 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi focusModel.addZone(new ContentZone(focusModel, dataSourceEditor)); navigationMenu.getUiModel().setConfig(dataSourceEditor.getNavigationUI().getTree().getModel().getConfig()); - dataSourceEditor.getHandler().loadNavigationUI(progressModel); + NavigationNode previousNode = this.previousNode; + // remove it right now + setPreviousNode(null); + dataSourceEditor.getHandler().loadNavigationUI(progressModel, previousNode); progressModel.increments(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.client.datasource.editor.api.content.ContentUIManager; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTreeModel; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUI; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.init.UIInitHelper; import fr.ird.observe.client.util.session.ObserveSwingSessionHelper; @@ -153,8 +154,9 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit * <b>Note:</b> cette méthode doit être appelée après tout rechargement de modèle de navigation. * * @param progressModel the progress model to interact with ui + * @param previousNode */ - public void loadNavigationUI(ProgressModel progressModel) { + public void loadNavigationUI(ProgressModel progressModel, NavigationNode previousNode) { boolean canReadData = getClientUIContext().getDataSourcesManager().getMainDataSource().canReadData(); NavigationUI navigationUI = ui.getNavigationUI(); NavigationTree tree = navigationUI.getTree(); @@ -163,10 +165,20 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit treeModel.populate(null); progressModel.increments(); // select initial node - try { - tree.selectInitialNode(); - } catch (Exception e) { - log.error("Could not load initial node", e); + if (previousNode != null) { + try { + tree.reselectInitialNode(previousNode); + } catch (Exception e) { + log.error("Could not load previous node", e); + previousNode = null; + } + } + if (previousNode == null) { + try { + tree.selectInitialNode(); + } catch (Exception e) { + log.error("Could not load initial node", e); + } } progressModel.increments(); tree.setVisible(true); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ReloadStorageAction.java ===================================== @@ -23,8 +23,9 @@ package fr.ird.observe.client.datasource.editor.api.menu.actions; */ import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; +import fr.ird.observe.client.datasource.editor.api.DataSourceEditorBodyContent; import fr.ird.observe.client.datasource.editor.api.menu.DataSourceEditorMenu; -import fr.ird.observe.client.main.ObserveMainUI; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.util.ObserveSwingTechnicalException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -60,28 +61,24 @@ public class ReloadStorageAction extends DataSourceEditorMenuActionSupport imple log.info(String.format("Will close main data source: %s", dataSource)); - // Close - getDataSourceEditorBodyContent().doCloseStorage(); + DataSourceEditorBodyContent bodyContent = getDataSourceEditorBodyContent(); - ObserveMainUI mainUI = getClientUIContext().getMainUI(); + // keep selected node to select it on new navigation tree + NavigationNode selectedNode = bodyContent.get().getNavigationUI().getTree().getSelectedNode(); + bodyContent.setPreviousNode(selectedNode); - //FIXME:BodyContent reload previous selected node - getClientUIContext().getBusyModel().addTask("Reload storage"); - try { - - //FIXME:Datasource See why we do this? - dataSource.setCanMigrate(getClientConfig()); + // Close storage + bodyContent.doCloseStorage(); - log.info(String.format("Will load main data source: %s", dataSource)); + //FIXME:Datasource See why we do this? + dataSource.setCanMigrate(getClientConfig()); - try { - getDataSourceEditorBodyContent().loadStorage(mainUI, dataSource); - } catch (Exception e) { - throw new ObserveSwingTechnicalException(e); - } + log.info(String.format("Will load main data source: %s", dataSource)); - } finally { - getClientUIContext().getBusyModel().popTask(); + try { + bodyContent.loadStorage(getClientUIContext().getMainUI(), dataSource); + } catch (Exception e) { + throw new ObserveSwingTechnicalException(e); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java ===================================== @@ -141,7 +141,7 @@ public class RootNavigationNode extends NavigationNode { return result; } - public <N extends NavigationNode> N findChildByType0(Class<N> childType, String id) { + public <N extends NavigationNode> N findChildByTypeWithNoCreate(Class<N> childType, String id) { return super.findChildByType(childType, id); } @@ -173,7 +173,10 @@ public class RootNavigationNode extends NavigationNode { NavigationNode next; NavigationNode oldNode = (NavigationNode) treeNode; if (oldNode.getLevel() == 0) { - next = ((RootNavigationNode) result).findChildByType0(oldNode.getClass(), oldNode.getInitializer().getSelectNodeId()); + next = result; + } else if (oldNode.getLevel() == 1) { + // use the method which will not create node + next = ((RootNavigationNode) result).findChildByTypeWithNoCreate(oldNode.getClass(), oldNode.getInitializer().getSelectNodeId()); } else if (oldNode.getScope().isSelectNode()) { next = result.findChildByType(oldNode.getClass(), oldNode.getInitializer().getSelectNodeId()); } else { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cef03dd12cb2956c5468dcd27… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cef03dd12cb2956c5468dcd27… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Contrôle total marché local - Closes #2059
by Tony CHEMIT (＠tchemit) Oct. 25, 2021

Oct. 25, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d035bec2 by Tony Chemit at 2021-10-25T20:40:12+02:00 Contrôle total marché local - Closes #2059 - - - - - 140d751f by Tony Chemit at 2021-10-25T20:40:12+02:00 Unicité Trip PS & LL - Closes #2060 - - - - - 3273fd95 by Tony Chemit at 2021-10-25T20:40:12+02:00 Erreur sur ouverture des forms objet flottant en mode serveur, sur les logbooks et les observations - Closes #2055 - - - - - 1b95f2d2 by Tony Chemit at 2021-10-25T21:28:49+02:00 Reconnexion - Closes #2057 - - - - - 28 changed files: - 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/menu/actions/ReloadStorageAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/DcpUIAdapter.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/FloatingObjectUICommon.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIHandler.java - models/definition/src/main/models/Observe/dto/attribute/boundNumber.properties - models/dto/java/src/main/java/fr/ird/observe/dto/referential/ps/common/ObjectMaterialHierarchyDto.java - models/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/FloatingObjectSpi.java - server/core/src/main/filtered-resources/META-INF/mapping-api-v1.wm - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java - services/api/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocalSupport.java - services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-create-error-validation.xml → services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-create-warning-validation.xml - services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-update-error-validation.xml - + services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-update-warning-validation.xml - services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-create-error-validation.xml - + services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-create-warning-validation.xml - services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-update-error-validation.xml - services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-update-warning-validation.xml Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java ===================================== @@ -40,6 +40,7 @@ import fr.ird.observe.client.datasource.editor.api.menu.actions.CloseStorageActi import fr.ird.observe.client.datasource.editor.api.menu.actions.ImportAvdthFileAction; import fr.ird.observe.client.datasource.editor.api.menu.actions.ReloadStorageAction; import fr.ird.observe.client.datasource.editor.api.menu.actions.ShowDataSourcePresetsAction; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.main.ObserveMainUI; import fr.ird.observe.client.main.body.HideBodyContentNotAcceptedException; import fr.ird.observe.client.main.body.MainUIBodyContent; @@ -79,6 +80,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi private DataSourceEditorMenu editorMenu; private DataSourceEditorNavigationMenu navigationMenu; private ObserveSwingDataSource dataSource; + private NavigationNode previousNode; public DataSourceEditorBodyContent() { super(1, DataSourceEditor.class); @@ -86,6 +88,10 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi this.reload = e -> reload(); } + public void setPreviousNode(NavigationNode previousNode) { + this.previousNode = previousNode; + } + private Supplier<DataSourceEditor> createSupplier() { return () -> { ObserveMainUI mainUI = getClientUIContext().getMainUI(); @@ -193,7 +199,10 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi focusModel.addZone(new ContentZone(focusModel, dataSourceEditor)); navigationMenu.getUiModel().setConfig(dataSourceEditor.getNavigationUI().getTree().getModel().getConfig()); - dataSourceEditor.getHandler().loadNavigationUI(progressModel); + NavigationNode previousNode = this.previousNode; + // remove it right now + setPreviousNode(null); + dataSourceEditor.getHandler().loadNavigationUI(progressModel, previousNode); progressModel.increments(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.client.datasource.editor.api.content.ContentUIManager; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTreeModel; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUI; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.init.UIInitHelper; import fr.ird.observe.client.util.session.ObserveSwingSessionHelper; @@ -153,8 +154,9 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit * <b>Note:</b> cette méthode doit être appelée après tout rechargement de modèle de navigation. * * @param progressModel the progress model to interact with ui + * @param previousNode */ - public void loadNavigationUI(ProgressModel progressModel) { + public void loadNavigationUI(ProgressModel progressModel, NavigationNode previousNode) { boolean canReadData = getClientUIContext().getDataSourcesManager().getMainDataSource().canReadData(); NavigationUI navigationUI = ui.getNavigationUI(); NavigationTree tree = navigationUI.getTree(); @@ -163,10 +165,20 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit treeModel.populate(null); progressModel.increments(); // select initial node - try { - tree.selectInitialNode(); - } catch (Exception e) { - log.error("Could not load initial node", e); + if (previousNode != null) { + try { + tree.reselectInitialNode(previousNode); + } catch (Exception e) { + log.error("Could not load previous node", e); + previousNode = null; + } + } + if (previousNode == null) { + try { + tree.selectInitialNode(); + } catch (Exception e) { + log.error("Could not load initial node", e); + } } progressModel.increments(); tree.setVisible(true); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ReloadStorageAction.java ===================================== @@ -23,8 +23,9 @@ package fr.ird.observe.client.datasource.editor.api.menu.actions; */ import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; +import fr.ird.observe.client.datasource.editor.api.DataSourceEditorBodyContent; import fr.ird.observe.client.datasource.editor.api.menu.DataSourceEditorMenu; -import fr.ird.observe.client.main.ObserveMainUI; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.util.ObserveSwingTechnicalException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -60,28 +61,24 @@ public class ReloadStorageAction extends DataSourceEditorMenuActionSupport imple log.info(String.format("Will close main data source: %s", dataSource)); - // Close - getDataSourceEditorBodyContent().doCloseStorage(); + DataSourceEditorBodyContent bodyContent = getDataSourceEditorBodyContent(); - ObserveMainUI mainUI = getClientUIContext().getMainUI(); + // keep selected node to select it on new navigation tree + NavigationNode selectedNode = bodyContent.get().getNavigationUI().getTree().getSelectedNode(); + bodyContent.setPreviousNode(selectedNode); - //FIXME:BodyContent reload previous selected node - getClientUIContext().getBusyModel().addTask("Reload storage"); - try { - - //FIXME:Datasource See why we do this? - dataSource.setCanMigrate(getClientConfig()); + // Close storage + bodyContent.doCloseStorage(); - log.info(String.format("Will load main data source: %s", dataSource)); + //FIXME:Datasource See why we do this? + dataSource.setCanMigrate(getClientConfig()); - try { - getDataSourceEditorBodyContent().loadStorage(mainUI, dataSource); - } catch (Exception e) { - throw new ObserveSwingTechnicalException(e); - } + log.info(String.format("Will load main data source: %s", dataSource)); - } finally { - getClientUIContext().getBusyModel().popTask(); + try { + bodyContent.loadStorage(getClientUIContext().getMainUI(), dataSource); + } catch (Exception e) { + throw new ObserveSwingTechnicalException(e); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java ===================================== @@ -141,7 +141,7 @@ public class RootNavigationNode extends NavigationNode { return result; } - public <N extends NavigationNode> N findChildByType0(Class<N> childType, String id) { + public <N extends NavigationNode> N findChildByTypeWithNoCreate(Class<N> childType, String id) { return super.findChildByType(childType, id); } @@ -173,7 +173,10 @@ public class RootNavigationNode extends NavigationNode { NavigationNode next; NavigationNode oldNode = (NavigationNode) treeNode; if (oldNode.getLevel() == 0) { - next = ((RootNavigationNode) result).findChildByType0(oldNode.getClass(), oldNode.getInitializer().getSelectNodeId()); + next = result; + } else if (oldNode.getLevel() == 1) { + // use the method which will not create node + next = ((RootNavigationNode) result).findChildByTypeWithNoCreate(oldNode.getClass(), oldNode.getInitializer().getSelectNodeId()); } else if (oldNode.getScope().isSelectNode()) { next = result.findChildByType(oldNode.getClass(), oldNode.getInitializer().getSelectNodeId()); } else { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx ===================================== @@ -320,8 +320,8 @@ </cell> <cell anchor='west' weightx="0.5"> <JPanel layout="{new GridLayout()}"> - <NumberEditor id='landingTotalWeight' styleClass="float3 logbookEnabled"/> <NumberEditor id='localMarketTotalWeight' styleClass="float3 logbookEnabled"/> + <NumberEditor id='landingTotalWeight' styleClass="float3 logbookEnabled"/> </JPanel> </cell> </row> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/DcpUIAdapter.java ===================================== @@ -39,7 +39,7 @@ import fr.ird.observe.dto.referential.ps.common.ObjectMaterialDto; import fr.ird.observe.dto.referential.ps.common.ObjectMaterialHierarchyDto; import fr.ird.observe.dto.referential.ps.common.ObjectOperationReference; import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyTypeReference; -import fr.ird.observe.services.service.data.ps.common.TripService; +import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.spi.decoration.DecoratorService; import io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor; import io.ultreia.java4all.jaxx.widgets.combobox.FilterableComboBox; @@ -60,6 +60,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.TreeMap; /** @@ -86,7 +87,7 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec JPanel getTransmittingBuoys(); - JLabel getNoBaliseEditor(); + JLabel getNoBuoyEditor(); FilterableComboBox<TransmittingBuoyTypeReference> getTransmittingBuoyType1(); @@ -121,9 +122,10 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec getTransmittingBuoy2()); } - default void onInit(DcpUIModelStates<?> states, TripService psCommonTripService, DecoratorService decoratorService) { + default void onInit(DcpUIModelStates<?> states, ReferentialService referentialService, DecoratorService decoratorService) { - ObjectMaterialHierarchyDto detailedForm = psCommonTripService.getObjectMaterialHierarchy(); + Set<ObjectMaterialDto> dtoList = referentialService.loadDtoList(ObjectMaterialDto.class); + ObjectMaterialHierarchyDto detailedForm = ObjectMaterialHierarchyDto.build(dtoList); Map<String, ObjectMaterialDto> allMap = new TreeMap<>(); detailedForm.getAllDto().forEach(s -> allMap.putIfAbsent(s.getId(), s)); @@ -141,13 +143,13 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec states.getBean().addPropertyChangeListener(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, e -> states.updateMaterials(getTable().getTreeTableModel(), (ObjectOperationReference) e.getNewValue())); } - default void installExtraActions(DcpUIModelStates<?> states) { + default void installExtraActions() { AddFloatingObjectPreset.init((ContentUI) this, getAddPreset(), AddFloatingObjectPreset.class); CopyFloatingObjectPartToRight.init((ContentUI) this, getCopyFloatingObjectPartToRight(), CopyFloatingObjectPartToRight.class); CopyFloatingObjectPartToLeft.init((ContentUI) this, getCopyFloatingObjectPartToLeft(), CopyFloatingObjectPartToLeft.class); } - default void customizeUI(DcpUIModelStates<?> states) { + default void customizeUI() { ContentUIInitializer.setDecoratorIndex(getVessel1(), 1); ContentUIInitializer.setDecoratorIndex(getVessel2(), 1); ContentUIInitializer.setDecoratorIndex(getCountry1(), 1); @@ -160,7 +162,7 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec changeTypeOperation(states, typeOperation, false); } - default void stopEditUI(DcpUIModelStates<?> states) { + default void stopEditUI() { if (getMainTabbedPane().getSelectedIndex() == 1) { getTable().editingCanceled(null); } @@ -214,17 +216,12 @@ public interface DcpUIAdapter<T extends TransmittingBuoyAware> extends JAXXObjec getValidatorBuoy1().setBean(null); getValidatorBuoy2().setBean(null); } -// if (TypeTransmittingBuoyOperation.retrait == typeOperation) { -// addTransmittingBuoyCoordinate(); -// } else { -// removeTransmittingBuoyCoordinate(reset); -// } String[] codeOperations = typeOperation.getCodeOperation(); JComponent focusOwner = null; switch (typeOperation) { case pasDeBalise: - editorPanel.add(getNoBaliseEditor()); + editorPanel.add(getNoBuoyEditor()); focusOwner = getComment(); break; case recuperationEtRemplacement: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/FloatingObjectUICommon.jcss ===================================== @@ -85,7 +85,7 @@ visible:{typeOperation.getSelectedValue() != null}; } -#noBaliseEditor { +#noBuoyEditor { horizontalAlignment:"center"; text:"observe.Common.noBuoy"; } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jaxx ===================================== @@ -155,7 +155,7 @@ <JPanel id="buoys" layout="{new GridLayout(1,0)}"> <FloatingObjectBuoyPresetUI id="buoy1" constructorParams="this"/> <FloatingObjectBuoyPresetUI id="buoy2" constructorParams="this"/> - <JLabel id='noBaliseEditor' styleClass="skipI18n"/> + <JLabel id='noBuoyEditor' styleClass="skipI18n"/> </JPanel> </cell> </row> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUI.jcss ===================================== @@ -92,7 +92,7 @@ JLabel { border:{new TitledBorder(t("observe.Common.second.buoy"))}; } -#noBaliseEditor { +#noBuoyEditor { horizontalAlignment:"center"; text:"observe.Common.noBuoy"; } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/presets/FloatingObjectPresetUIHandler.java ===================================== @@ -64,7 +64,7 @@ public class FloatingObjectPresetUIHandler implements UIHandler<FloatingObjectPr initializer.disabledIfNull(model, bean, "keepSupplyName"); ui.getBuoys().removeAll(); SwingValidatorUtil.setValidatorBean(ui, bean); - ui.getBuoys().add(ui.getNoBaliseEditor()); + ui.getBuoys().add(ui.getNoBuoyEditor()); Optional.ofNullable(floatingObjectPreset.getBuoy1()).ifPresent(t -> prepareBuoy(t, ui, buoy1)); Optional.ofNullable(floatingObjectPreset.getBuoy2()).ifPresent(t -> prepareBuoy(t, ui, buoy2)); @@ -115,7 +115,7 @@ public class FloatingObjectPresetUIHandler implements UIHandler<FloatingObjectPr FloatingObjectBuoyPreset bean = buoyUI.getBean(); FloatingObjectBuoyPresetUIModel model = buoyUI.getModel(); preset.copy(bean); - ui.getBuoys().remove(ui.getNoBaliseEditor()); + ui.getBuoys().remove(ui.getNoBuoyEditor()); ui.getBuoys().add(buoyUI); SwingValidatorUtil.setValidatorBean(buoyUI, model.getBean()); ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx ===================================== @@ -323,7 +323,7 @@ </row> </Table> </JXTitledPanel> - <JLabel id='noBaliseEditor' styleClass="skipI18n"/> + <JLabel id='noBuoyEditor' styleClass="skipI18n"/> </JPanel> </JPanel> </tab> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIHandler.java ===================================== @@ -43,19 +43,19 @@ public class FloatingObjectUIHandler extends GeneratedFloatingObjectUIHandler { coordinate1Label = ui.transmittingBuoy1Editor.getComponent(10); coordinate1 = ui.transmittingBuoy1Editor.getComponent(11); comment1 = ui.transmittingBuoy1Editor.getComponent(12); - ui.onInit(ui.getModel().getStates(), getPsCommonTripService(), getDecoratorService()); + ui.onInit(ui.getModel().getStates(), getReferentialService(), getDecoratorService()); } @Override protected void customizeUI() { super.customizeUI(); - ui.customizeUI(ui.getModel().getStates()); + ui.customizeUI(); } @Override protected void installExtraActions() { super.installExtraActions(); - ui.installExtraActions(ui.getModel().getStates()); + ui.installExtraActions(); } //FIXME:Focus ui.getModel().getStates().isCreatingMode() ? getUi().getObjectOperation() : getUi().getSupportVesselName() @@ -72,7 +72,7 @@ public class FloatingObjectUIHandler extends GeneratedFloatingObjectUIHandler { @Override public void stopEditUI() { - ui.stopEditUI(ui.getModel().getStates()); + ui.stopEditUI(); super.stopEditUI(); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx ===================================== @@ -298,7 +298,7 @@ </row> </Table> </JXTitledPanel> - <JLabel id='noBaliseEditor' styleClass="skipI18n"/> + <JLabel id='noBuoyEditor' styleClass="skipI18n"/> </JPanel> </JPanel> </tab> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIHandler.java ===================================== @@ -32,19 +32,19 @@ public class FloatingObjectUIHandler extends GeneratedFloatingObjectUIHandler { @Override public void onInit(FloatingObjectUI ui) { super.onInit(ui); - ui.onInit(ui.getModel().getStates(), getPsCommonTripService(), getDecoratorService()); + ui.onInit(ui.getModel().getStates(), getReferentialService(), getDecoratorService()); } @Override protected void customizeUI() { super.customizeUI(); - ui.customizeUI(ui.getModel().getStates()); + ui.customizeUI(); } @Override protected void installExtraActions() { super.installExtraActions(); - ui.installExtraActions(ui.getModel().getStates()); + ui.installExtraActions(); } //FIXME:Focus ui.getModel().getStates().isCreatingMode() ? getUi().getObjectOperation() : getUi().getSupportVesselName() @@ -61,7 +61,7 @@ public class FloatingObjectUIHandler extends GeneratedFloatingObjectUIHandler { @Override public void stopEditUI() { - ui.stopEditUI(ui.getModel().getStates()); + ui.stopEditUI(); super.stopEditUI(); } ===================================== models/definition/src/main/models/Observe/dto/attribute/boundNumber.properties ===================================== @@ -69,7 +69,7 @@ data.ll.observation.SizeMeasure.attribute.size=0.0:1000.0 data.ll.observation.WeightMeasure.attribute.weight=0.0:1000.0 data.ps.common.Trip.attribute.fishingTime=0:1300:!logbookEnabled data.ps.common.Trip.attribute.landingTotalWeight=0.1:3000.0:!targetWellsSamplingEnabled -data.ps.common.Trip.attribute.localMarketTotalWeight=0.1:3000.0:!localMarketWellsSamplingEnabled && !localMarketSurveySamplingEnabled +data.ps.common.Trip.attribute.localMarketTotalWeight=0.0:1500.0:!localMarketWellsSamplingEnabled && !localMarketSurveySamplingEnabled data.ps.common.Trip.attribute.timeAtSea=10:2400:!logbookEnabled data.ps.landing.Landing.attribute.weight=0.0:600.0 data.ps.localmarket.Batch.attribute.weight=0.0:5.0:!countOrWeightValid ===================================== models/dto/java/src/main/java/fr/ird/observe/dto/referential/ps/common/ObjectMaterialHierarchyDto.java ===================================== @@ -22,13 +22,22 @@ package fr.ird.observe.dto.referential.ps.common; * #L% */ +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; import fr.ird.observe.dto.referential.FormulaHelper; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; /** * Created by tchemit on 29/05/17. @@ -40,6 +49,62 @@ public class ObjectMaterialHierarchyDto extends ObjectMaterialDto { private final List<ObjectMaterialHierarchyDto> children; + public static class Builder { + + private final List<ObjectMaterialDto> dtoList; + + public Builder(Collection<ObjectMaterialDto> dtoList) { + this.dtoList = new ArrayList<>(dtoList); + + } + + public ObjectMaterialHierarchyDto build() { + dtoList.sort(Comparator.comparing(ObjectMaterialDto::getCode)); + return getObjectMaterialHierarchyList(dtoList).get(0); + } + + + public List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchyList(List<ObjectMaterialDto> objectMaterials) { + Multimap<String, ObjectMaterialDto> childrenByParent = ArrayListMultimap.create(); + objectMaterials.forEach(o -> childrenByParent.put(Optional.ofNullable(o.getParent()).map(ObjectMaterialReference::getId).orElse("Yo"), o)); + Collection<ObjectMaterialDto> topLevelMaterials = childrenByParent.get("Yo"); + List<ObjectMaterialHierarchyDto> result = new LinkedList<>(); + Set<String> idsDone = new TreeSet<>(); + for (ObjectMaterialDto topLevelMaterial : topLevelMaterials) { + ObjectMaterialHierarchyDto hierarchyDto = fillHierarchyDto(childrenByParent, topLevelMaterial, idsDone); + result.add(hierarchyDto); + } + result.sort(Comparator.comparing(ObjectMaterialDto::getCode)); + return result; + } + + private ObjectMaterialHierarchyDto fillHierarchyDto(Multimap<String, ObjectMaterialDto> childrenByParent, ObjectMaterialDto topLevelMaterial, Set<String> idsDone) { + Collection<ObjectMaterialDto> childrenEntities = childrenByParent.get(topLevelMaterial.getId()); + String code = topLevelMaterial.getCode(); + int level = code == null || code.isEmpty() ? 0 : code.split("-").length; + Map<Integer, ObjectMaterialDto> orderMap = new TreeMap<>(); + for (ObjectMaterialDto child : childrenEntities) { + String code1 = child.getCode().split("-")[level]; + orderMap.put(Integer.valueOf(code1), child); + } + List<ObjectMaterialDto> orderedChildren = new LinkedList<>(); + orderMap.forEach((k, v) -> orderedChildren.add(v)); + ObjectMaterialHierarchyDto hierarchyDto = new ObjectMaterialHierarchyDto(topLevelMaterial); + boolean add = idsDone.add(hierarchyDto.getId()); + if (add) { + for (ObjectMaterialDto child : orderedChildren) { + ObjectMaterialHierarchyDto hierarchyDto1 = fillHierarchyDto(childrenByParent, child, idsDone); + hierarchyDto.addChild(hierarchyDto1); + } + } + return hierarchyDto; + } + } + + public static ObjectMaterialHierarchyDto build(Collection<ObjectMaterialDto> dtoList) { + return new Builder(dtoList).build(); + } + public ObjectMaterialHierarchyDto(ObjectMaterialDto root) { root.copy(this); this.children = new LinkedList<>(); ===================================== models/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/FloatingObjectSpi.java ===================================== @@ -22,16 +22,12 @@ package fr.ird.observe.entities.data.ps.logbook; * #L% */ -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; import fr.ird.observe.dto.ProtectedIdsPs; import fr.ird.observe.dto.data.ps.dcp.FloatingObjectBuoyPreset; import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPreset; import fr.ird.observe.dto.data.ps.logbook.FloatingObjectDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.ps.common.ObjectMaterialDto; -import fr.ird.observe.dto.referential.ps.common.ObjectMaterialHierarchyDto; import fr.ird.observe.entities.ObserveTopiaPersistenceContextSupport; import fr.ird.observe.entities.referential.common.Country; import fr.ird.observe.entities.referential.common.Vessel; @@ -44,19 +40,13 @@ import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; import java.util.function.Supplier; /** @@ -68,12 +58,6 @@ import java.util.function.Supplier; public class FloatingObjectSpi extends GeneratedFloatingObjectSpi { private static final Logger log = LogManager.getLogger(FloatingObjectSpi.class); - public ObjectMaterialHierarchyDto getObjectMaterialHierarchy(ObserveTopiaPersistenceContextSupport persistenceContext, ReferentialLocale referentialLocale) { - List<ObjectMaterial> objectMaterials = ObjectMaterial.getDao(persistenceContext).findAll(); - objectMaterials.sort(Comparator.comparing(ObjectMaterial::getCode)); - return getObjectMaterialHierarchyList(objectMaterials, referentialLocale).get(0); - } - public Form<FloatingObjectDto> preCreate(ObserveTopiaPersistenceContextSupport persistenceContext, Locale applicationLocale, ReferentialLocale referentialLocale, Supplier<Date> nowSupplier, FloatingObjectPreset floatingObjectPreset) { Date now = nowSupplier.get(); FloatingObject entity = newEntity(now); @@ -122,43 +106,6 @@ public class FloatingObjectSpi extends GeneratedFloatingObjectSpi { super.onSave(persistenceContext, applicationLocale, referentialLocale, nowSupplier, parent, entity, dto); } - public List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchyList(List<ObjectMaterial> objectMaterials, ReferentialLocale referentialLocale) { - Multimap<String, ObjectMaterial> childrenByParent = ArrayListMultimap.create(); - objectMaterials.forEach(o -> childrenByParent.put(Optional.ofNullable(o.getParent()).map(ObjectMaterial::getTopiaId).orElse("Yo"), o)); - Collection<ObjectMaterial> topLevelMaterials = childrenByParent.get("Yo"); - List<ObjectMaterialHierarchyDto> result = new LinkedList<>(); - Set<String> idsDone = new TreeSet<>(); - for (ObjectMaterial topLevelMaterial : topLevelMaterials) { - ObjectMaterialHierarchyDto hierarchyDto = fillHierarchyDto(childrenByParent, referentialLocale, ObjectMaterial.toDto(referentialLocale, topLevelMaterial), idsDone); - result.add(hierarchyDto); - } - result.sort(Comparator.comparing(ObjectMaterialDto::getCode)); - return result; - } - - private ObjectMaterialHierarchyDto fillHierarchyDto(Multimap<String, ObjectMaterial> childrenByParent, ReferentialLocale referentialLocale, ObjectMaterialDto topLevelMaterial, Set<String> idsDone) { - Collection<ObjectMaterial> childrenEntities = childrenByParent.get(topLevelMaterial.getId()); - List<ObjectMaterialDto> children = ObjectMaterial.toDtoList(referentialLocale, childrenEntities.stream()); - String code = topLevelMaterial.getCode(); - int level = code == null|| code.isEmpty() ? 0 : code.split("-").length; - Map<Integer, ObjectMaterialDto> orderMap = new TreeMap<>(); - for (ObjectMaterialDto child : children) { - String code1 = child.getCode().split("-")[level]; - orderMap.put(Integer.valueOf(code1), child); - } - List<ObjectMaterialDto> orderedChildren = new LinkedList<>(); - orderMap.forEach((k, v) -> orderedChildren.add(v)); - ObjectMaterialHierarchyDto hierarchyDto = new ObjectMaterialHierarchyDto(topLevelMaterial); - boolean add = idsDone.add(hierarchyDto.getId()); - if (add) { - for (ObjectMaterialDto child : orderedChildren) { - ObjectMaterialHierarchyDto hierarchyDto1 = fillHierarchyDto(childrenByParent, referentialLocale, child, idsDone); - hierarchyDto.addChild(hierarchyDto1); - } - } - return hierarchyDto; - } - private TransmittingBuoy preCreate(ObserveTopiaPersistenceContextSupport topiaPersistenceContext, Locale applicationLocale, FloatingObjectBuoyPreset floatingObjectBuoyPreset, Date now) { TransmittingBuoy transmittingBuoy = TransmittingBuoy.newEntity(now); transmittingBuoy.setCode(floatingObjectBuoyPreset.getCode()); ===================================== server/core/src/main/filtered-resources/META-INF/mapping-api-v1.wm ===================================== @@ -105,7 +105,6 @@ GET /data/ps/common/TripService/getAllTripIds data GET /data/ps/common/TripService/getLogbookSetActivities data.ps.common.TripServiceRestApi.getLogbookSetActivities GET /data/ps/common/TripService/getLogbookWellPlanActivities data.ps.common.TripServiceRestApi.getLogbookWellPlanActivities GET /data/ps/common/TripService/getMatchingTripsVesselWithinDateRange data.ps.common.TripServiceRestApi.getMatchingTripsVesselWithinDateRange -GET /data/ps/common/TripService/getObjectMaterialHierarchy data.ps.common.TripServiceRestApi.getObjectMaterialHierarchy GET /data/ps/common/TripService/getSpeciesByListAndTrip data.ps.common.TripServiceRestApi.getSpeciesByListAndTrip GET /data/ps/common/TripService/getTripMap data.ps.common.TripServiceRestApi.getTripMap GET /data/ps/common/TripService/isActivityEndOfSearchFound data.ps.common.TripServiceRestApi.isActivityEndOfSearchFound ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java ===================================== @@ -34,7 +34,6 @@ import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.SpeciesReference; -import fr.ird.observe.dto.referential.ps.common.ObjectMaterialHierarchyDto; import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.service.data.EditableServiceFixtures; import fr.ird.observe.services.service.data.OpenableServiceFixtures; @@ -126,12 +125,6 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures { Assert.assertTrue(activityEndOfSearchFound); } - @Override - public void getObjectMaterialHierarchy(ObserveServicesProvider servicesProvider, TripService service) { - ObjectMaterialHierarchyDto form = service.getObjectMaterialHierarchy(); - Assert.assertNotNull(form); - } - @Override public void preCreateLogbookFloatingObject(ObserveServicesProvider servicesProvider, TripService service) { String activityId = getProperty("preCreateLogbookFloatingObject.activityId"); ===================================== services/api/src/main/java/fr/ird/observe/services/service/data/ps/common/TripService.java ===================================== @@ -26,7 +26,6 @@ import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPreset; import fr.ird.observe.dto.data.ps.logbook.ActivityReference; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; -import fr.ird.observe.dto.referential.ps.common.ObjectMaterialHierarchyDto; import fr.ird.observe.security.Permission; import fr.ird.observe.services.service.data.TripAwareService; import fr.ird.observe.services.spi.MethodCredential; @@ -65,10 +64,6 @@ public interface TripService extends TripAwareService { @MethodCredential(Permission.READ_DATA) boolean isActivityEndOfSearchFound(String routeId); - @Get - @MethodCredential(Permission.READ_REFERENTIAL) - ObjectMaterialHierarchyDto getObjectMaterialHierarchy(); - @Get @MethodCredential(Permission.WRITE_DATA) Form<fr.ird.observe.dto.data.ps.observation.FloatingObjectDto> preCreateObservationFloatingObject(String activityId, @Nullable FloatingObjectPreset floatingObjectPreset); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocalSupport.java ===================================== @@ -29,13 +29,11 @@ import fr.ird.observe.dto.data.ps.logbook.ActivityReference; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.ps.common.ObjectMaterialHierarchyDto; import fr.ird.observe.entities.data.ps.common.Program; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.common.TripSpi; import fr.ird.observe.entities.data.ps.common.TripTopiaDao; import fr.ird.observe.entities.data.ps.logbook.Activity; -import fr.ird.observe.entities.data.ps.logbook.FloatingObject; import fr.ird.observe.entities.data.ps.observation.Route; import fr.ird.observe.services.service.data.ps.common.TripService; @@ -73,11 +71,6 @@ public abstract class TripServiceLocalSupport extends fr.ird.observe.services.lo return route.getActivity().stream().anyMatch(fr.ird.observe.entities.data.ps.observation.Activity::isActivityEndOfSearching); } - @Override - public ObjectMaterialHierarchyDto getObjectMaterialHierarchy() { - return FloatingObject.SPI.getObjectMaterialHierarchy(getTopiaPersistenceContext(), getReferentialLocale()); - } - @Override public Form<fr.ird.observe.dto.data.ps.observation.FloatingObjectDto> preCreateObservationFloatingObject(String activityId, FloatingObjectPreset floatingObjectPreset) { return fr.ird.observe.entities.data.ps.observation.FloatingObject.SPI.preCreate(getTopiaPersistenceContext(), getApplicationLocale(), getReferentialLocale(), this::now, floatingObjectPreset); ===================================== services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-create-error-validation.xml → services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-create-warning-validation.xml ===================================== ===================================== services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-update-error-validation.xml ===================================== @@ -23,13 +23,6 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="vessel"> -  - <field-validator type="tripVessel" short-circuit="true"> - <param name="serviceName">servicesProvider.llCommonTripService</param> - <message/> - </field-validator> - </field> <field name="startDate">  <field-validator type="collectionFieldExpression"> ===================================== services/validation/src/main/validation/fr/ird/observe/dto/data/ll/common/TripDto-update-warning-validation.xml ===================================== @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + <field name="vessel"> +  + <field-validator type="tripVessel" short-circuit="true"> + <param name="serviceName">servicesProvider.psCommonTripService</param> + <message/> + </field-validator> + </field> +</validators> ===================================== services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-create-error-validation.xml ===================================== @@ -23,13 +23,6 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="vessel"> -  - <field-validator type="tripVessel" short-circuit="true"> - <param name="serviceName">servicesProvider.psCommonTripService</param> - <message/> - </field-validator> - </field> <field name="formsUrl">  <field-validator type="url" short-circuit="true"> ===================================== services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-create-warning-validation.xml ===================================== @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + <field name="vessel"> +  + <field-validator type="tripVessel" short-circuit="true"> + <param name="serviceName">servicesProvider.psCommonTripService</param> + <message/> + </field-validator> + </field> +</validators> ===================================== services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-update-error-validation.xml ===================================== @@ -23,13 +23,6 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="vessel"> -  - <field-validator type="tripVessel" short-circuit="true"> - <param name="serviceName">servicesProvider.psCommonTripService</param> - <message/> - </field-validator> - </field> <field name="startDate">  <field-validator type="collectionFieldExpression"> ===================================== services/validation/src/main/validation/fr/ird/observe/dto/data/ps/common/TripDto-update-warning-validation.xml ===================================== @@ -23,6 +23,13 @@ "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="vessel"> +  + <field-validator type="tripVessel" short-circuit="true"> + <param name="serviceName">servicesProvider.psCommonTripService</param> + <message/> + </field-validator> + </field> <field name="routeObs">  <field-validator type="collectionFieldExpression"> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e828c2dbe1aecb14f3df14d5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e828c2dbe1aecb14f3df14d5… You're receiving this email because of your account on gitlab.com.

1 0