Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
8faa6ceb
by tchemit at 2020-03-27T14:24:35+01:00
2 changed files:
- services-local/pom.xml
- services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityServiceLocal.java
Changes:
| ... | ... | @@ -127,6 +127,10 @@ |
| 127 | 127 |
<scope>runtime</scope>
|
| 128 | 128 |
</dependency>
|
| 129 | 129 |
|
| 130 |
+ <dependency>
|
|
| 131 |
+ <groupId>io.ultreia.java4all</groupId>
|
|
| 132 |
+ <artifactId>java-util</artifactId>
|
|
| 133 |
+ </dependency>
|
|
| 130 | 134 |
<dependency>
|
| 131 | 135 |
<groupId>io.ultreia.java4all.http</groupId>
|
| 132 | 136 |
<artifactId>http-api</artifactId>
|
| ... | ... | @@ -39,6 +39,8 @@ import fr.ird.observe.entities.referential.common.DataQuality; |
| 39 | 39 |
import fr.ird.observe.services.local.service.ObserveServiceLocal;
|
| 40 | 40 |
import fr.ird.observe.services.local.service.data.ll.common.TripServiceLocal;
|
| 41 | 41 |
import fr.ird.observe.services.service.data.ll.logbook.ActivityService;
|
| 42 |
+import io.ultreia.java4all.util.Dates;
|
|
| 43 |
+import org.nuiton.util.DateUtil;
|
|
| 42 | 44 |
|
| 43 | 45 |
import java.util.Calendar;
|
| 44 | 46 |
import java.util.Date;
|
| ... | ... | @@ -88,10 +90,13 @@ public class ActivityServiceLocal extends ObserveServiceLocal implements Activit |
| 88 | 90 |
// première activité, on utilise la date de début de marée (voir http://forge.codelutin.com/issues/6777)
|
| 89 | 91 |
Calendar calendar = Calendar.getInstance();
|
| 90 | 92 |
calendar.setTime(trip.getStartDate());
|
| 91 |
- timestamp = calendar.getTime();
|
|
| 93 |
+ timestamp = Dates.getDay(calendar.getTime());
|
|
| 92 | 94 |
} else {
|
| 93 |
- // on reprend la date et l'heure de la dernière activité
|
|
| 94 |
- timestamp = lastActivityLongline.getStartTimeStamp();
|
|
| 95 |
+ // on reprend la date +1 de la dernière activité
|
|
| 96 |
+ Calendar calendar = Calendar.getInstance();
|
|
| 97 |
+ calendar.setTime(lastActivityLongline.getStartTimeStamp());
|
|
| 98 |
+ calendar.add(Calendar.DAY_OF_YEAR, 1);
|
|
| 99 |
+ timestamp = Dates.getDay(calendar.getTime());
|
|
| 95 | 100 |
}
|
| 96 | 101 |
preCreated.setStartTimeStamp(timestamp);
|
| 97 | 102 |
DataQuality defaultDataQuality = getTopiaPersistenceContext().getCommonDataQualityDao().forTopiaIdEquals(ProtectedIds.LL_LOGBOOK_ACTIVITY_DEFAULT_DATA_QUALITY_ID).findUnique();
|