Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: de2f1e0d by Tony CHEMIT at 2018-04-15T15:19:02Z [N2] Question sur le log N2 (closes #316) - - - - - 5 changed files: - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl - t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java Changes: ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl @@ -82,12 +82,13 @@ Qualité des strates échantillons : Indicateurs ----------- -- Nombre de strates : ${output.nbStratum} -- Nombre de strates corrigés : ${output.nbStrataFixed} -- Nombre d'activités traités : ${output.totalCatchActivities} -- Nombre d'activités traités (avec échantillon) : ${output.totalCatchActivitiesWithSample} -- Poids total (toute espèce confondue) : ${output.totalCatchWeight} -- Poids total (pour les espèces à corriger) : ${output.totalCatchWeightForSpeciesFoFix} +- Nombre de strates : ${output.nbStratum} +- Nombre de strates corrigés : ${output.nbStrataFixed} +- Nombre total d'activités traitées : ${output.totalCatchActivities} +- Nombre d'activités traitées (avec échantillon) : ${output.totalCatchActivitiesWithSample} +- Nombre d'activités traitées (sans échantillon) : ${output.totalCatchActivitiesWithoutSample} +- Poids total (toute espèce confondue) : ${output.totalCatchWeight} +- Poids total (pour les espèces à corriger) : ${output.totalCatchWeightForSpeciesFoFix} ${output.inputCatchStratumLog} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl @@ -81,12 +81,13 @@ Quality of sample stratum: Indicators ---------- -- Number of stratums: ${output.nbStratum} -- Number of treated stratums: ${output.nbStrataFixed} -- Number of treated sets: ${output.totalCatchActivities} -- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample} -- Total weight (for all species): ${output.totalCatchWeight} -- total weight (for species to fix): ${output.totalCatchWeightForSpeciesFoFix} +- Number of strata: ${output.nbStratum} +- Number of treated strata: ${output.nbStrataFixed} +- Total number of treated sets: ${output.totalCatchActivities} +- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample} +- Number of treated sets (without samples): ${output.totalCatchActivitiesWithoutSample} +- Total weight (for all species): ${output.totalCatchWeight} +- total weight (for species to fix): ${output.totalCatchWeightForSpeciesFoFix} ${output.inputCatchStratumLog} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl @@ -86,8 +86,9 @@ Indicateurs - Nombre de strates : ${output.nbStratum} - Nombre de strates corrigés : ${output.nbStrataFixed} -- Nombre d'activités traités : ${output.totalCatchActivities} -- Nombre d'activités traités (avec échantillon) : ${output.totalCatchActivitiesWithSample} +- Nombre total d'activités traitées : ${output.totalCatchActivities} +- Nombre d'activités traitées (avec échantillon) : ${output.totalCatchActivitiesWithSample} +- Nombre d'activités traitées (sans échantillon) : ${output.totalCatchActivitiesWithoutSample} ${output.totalFishesCountResume} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl @@ -84,10 +84,11 @@ Quality of sample stratum: Indicators ---------- -- Number of stratums: ${output.nbStratum} -- Number of treated stratums: ${output.nbStrataFixed} -- Number of treated sets: ${output.totalCatchActivities} -- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample} +- Number of strata: ${output.nbStratum} +- Number of treated strata: ${output.nbStrataFixed} +- Total number of treated sets: ${output.totalCatchActivities} +- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample} +- Number of treated sets (without samples): ${output.totalCatchActivitiesWithoutSample} ${output.totalFishesCountResume} ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java @@ -117,6 +117,10 @@ public abstract class LevelOutputContext<C extends LevelConfigurationWithStratum return totalCatchActivitiesWithSample; } + public long getTotalCatchActivitiesWithoutSample() { + return totalCatchActivities - totalCatchActivitiesWithSample; + } + public Collection<R> getStratumResult(int level) { Set<R> singleResult = new LinkedHashSet<>(); for (R stratumResult : stratumResultSet) { View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/de2f1e0d68db496af6af2b589e9a79179... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/de2f1e0d68db496af6af2b589e9a79179... You're receiving this email because of your account on gitlab.com.