This is an automated email from the git hooks/post-receive script. New commit to branch feature/7519 in repository observe. See http://git.codelutin.com/observe.git commit 0d49a35e46b6018f526408f87d1fabf5e9be8923 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 15 17:54:20 2015 +0200 ajout de spropiétés date et time dans les models d'ui --- .../open/impl/longline/ActivityLonglineUI.css | 6 ++-- .../impl/longline/ActivityLonglineUIModel.java | 33 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css index 15c47cd..068d2e4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css @@ -28,10 +28,8 @@ #timeStamp { propertyDate:{ActivityLonglineDto.PROPERTY_TIME_STAMP}; - //FIXME - //propertyDayDate:{ActivityLonglineDto.PROPERTY_DATE}; - //FIXME - //propertyTimeDate:{ActivityLonglineDto.PROPERTY_TIME}; + propertyDayDate:{ActivityLonglineUIModel.PROPERTY_DATE}; + propertyTimeDate:{ActivityLonglineUIModel.PROPERTY_TIME}; label:{t("observe.activityLongline.timeStamp")}; date:{bean.getTimeStamp()}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java index 50c9211..8e8fab3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java @@ -27,8 +27,11 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.BinderModelBuilder; +import java.util.Date; + /** * Created on 9/26/14. * @@ -42,6 +45,10 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong //FIXME à mettre ailleurs private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; + public static final String PROPERTY_DATE = "date"; + + public static final String PROPERTY_TIME = "time"; + public ActivityLonglineUIModel() { super(ActivityLonglineDto.class); } @@ -82,4 +89,30 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong return vesselActivityLongline != null && VESSEL_ACTIVITY_ID_FOR_SET.equals(vesselActivityLongline.getId()); } + + public Date getDate() { + Date timeStamp = bean.getTimeStamp(); + return timeStamp == null ? null : DateUtil.getDay(timeStamp); + } + + public Date getTime() { + Date timeStamp = bean.getTimeStamp(); + return timeStamp == null ? null : DateUtil.getTime(timeStamp, false, false); + } + + public void setDate(Date date) { + Date timeStamp = bean.getTimeStamp(); + if (timeStamp != null) { + Date dateAndTime = date == null ? timeStamp : DateUtil.getDateAndTime(date, timeStamp, true, false); + bean.setTimeStamp(dateAndTime); + } + } + + public void setTime(Date time) { + Date timeStamp = bean.getTimeStamp(); + if (timeStamp != null) { + Date dateAndTime = time == null ? timeStamp : DateUtil.getDateAndTime(timeStamp, time, false, false); + bean.setTimeStamp(dateAndTime); + } + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.