Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
de2f1e0d
by Tony CHEMIT at 2018-04-15T15:19:02Z
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:
| ... | ... | @@ -82,12 +82,13 @@ Qualité des strates échantillons : |
| 82 | 82 |
Indicateurs
|
| 83 | 83 |
-----------
|
| 84 | 84 |
|
| 85 |
-- Nombre de strates : ${output.nbStratum}
|
|
| 86 |
-- Nombre de strates corrigés : ${output.nbStrataFixed}
|
|
| 87 |
-- Nombre d'activités traités : ${output.totalCatchActivities}
|
|
| 88 |
-- Nombre d'activités traités (avec échantillon) : ${output.totalCatchActivitiesWithSample}
|
|
| 89 |
-- Poids total (toute espèce confondue) : ${output.totalCatchWeight}
|
|
| 90 |
-- Poids total (pour les espèces à corriger) : ${output.totalCatchWeightForSpeciesFoFix}
|
|
| 85 |
+- Nombre de strates : ${output.nbStratum}
|
|
| 86 |
+- Nombre de strates corrigés : ${output.nbStrataFixed}
|
|
| 87 |
+- Nombre total d'activités traitées : ${output.totalCatchActivities}
|
|
| 88 |
+- Nombre d'activités traitées (avec échantillon) : ${output.totalCatchActivitiesWithSample}
|
|
| 89 |
+- Nombre d'activités traitées (sans échantillon) : ${output.totalCatchActivitiesWithoutSample}
|
|
| 90 |
+- Poids total (toute espèce confondue) : ${output.totalCatchWeight}
|
|
| 91 |
+- Poids total (pour les espèces à corriger) : ${output.totalCatchWeightForSpeciesFoFix}
|
|
| 91 | 92 |
|
| 92 | 93 |
${output.inputCatchStratumLog}
|
| 93 | 94 |
|
| ... | ... | @@ -81,12 +81,13 @@ Quality of sample stratum: |
| 81 | 81 |
Indicators
|
| 82 | 82 |
----------
|
| 83 | 83 |
|
| 84 |
-- Number of stratums: ${output.nbStratum}
|
|
| 85 |
-- Number of treated stratums: ${output.nbStrataFixed}
|
|
| 86 |
-- Number of treated sets: ${output.totalCatchActivities}
|
|
| 87 |
-- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample}
|
|
| 88 |
-- Total weight (for all species): ${output.totalCatchWeight}
|
|
| 89 |
-- total weight (for species to fix): ${output.totalCatchWeightForSpeciesFoFix}
|
|
| 84 |
+- Number of strata: ${output.nbStratum}
|
|
| 85 |
+- Number of treated strata: ${output.nbStrataFixed}
|
|
| 86 |
+- Total number of treated sets: ${output.totalCatchActivities}
|
|
| 87 |
+- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample}
|
|
| 88 |
+- Number of treated sets (without samples): ${output.totalCatchActivitiesWithoutSample}
|
|
| 89 |
+- Total weight (for all species): ${output.totalCatchWeight}
|
|
| 90 |
+- total weight (for species to fix): ${output.totalCatchWeightForSpeciesFoFix}
|
|
| 90 | 91 |
|
| 91 | 92 |
${output.inputCatchStratumLog}
|
| 92 | 93 |
|
| ... | ... | @@ -86,8 +86,9 @@ Indicateurs |
| 86 | 86 |
|
| 87 | 87 |
- Nombre de strates : ${output.nbStratum}
|
| 88 | 88 |
- Nombre de strates corrigés : ${output.nbStrataFixed}
|
| 89 |
-- Nombre d'activités traités : ${output.totalCatchActivities}
|
|
| 90 |
-- Nombre d'activités traités (avec échantillon) : ${output.totalCatchActivitiesWithSample}
|
|
| 89 |
+- Nombre total d'activités traitées : ${output.totalCatchActivities}
|
|
| 90 |
+- Nombre d'activités traitées (avec échantillon) : ${output.totalCatchActivitiesWithSample}
|
|
| 91 |
+- Nombre d'activités traitées (sans échantillon) : ${output.totalCatchActivitiesWithoutSample}
|
|
| 91 | 92 |
|
| 92 | 93 |
${output.totalFishesCountResume}
|
| 93 | 94 |
|
| ... | ... | @@ -84,10 +84,11 @@ Quality of sample stratum: |
| 84 | 84 |
Indicators
|
| 85 | 85 |
----------
|
| 86 | 86 |
|
| 87 |
-- Number of stratums: ${output.nbStratum}
|
|
| 88 |
-- Number of treated stratums: ${output.nbStrataFixed}
|
|
| 89 |
-- Number of treated sets: ${output.totalCatchActivities}
|
|
| 90 |
-- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample}
|
|
| 87 |
+- Number of strata: ${output.nbStratum}
|
|
| 88 |
+- Number of treated strata: ${output.nbStrataFixed}
|
|
| 89 |
+- Total number of treated sets: ${output.totalCatchActivities}
|
|
| 90 |
+- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample}
|
|
| 91 |
+- Number of treated sets (without samples): ${output.totalCatchActivitiesWithoutSample}
|
|
| 91 | 92 |
|
| 92 | 93 |
${output.totalFishesCountResume}
|
| 93 | 94 |
|
| ... | ... | @@ -117,6 +117,10 @@ public abstract class LevelOutputContext<C extends LevelConfigurationWithStratum |
| 117 | 117 |
return totalCatchActivitiesWithSample;
|
| 118 | 118 |
}
|
| 119 | 119 |
|
| 120 |
+ public long getTotalCatchActivitiesWithoutSample() {
|
|
| 121 |
+ return totalCatchActivities - totalCatchActivitiesWithSample;
|
|
| 122 |
+ }
|
|
| 123 |
+ |
|
| 120 | 124 |
public Collection<R> getStratumResult(int level) {
|
| 121 | 125 |
Set<R> singleResult = new LinkedHashSet<>();
|
| 122 | 126 |
for (R stratumResult : stratumResultSet) {
|