Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 1c264668 by Tony CHEMIT at 2018-03-08T10:28:09Z [N2][N3] Les calées de type banc indéterminé ne sont pas traitées au N2 et N3 (See #261) - - - - - 3 changed files: - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java Changes: ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step2Action.java @@ -25,6 +25,7 @@ import fr.ird.t3.actions.stratum.SchoolTypeIndeterminate; import fr.ird.t3.actions.stratum.StratumMinimumSampleCount; import fr.ird.t3.entities.reference.Country; import fr.ird.t3.entities.reference.CountryTopiaDao; +import fr.ird.t3.entities.reference.SchoolTypeTopiaDao; import fr.ird.t3.entities.reference.Species; import fr.ird.t3.services.ioc.InjectDAO; import fr.ird.t3.services.ioc.InjectDecoratedBeans; @@ -86,6 +87,8 @@ public class ConfigureLevel3Step2Action extends AbstractConfigureAction<Level3Co Level3Configuration configuration = getConfiguration(); log.info(String.format("Prepare with configuration %s", configuration)); injectExcept(InjectDecoratedBeans.class); + // on level 3, can't treat Indeterminate school type + schoolTypeIndeterminate.remove(SchoolTypeTopiaDao.SCHOOL_TYPE_INDETERMINATE_ID); missingData = false; Set<Country> sampleFlags = new LinkedHashSet<>(); Set<Country> sampleFleets = new LinkedHashSet<>(); ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3ConfigureAction.java @@ -25,6 +25,7 @@ import fr.ird.t3.actions.stratum.SchoolTypeIndeterminate; import fr.ird.t3.actions.stratum.StratumMinimumSampleCount; import fr.ird.t3.entities.reference.Country; import fr.ird.t3.entities.reference.Ocean; +import fr.ird.t3.entities.reference.SchoolTypeTopiaDao; import fr.ird.t3.entities.reference.Species; import fr.ird.t3.entities.reference.zone.ZoneStratumAwareMeta; import fr.ird.t3.entities.reference.zone.ZoneVersion; @@ -85,10 +86,13 @@ public class Level3ConfigureAction extends AbstractConfigureAction<Level3Configu log.info(String.format("Prepare with configuration %s", getConfiguration())); useSamplesOrNot = createLevel3UseSamplesOrNotMap(); useWeightCategoriesOrNot = createLevel3UseWeightCategoriesOrNotMap(); + useWeightCategoriesInStratumOrNot = createUseWeightCategoriesInStratumOrNot(); // load configuration getConfiguration(); // load decorated beans injectOnly(InjectDecoratedBeans.class); + // on level 3, can't treat Indeterminate school type + schoolTypeIndeterminate.remove(SchoolTypeTopiaDao.SCHOOL_TYPE_INDETERMINATE_ID); } @Override @@ -161,10 +165,12 @@ public class Level3ConfigureAction extends AbstractConfigureAction<Level3Configu public Map<String, String> getUseWeightCategoriesOrNot() { return useWeightCategoriesOrNot; } + @SuppressWarnings("unused") public Map<String, String> getUseWeightCategoriesInStratumOrNot() { return useWeightCategoriesInStratumOrNot; } + @SuppressWarnings("unused") public Map<String, String> getSchoolTypeIndeterminate() { return schoolTypeIndeterminate; ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/Level3RunAction.java @@ -26,6 +26,7 @@ import fr.ird.t3.actions.stratum.SchoolTypeIndeterminate; import fr.ird.t3.actions.stratum.StratumMinimumSampleCount; import fr.ird.t3.entities.reference.Country; import fr.ird.t3.entities.reference.Ocean; +import fr.ird.t3.entities.reference.SchoolTypeTopiaDao; import fr.ird.t3.entities.reference.Species; import fr.ird.t3.entities.reference.zone.ZoneStratumAwareMeta; import fr.ird.t3.entities.reference.zone.ZoneVersion; @@ -159,6 +160,8 @@ public class Level3RunAction extends AbstractRunAction<Level3Configuration, Leve useWeightCategoriesOrNot = createLevel3UseWeightCategoriesOrNotMap(); useWeightCategoriesInStratumOrNot = createUseWeightCategoriesInStratumOrNot(); super.prepare(); + // on level 3, can't treat Indeterminate school type + schoolTypeIndeterminate.remove(SchoolTypeTopiaDao.SCHOOL_TYPE_INDETERMINATE_ID); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/1c26466856a7c12ee3ea44fb9265cecb1... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/1c26466856a7c12ee3ea44fb9265cecb1... You're receiving this email because of your account on gitlab.com.