[Git][ultreiaio/ird-observe][develop-7.x] les programmes ne sont pas triés dans le même ordre dans l'arbre de navigation...

6 Jul 2020


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


Commits:
99551863 by Tony Chemit at 2020-07-06T06:21:23+02:00
les programmes ne sont pas triés dans le même ordre dans l'arbre de navigation et dans la formulaire liste des marées - Closes #1567

- - - - -


3 changed files:

- dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
- dto/src/main/java/fr/ird/observe/dto/decoration/decorators/TripLonglineDecorator.java
- dto/src/main/java/fr/ird/observe/dto/decoration/decorators/TripSeineDecorator.java


Changes:

=====================================
dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
=====================================
@@ -339,7 +339,7 @@ public class DecoratorService extends DecoratorProvider {
             // Trip commun decorator
             registerDataReferenceDecorator(TRIP_CONTEXT,
                                            TripSeineReference.class,
-                                           "${startEndDateLabel}$s##${vesselLabel}$s##${observerLabel}$s");
+                                           "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s");
 
             // gps decorators
             registerObserveDecorator("activity-gps",
@@ -510,7 +510,7 @@ public class DecoratorService extends DecoratorProvider {
         public void initTripLonglineDto() {
             registerDecorator(new TripLonglineDecorator());
             registerDataReferenceDecorator(TripLonglineReference.class,
-                                           "${startEndDateLabel}$s##${vesselLabel}$s##${observerLabel}$s");
+                                           "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s");
         }
 
         @Override
@@ -1017,7 +1017,7 @@ public class DecoratorService extends DecoratorProvider {
         public void initTripSeineDto() {
             registerDecorator(new TripSeineDecorator());
             registerDataReferenceDecorator(TripSeineReference.class,
-                                           "${startEndDateLabel}$s##${vesselLabel}$s##${observerLabel}$s");
+                                           "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s");
         }
 
         @Override


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


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



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/99551863966c8a3cf54a868d63...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/99551863966c8a3cf54a868d63...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)