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

Commits:

4 changed files:

Changes:

  • client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/ActivityLlPairingTreeTable.java
    ... ... @@ -215,6 +215,7 @@ public class ActivityLlPairingTreeTable extends JXTreeTable implements WithClien
    215 215 
                     if (table.getColumn(2).equals(columnExt)) {
    216 216 
                         columnExt.setPreferredWidth(50);
    217 217 
                         columnExt.setMinWidth(50);
    218 
    +                    columnExt.setMaxWidth(100);
    218 219 
                         return;
    219 220 
                     }
    220 221 
                     super.configureColumnWidths(table, columnExt);

  • client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/node/ActivityLlPairingTripNode.java
    ... ... @@ -38,7 +38,9 @@ public class ActivityLlPairingTripNode extends ActivityPairingNodeSupport {
    38 38 
         public ActivityLlPairingTripNode(TripPairingResult userObject) {
    39 39 
             super(Objects.requireNonNull(userObject), true);
    40 40 
             for (ActivityPairingResult activityPairingResult : userObject.getItems()) {
    41 
    -            add(new ActivityLlPairingActivityNode(activityPairingResult));
    41 
    +            if (!activityPairingResult.getItems().isEmpty() || activityPairingResult.getSelectedRelatedObservedActivity() != null) {
    42 
    +                add(new ActivityLlPairingActivityNode(activityPairingResult));
    43 
    +            }
    42 44 
             }
    43 45 
         }
    44 46

  • models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/pairing/ActivityPairingResult.java
    ... ... @@ -36,6 +36,7 @@ import java.util.Objects;
    36 36 
      */
    37 37 
     public class ActivityPairingResult implements ObserveDto {
    38 38
    39 
    +    public static final Comparator<ActivityPairingResult> RESULT_COMPARATOR = Comparator.comparing(t->t.getActivityLogbook().getTimeStamp());
    39 40 
         public static final Comparator<ActivityPairingResultItem> COMPARATOR = Comparator.comparingDouble(ActivityPairingResultItem::getComputedDistance).thenComparingDouble(ActivityPairingResultItem::getComputedTime);
    40 41
    41 42 
         private final ActivityReference activityLogbook;

  • models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripPairingResult.java
    ... ... @@ -38,7 +38,7 @@ public class TripPairingResult implements ObserveDto {
    38 38
    39 39 
         public TripPairingResult(TripReference trip, ImmutableList<ActivityPairingResult> items) {
    40 40 
             this.trip = trip;
    41 
    -        this.items = items;
    41 
    +        this.items = items.stream().sorted(ActivityPairingResult.RESULT_COMPARATOR).collect(ImmutableList.toImmutableList());
    42 42 
         }
    43 43
    44 44 
         public TripReference getTrip() {

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