Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6fb73436 by Tony Chemit at 2023-04-04T09:30:25+02:00 Un marée sur laquelle l'assistant d'appariement bloque - Closes #2667 - - - - - 2 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/pairing/ActivityPairingResultItemSupport.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java ===================================== @@ -215,7 +215,10 @@ public class ActivityUIModelStates extends GeneratedActivityUIModelStates { log.info(String.format("%s Will update related observed activities...", getPrefix())); String vesselActivityId = bean.getVesselActivityId(); Date timeStamp = bean.getTimeStamp(); - if (pairingContext == null || vesselActivityId == null || timeStamp == null) { + if (timeStamp == null) { + timeStamp = bean.getDate(); + } + if (vesselActivityId == null) { activityObs = Collections.emptyList(); } else { RoutePairingContextRequest request = new RoutePairingContextRequest(tripId, source().getParentReference().getId(), vesselActivityId); ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/pairing/ActivityPairingResultItemSupport.java ===================================== @@ -52,6 +52,9 @@ public abstract class ActivityPairingResultItemSupport<O extends ActivityAware> protected ActivityPairingResultItemSupport(ActivityAware activityLogbook, O observationActivity) { Date logbookTimeStamp = Objects.requireNonNull(activityLogbook).getTimeStamp(); + if (logbookTimeStamp == null) { + logbookTimeStamp = Objects.requireNonNull(activityLogbook.getDate()); + } Date obsTimeStamp = Objects.requireNonNull(observationActivity).getTimeStamp(); this.observationActivity = observationActivity; this.computedTime = TimeUnit.MINUTES.convert(logbookTimeStamp.getTime() - obsTimeStamp.getTime(), TimeUnit.MILLISECONDS); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6fb7343683dda6a79e9c551335... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6fb7343683dda6a79e9c551335... You're receiving this email because of your account on gitlab.com.