Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8faa6ceb by tchemit at 2020-03-27T14:24:35+01:00 [SFA] LL/Logbook/Trips/activity date by default - Closes #1449 - - - - - 2 changed files: - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityServiceLocal.java Changes: ===================================== services-local/pom.xml ===================================== @@ -127,6 +127,10 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-util</artifactId> + </dependency> <dependency> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-api</artifactId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityServiceLocal.java ===================================== @@ -39,6 +39,8 @@ import fr.ird.observe.entities.referential.common.DataQuality; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.local.service.data.ll.common.TripServiceLocal; import fr.ird.observe.services.service.data.ll.logbook.ActivityService; +import io.ultreia.java4all.util.Dates; +import org.nuiton.util.DateUtil; import java.util.Calendar; import java.util.Date; @@ -88,10 +90,13 @@ public class ActivityServiceLocal extends ObserveServiceLocal implements Activit // première activité, on utilise la date de début de marée (voir http://forge.codelutin.com/issues/6777) Calendar calendar = Calendar.getInstance(); calendar.setTime(trip.getStartDate()); - timestamp = calendar.getTime(); + timestamp = Dates.getDay(calendar.getTime()); } else { - // on reprend la date et l'heure de la dernière activité - timestamp = lastActivityLongline.getStartTimeStamp(); + // on reprend la date +1 de la dernière activité + Calendar calendar = Calendar.getInstance(); + calendar.setTime(lastActivityLongline.getStartTimeStamp()); + calendar.add(Calendar.DAY_OF_YEAR, 1); + timestamp = Dates.getDay(calendar.getTime()); } preCreated.setStartTimeStamp(timestamp); DataQuality defaultDataQuality = getTopiaPersistenceContext().getCommonDataQualityDao().forTopiaIdEquals(ProtectedIds.LL_LOGBOOK_ACTIVITY_DEFAULT_DATA_QUALITY_ID).findUnique(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8faa6ceba9388cb83c4ba64e95... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8faa6ceba9388cb83c4ba64e95... You're receiving this email because of your account on gitlab.com.