Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: a49d2063 by Tony Chemit at 2023-02-15T10:55:07+01:00 Consolidate - Sur les captures, suppression de la méthode de mesure de poids si le poids n'est pas déclaré, ou qu'il est calculé dans l'action de consolidation - See #2628 - - - - - 1 changed file: - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java Changes: ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java ===================================== @@ -126,13 +126,14 @@ public class TripConsolidateEngine { SampleMeasure.PROPERTY_WEIGHT, SampleMeasure.PROPERTY_IS_WEIGHT_COMPUTED); - BeanMonitor nonTargetCatchMonitor = new BeanMonitor( + BeanMonitor catchMonitor = new BeanMonitor( Catch.PROPERTY_MEAN_LENGTH, Catch.PROPERTY_MEAN_LENGTH_COMPUTED_SOURCE, Catch.PROPERTY_MEAN_WEIGHT, Catch.PROPERTY_MEAN_WEIGHT_COMPUTED_SOURCE, Catch.PROPERTY_CATCH_WEIGHT, Catch.PROPERTY_CATCH_WEIGHT_COMPUTED_SOURCE, + Catch.PROPERTY_WEIGHT_MEASURE_METHOD, Catch.PROPERTY_TOTAL_COUNT, Catch.PROPERTY_TOTAL_COUNT_COMPUTED_SOURCE); @@ -196,7 +197,7 @@ public class TripConsolidateEngine { activityContext.activityObs = activity; activityContext.sampleMeasureObsMonitor = sampleMeasureMonitor; activityContext.sampleObsMonitor = sampleMonitor; - activityContext.catchObsMonitor = nonTargetCatchMonitor; + activityContext.catchObsMonitor = catchMonitor; activityContext.floatingObjectConsolidateEngine = floatingObjectConsolidateEngine; activityContext.activityPrefix = activityPrefix; try { @@ -267,6 +268,7 @@ public class TripConsolidateEngine { for (Catch aCatch : set.getCatches()) { activityContext.watchCatch(aCatch); updateCatch(activityContext, aCatch); + updateCatchWeightMeasureMethod(aCatch); activityContext.flushCatch(); } } @@ -355,6 +357,14 @@ public class TripConsolidateEngine { computeCatchMeanValues(aCatch, lengthWeightParameter); } + private void updateCatchWeightMeasureMethod(Catch aCatch) { + if (aCatch.getWeightMeasureMethod() != null && (aCatch.getCatchWeight() == null || aCatch.getCatchWeightComputedSource() != null)) { + // remove measure method when no catchWeight or catchWeight is computed + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2628 + aCatch.setWeightMeasureMethod(null); + } + } + private void updateCatchByLengthWeightRelation(Catch aCatch, LengthWeightParameter lengthWeightParameter) { // calcul via le paramétrage taille - poids View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a49d206396a8db7de7b0be5e20... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a49d206396a8db7de7b0be5e20... You're receiving this email because of your account on gitlab.com.