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

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.1.3-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 12 May '23

12 May '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 99249f23 by Tony Chemit at 2023-05-12T16:43:46+02:00 [jgitflow-maven-plugin]updating poms for 9.1.3-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/99249f23cda94b6ffe2b2f053… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/99249f23cda94b6ffe2b2f053… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.1.2
by Tony CHEMIT (＠tchemit) 12 May '23

12 May '23

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

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.1.2 [skip CI]
by Tony CHEMIT (＠tchemit) 12 May '23

12 May '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 78e08c43 by Tony Chemit at 2023-05-12T16:41:46+02:00 Update changelog for v.9.1.2 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,21 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-05-10 17:35. + * Last generated at 2023-05-12 16:31. + +## Version [9.1.2](https://gitlab.com/ultreiaio/ird-observe/-/milestones/265) + +**Closed at 2023-05-12.** + +### Download +* [Client (observe-9.1.2-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.1.2.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.1.2-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + +### Issues + * [[Type::Anomalie 2688]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2688) **En LL / logbook / Opération de pêche, les boutons de recopie des caractéristiques des opérations précédentes sont indisponibles** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2687]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2687) **Dans le calcul des nombres estimés (PS observation), appliquer un arrondi standard** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2689]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2689) **Dans la consolidation des poids pondérés des cuves-calées, il faut effectuer un filtre sur une liste d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.1.1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/264) @@ -12,7 +26,6 @@ * [Serveur (observe-9.1.1.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.1.1-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[Type::Anomalie 2680]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2680) **Erreur en sortie de form lors du renommage d'un programme** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2681]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2681) **Impossible de saisir des captures LL observations en mode individuel** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/78e08c43046d0a50ba80582ac… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/78e08c43046d0a50ba80582ac… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT (＠tchemit) 12 May '23

12 May '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 68d34317 by Tony Chemit at 2023-05-11T15:45:12+02:00 update pom - - - - - c6bfd4e0 by Tony Chemit at 2023-05-12T15:38:03+02:00 Dans la consolidation des poids pondérés des cuves-calées, il faut effectuer un filtre sur une liste d'espèces - Closes #2689 - - - - - 5 changed files: - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleActivityConsolidateActions.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/WellActivityImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/WellImpl.java - model/src/main/models/Observe/persistence/21-data-ps-logbook.model - pom.xml Changes: ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleActivityConsolidateActions.java ===================================== @@ -42,6 +42,25 @@ public enum SampleActivityConsolidateActions implements AtomicConsolidateAction< * Compute {@link SampleActivity#getWeightedWeight()}. */ ComputeWeightedWeight() { + + /** + * Filter on these species to compute any weight on SampleActivitySpecies + */ + public final Set<String> SPECIES_IDS = Set.of( + "fr.ird.referential.common.Species#1239832685474#0.8943253454598569", // YFT + "fr.ird.referential.common.Species#1239832685474#0.975344121171992", // SKJ + "fr.ird.referential.common.Species#1239832685475#0.13349466123905152", // BET + "fr.ird.referential.common.Species#1239832685476#0.5618871286604711", // ALB + "fr.ird.referential.common.Species#1239832685477#0.8024257002747615", // LTA + "fr.ird.referential.common.Species#1239832685477#0.3846921632590058", // FRI + "fr.ird.referential.common.Species#1441287921299#0.016754076421811148", // TUN + "fr.ird.referential.common.Species#1433499265113#0.891799515346065", // TUS + "fr.ird.referential.common.Species#1239832685477#0.2673009297087321", // KAW + "fr.ird.referential.common.Species#1239832685478#0.7676744877900202", // LOT + "fr.ird.referential.common.Species#1239832685477#0.5989181185528589", // FRZ + "fr.ird.referential.common.Species#1239832685476#0.36339915670317835" // BLT + ); + @Override public List<String> fieldNames() { return List.of(SampleActivity.PROPERTY_WEIGHTED_WEIGHT, SampleActivity.PROPERTY_WEIGHTED_WEIGHT_COMPUTED); @@ -61,7 +80,7 @@ public enum SampleActivityConsolidateActions implements AtomicConsolidateAction< // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2053 // Get total weight of the set which is this well - double w1 = context.sumOnTripWell(w -> w.getTotalWeight(activity, Set.of(wellId))); + double w1 = context.sumOnTripWell(w -> w.getTotalWeight(activity, SPECIES_IDS, Set.of(wellId))); if (w1 == 0) { // limit case if the well was not found in trip well plan log.warn("Well {} not found for activity {} in trip well plan.", wellId, activity.getTopiaId()); @@ -70,9 +89,9 @@ public enum SampleActivityConsolidateActions implements AtomicConsolidateAction< return; } // Get total weight of the set which are in well that has been sampled - double w2 = context.sumOnTripWell(w -> w.getTotalWeight(activity, context.getSampledWellIds())); + double w2 = context.sumOnTripWell(w -> w.getTotalWeight(activity, SPECIES_IDS, context.getSampledWellIds())); // Get total weight of the set in any well - double wT = context.sumOnTripWell(w -> w.getTotalWeight(activity)); + double wT = context.sumOnTripWell(w -> w.getTotalWeight(activity, SPECIES_IDS)); // the weighted weight is the formula: weightedWeight = (w1/w2)*wT float weightedWeight = (float) ((w1 / w2) * wT); Float oldWeightedWeight = datum.getWeightedWeight(); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/WellActivityImpl.java ===================================== @@ -25,17 +25,19 @@ package fr.ird.observe.entities.data.ps.logbook; import io.ultreia.java4all.decoration.Decorator; import io.ultreia.java4all.decoration.DecoratorProvider; +import java.util.Collection; + public class WellActivityImpl extends WellActivityAbstract { private static final long serialVersionUID = 1L; @Override - public double getTotalWeight(Activity activity) { - return getActivity().equals(activity) ? getTotalWeight() : 0; + public double getTotalWeight(Activity activity, Collection<String> speciesIds) { + return getActivity().equals(activity) ? getTotalWeight(speciesIds) : 0; } @Override - public double getTotalWeight() { - return getWellActivitySpecies().stream().mapToDouble(WellActivitySpecies::getWeight).sum(); + public double getTotalWeight(Collection<String> speciesIds) { + return getWellActivitySpecies().stream().filter(was -> speciesIds.contains(was.getSpecies().getId())).mapToDouble(WellActivitySpecies::getWeight).sum(); } @Override ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/WellImpl.java ===================================== @@ -35,12 +35,12 @@ public class WellImpl extends WellAbstract { private static final long serialVersionUID = 1L; @Override - public double getTotalWeight(Activity activity) { - return getWellActivity().stream().mapToDouble(wa -> wa.getTotalWeight(activity)).sum(); + public double getTotalWeight(Activity activity, Collection<String> speciesIds) { + return getWellActivity().stream().mapToDouble(wa -> wa.getTotalWeight(activity, speciesIds)).sum(); } @Override - public double getTotalWeight(Activity activity, Collection<String> wellIds) { - return wellIds.contains(getWell()) ? getTotalWeight(activity) : 0; + public double getTotalWeight(Activity activity, Collection<String> speciesIds, Collection<String> wellIds) { + return wellIds.contains(getWell()) ? getTotalWeight(activity, speciesIds) : 0; } } ===================================== model/src/main/models/Observe/persistence/21-data-ps-logbook.model ===================================== @@ -119,14 +119,14 @@ wellFactory String wellSamplingConformity {*:1} referential.ps.logbook.WellSamplingConformity wellSamplingStatus {*:1} referential.ps.logbook.WellSamplingStatus wellActivity + {0:*} data.ps.logbook.WellActivity -getTotalWeight(activity data.ps.logbook.Activity) double -getTotalWeight(activity data.ps.logbook.Activity, wellIds java.util.Collection<String>) double +getTotalWeight(activity data.ps.logbook.Activity, speciesIds java.util.Collection<String>) double +getTotalWeight(activity data.ps.logbook.Activity, speciesIds java.util.Collection<String>, wellIds java.util.Collection<String>) double data.ps.logbook.WellActivity > data.DataEntity >> fr.ird.observe.dto.data.ps.logbook.ActivityLabelAware activity {*:1} data.ps.logbook.Activity wellActivitySpecies + {0:*} data.ps.logbook.WellActivitySpecies -getTotalWeight() double -getTotalWeight(activity data.ps.logbook.Activity) double +getTotalWeight(speciesIds java.util.Collection<String>) double +getTotalWeight(activity data.ps.logbook.Activity, speciesIds java.util.Collection<String>) double data.ps.logbook.WellActivitySpecies > data.DataEntity species {*:1} referential.common.Species ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.21</version> + <version>2023.22</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/198a38824a2bb62f465cb415… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/198a38824a2bb62f465cb415… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix gitlab CI docker password
by Tony CHEMIT (＠tchemit) 11 May '23

11 May '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 198a3882 by Tony Chemit at 2023-05-11T15:21:52+02:00 Fix gitlab CI docker password - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -33,7 +33,7 @@ cache: services: - docker:dind script: - - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token $CI_BUILD_TOKEN; fi + - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token ${CI_REGISTRY_PASSWORD}; fi .build-for-release: &build-for-release environment: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/198a38824a2bb62f465cb4154… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/198a38824a2bb62f465cb4154… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: En LL / logbook / Opération de pêche, les boutons de recopie des...
by Tony CHEMIT (＠tchemit) 11 May '23

11 May '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4eb7744b by Tony Chemit at 2023-05-11T13:18:54+02:00 En LL / logbook / Opération de pêche, les boutons de recopie des caractéristiques des opérations précédentes sont indisponibles - Closes #2688 - - - - - 98b5886d by Tony Chemit at 2023-05-11T13:19:22+02:00 Dans le calcul des nombres estimés (PS observation), appliquer un arrondi standard - Closes #2687 - - - - - 3 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIModelStates.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/CatchConsolidateActions.java Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jcss ===================================== @@ -30,14 +30,14 @@ DateTimeEditor { } #copyFirstValuesAndSave { - enabled:{states.isUpdatingMode() && states.getCopyFirstSetCandidate() != null && states.isValid()}; + enabled:{!states.isReadingMode() && states.getCopyFirstSetCandidate() != null && states.isValid()}; text:"observe.data.ll.logbook.Set.action.copyFirstValuesAndSave"; toolTipText:"observe.data.ll.logbook.Set.action.copyFirstValuesAndSave"; _keyStroke:{fr.ird.observe.client.datasource.editor.ll.ObserveLLKeyStrokes.KEY_STROKE_COPY_FIRST_VALUES_AND_SAVE}; } #copyLastValuesAndSave { - enabled:{states.isUpdatingMode() && states.getCopyLastSetCandidate() != null && states.isValid()}; + enabled:{!states.isReadingMode() && states.getCopyLastSetCandidate() != null && states.isValid()}; text:"observe.data.ll.logbook.Set.action.copyLastValuesAndSave"; toolTipText:"observe.data.ll.logbook.Set.action.copyLastValuesAndSave"; _keyStroke:{fr.ird.observe.client.datasource.editor.ll.ObserveLLKeyStrokes.KEY_STROKE_COPY_LAST_VALUES_AND_SAVE}; ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIModelStates.java ===================================== @@ -51,7 +51,7 @@ public class SetUIModelStates extends GeneratedSetUIModelStates { copySetCandidates = form.getObject().getOtherSets().stream() .sorted(Comparator.comparing(SetStubDto::getSettingStartTimeStamp)) .collect(Collectors.toList()); - updateCopySetCandidate(getBean().getSettingStartTimeStamp()); + updateCopySetCandidate(null); super.copyFormToBean(form); } @@ -91,17 +91,19 @@ public class SetUIModelStates extends GeneratedSetUIModelStates { } private void updateCopySetCandidate(Date newValue) { + if (isReadingMode()) { + return; + } + setCopyFirstSetCandidate(null); + setCopyLastSetCandidate(null); if (newValue == null) { - setCopyLastSetCandidate(null); - } else { - List<SetStubDto> collect = copySetCandidates.stream().filter(e -> e.getSettingStartTimeStamp().before(newValue)).collect(Collectors.toList()); - if (collect.isEmpty()) { - setCopyFirstSetCandidate(null); - setCopyLastSetCandidate(null); - } else { - setCopyFirstSetCandidate(collect.get(0)); - setCopyLastSetCandidate(collect.get(collect.size() - 1)); - } + return; + } + List<SetStubDto> collect = copySetCandidates.stream().filter(e -> e.getSettingStartTimeStamp().before(newValue)).collect(Collectors.toList()); + if (collect.isEmpty()) { + return; } + setCopyFirstSetCandidate(collect.get(0)); + setCopyLastSetCandidate(collect.get(collect.size() - 1)); } } ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/CatchConsolidateActions.java ===================================== @@ -143,7 +143,7 @@ public enum CatchConsolidateActions implements AtomicConsolidateAction<CatchCons public void accept(CatchConsolidateContext context, Catch aCatch) { float meanWeight = aCatch.getMeanWeight(); float catchWeight = aCatch.getCatchWeight(); - int totalCount = (int) ((float) 1000 * catchWeight / meanWeight); + int totalCount = Math.round(1000f * catchWeight / meanWeight); aCatch.setTotalCount(totalCount); aCatch.setTotalCountComputedSource(CatchComputedValueSource.fromData); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a1c12e640affebbf7e533702… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a1c12e640affebbf7e533702… 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.1.1)
by Tony CHEMIT (＠tchemit) 10 May '23

10 May '23

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 7e3f949a by Tony Chemit at 2023-05-10T19:18:48+02:00 Site checkin for project ObServe (version 9.1.1) - - - - - 15 changed files: - latest/CHANGELOG.html → 9.1.1/CHANGELOG.html - latest/architecture-logicielle.html → 9.1.1/architecture-logicielle.html - latest/avdth/common.html → 9.1.1/avdth/common.html - + 9.1.1/avdth/index.html - latest/avdth/landing.html → 9.1.1/avdth/landing.html - latest/avdth/local_market.html → 9.1.1/avdth/local_market.html - latest/avdth/logbook.html → 9.1.1/avdth/logbook.html - latest/avdth/referential.html → 9.1.1/avdth/referential.html - latest/avdth/sample.html → 9.1.1/avdth/sample.html - + 9.1.1/changelog.html - latest/changes-report.html → 9.1.1/changes-report.html - + 9.1.1/ci-management.html - + 9.1.1/client/changelog.html - + 9.1.1/client/ci-management.html - + 9.1.1/client/client-configuration/changelog.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7e3f949a782408a25077bdf15… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7e3f949a782408a25077bdf15… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.1.1
by Tony CHEMIT (＠tchemit) 10 May '23

10 May '23

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

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.1.1
by Tony CHEMIT (＠tchemit) 10 May '23

10 May '23

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

1 0

[Git][ultreiaio/ird-observe][release/9.1.1] [jgitflow-maven-plugin]updating poms for branch'release/9.1.1' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 10 May '23

10 May '23

Tony CHEMIT pushed to branch release/9.1.1 at ultreiaio / ird-observe Commits: 6db8fea3 by Tony Chemit at 2023-05-10T17:48:53+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.1' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6db8fea304223981f3477d453… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6db8fea304223981f3477d453… You're receiving this email because of your account on gitlab.com.

1 0