Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe
Commits:
-
0bdda0a2
by Tony Chemit at 2023-04-04T09:30:36+02:00
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:
| ... | ... | @@ -215,7 +215,10 @@ public class ActivityUIModelStates extends GeneratedActivityUIModelStates { |
| 215 | 215 | log.info(String.format("%s Will update related observed activities...", getPrefix()));
|
| 216 | 216 | String vesselActivityId = bean.getVesselActivityId();
|
| 217 | 217 | Date timeStamp = bean.getTimeStamp();
|
| 218 | - if (pairingContext == null || vesselActivityId == null || timeStamp == null) {
|
|
| 218 | + if (timeStamp == null) {
|
|
| 219 | + timeStamp = bean.getDate();
|
|
| 220 | + }
|
|
| 221 | + if (vesselActivityId == null) {
|
|
| 219 | 222 | activityObs = Collections.emptyList();
|
| 220 | 223 | } else {
|
| 221 | 224 | RoutePairingContextRequest request = new RoutePairingContextRequest(tripId, source().getParentReference().getId(), vesselActivityId);
|
| ... | ... | @@ -52,6 +52,9 @@ public abstract class ActivityPairingResultItemSupport<O extends ActivityAware> |
| 52 | 52 | |
| 53 | 53 | protected ActivityPairingResultItemSupport(ActivityAware activityLogbook, O observationActivity) {
|
| 54 | 54 | Date logbookTimeStamp = Objects.requireNonNull(activityLogbook).getTimeStamp();
|
| 55 | + if (logbookTimeStamp == null) {
|
|
| 56 | + logbookTimeStamp = Objects.requireNonNull(activityLogbook.getDate());
|
|
| 57 | + }
|
|
| 55 | 58 | Date obsTimeStamp = Objects.requireNonNull(observationActivity).getTimeStamp();
|
| 56 | 59 | this.observationActivity = observationActivity;
|
| 57 | 60 | this.computedTime = TimeUnit.MINUTES.convert(logbookTimeStamp.getTime() - obsTimeStamp.getTime(), TimeUnit.MILLISECONDS);
|