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

Commits:

6 changed files:

Changes:

  • dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripReference.java
    ... ... @@ -37,5 +37,10 @@ public class TripReference extends GeneratedTripReference {
    37 37 
             return I18nDecoratorHelper.getStartEndDateLabel(getStartDate(), getEndDate());
    38 38 
         }
    39 39
    40 
    +    @Override
    41 
    +    public String getVesselLabel() {
    42 
    +        return getVessel().getLabel();
    43 
    +    }
    44 
    +
    40 45
    41 46 
     }
    \ No newline at end of file

  • dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripReference.java
    ... ... @@ -36,4 +36,9 @@ public class TripReference extends GeneratedTripReference {
    36 36 
         public String getStartEndDateLabel() {
    37 37 
             return I18nDecoratorHelper.getStartEndDateLabel(getStartDate(), getEndDate());
    38 38 
         }
    39 
    +
    40 
    +    @Override
    41 
    +    public String getVesselLabel() {
    42 
    +        return getVessel().getLabel();
    43 
    +    }
    39 44 
     }

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/TripLonglineDecorator.java
    ... ... @@ -35,7 +35,7 @@ public class TripLonglineDecorator extends ObserveDecorator<TripDto> {
    35 35
    36 36 
         public TripLonglineDecorator() throws IllegalArgumentException, NullPointerException {
    37 37 
             super(TripDto.class,
    38 
    -              "${startEndDateLabel}$s##${vessel/label}$s##${observerLabel}$s"
    38 
    +              "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/label}$s##${observerLabel}$s"
    39 39 
             );
    40 40 
         }
    41 41

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/TripSeineDecorator.java
    ... ... @@ -36,7 +36,7 @@ public class TripSeineDecorator extends ObserveDecorator<TripDto> {
    36 36
    37 37 
         public TripSeineDecorator() throws IllegalArgumentException, NullPointerException {
    38 38 
             super(TripDto.class,
    39 
    -              "${startEndDateLabel}$s##${vessel/label}$s##${observerLabel}$s"
    39 
    +              "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/label}$s##${observerLabel}$s"
    40 40 
             );
    41 41 
         }
    42 42

  • dto/src/main/java/fr/ird/observe/dto/decoration/init/DataLlCommonModelDecoratorInitializer.java
    ... ... @@ -48,7 +48,7 @@ public class DataLlCommonModelDecoratorInitializer extends ModelDecoratorInitial
    48 48 
         public void initLlCommonTripDto() {
    49 49 
             registerDecorator(new TripLonglineDecorator());
    50 50 
             registerDataReferenceDecorator(fr.ird.observe.dto.data.ll.common.TripReference.class,
    51 
    -                                       "${startEndDateLabel}$s##${vessel/label}$s##${observerLabel}$s");
    51 
    +                                       "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s");
    52 52 
         }
    53 53
    54 54 
         @Override

  • dto/src/main/java/fr/ird/observe/dto/decoration/init/DataPsCommonModelDecoratorInitializer.java
    ... ... @@ -54,11 +54,11 @@ public class DataPsCommonModelDecoratorInitializer extends ModelDecoratorInitial
    54 54 
         public void initPsCommonTripDto() {
    55 55 
             registerDecorator(new TripSeineDecorator());
    56 56 
             registerDataReferenceDecorator(fr.ird.observe.dto.data.ps.common.TripReference.class,
    57 
    -                                       "${startEndDateLabel}$s##${vessel/label}$s##${observerLabel}$s");
    57 
    +                                       "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s");
    58 58 
             // Trip commun decorator
    59 59 
             registerDataReferenceDecorator(TRIP_CONTEXT,
    60 60 
                                            fr.ird.observe.dto.data.ps.common.TripReference.class,
    61 
    -                                       "${startEndDateLabel}$s##${vessel/label}$s##${observerLabel}$s");
    61 
    +                                       "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s");
    62 62
    63 63 
         }
    64 64

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