GitLab

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

             // 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",

         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

         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

 

     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"

         );

     }

 

 

     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"

         );

     }

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

Commits:

3 changed files:

Changes: