Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 7dbbca05 by Tony CHEMIT at 2018-02-18T18:12:20+01:00 [N0.4][LOG] Calcul du nombre de calées et durée des calées - Petite erreur dans le log (See #160) - - - - - 3 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction_en.ftl Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java @@ -32,15 +32,15 @@ import fr.ird.t3.entities.reference.SetDurationTopiaDao; import fr.ird.t3.entities.reference.Species; import fr.ird.t3.services.DecoratorService; import fr.ird.t3.services.ioc.InjectDAO; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.TimeLog; +import java.util.List; +import java.util.Map; +import java.util.Set; import static org.nuiton.i18n.I18n.l; @@ -64,10 +64,10 @@ public class ComputeSetDurationAndPositiveSetCountAction extends AbstractLevel0A /** Count of treated activites. */ protected int nbActivities; - + /** Count of set (sum(a.setCount) on each activity trip). */ + protected int nbSet; /** Count of positive activites found. */ protected int nbPositiveActivities; - /** * Cache of setDuration (improve a lot performance!). * @@ -79,8 +79,8 @@ public class ComputeSetDurationAndPositiveSetCountAction extends AbstractLevel0A super(Level0Step.COMPUTE_SET_DURATION_AND_POSITIVE_SET_COUNT); } - public int getNbActivities() { - return nbActivities; + public int getNbSet() { + return nbSet; } public int getNbPositiveActivities() { @@ -144,6 +144,7 @@ public class ComputeSetDurationAndPositiveSetCountAction extends AbstractLevel0A String activityStr = "Activity " + tripStr + " - " + decorate(activity); + nbSet += activity.getSetCount(); incrementsProgression(); float totalCatchesWeight = ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.ftl @@ -36,7 +36,7 @@ Indicateurs - Nombre de navires : ${action.nbVessels} - Nombre de marées : ${action.nbTrips} -- Nombre de calées : ${action.nbActivities} +- Nombre de calées : ${action.nbSet} - Nombre de calées positives : ${action.nbPositiveActivities} <#include "/ftl/showMessages.ftl"/> ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction_en.ftl @@ -36,7 +36,7 @@ Indicators - Number of vessels: ${action.nbVessels} - Number of trips: ${action.nbTrips} -- Number of activities: ${action.nbActivities} +- Number of activities: ${action.nbSet} - Number of positive activities: ${action.nbPositiveActivities} <#include "/ftl/showMessages.ftl"/> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7dbbca052194fe1763bbae3d24f63340c... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7dbbca052194fe1763bbae3d24f63340c... You're receiving this email because of your account on gitlab.com.