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

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT (＠tchemit) 03 Jan '23

03 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cd506c64 by Tony Chemit at 2023-01-03T19:34:07+01:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.102</version> + <version>2023.1</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cd506c645324609f1a9a342e7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cd506c645324609f1a9a342e7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 5 commits: Lors de la suppression gloable d'une capture utilisée sur le formulaire...
by Tony CHEMIT (＠tchemit) 03 Jan '23

03 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: d8016878 by Tony Chemit at 2023-01-03T14:29:48+01:00 Lors de la suppression gloable d'une capture utilisée sur le formulaire espèces sensibles, la demande de confirmation n'est pas proposée (mais elle l'est bien si l'espèce est utilisée dans un échantillon) - Closes #2580 - - - - - cf5d1c5b by Tony Chemit at 2023-01-03T18:35:10+01:00 Imperfection de la validation sur une activité de pêche - Closes #2581 - - - - - 5662c2b9 by Tony Chemit at 2023-01-03T18:35:10+01:00 Après création d'une activité, le nœud captures n'apparaît pas - Closes #2582 - - - - - 395dc4e4 by Tony Chemit at 2023-01-03T18:35:10+01:00 Les activités ne sont pas disponibles lors de la création d'un échantillon (mais disponible en mode mis à jour) - Closes #2584 - - - - - a4c18864 by Tony Chemit at 2023-01-03T18:35:10+01:00 Problème sur la sauvegarde d'un échantillon (si on lui associe des activités) - Closes #2585 - - - - - 14 changed files: - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SetCatchDto.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetCatchSpi.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json - model/src/main/models/Observe/dto/attribute/notNullIf.properties - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json Changes: ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java ===================================== @@ -388,7 +388,7 @@ public class CapabilityDescriptor { switch (capacityNodeType) { case STATIC_WITH_PREDICATE: { String beanPropertyName = getOptionalPredicate().orElseThrow(); - return String.format(" .onPredicate(d-> d.is%1$s() && d.get%2$sStatValue() > 0, %3$s.class)\n", beanPropertyName, Strings.removeEnd(beanPropertyName,"Enabled"), getNodeTypeSimpleName()); + return String.format(" .onPredicate(%1$s::is%2$s, %3$s.class)\n", mainDtoType.getSimpleName(), beanPropertyName, getNodeTypeSimpleName()); } case REFERENCE_LIST: case REFERENCE: { ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SetCatchDto.java ===================================== @@ -53,7 +53,7 @@ public class SetCatchDto extends GeneratedSetCatchDto { * @return set of unsafe species used in catches */ public Set<SpeciesReference> getUnsafeSpecies() { - return getCatches().stream().filter(CatchDto::isHasSample).map(CatchDto::getSpecies).collect(Collectors.toSet()); + return getCatches().stream().filter(c -> c.isHasSample() || c.isHasRelease()).map(CatchDto::getSpecies).collect(Collectors.toSet()); } /** ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -9666,7 +9666,7 @@ "name": "schoolType", "comments": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ] }, { @@ -9939,7 +9939,7 @@ "name": "schoolType", "comments": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ] }, { ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml ===================================== @@ -236,9 +236,9 @@ </field> <field name="schoolType"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ !setEnabled ]]></param> + <param name="skip"><![CDATA[ !setEnabled || reasonForNoFishing != null ]]></param> <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> </field-validator> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml ===================================== @@ -236,9 +236,9 @@ </field> <field name="schoolType"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ !setEnabled ]]></param> + <param name="skip"><![CDATA[ !setEnabled || reasonForNoFishing != null ]]></param> <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> </field-validator> ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.referential.ps.common.SampleType; import fr.ird.observe.entities.referential.ps.logbook.SampleQuality; +import fr.ird.observe.services.service.SaveResultDto; import fr.ird.observe.spi.service.ServiceContext; import java.util.Objects; @@ -63,7 +64,9 @@ public class SampleSpi extends GeneratedSampleSpi { preCreated.setSampleType(SampleType.loadEntity(context, ProtectedIdsPs.PS_LOGBOOK_SAMPLE_DEFAULT_SAMPLE_TYPE_ID)); preCreated.setSampleQuality(SampleQuality.loadEntity(context, ProtectedIdsPs.PS_LOGBOOK_SAMPLE_DEFAULT_SAMPLE_QUALITY_ID)); preCreated.setSuperSample(false); - return super.preCreate(context, parent, preCreated); + Form<SampleDto> form = super.preCreate(context, parent, preCreated); + form.getObject().setActivity(Trip.SPI.getLogbookSetActivities(context, parent.getTopiaId())); + return form; } @Override @@ -90,6 +93,13 @@ public class SampleSpi extends GeneratedSampleSpi { private int getSampleSpeciesSubNumber(Sample entity) { return (int) entity.getSampleSpecies().stream().mapToInt(SampleSpecies::getSubSampleNumber).distinct().count(); } + + @Override + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Sample entity) { + SampleActivity.SPI.initId(context, entity.getSampleActivity()); + return super.saveEntity(context, parent, entity); + } + //FIXME Add a callback in MoveRequest // @Override // public void moveCallback(Trip oldParent, Trip newParent, List<Sample> moved) { ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetCatchSpi.java ===================================== @@ -48,7 +48,7 @@ public class SetCatchSpi extends GeneratedSetCatchSpi { childDto.setHasSample(hasSample); }); } - // on cherche si il y a des libérations d'espèce sensibles + // is there some non target catch release? if (entity.isNonTargetCatchReleaseNotEmpty()) { // get usable species ids java.util.Set<String> speciesId = ToolkitId.ids(entity.getNonTargetCatchRelease().stream().map(NonTargetCatchRelease::getSpecies)); ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json ===================================== @@ -124,7 +124,7 @@ "schoolType": { "errors": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json ===================================== @@ -124,7 +124,7 @@ "schoolType": { "errors": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== model/src/main/models/Observe/dto/attribute/notNullIf.properties ===================================== @@ -46,7 +46,7 @@ data.ps.localmarket.Batch.attribute.weight=countOrWeightValid data.ps.logbook.Activity.attribute.latitude=floatingObjectEnabled && !setEnabled data.ps.logbook.Activity.attribute.longitude=floatingObjectEnabled && !setEnabled data.ps.logbook.Activity.attribute.quadrant=floatingObjectEnabled && !setEnabled -data.ps.logbook.Activity.attribute.schoolType=!setEnabled +data.ps.logbook.Activity.attribute.schoolType=!setEnabled || reasonForNoFishing != null data.ps.logbook.Activity.attribute.setCount=!setEnabled data.ps.logbook.Activity.attribute.setSuccessStatus=!setEnabled || reasonForNoFishing != null data.ps.logbook.Catch.attribute.weight=count != null && count > 0 ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml ===================================== @@ -234,9 +234,9 @@ </field> <field name="schoolType"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ !setEnabled ]]></param> + <param name="skip"><![CDATA[ !setEnabled || reasonForNoFishing != null ]]></param> <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create.json ===================================== @@ -124,7 +124,7 @@ "schoolType": { "errors": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update-error.xml ===================================== @@ -234,9 +234,9 @@ </field> <field name="schoolType"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ !setEnabled ]]></param> + <param name="skip"><![CDATA[ !setEnabled || reasonForNoFishing != null ]]></param> <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json ===================================== @@ -124,7 +124,7 @@ "schoolType": { "errors": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8a8f2a7c0d63cc02efe076f6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8a8f2a7c0d63cc02efe076f6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Imperfection de la validation sur une activité de pêche - Closes #2581
by Tony CHEMIT (＠tchemit) 03 Jan '23

03 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1810406c by Tony Chemit at 2023-01-03T18:56:21+01:00 Imperfection de la validation sur une activité de pêche - Closes #2581 - - - - - bdedac69 by Tony Chemit at 2023-01-03T18:56:26+01:00 Après création d'une activité, le nœud captures n'apparaît pas - Closes #2582 - - - - - 95d05194 by Tony Chemit at 2023-01-03T18:56:30+01:00 Les activités ne sont pas disponibles lors de la création d'un échantillon (mais disponible en mode mis à jour) - Closes #2584 - - - - - 8e4455c5 by Tony Chemit at 2023-01-03T18:56:33+01:00 Problème sur la sauvegarde d'un échantillon (si on lui associe des activités) - Closes #2585 - - - - - 12 changed files: - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json - model/src/main/models/Observe/dto/attribute/notNullIf.properties - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json Changes: ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java ===================================== @@ -388,7 +388,7 @@ public class CapabilityDescriptor { switch (capacityNodeType) { case STATIC_WITH_PREDICATE: { String beanPropertyName = getOptionalPredicate().orElseThrow(); - return String.format(" .onPredicate(d-> d.is%1$s() && d.get%2$sStatValue() > 0, %3$s.class)\n", beanPropertyName, Strings.removeEnd(beanPropertyName,"Enabled"), getNodeTypeSimpleName()); + return String.format(" .onPredicate(%1$s::is%2$s, %3$s.class)\n", mainDtoType.getSimpleName(), beanPropertyName, getNodeTypeSimpleName()); } case REFERENCE_LIST: case REFERENCE: { ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -9666,7 +9666,7 @@ "name": "schoolType", "comments": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ] }, { @@ -9939,7 +9939,7 @@ "name": "schoolType", "comments": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ] }, { ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-create-error-validation.xml ===================================== @@ -236,9 +236,9 @@ </field> <field name="schoolType"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ !setEnabled ]]></param> + <param name="skip"><![CDATA[ !setEnabled || reasonForNoFishing != null ]]></param> <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> </field-validator> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/ActivityDto-update-error-validation.xml ===================================== @@ -236,9 +236,9 @@ </field> <field name="schoolType"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ !setEnabled ]]></param> + <param name="skip"><![CDATA[ !setEnabled || reasonForNoFishing != null ]]></param> <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> </field-validator> ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/SampleSpi.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.referential.ps.common.SampleType; import fr.ird.observe.entities.referential.ps.logbook.SampleQuality; +import fr.ird.observe.services.service.SaveResultDto; import fr.ird.observe.spi.service.ServiceContext; import java.util.Objects; @@ -63,7 +64,9 @@ public class SampleSpi extends GeneratedSampleSpi { preCreated.setSampleType(SampleType.loadEntity(context, ProtectedIdsPs.PS_LOGBOOK_SAMPLE_DEFAULT_SAMPLE_TYPE_ID)); preCreated.setSampleQuality(SampleQuality.loadEntity(context, ProtectedIdsPs.PS_LOGBOOK_SAMPLE_DEFAULT_SAMPLE_QUALITY_ID)); preCreated.setSuperSample(false); - return super.preCreate(context, parent, preCreated); + Form<SampleDto> form = super.preCreate(context, parent, preCreated); + form.getObject().setActivity(Trip.SPI.getLogbookSetActivities(context, parent.getTopiaId())); + return form; } @Override @@ -90,6 +93,13 @@ public class SampleSpi extends GeneratedSampleSpi { private int getSampleSpeciesSubNumber(Sample entity) { return (int) entity.getSampleSpecies().stream().mapToInt(SampleSpecies::getSubSampleNumber).distinct().count(); } + + @Override + protected SaveResultDto saveEntity(ServiceContext context, Trip parent, Sample entity) { + SampleActivity.SPI.initId(context, entity.getSampleActivity()); + return super.saveEntity(context, parent, entity); + } + //FIXME Add a callback in MoveRequest // @Override // public void moveCallback(Trip oldParent, Trip newParent, List<Sample> moved) { ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-create.json ===================================== @@ -124,7 +124,7 @@ "schoolType": { "errors": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/Activity/validation-update.json ===================================== @@ -124,7 +124,7 @@ "schoolType": { "errors": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== model/src/main/models/Observe/dto/attribute/notNullIf.properties ===================================== @@ -46,7 +46,7 @@ data.ps.localmarket.Batch.attribute.weight=countOrWeightValid data.ps.logbook.Activity.attribute.latitude=floatingObjectEnabled && !setEnabled data.ps.logbook.Activity.attribute.longitude=floatingObjectEnabled && !setEnabled data.ps.logbook.Activity.attribute.quadrant=floatingObjectEnabled && !setEnabled -data.ps.logbook.Activity.attribute.schoolType=!setEnabled +data.ps.logbook.Activity.attribute.schoolType=!setEnabled || reasonForNoFishing != null data.ps.logbook.Activity.attribute.setCount=!setEnabled data.ps.logbook.Activity.attribute.setSuccessStatus=!setEnabled || reasonForNoFishing != null data.ps.logbook.Catch.attribute.weight=count != null && count > 0 ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml ===================================== @@ -234,9 +234,9 @@ </field> <field name="schoolType"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ !setEnabled ]]></param> + <param name="skip"><![CDATA[ !setEnabled || reasonForNoFishing != null ]]></param> <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create.json ===================================== @@ -124,7 +124,7 @@ "schoolType": { "errors": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update-error.xml ===================================== @@ -234,9 +234,9 @@ </field> <field name="schoolType"> -  +  <field-validator type="mandatory" short-circuit="true"> - <param name="skip"><![CDATA[ !setEnabled ]]></param> + <param name="skip"><![CDATA[ !setEnabled || reasonForNoFishing != null ]]></param> <message>observe.data.ps.logbook.Activity.schoolType.validation.required</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-update.json ===================================== @@ -124,7 +124,7 @@ "schoolType": { "errors": [ "check if referential schoolType is disabled (only if validation is strong)", - "schoolType is mandatory except if !setEnabled" + "schoolType is mandatory except if !setEnabled || reasonForNoFishing != null" ], "warnings": [ "check if referential schoolType is disabled (only if validation is not strong)" View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8b41a19189b06da580e06945… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8b41a19189b06da580e06945… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Lors de la suppression gloable d'une capture utilisée sur le formulaire...
by Tony CHEMIT (＠tchemit) 03 Jan '23

03 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8b41a191 by Tony Chemit at 2023-01-03T14:29:58+01:00 Lors de la suppression gloable d'une capture utilisée sur le formulaire espèces sensibles, la demande de confirmation n'est pas proposée (mais elle l'est bien si l'espèce est utilisée dans un échantillon) - Closes #2580 - - - - - 2 changed files: - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SetCatchDto.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetCatchSpi.java Changes: ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SetCatchDto.java ===================================== @@ -53,7 +53,7 @@ public class SetCatchDto extends GeneratedSetCatchDto { * @return set of unsafe species used in catches */ public Set<SpeciesReference> getUnsafeSpecies() { - return getCatches().stream().filter(CatchDto::isHasSample).map(CatchDto::getSpecies).collect(Collectors.toSet()); + return getCatches().stream().filter(c -> c.isHasSample() || c.isHasRelease()).map(CatchDto::getSpecies).collect(Collectors.toSet()); } /** ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetCatchSpi.java ===================================== @@ -48,7 +48,7 @@ public class SetCatchSpi extends GeneratedSetCatchSpi { childDto.setHasSample(hasSample); }); } - // on cherche si il y a des libérations d'espèce sensibles + // is there some non target catch release? if (entity.isNonTargetCatchReleaseNotEmpty()) { // get usable species ids java.util.Set<String> speciesId = ToolkitId.ids(entity.getNonTargetCatchRelease().stream().map(NonTargetCatchRelease::getSpecies)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8b41a19189b06da580e06945c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8b41a19189b06da580e06945c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Impossible de créer une route en 9.0.22 - Closes #2579
by Tony CHEMIT (＠tchemit) 03 Jan '23

03 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 0d8cc4c6 by Tony Chemit at 2023-01-03T12:49:20+01:00 Impossible de créer une route en 9.0.22 - Closes #2579 - - - - - 8a8f2a7c by Tony Chemit at 2023-01-03T13:03:36+01:00 Happy new yar commit \o/ - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/assembly/dcp-presets.xml - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/configuration/src/main/i18n/templates/about_es_ES.ftl - client/configuration/src/main/i18n/templates/about_fr_FR.ftl - client/configuration/src/main/java/fr/ird/observe/client/ObServeSwingSessionConfig.java - client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfigFinder.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/pom.xml - client/core/src/main/i18n/templates/ConfigurationModel_en_GB.ftl - client/core/src/main/i18n/templates/ConfigurationModel_es_ES.ftl - client/core/src/main/i18n/templates/ConfigurationModel_fr_FR.ftl - client/core/src/main/i18n/templates/DataSourceInitModel_en_GB.ftl - client/core/src/main/i18n/templates/DataSourceInitModel_es_ES.ftl - client/core/src/main/i18n/templates/DataSourceInitModel_fr_FR.ftl - client/core/src/main/i18n/templates/InitStorageModel_en_GB.ftl - client/core/src/main/i18n/templates/InitStorageModel_es_ES.ftl - client/core/src/main/i18n/templates/InitStorageModel_fr_FR.ftl - client/core/src/main/i18n/templates/ObserveSwingDataSource_en_GB.ftl - client/core/src/main/i18n/templates/ObserveSwingDataSource_es_ES.ftl - client/core/src/main/i18n/templates/ObserveSwingDataSource_fr_FR.ftl - client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_en_GB.ftl - client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_es_ES.ftl - client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b6e1143a2781aea6c9654349… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b6e1143a2781aea6c9654349… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Impossible de créer une route en 9.0.22 - Closes #2579
by Tony CHEMIT (＠tchemit) 03 Jan '23

03 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 48d3f051 by Tony Chemit at 2023-01-03T13:13:33+01:00 Impossible de créer une route en 9.0.22 - Closes #2579 - - - - - 6a8578ab by Tony Chemit at 2023-01-03T13:20:42+01:00 Happy new yar commit \o/ - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/assembly/dcp-presets.xml - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/configuration/src/main/i18n/templates/about_es_ES.ftl - client/configuration/src/main/i18n/templates/about_fr_FR.ftl - client/configuration/src/main/java/fr/ird/observe/client/ObServeSwingSessionConfig.java - client/configuration/src/main/java/fr/ird/observe/client/ObserveSwingSession.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfigFinder.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/pom.xml - client/core/src/main/i18n/templates/ConfigurationModel_en_GB.ftl - client/core/src/main/i18n/templates/ConfigurationModel_es_ES.ftl - client/core/src/main/i18n/templates/ConfigurationModel_fr_FR.ftl - client/core/src/main/i18n/templates/DataSourceInitModel_en_GB.ftl - client/core/src/main/i18n/templates/DataSourceInitModel_es_ES.ftl - client/core/src/main/i18n/templates/DataSourceInitModel_fr_FR.ftl - client/core/src/main/i18n/templates/InitStorageModel_en_GB.ftl - client/core/src/main/i18n/templates/InitStorageModel_es_ES.ftl - client/core/src/main/i18n/templates/InitStorageModel_fr_FR.ftl - client/core/src/main/i18n/templates/ObserveSwingDataSource_en_GB.ftl - client/core/src/main/i18n/templates/ObserveSwingDataSource_es_ES.ftl - client/core/src/main/i18n/templates/ObserveSwingDataSource_fr_FR.ftl - client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_en_GB.ftl - client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_es_ES.ftl - client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6e5e93c3fd72d6615d0968a6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6e5e93c3fd72d6615d0968a6… You're receiving this email because of your account on gitlab.com.

1 0