Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 9d116e9a by Tony CHEMIT at 2018-05-04T12:39:17Z [N2] Des espèces accessoires ne sont pas recopiées de catchWeight vers correctedCatchWeight lors d'un N2 - Closes #322 - - - - - 6 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java @@ -229,15 +229,4 @@ public class L2CatchStratum extends CatchStratum<Level2Configuration, Level2Acti return sampleWeightModelFroAllSpecies; } - public void resetCorrectedElementaryCatches() { - for (Activity activity : getActivities().keySet()) { - if (activity.isCorrectedElementaryCatchNotEmpty()) { - for (CorrectedElementaryCatch correctedElementaryCatch : activity.getCorrectedElementaryCatch()) { - if (correctedElementaryCatch.getCorrectedCatchWeight()==null) { - correctedElementaryCatch.setCorrectedCatchWeight(correctedElementaryCatch.getCatchWeight()); - } - } - } - } - } } ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java @@ -23,6 +23,7 @@ package fr.ird.t3.actions.data.level2; import fr.ird.t3.actions.stratum.CatchStratumLoader; import fr.ird.t3.entities.data.Activity; import fr.ird.t3.entities.data.ActivityTopiaDao; +import fr.ird.t3.entities.data.CorrectedElementaryCatch; import fr.ird.t3.services.ioc.InjectDAO; import java.util.Map; @@ -60,4 +61,13 @@ public class L2CatchStratumLoader extends CatchStratumLoader<Level2Configuration // - maree.bateau dans la bonne flotte OK return filterActivities(configuration, activityIds); } + + @Override + protected void onActivityFound(Activity activity) { + if (activity.isCorrectedElementaryCatchNotEmpty()) { + for (CorrectedElementaryCatch correctedElementaryCatch : activity.getCorrectedElementaryCatch()) { + correctedElementaryCatch.setCorrectedCatchWeight(correctedElementaryCatch.getCatchWeight()); + } + } + } } \ No newline at end of file ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java @@ -174,8 +174,6 @@ public class Level2Action extends T3Action<Level2Configuration> { result.setSubstitutionLevel(0); incrementsProgression(); } else { - catchStratum.resetCorrectedElementaryCatches(); - //flushTransaction("clean stratum " + stratumConfiguration.getStratumIndex()); // compute sample stratum try (L2SampleStratum sampleStratum = L2SampleStratum.newSampleStratum(stratumConfiguration, catchStratum, weightCategories, species, this)) { ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3CatchStratumLoader.java @@ -60,4 +60,9 @@ public class L3CatchStratumLoader extends CatchStratumLoader<Level3Configuration // - maree.bateau dans la bonne flotte OK return filterActivities(configuration, activityIds); } + + @Override + protected void onActivityFound(Activity activity) { + + } } ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java @@ -74,15 +74,19 @@ public abstract class CatchStratumLoader<C extends LevelConfigurationWithStratum String activityId = e.getKey(); // get activity Activity activity = configuration.getActivity(activityId); + onActivityFound(activity); // get his trip Trip trip = activity.getTrip(); if (!possibleVessels.contains(trip.getVessel())) { // not a matching boat continue; } +// if (activity.isCorrectedElementaryCatchEmpty()) { +// continue; +// } // recheck activity have some catches. - Preconditions.checkState(!activity.isCorrectedElementaryCatchEmpty(), - String.format("Can not accept an activity (%s) with no catch", activity.getTopiaId())); +// Preconditions.checkState(!activity.isCorrectedElementaryCatchEmpty(), +// String.format("Can not accept an activity (%s) with no catch", activity.getTopiaId())); // weight category is in stratum, check there is catch using this category if (weightCategoryTreatment != null && !activity.withCorrectedElementaryCatch(weightCategoryTreatment)) { // reject - the stratum weight category not found for this activity @@ -93,4 +97,6 @@ public abstract class CatchStratumLoader<C extends LevelConfigurationWithStratum } return result; } + + protected abstract void onActivityFound(Activity activity); } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractActivityTopiaDao.java @@ -151,8 +151,8 @@ public class AbstractActivityTopiaDao<E extends Activity> extends GeneratedActiv "AND a.expertflag != 0 " + "AND a.schooltype IN (" + schoolTypeParameters.substring(2) + ")" + "AND r.date::date >= ? " + - "AND r.date::date <= ? " + - "AND (SELECT COUNT(*) FROM CorrectedElementaryCatch c WHERE c.activity = a.topiaid) > 0" + "AND r.date::date <= ? " +// + "AND (SELECT COUNT(*) FROM CorrectedElementaryCatch c WHERE c.activity = a.topiaid) > 0" ); int index = 0; View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/9d116e9a0813e0e3ba37843ca0b30f3e3... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/9d116e9a0813e0e3ba37843ca0b30f3e3... You're receiving this email because of your account on gitlab.com.