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

Commits:

4 changed files:

Changes:

  • t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java
    ... ... @@ -55,7 +55,6 @@ import java.util.Iterator;
    55 55 
     import java.util.List;
    56 56 
     import java.util.Map;
    57 57 
     import java.util.Set;
    58 
    -import java.util.stream.Collectors;
    59 58
    60 59 
     import static org.nuiton.i18n.I18n.l;
    61 60

  • t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties
    ... ... @@ -38,7 +38,7 @@ t3.level0.computeRF1.warning.too.high.rf1=For complete trip %s from %s to %s com
    38 38 
     t3.level0.computeRF1.warning.too.low.rf1=For complete trip %s from %s to %s computed rf1 is too small (less than %s)
    39 39 
     t3.level0.computeRF1.warning.trip.is.not.complete=Trip %s is not compelte, can not compute any rf1 for it
    40 40 
     t3.level0.computeRF2.computed.rf2.for.stratum=Computed rf2 for stratum \: %s
    41 
    -t3.level0.computeRF2.nbTrips.for.stratum=%s trip(s) for Stratum (%s) [%s/%s/%s/%s]
    41 
    +t3.level0.computeRF2.nbTrips.for.stratum=%s complete trip(s) for Stratum (%s) [%s/%s/%s/%s]
    42 42 
     t3.level0.computeRF2.resume.rf1.for.trip=Trip %s total rf1 catches weight %s / total landing weight %s
    43 43 
     t3.level0.computeRF2.resume.skip.for.trip=Trip %s has not elementary landing (trip not used to compute rf2)
    44 44 
     t3.level0.computeRF2.resume.total.rf1=Sum total rf1 catches weight %s  / Sum total landing weight %s

  • t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties
    ... ... @@ -38,7 +38,7 @@ t3.level0.computeRF1.warning.too.high.rf1=Pour la marée complète %s de %s à %
    38 38 
     t3.level0.computeRF1.warning.too.low.rf1=Pour la marée complète %s de %s à %s le rf1 calculé %s est trop petit (inférieur à %s)
    39 39 
     t3.level0.computeRF1.warning.trip.is.not.complete=La marée %s n'est pas complète, calcul du rf1 impossible
    40 40 
     t3.level0.computeRF2.computed.rf2.for.stratum=Valeur du rf2 calculé pour la strate \: %s
    41 
    -t3.level0.computeRF2.nbTrips.for.stratum=%s marée(s) pour la Strate (%s) [%s/%s/%s/%s]
    41 
    +t3.level0.computeRF2.nbTrips.for.stratum=%s marée(s) complête(s) pour la Strate (%s) [%s/%s/%s/%s]
    42 42 
     t3.level0.computeRF2.resume.rf1.for.trip=Marée %s Poids total des captures rf1isées %s / Poids total des ventes %s
    43 43 
     t3.level0.computeRF2.resume.skip.for.trip=La marée %s ne possède pas de lots commerciaux (non prise en compte dans le calcul du rf2)
    44 44 
     t3.level0.computeRF2.resume.total.rf1=Poids cumulé des captures rf1isées %s  / Poids cumulé des ventes %s

  • t3-domain/src/main/java/fr/ird/t3/services/DecoratorService.java
    ... ... @@ -157,10 +157,10 @@ public class DecoratorService extends T3ServiceSupport implements T3ServiceSingl
    157 157 
                 registerJXPathDecorator(locale, Trip.class, WITH_ID, "${vesselLabel}$s - ${landingDate}$td/%2$tm/%2$tY [${topiaId}$s]");
    158 158
    159 159 
                 // trip (with topiaid) decorator
    160 
    -            registerJXPathDecorator(locale, CompleteTrip.class, "${landingTrip/vesselLabel}$s - ${landingTrip/landingDate}$td/%2$tm/%2$tY (nb trip(s) ${nbTrips}$s)");
    160 
    +            registerJXPathDecorator(locale, CompleteTrip.class, "${landingTrip/vesselLabel}$s - ${departureTrip/departureDate}$td/%2$tm/%2$tY - ${landingTrip/landingDate}$td/%3$tm/%3$tY (nb trip(s) ${nbTrips}$s)");
    161 161
    162 162 
                 // trip (with topiaid) decorator
    163 
    -            registerJXPathDecorator(locale, CompleteTrip.class, WITH_ID, "${landingTrip/vesselLabel}$s - ${landingTrip/landingDate}$td/%2$tm/%2$tY [${landingTrip/topiaId}$s] (nb trip(s) ${nbTrips}$s)");
    163 
    +            registerJXPathDecorator(locale, CompleteTrip.class, WITH_ID, "${landingTrip/vesselLabel}$s - ${departureTrip/departureDate}$td/%2$tm/%2$tY - ${landingTrip/landingDate}$td/%3$tm/%3$tY [${landingTrip/topiaId}$s] (nb trip(s) ${nbTrips}$s)");
    164 164
    165 165 
                 // well (with topiaid) decorator
    166 166 
                 registerJXPathDecorator(locale, Well.class, "Number ${wellNumber}$s - Position ${wellPosition}$s [${topiaId}$s]");

    • —
    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.