This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 246afa10cc03bab96c8cc74367a5fb9fb1abf613 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 13 16:57:21 2016 +0200 Remove wrong code --- .../service/longline/SetLonglineServiceTopia.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java index 0a50834..f7a714c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/SetLonglineServiceTopia.java @@ -28,9 +28,6 @@ import fr.ird.observe.entities.longline.ActivityLonglineTopiaDao; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; -import fr.ird.observe.services.service.longline.SetLonglineService; -import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -39,6 +36,9 @@ import fr.ird.observe.services.dto.longline.SetLonglineStubDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; +import fr.ird.observe.services.service.longline.SetLonglineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -118,7 +118,7 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL SetLongline preCreated = newEntity(SetLongline.class); // on utilise la date - heure de l'activité pour initialiser les horodatages - // de l'opération de peche + // de l'opération de pêche Date timeStamp = activityLongline.getTimeStamp(); preCreated.setSettingStartTimeStamp(timeStamp); preCreated.setSettingEndTimeStamp(DateUtils.addHours(timeStamp, 1)); @@ -126,14 +126,8 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL preCreated.setHaulingEndTimeStamp(DateUtils.addHours(timeStamp, 3)); // on reporte la position de l'activité pour la position de début de filage - Float latitude = activityLongline.getLatitude(); - Float longitude = activityLongline.getLongitude(); - - // On enregistre deux fois les coordonnées car la première fois on perd le signe à cause de l'éditeur - preCreated.setSettingStartLatitude(latitude); - preCreated.setSettingStartLongitude(longitude); - preCreated.setSettingStartLatitude(latitude); - preCreated.setSettingStartLongitude(longitude); + preCreated.setSettingStartLatitude(activityLongline.getLatitude()); + preCreated.setSettingStartLongitude(activityLongline.getLongitude()); Form<SetLonglineDto> form = dataEntityToForm(SetLonglineDto.class, preCreated, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.