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

Commits:

9 changed files:

Changes:

  • client-core/src/main/i18n/getters/java.getter
    ... ... @@ -999,6 +999,7 @@ observe.ui.tree.longline.encounter
    999 999 
     observe.ui.tree.longline.logbook.activity.list
    1000 1000 
     observe.ui.tree.longline.logbook.activity.unsaved
    1001 1001 
     observe.ui.tree.longline.logbook.landing.list
    1002 
    +observe.ui.tree.longline.logbook.landing.unsaved
    1002 1003 
     observe.ui.tree.longline.logbook.sample.list
    1003 1004 
     observe.ui.tree.longline.logbook.sample.unsaved
    1004 1005 
     observe.ui.tree.longline.logbook.set.unsaved

  • client-core/src/main/i18n/getters/jaxx.getter
    ... ... @@ -100,10 +100,6 @@ observe.common.ActivityLonglineObsDto.timeStamp
    100 100 
     observe.common.ActivityLonglineObsDto.title
    101 101 
     observe.common.ActivityLonglineObsDto.titles
    102 102 
     observe.common.ActivityLonglineObsDto.vesselActivityLongline
    103 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistance
    104 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue
    105 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTime
    106 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue
    107 103 
     observe.common.ActivitySeineDto.availableObservedSystem
    108 104 
     observe.common.ActivitySeineDto.comment
    109 105 
     observe.common.ActivitySeineDto.coordinate
    ... ... @@ -899,6 +895,10 @@ observe.common.WithFormula.coefficientsInformation
    899 895 
     observe.common.WithFormula.equation
    900 896 
     observe.common.WithFormula.source
    901 897 
     observe.common.acquisitionMode
    898 
    +observe.common.activityLonglinePairingResultItem.computedDistance
    899 
    +observe.common.activityLonglinePairingResultItem.computedDistanceValue
    900 
    +observe.common.activityLonglinePairingResultItem.computedTime
    901 
    +observe.common.activityLonglinePairingResultItem.computedTimeValue
    902 902 
     observe.common.description
    903 903 
     observe.common.directory
    904 904 
     observe.common.file

  • client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingConfigUI.jcss
    ... ... @@ -25,7 +25,7 @@
    25 25 
     }
    26 26
    27 27 
     #longlineActivityPairingMaxTimeLabel {
    28 
    -  text:"observe.common.ActivityLonglinePairingResultItemDto.computedTime";
    28 
    +  text:"observe.common.activityLonglinePairingResultItem.computedTime";
    29 29 
     }
    30 30
    31 31 
     #longlineActivityPairingMaxTime {
    ... ... @@ -35,7 +35,7 @@
    35 35 
     }
    36 36
    37 37 
     #longlineActivityPairingMaxDistanceLabel {
    38 
    -  text:"observe.common.ActivityLonglinePairingResultItemDto.computedDistance";
    38 
    +  text:"observe.common.activityLonglinePairingResultItem.computedDistance";
    39 39 
     }
    40 40
    41 41 
     #longlineActivityPairingMaxDistance {

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Activities
    465 465 
     observe.common.ActivityLonglineObsDto.vesselActivityLongline=Vessel activity
    466 466 
     observe.common.ActivityLonglineObsEncounterDto.comment=Comment
    467 467 
     observe.common.ActivityLonglineObsSensorUsedDto.comment=Comment
    468 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km)
    469 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms)
    470 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTime=Time (minutes)
    471 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Time (%s minutes)
    472 
    -observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Observed activity
    473 
    -observe.common.ActivityLonglinePairingResultItemDto.type=Observed activity
    474 468 
     observe.common.ActivityObsDto.action.goToOpen.short=Observations - Open activity
    475 469 
     observe.common.ActivityObsDto.action.goToOpen.tip=Go to open activity (Observations)
    476 470 
     observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD
    ... ... @@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Select first entry
    2570 2564 
     observe.common.action.selectLast.tip=Select last entry
    2571 2565 
     observe.common.action.selectNext.tip=Select next entry
    2572 2566 
     observe.common.action.selectPrevious.tip=Select previous entry
    2567 
    +observe.common.activityLonglinePairingResultItem=Observed activity
    2568 
    +observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km)
    2569 
    +observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms)
    2570 
    +observe.common.activityLonglinePairingResultItem.computedTime=Time (minutes)
    2571 
    +observe.common.activityLonglinePairingResultItem.computedTimeValue=Time (%s minutes)
    2572 
    +observe.common.activityLonglinePairingResultItem.observationActivity=Observed activity
    2573 2573 
     observe.common.boolean.false=No
    2574 2574 
     observe.common.boolean.null=Undefined
    2575 2575 
     observe.common.boolean.true=Yes

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Actividades
    465 465 
     observe.common.ActivityLonglineObsDto.vesselActivityLongline=Actividad barco
    466 466 
     observe.common.ActivityLonglineObsEncounterDto.comment=Comentarios
    467 467 
     observe.common.ActivityLonglineObsSensorUsedDto.comment=Comentarios
    468 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km) \#TODO
    469 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms) \#TODO
    470 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTime=Time (minutes) \#TODO
    471 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Time (%s minutes) \#TODO
    472 
    -observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Observed activity \#TODO
    473 
    -observe.common.ActivityLonglinePairingResultItemDto.type=Observed activity \#TODO
    474 468 
     observe.common.ActivityObsDto.action.goToOpen.short=Observations - Open activity \#TODO
    475 469 
     observe.common.ActivityObsDto.action.goToOpen.tip=Go to open activity (Observations) \#TODO
    476 470 
     observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un FOB
    ... ... @@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Select first entry
    2570 2564 
     observe.common.action.selectLast.tip=Select last entry
    2571 2565 
     observe.common.action.selectNext.tip=Select next entry
    2572 2566 
     observe.common.action.selectPrevious.tip=Select previous entry
    2567 
    +observe.common.activityLonglinePairingResultItem=Observed activity \#TODO
    2568 
    +observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km) \#TODO
    2569 
    +observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms) \#TODO
    2570 
    +observe.common.activityLonglinePairingResultItem.computedTime=Time (minutes) \#TODO
    2571 
    +observe.common.activityLonglinePairingResultItem.computedTimeValue=Time (%s minutes) \#TODO
    2572 
    +observe.common.activityLonglinePairingResultItem.observationActivity=Observed activity \#TODO
    2573 2573 
     observe.common.boolean.false=No
    2574 2574 
     observe.common.boolean.null=Indeterminado
    2575 2575 
     observe.common.boolean.true=Si

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Activités
    465 465 
     observe.common.ActivityLonglineObsDto.vesselActivityLongline=Activité bateau
    466 466 
     observe.common.ActivityLonglineObsEncounterDto.comment=Commentaire
    467 467 
     observe.common.ActivityLonglineObsSensorUsedDto.comment=Commentaire
    468 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km)
    469 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms)
    470 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTime=Temps (minutes)
    471 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Temps (%s minutes)
    472 
    -observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Activité observée
    473 
    -observe.common.ActivityLonglinePairingResultItemDto.type=Activité observée
    474 468 
     observe.common.ActivityObsDto.action.goToOpen.short=Observations - Activité ouverte
    475 469 
     observe.common.ActivityObsDto.action.goToOpen.tip=Accéder à l'activité ouverte (Observations)
    476 470 
     observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP
    ... ... @@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Sélectionner la première entrée
    2570 2564 
     observe.common.action.selectLast.tip=Sélectionner la dernière entrée
    2571 2565 
     observe.common.action.selectNext.tip=Sélectionner l'entrée suivante
    2572 2566 
     observe.common.action.selectPrevious.tip=Sélectionner l'entrée précédente
    2567 
    +observe.common.activityLonglinePairingResultItem=Activité observée
    2568 
    +observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km)
    2569 
    +observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms)
    2570 
    +observe.common.activityLonglinePairingResultItem.computedTime=Temps (minutes)
    2571 
    +observe.common.activityLonglinePairingResultItem.computedTimeValue=Temps (%s minutes)
    2572 
    +observe.common.activityLonglinePairingResultItem.observationActivity=Activité observée
    2573 2573 
     observe.common.boolean.false=Non
    2574 2574 
     observe.common.boolean.null=Indéterminé
    2575 2575 
     observe.common.boolean.true=Oui

  • services/src/main/i18n/getters/java.getter
    1 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistance
    2 
    -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue
    3 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTime
    4 
    -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue
    5 
    -observe.common.ActivityLonglinePairingResultItemDto.observationActivity
    6 
    -observe.common.ActivityLonglinePairingResultItemDto.type
    1 
    +observe.common.activityLonglinePairingResultItem
    2 
    +observe.common.activityLonglinePairingResultItem.computedDistance
    3 
    +observe.common.activityLonglinePairingResultItem.computedDistanceValue
    4 
    +observe.common.activityLonglinePairingResultItem.computedTime
    5 
    +observe.common.activityLonglinePairingResultItem.computedTimeValue
    6 
    +observe.common.activityLonglinePairingResultItem.observationActivity

  • services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItem.java
    ... ... @@ -28,6 +28,8 @@ import io.ultreia.java4all.lang.Numbers;
    28 28
    29 29 
     import java.util.Objects;
    30 30
    31 
    +import static io.ultreia.java4all.i18n.I18n.n;
    32 
    +
    31 33 
     /**
    32 34 
      * Created by tchemit on 15/10/2018.
    33 35 
      *
    ... ... @@ -35,6 +37,10 @@ import java.util.Objects;
    35 37 
      */
    36 38 
     public class ActivityLonglinePairingResultItem implements ObserveDto {
    37 39
    40 
    +    static {
    41 
    +        n("observe.common.activityLonglinePairingResultItem");
    42 
    +
    43 
    +    }
    38 44 
         private final ActivityLonglineObsReference observationActivity;
    39 45 
         private final long computedTime;
    40 46 
         private final double computedDistance;

  • services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItemDecorator.java
    ... ... @@ -41,10 +41,10 @@ import static io.ultreia.java4all.i18n.I18n.n;
    41 41 
     public class ActivityLonglinePairingResultItemDecorator extends ObserveDecorator<ActivityLonglinePairingResultItem> {
    42 42
    43 43 
         static {
    44 
    -        n("observe.common.ActivityLonglinePairingResultItemDto.type");
    45 
    -        n("observe.common.ActivityLonglinePairingResultItemDto.observationActivity");
    46 
    -        n("observe.common.ActivityLonglinePairingResultItemDto.computedTime");
    47 
    -        n("observe.common.ActivityLonglinePairingResultItemDto.computedDistance");
    44 
    +        n("observe.common.activityLonglinePairingResultItem");
    45 
    +        n("observe.common.activityLonglinePairingResultItem.observationActivity");
    46 
    +        n("observe.common.activityLonglinePairingResultItem.computedTime");
    47 
    +        n("observe.common.activityLonglinePairingResultItem.computedDistance");
    48 48 
         }
    49 49
    50 50 
         private final Locale locale;
    ... ... @@ -62,9 +62,9 @@ public class ActivityLonglinePairingResultItemDecorator extends ObserveDecorator
    62 62 
             Object value0 = jxcontext.getValue(token);
    63 63 
             switch (token) {
    64 64 
                 case "computedTime":
    65 
    -                return (Comparable) l(locale, "observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue", value0);
    65 
    +                return (Comparable) l(locale, "observe.common.activityLonglinePairingResultItem.computedTimeValue", value0);
    66 66 
                 case "computedDistance":
    67 
    -                return (Comparable) l(locale, "observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue", value0);
    67 
    +                return (Comparable) l(locale, "observe.common.activityLonglinePairingResultItem.computedDistanceValue", value0);
    68 68 
                 case "observationActivity":
    69 69 
                     return (Comparable) activityDecorator.toString(value0);
    70 70 
             }

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