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

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-17
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

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

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: low log level
by Tony CHEMIT (＠tchemit) Oct. 27, 2021

Oct. 27, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: daa07bd4 by Tony Chemit at 2021-10-27T12:02:41+02:00 low log level - - - - - 6dfac180 by Tony Chemit at 2021-10-27T12:04:09+02:00 improve WeightCategoryHelper code - - - - - a709fbdc by Tony Chemit at 2021-10-27T12:14:31+02:00 update pom - - - - - 1e948a7b by Tony Chemit at 2021-10-27T12:34:40+02:00 update CHANGELOG [skip ci] - - - - - 762b5622 by Tony Chemit at 2021-10-27T13:21:45+02:00 Gestion des dates de mises à jour lors de suppression de référentiels via les synchronisations - Close ultreiaio/ird-observe-toolkit#102 On utilise toujours une date par defaut si on ne la pas trouvée depuis la Task lors de la génération du code sql, cette date est nécessaire pour mettee à jour certaines associations lors de remplacement - - - - - 76d2d058 by Tony Chemit at 2021-10-27T15:12:40+02:00 update pom - - - - - 6 changed files: - CHANGELOG.md - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/WeightCategoryHelper.java - pom.xml - services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/SynchronizeServiceLocalSupport.java Changes: ===================================== CHANGELOG.md ===================================== @@ -1,11 +1,11 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2021-10-26 20:34. + * Last generated at 2021-10-27 12:34. ## Version [9.0.0-RC-17](https://gitlab.com/ultreiaio/ird-observe/-/milestones/205) -**Closed at 2021-10-26.** +**Closed at 2021-10-27.** ### Download * [Application (observe-9.0.0-RC-17.zip)](https://repo1.maven.org/maven2/fr/ird/observe/obs…) @@ -47,7 +47,9 @@ * [[Type::Evolution 1618]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1618) **[PS][Logbook] Rajout d'un champ** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1773]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1773) **S'assurer qu'il y aura une date sur les landings PS** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1862]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1862) **Migration des données Logbook depuis AVDTH** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1871]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1871) **Migration des TargetCatch de la v7/8 vers Catch de la v9 : De la catégorie au poids moyen** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) * [[Type::Evolution 1883]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1883) **Captures logbook avec espèce de type Appât** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1888]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1888) **Synthèse des catégories de poids actuellement en vigueur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1890]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1890) **Déporter la regex de contrôle de la syntaxe des cuves dans la configuration de l'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1963]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1963) **Rajouter un programme logbook sur la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2026]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2026) **Logs de l'import AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java ===================================== @@ -61,7 +61,7 @@ public abstract class ContentSimpleUIModelSupport<D extends DataDto> extends Con result = bean.get(showDataPropertyName); if (result) { // got a matching bean property - log.info(String.format("%sUse dto bean property %s to enable %s create action.", getPrefix(), showDataPropertyName, dtoType.getName())); + log.debug(String.format("%sUse dto bean property %s to enable %s create action.", getPrefix(), showDataPropertyName, dtoType.getName())); } } return result; ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/WeightCategoryHelper.java ===================================== @@ -43,6 +43,7 @@ import java.util.stream.Collectors; * @since 9.0.0 */ public class WeightCategoryHelper { + public static final String AVAILABLE_WEIGHT_CATEGORY = "availableWeightCategory"; private static final Logger log = LogManager.getLogger(WeightCategoryHelper.class); final ContentTableUIModelStates<?, ?> states; final PropertyChangeListener speciesChanged; @@ -53,16 +54,18 @@ public class WeightCategoryHelper { } public void install(FilterableComboBox<WeightCategoryReference> editor) { - states.addPropertyChangeListener("availableWeightCategory", evt -> { - WeightCategoryReference weightCategory = states.getTableEditBean().get("weightCategory"); + states.addPropertyChangeListener(AVAILABLE_WEIGHT_CATEGORY, evt -> { + WeightCategoryReference previousWeightCategory = states.getTableEditBean().get("weightCategory"); @SuppressWarnings("unchecked") List<WeightCategoryReference> newValue = (List<WeightCategoryReference>) evt.getNewValue(); -// boolean weightCategoryModified = false; - if (newValue == null || !newValue.contains(weightCategory)) { - weightCategory = null; -// weightCategoryModified = true; + WeightCategoryReference newWeightCategory; + if (newValue == null || !newValue.contains(previousWeightCategory)) { + newWeightCategory = null; + } else { + newWeightCategory = previousWeightCategory; } + log.info(String.format("Will use category %s, from %d category(ies)", newWeightCategory, newValue == null ? 0 : newValue.size())); editor.setData(newValue); - editor.setSelectedItem(weightCategory); + editor.setSelectedItem(newWeightCategory); }); } @@ -79,8 +82,7 @@ public class WeightCategoryHelper { if (states.isReadingMode() || !states.isEditing()) { return; } - List<WeightCategoryReference> newCategories; - List<WeightCategoryReference> referentialReferences = states.getReferenceCache().getReferentialReferences(CatchDto.PROPERTY_WEIGHT_CATEGORY); + List<WeightCategoryReference> allCategories = states.getReferenceCache().getReferentialReferences(CatchDto.PROPERTY_WEIGHT_CATEGORY); Predicate<WeightCategoryReference> predicate; if (species == null) { // get all categories with no species @@ -89,8 +91,8 @@ public class WeightCategoryHelper { // get all categories with no species, or with this species predicate = r -> r.getSpecies() == null || r.getSpecies().equals(species); } - newCategories = referentialReferences.stream().filter(predicate).collect(Collectors.toList()); + List<WeightCategoryReference> newCategories = allCategories.stream().filter(predicate).collect(Collectors.toList()); log.info(String.format("For species: %s, found %d category(ies)", species, newCategories.size())); - states.firePropertyChanged("availableWeightCategory", newCategories); + states.firePropertyChanged(AVAILABLE_WEIGHT_CATEGORY, newCategories); } } ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.113</version> + <version>2021.116</version> </parent> <groupId>fr.ird.observe</groupId> @@ -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</lib.version.toolkit> + <lib.version.toolkit>5.0.52</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalSupport.java ===================================== @@ -278,7 +278,7 @@ class ReferentialServiceLocalSupport extends ObserveServiceLocal implements Refe } OneSideSqlRequest sqlRequest = OneSideSqlRequest.builder().addTasks(SynchronizeTaskType.ADD, missingReferentialIds).build(); OneSideSqlResult sqlResult = serviceContext.getTopiaApplicationContext() - .newOneSideSqlResultBuilder(getTopiaPersistenceContext(), getApplicationLocale()) + .newOneSideSqlResultBuilder(getTopiaPersistenceContext(), getApplicationLocale(), now()) .build(sqlRequest); Path temporaryDirectoryRoot = serviceContext.getServiceInitializer().getInitializerConfig().getTemporaryDirectoryRoot().toPath(); ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/SynchronizeServiceLocalSupport.java ===================================== @@ -89,7 +89,7 @@ public class SynchronizeServiceLocalSupport extends ObserveServiceLocal implemen public OneSideSqlResult produceSqlResult(OneSideSqlRequest request) { long startTime = TimeLog.getTime(); OneSideSqlResult result = serviceContext.getTopiaApplicationContext() - .newOneSideSqlResultBuilder(getTopiaPersistenceContext(), getApplicationLocale()) + .newOneSideSqlResultBuilder(getTopiaPersistenceContext(), getApplicationLocale(), now()) .build(request); TIME_LOG.log(startTime, "produceSqlResult"); return result; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d1c53add87dc53aa9b34d817… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d1c53add87dc53aa9b34d817… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-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