Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e663a35b by Tony Chemit at 2021-03-12T14:47:42+01:00 Improve LL pairing result tree (remove any node without data, and sort also activity nodes by their timestamp) - - - - - 4 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/ActivityLlPairingTreeTable.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/node/ActivityLlPairingTripNode.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/pairing/ActivityPairingResult.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripPairingResult.java 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 if (table.getColumn(2).equals(columnExt)) { columnExt.setPreferredWidth(50); columnExt.setMinWidth(50); + columnExt.setMaxWidth(100); return; } 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 { public ActivityLlPairingTripNode(TripPairingResult userObject) { super(Objects.requireNonNull(userObject), true); for (ActivityPairingResult activityPairingResult : userObject.getItems()) { - add(new ActivityLlPairingActivityNode(activityPairingResult)); + if (!activityPairingResult.getItems().isEmpty() || activityPairingResult.getSelectedRelatedObservedActivity() != null) { + add(new ActivityLlPairingActivityNode(activityPairingResult)); + } } } ===================================== models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/pairing/ActivityPairingResult.java ===================================== @@ -36,6 +36,7 @@ import java.util.Objects; */ public class ActivityPairingResult implements ObserveDto { + public static final Comparator<ActivityPairingResult> RESULT_COMPARATOR = Comparator.comparing(t->t.getActivityLogbook().getTimeStamp()); public static final Comparator<ActivityPairingResultItem> COMPARATOR = Comparator.comparingDouble(ActivityPairingResultItem::getComputedDistance).thenComparingDouble(ActivityPairingResultItem::getComputedTime); 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 { public TripPairingResult(TripReference trip, ImmutableList<ActivityPairingResult> items) { this.trip = trip; - this.items = items; + this.items = items.stream().sorted(ActivityPairingResult.RESULT_COMPARATOR).collect(ImmutableList.toImmutableList()); } public TripReference getTrip() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e663a35ba08284efa266aad370... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e663a35ba08284efa266aad370... You're receiving this email because of your account on gitlab.com.