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/ComputeRF2Action.java
    ... ... @@ -194,34 +194,29 @@ public class ComputeRF2Action extends AbstractLevel0Action<ComputeRF2Configurati
    194 194 
                                     // check that at least on trip miss logbook
    195 195 
                                     computeThisStratum = false;
    196 196 
                                     for (CompleteTrip completeTrip : stratumTrips) {
    197 
    -                                    if (computeThisStratum) {
    198 
    -                                        break;
    199 
    -                                    }
    200 197 
                                         for (Trip trip : completeTrip) {
    201 198 
                                             if (trip.getElementaryCatchTotalWeightRf1(species) == 0) {
    202 
    -
    203 199 
                                                 // no logbook on this
    204 200 
                                                 computeThisStratum = true;
    205 
    -                                            String message = l(locale, "t3.level0.computeRF2.found.missing.logbook", harbourStr, countryStr, vesselSimpleTypeStr, decorate(trip));
    201 
    +                                            String message = l(locale, "t3.level0.computeRF2.found.missing.logbook", harbourStr, countryStr, vesselSimpleTypeStr, month, nbStratum, decorate(trip));
    206 202 
                                                 log.info(message);
    207 203 
                                                 addInfoMessage(message);
    208 
    -                                            break;
    209 204 
                                             }
    210 205 
                                         }
    211 206 
                                     }
    212 207 
                                     if (!computeThisStratum) {
    213 
    -                                    String message = l(locale, "t3.level0.computeRF2.skip.missing.logbook", harbourStr, countryStr, vesselSimpleTypeStr);
    208 
    +                                    String message = l(locale, "t3.level0.computeRF2.skip.missing.logbook", harbourStr, countryStr, vesselSimpleTypeStr, month, nbStratum);
    214 209 
                                         log.info(message);
    215 210 
                                         addInfoMessage(message);
    216 211 
                                     }
    217 212 
                                 }
    218 213 
                                 String message = l(locale, "t3.level0.computeRF2.nbTrips.for.stratum",
    219 
    -                                    stratumTrips.size(),
    220 
    -                                    nbStratum,
    221 214 
                                         harbourStr,
    222 215 
                                         countryStr,
    223 216 
                                         vesselSimpleTypeStr,
    224 
    -                                    month);
    217 
    +                                    month,
    218 
    +                                    nbStratum,
    219 
    +                                    stratumTrips.size());
    225 220 
                                 log.info(message);
    226 221 
                                 addInfoMessage(message);
    227 222 
                                 executeForStratum(harbour, fleet, vesselSimpleType, month, species, stratumTrips, computeThisStratum);

  • t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties
    ... ... @@ -38,13 +38,13 @@ 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.found.missing.logbook=Stratum [%s/%s/%s] - found a trip {%s} without logbook, will compute rf2.
    42 
    -t3.level0.computeRF2.nbTrips.for.stratum=%s complete trip(s) for Stratum (%s) [%s/%s/%s/%s]
    41 
    +t3.level0.computeRF2.found.missing.logbook=Stratum [%s/%s/%s/%s] (%s) - found a trip {%s} without logbook, will compute rf2.
    42 
    +t3.level0.computeRF2.nbTrips.for.stratum=[%s/%s/%s/%s] (%s) - %s complete trip(s) found.
    43 43 
     t3.level0.computeRF2.resume.rf1.for.trip=Trip %s total rf1 catches weight %s / total landing weight %s
    44 44 
     t3.level0.computeRF2.resume.skip.for.trip=Trip %s has not elementary landing (trip not used to compute rf2)
    45 45 
     t3.level0.computeRF2.resume.total.rf1=Sum total rf1 catches weight %s  / Sum total landing weight %s
    46 
    -t3.level0.computeRF2.skip.missing.logbook=Stratum [%s/%s/%s] - won't compute rf2, since no logbook is missing.
    47 
    -t3.level0.computeRF2.skip.missing.species=Strate [%s/%s/???] - won't compute rf2, since no species found the fleet.
    46 
    +t3.level0.computeRF2.skip.missing.logbook=Stratum [%s/%s/%s/%s] (%s) - won't compute rf2, since no logbook is missing.
    47 
    +t3.level0.computeRF2.skip.missing.species=Strate [%s/%s/???/???] - won't compute rf2, since no species found the fleet.
    48 48 
     t3.level0.computeSetDurationAndPositiveSetCount.error.noSetDurationFound=SetDuration data not found (ocean %s, fleet %s, school type %s, year %s)
    49 49 
     t3.level0.computeTripEffort=Trip efforts %s (fishing %s, search %s)
    50 50 
     t3.level0.computeTripEffortSkipForDay=Trip %s, day without fishing time (only activities of type « at harbour » or « under way without prospection »)

  • t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties
    ... ... @@ -38,13 +38,13 @@ 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.found.missing.logbook=Strate [%s/%s/%s] - une marée {%s} sans logbook a été trouvée, calcul du rf2 programmé.
    42 
    -t3.level0.computeRF2.nbTrips.for.stratum=%s marée(s) complête(s) pour la Strate (%s) [%s/%s/%s/%s]
    41 
    +t3.level0.computeRF2.found.missing.logbook=Strate [%s/%s/%s%s] (%s) - une marée {%s} sans logbook a été trouvée, calcul du rf2 programmé.
    42 
    +t3.level0.computeRF2.nbTrips.for.stratum=Strate [%s/%s/%s/%s] (%s) - %s marée(s) complète(s) trouvée(s).
    43 43 
     t3.level0.computeRF2.resume.rf1.for.trip=Marée %s Poids total des captures rf1isées %s / Poids total des ventes %s
    44 44 
     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)
    45 45 
     t3.level0.computeRF2.resume.total.rf1=Poids cumulé des captures rf1isées %s  / Poids cumulé des ventes %s
    46 
    -t3.level0.computeRF2.skip.missing.logbook=Strate [%s/%s/%s] - le rf2 ne sera pas calculé, aucun logbook manquant.
    47 
    -t3.level0.computeRF2.skip.missing.species=Strate [%s/%s/???] - le rf2 ne sera pas calculé, pas d'espèce trouvé pour la flotte.
    46 
    +t3.level0.computeRF2.skip.missing.logbook=Strate [%s/%s/%s/%s] (%s) - le rf2 ne sera pas calculé, aucun logbook manquant.
    47 
    +t3.level0.computeRF2.skip.missing.species=Strate [%s/%s/???/???] - le rf2 ne sera pas calculé, pas d'espèce trouvé pour la flotte.
    48 48 
     t3.level0.computeSetDurationAndPositiveSetCount.error.noSetDurationFound=Donnée SetDuration non trouvée (ocean %s, flotte %s, type de banc %s, année %s)
    49 49 
     t3.level0.computeTripEffort=Efforts de la marée %s (pêche %s, recherche %s)
    50 50 
     t3.level0.computeTripEffortSkipForDay=Marée %s, jour sans temps de pêche (uniquement des activités « au port » ou « route sans veille »)

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