Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3

Commits:

3 changed files:

Changes:

  • t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java
    ... ... @@ -32,15 +32,15 @@ import fr.ird.t3.entities.reference.SetDurationTopiaDao;
    32 32 
     import fr.ird.t3.entities.reference.Species;
    33 33 
     import fr.ird.t3.services.DecoratorService;
    34 34 
     import fr.ird.t3.services.ioc.InjectDAO;
    35 
    -import java.util.List;
    36 
    -import java.util.Map;
    37 
    -import java.util.Set;
    38 35 
     import org.apache.commons.collections.CollectionUtils;
    39 36 
     import org.apache.commons.logging.Log;
    40 37 
     import org.apache.commons.logging.LogFactory;
    41 38 
     import org.nuiton.topia.persistence.TopiaException;
    42 39 
     import org.nuiton.util.TimeLog;
    43 40
    41 
    +import java.util.List;
    42 
    +import java.util.Map;
    43 
    +import java.util.Set;
    44 44
    45 45 
     import static org.nuiton.i18n.I18n.l;
    46 46
    ... ... @@ -64,10 +64,10 @@ public class ComputeSetDurationAndPositiveSetCountAction extends AbstractLevel0A
    64 64
    65 65 
         /** Count of treated activites. */
    66 66 
         protected int nbActivities;
    67 
    -
    67 
    +    /** Count of set (sum(a.setCount) on each activity trip). */
    68 
    +    protected int nbSet;
    68 69 
         /** Count of positive activites found. */
    69 70 
         protected int nbPositiveActivities;
    70 
    -
    71 71 
         /**
    72 72 
          * Cache of setDuration (improve a lot performance!).
    73 73 
          *
    ... ... @@ -79,8 +79,8 @@ public class ComputeSetDurationAndPositiveSetCountAction extends AbstractLevel0A
    79 79 
             super(Level0Step.COMPUTE_SET_DURATION_AND_POSITIVE_SET_COUNT);
    80 80 
         }
    81 81
    82 
    -    public int getNbActivities() {
    83 
    -        return nbActivities;
    82 
    +    public int getNbSet() {
    83 
    +        return nbSet;
    84 84 
         }
    85 85
    86 86 
         public int getNbPositiveActivities() {
    ... ... @@ -144,6 +144,7 @@ public class ComputeSetDurationAndPositiveSetCountAction extends AbstractLevel0A
    144 144 
                     String activityStr = "Activity " + tripStr + " - " +
    145 145 
                                          decorate(activity);
    146 146
    147 
    +                nbSet += activity.getSetCount();
    147 148 
                     incrementsProgression();
    148 149
    149 150 
                     float totalCatchesWeight =

  • t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.ftl
    ... ... @@ -36,7 +36,7 @@ Indicateurs
    36 36
    37 37 
     - Nombre de navires          : ${action.nbVessels}
    38 38 
     - Nombre de marées           : ${action.nbTrips}
    39 
    -- Nombre de calées           : ${action.nbActivities}
    39 
    +- Nombre de calées           : ${action.nbSet}
    40 40 
     - Nombre de calées positives : ${action.nbPositiveActivities}
    41 41
    42 42 
     <#include "/ftl/showMessages.ftl"/>

  • t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction_en.ftl
    ... ... @@ -36,7 +36,7 @@ Indicators
    36 36
    37 37 
     - Number of vessels:             ${action.nbVessels}
    38 38 
     - Number of trips:               ${action.nbTrips}
    39 
    -- Number of activities:          ${action.nbActivities}
    39 
    +- Number of activities:          ${action.nbSet}
    40 40 
     - Number of positive activities: ${action.nbPositiveActivities}
    41 41
    42 42 
     <#include "/ftl/showMessages.ftl"/>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.