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 d2fbe48e41224bcab795c4525812845b4a9f8122 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 15 17:52:07 2015 +0200 ajout de spropiétés date et time dans les models d'ui --- .../ui/content/impl/longline/BranchlineUI.css | 6 +- .../content/impl/longline/BranchlineUIModel.java | 32 +++++ .../ui/content/impl/longline/SetLonglineUI.css | 16 +-- .../content/impl/longline/SetLonglineUIModel.java | 129 +++++++++++++++++++++ .../FloatingObjectTransmittingBuoyOperationUI.css | 6 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 + .../open/impl/longline/ActivityLonglineUI.css | 2 +- .../impl/longline/ActivityLonglineUIModel.java | 11 ++ .../ui/content/open/impl/seine/ActivitySeineUI.css | 9 +- .../open/impl/seine/ActivitySeineUIModel.java | 12 ++ .../table/impl/longline/BaitsCompositionUI.css | 3 +- .../impl/longline/BaitsCompositionUIModel.java | 13 ++- .../ui/content/table/impl/longline/TdrUI.css | 16 +-- .../ui/content/table/impl/longline/TdrUIModel.java | 122 +++++++++++++++++++ 14 files changed, 347 insertions(+), 34 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css index 42f8916..598904c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css @@ -101,10 +101,8 @@ label:{t("observe.branchline.timerTimeOnBoard")}; date:{bean.getTimerTimeOnBoard()}; propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; - //FIXME - //propertyDayDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; - //FIXME - //propertyTimeDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; + propertyDayDate: {BranchlineUIModel.PROPERTY_TIMER_TIME_ON_BOARD_DATE}; + propertyTimeDate: {BranchlineUIModel.PROPERTY_TIMER_TIME_ON_BOARD_TIME}; _validatorLabel:{t("observe.branchline.timerTimeOnBoard")}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java index 4ecf7b0..aca4e59 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java @@ -26,8 +26,10 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.business.BinderService; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.ui.content.ContentUIModel; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.BinderModelBuilder; +import java.util.Date; import java.util.Set; /** @@ -46,6 +48,10 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { public static final String PROPERTY_HOOK_AND_BAIT_TAB_VALID = "hookAndBaitTabValid"; + public static final String PROPERTY_TIMER_TIME_ON_BOARD_DATE = "timerTimeOnBoardDate"; + + public static final String PROPERTY_TIMER_TIME_ON_BOARD_TIME = "timerTimeOnBoardTime"; + public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(BranchlineDto.PROPERTY_TOP_TYPE, BranchlineDto.PROPERTY_TRACELINE_TYPE, @@ -143,4 +149,30 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { public void fireSaved() { firePropertyChange(PROPERTY_SAVED, null, true); } + + public Date getTimerTimeOnBoardDate() { + Date timerTimeOnBoard = bean.getTimerTimeOnBoard(); + return timerTimeOnBoard == null ? null : DateUtil.getDay(timerTimeOnBoard); + } + + public Date getTimerTimeOnBoardTime() { + Date timerTimeOnBoard = bean.getTimerTimeOnBoard(); + return timerTimeOnBoard == null ? null : DateUtil.getTime(timerTimeOnBoard, false, false); + } + + public void setTimerTimeOnBoardDate(Date date) { + Date timerTimeOnBoard = bean.getTimerTimeOnBoard(); + if (timerTimeOnBoard != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, timerTimeOnBoard, true, false); + bean.setTimerTimeOnBoard(dateAndTime); + } + } + + public void setTimerTimeOnBoardTime(Date time) { + Date timerTimeOnBoard = bean.getTimerTimeOnBoard(); + if (timerTimeOnBoard != null) { + Date dateAndTime = DateUtil.getDateAndTime(timerTimeOnBoard, time, false, false); + bean.setTimerTimeOnBoard(dateAndTime); + } + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css index fb9033f..dca6af3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css @@ -69,8 +69,8 @@ label:{t("observe.setLongline.settingStartTimeStamp")}; date:{bean.getSettingStartTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP}; - //propertyDayDate: {SetLonglineDto.PROPERTY_SETTING_START_DATE}; - //propertyTimeDate: {SetLonglineDto.PROPERTY_SETTING_START_TIME}; + propertyDayDate: {SetLonglineUIModel.PROPERTY_SETTING_START_DATE}; + propertyTimeDate: {SetLonglineUIModel.PROPERTY_SETTING_START_TIME}; _validatorLabel:{t("observe.setLongline.settingStartTimeStamp")}; } @@ -92,8 +92,8 @@ label:{t("observe.setLongline.settingEndTimeStamp")}; date:{bean.getSettingEndTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP}; - //propertyDayDate: {SetLonglineDto.PROPERTY_SETTING_END_DATE}; - //propertyTimeDate: {SetLonglineDto.PROPERTY_SETTING_END_TIME}; + propertyDayDate: {SetLonglineUIModel.PROPERTY_SETTING_END_DATE}; + propertyTimeDate: {SetLonglineUIModel.PROPERTY_SETTING_END_TIME}; _validatorLabel:{t("observe.setLongline.settingEndTimeStamp")}; } @@ -367,8 +367,8 @@ label:{t("observe.setLongline.haulingStartTimeStamp")}; date:{bean.getHaulingStartTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP}; - //propertyDayDate: {SetLonglineDto.PROPERTY_HAULING_START_DATE}; - //propertyTimeDate: {SetLonglineDto.PROPERTY_HAULING_START_TIME}; + propertyDayDate: {SetLonglineUIModel.PROPERTY_HAULING_START_DATE}; + propertyTimeDate: {SetLonglineUIModel.PROPERTY_HAULING_START_TIME}; _validatorLabel:{t("observe.setLongline.haulingStartTimeStamp")}; } @@ -386,8 +386,8 @@ label:{t("observe.setLongline.haulingEndTimeStamp")}; date:{bean.getHaulingEndTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP}; - //propertyDayDate: {SetLonglineDto.PROPERTY_HAULING_END_DATE}; - //propertyTimeDate: {SetLonglineDto.PROPERTY_HAULING_END_TIME}; + propertyDayDate: {SetLonglineUIModel.PROPERTY_HAULING_END_DATE}; + propertyTimeDate: {SetLonglineUIModel.PROPERTY_HAULING_END_TIME}; _validatorLabel:{t("observe.setLongline.haulingEndTimeStamp")}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java index 9e9b595..2f19f3a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java @@ -26,8 +26,10 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.business.BinderService; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.BinderModelBuilder; +import java.util.Date; import java.util.Set; /** @@ -44,6 +46,30 @@ public class SetLonglineUIModel extends ContentUIModel<SetLonglineDto> { public static final String PROPERTY_HAULING_TAB_VALID = "haulingTabValid"; + public static final String PROPERTY_SETTING_START_DATE = "settingStartDate"; + + public static final String PROPERTY_SETTING_START_TIME = "settingStartTime"; + + public static final String PROPERTY_SETTING_START_QUADRANT = "settingStartQuadrant"; + + public static final String PROPERTY_SETTING_END_DATE = "settingEndDate"; + + public static final String PROPERTY_SETTING_END_TIME = "settingEndTime"; + + public static final String PROPERTY_SETTING_END_QUADRANT = "settingEndQuadrant"; + + public static final String PROPERTY_HAULING_START_DATE = "haulingStartDate"; + + public static final String PROPERTY_HAULING_START_TIME = "haulingStartTime"; + + public static final String PROPERTY_HAULING_START_QUADRANT = "haulingStartQuadrant"; + + public static final String PROPERTY_HAULING_END_DATE = "haulingEndDate"; + + public static final String PROPERTY_HAULING_END_TIME = "haulingEndTime"; + + public static final String PROPERTY_HAULING_END_QUADRANT = "haulingEndQuadrant"; + public static final Set<String> SETTING_TAB_PROPERTIES = ImmutableSet.<String>builder().add(SetLonglineDto.PROPERTY_HOME_ID, SetLonglineDto.PROPERTY_NUMBER, @@ -202,4 +228,107 @@ public class SetLonglineUIModel extends ContentUIModel<SetLonglineDto> { firePropertyChange(PROPERTY_SETTING_TAB_VALID, null, settingTabValid); } + public Date getSettingStartDate() { + Date settingStartTimeStamp = bean.getSettingStartTimeStamp(); + return settingStartTimeStamp == null ? null : DateUtil.getDay(settingStartTimeStamp); + } + + public Date getSettingStartTime() { + Date settingStartTimeStamp = bean.getSettingStartTimeStamp(); + return settingStartTimeStamp == null ? null : DateUtil.getTime(settingStartTimeStamp, false, false); + } + + public void setSettingStartDate(Date date) { + Date settingStartTimeStamp = bean.getSettingStartTimeStamp(); + if (settingStartTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, settingStartTimeStamp, true, false); + bean.setSettingStartTimeStamp(dateAndTime); + } + } + + public void setSettingStartTime(Date time) { + Date settingStartTimeStamp = bean.getSettingStartTimeStamp(); + if (settingStartTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(settingStartTimeStamp, time, false, false); + bean.setSettingStartTimeStamp(dateAndTime); + } + } + + public Date getSettingEndDate() { + Date settingEndTimeStamp = bean.getSettingEndTimeStamp(); + return settingEndTimeStamp == null ? null : DateUtil.getDay(settingEndTimeStamp); + } + + public Date getSettingEndTime() { + Date settingEndTimeStamp = bean.getSettingEndTimeStamp(); + return settingEndTimeStamp == null ? null : DateUtil.getTime(settingEndTimeStamp, false, false); + } + + public void setSettingEndDate(Date date) { + Date settingEndTimeStamp = bean.getSettingEndTimeStamp(); + if (settingEndTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, settingEndTimeStamp, true, false); + bean.setSettingEndTimeStamp(dateAndTime); + } + } + + public void setSettingEndTime(Date time) { + Date settingEndTimeStamp = bean.getSettingEndTimeStamp(); + if (settingEndTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(settingEndTimeStamp, time, true, false); + bean.setSettingEndTimeStamp(dateAndTime); + } + } + + public Date getHaulingStartDate() { + Date haulingStartTimeStamp = bean.getHaulingStartTimeStamp(); + return haulingStartTimeStamp == null ? null : DateUtil.getDay(haulingStartTimeStamp); + } + + public Date getHaulingStartTime() { + Date haulingStartTimeStamp = bean.getHaulingStartTimeStamp(); + return haulingStartTimeStamp == null ? null : DateUtil.getTime(haulingStartTimeStamp, false, false); + } + + public void setHaulingStartDate(Date date) { + Date haulingStartTimeStamp = bean.getHaulingStartTimeStamp(); + if (haulingStartTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, haulingStartTimeStamp, true, false); + bean.setHaulingStartTimeStamp(dateAndTime); + } + } + + public void setHaulingStartTime(Date time) { + Date haulingStartTimeStamp = bean.getHaulingStartTimeStamp(); + if (haulingStartTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(haulingStartTimeStamp, time, false, false); + bean.setHaulingStartTimeStamp(dateAndTime); + } + } + + public Date getHaulingEndDate() { + Date haulingEndTimeStamp = bean.getHaulingEndTimeStamp(); + return haulingEndTimeStamp == null ? null : DateUtil.getDay(haulingEndTimeStamp); + } + + public Date getHaulingEndTime() { + Date haulingEndTimeStamp = bean.getHaulingEndTimeStamp(); + return haulingEndTimeStamp == null ? null : DateUtil.getTime(haulingEndTimeStamp, false, false); + } + + public void setHaulingEndDate(Date date) { + Date haulingEndTimeStamp = bean.getHaulingEndTimeStamp(); + if (haulingEndTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, haulingEndTimeStamp, true, false); + bean.setHaulingEndTimeStamp(dateAndTime); + } + } + + public void setHaulingEndTime(Date time) { + Date haulingEndTimeStamp = bean.getHaulingEndTimeStamp(); + if (haulingEndTimeStamp != null) { + Date dateAndTime = DateUtil.getDateAndTime(haulingEndTimeStamp, time, true, false); + bean.setHaulingEndTimeStamp(dateAndTime); + } + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css index 0946698..d887732 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css @@ -86,8 +86,7 @@ #ownership1 { selectedItem:{transmittingBuoy1.getOwnership()}; - //FIXME - //enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} + enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} } #country1Label { @@ -153,8 +152,7 @@ #ownership2 { selectedItem:{transmittingBuoy2.getOwnership()}; - //FIXME - //enabled: {!getHandler().isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} + enabled: {!getHandler().isBalisePose(transmittingBuoy2.getTransmittingBuoyOperation())} } #country2Label { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index d168510..531d780 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -237,6 +237,10 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH return operation != null && "3".equals(operation.getCode()); } + public boolean isBalisePose(ReferentialReferenceDto<TransmittingBuoyOperationDto> operation) { + return operation != null && "3".equals(operation.getPropertyValue(TransmittingBuoyOperationDto.PROPERTY_CODE)); + } + //FIXME // @Override // protected boolean doSave(FloatingObject bean, 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 3bb8489..15c47cd 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 @@ -99,5 +99,5 @@ actionIcon:add; text:"observe.action.add.setLongline"; toolTipText:"observe.action.add.setLongline.tip"; - enabled:{model.isValid()}; // FIXME && bean.isSetOperation() && bean.getSetLongline() == null}; + enabled:{model.isValid() && model.isSetOperation()}; // FIXME && bean.getSetLongline() == null}; } 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 c7b3b84..50c9211 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 @@ -24,6 +24,8 @@ package fr.ird.observe.ui.content.open.impl.longline; import fr.ird.observe.business.BinderService; 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.beans.BinderModelBuilder; @@ -37,6 +39,9 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong private static final long serialVersionUID = 1L; + //FIXME à mettre ailleurs + private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; + public ActivityLonglineUIModel() { super(ActivityLonglineDto.class); } @@ -71,4 +76,10 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong return builder; } + + public boolean isSetOperation() { + ReferentialReferenceDto<VesselActivityLonglineDto> vesselActivityLongline = bean.getVesselActivityLongline(); + return vesselActivityLongline != null + && VESSEL_ACTIVITY_ID_FOR_SET.equals(vesselActivityLongline.getId()); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css index e0b3214..1503ec8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css @@ -90,8 +90,7 @@ #previousFpaZone { property:{ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE}; selectedItem:{bean.getPreviousFpaZone()}; - //FIXME - //enabled:{bean.isChangedZoneOperation()}; + enabled:{model.isChangedZoneOperation()}; } #currentFpaZoneLabel { @@ -102,8 +101,7 @@ #currentFpaZone { property:{ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE}; selectedItem:{bean.getCurrentFpaZone()}; - //FIXME - //enabled:{!bean.isChangedZoneOperation()}; + enabled:{model.isChangedZoneOperation()}; } #nextFpaZoneLabel { @@ -114,8 +112,7 @@ #nextFpaZone { property:{ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE}; selectedItem:{bean.getNextFpaZone()}; - //FIXME - //enabled:{bean.isChangedZoneOperation()}; + enabled:{model.isChangedZoneOperation()}; } #vesselSpeedLabel { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java index df26c8c..cbb7e4b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -24,10 +24,13 @@ package fr.ird.observe.ui.content.open.impl.seine; import com.google.common.collect.ImmutableSet; import fr.ird.observe.business.BinderService; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.BinderModelBuilder; +import java.io.Serializable; import java.util.Set; /** @@ -42,6 +45,9 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt public static final String PROPERTY_MEASUREMENTS_TAB_VALID = "measurementsTabValid"; + //FIXME à mettre ailleurs + public static final String ACTIVITY_CHANGED_ZONE = "21"; + public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(ActivitySeineDto.PROPERTY_TIME, //FIXME @@ -92,6 +98,12 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); } + public boolean isChangedZoneOperation() { + ReferentialReferenceDto<VesselActivitySeineDto> vesselActivitySeine = bean.getVesselActivitySeine(); + Serializable code = vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE); + return vesselActivitySeine != null && ACTIVITY_CHANGED_ZONE.equals(code); + } + @Override protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(BinderService binderService, String binderName) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css index a1e437f..644dd50 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css @@ -84,8 +84,7 @@ } #baitsCompositionProportionSum { - //FIXME - //text:{getStringValue(bean.getBaitsCompositionProportionSum())}; + text:{getStringValue(model.getBaitsCompositionProportionSum())}; _validatorLabel:{t("observe.baitsComposition.proportionSum")}; font-weight:bold; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java index 038587a..9667d33 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -66,5 +65,17 @@ public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineDto, } + public int getBaitsCompositionProportionSum() { + int sum = 0; + //FIXME +// if (!isBaitsCompositionEmpty()) { +// for (BaitsComposition composition : baitsComposition) { +// if (composition.getProportion() != null) { +// sum += composition.getProportion(); +// } +// } +// } + return sum; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css index d7381c7..74c8171 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css @@ -230,8 +230,8 @@ label:{t("observe.tdr.deployementStart")}; date:{tableEditBean.getDeployementStart()}; propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_START}; - //propertyDayDate: {TdrDto.PROPERTY_DEPLOYEMENT_START_DATE}; - //propertyTimeDate: {TdrDto.PROPERTY_DEPLOYEMENT_START_TIME}; + propertyDayDate: {TdrUIModel.PROPERTY_DEPLOYEMENT_START_DATE}; + propertyTimeDate: {TdrUIModel.PROPERTY_DEPLOYEMENT_START_TIME}; _validatorLabel: {t("observe.tdr.deployementStart")}; } @@ -239,8 +239,8 @@ label:{t("observe.tdr.deployementEnd")}; date:{tableEditBean.getDeployementEnd()}; propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_END}; - //propertyDayDate: {TdrDto.PROPERTY_DEPLOYEMENT_END_DATE}; - //propertyTimeDate: {TdrDto.PROPERTY_DEPLOYEMENT_END_TIME}; + propertyDayDate: {TdrUIModel.PROPERTY_DEPLOYEMENT_END_DATE}; + propertyTimeDate: {TdrUIModel.PROPERTY_DEPLOYEMENT_END_TIME}; _validatorLabel: {t("observe.tdr.deployementEnd")}; } @@ -248,8 +248,8 @@ label:{t("observe.tdr.fishingStart")}; date:{tableEditBean.getFishingStart()}; propertyDate: {TdrDto.PROPERTY_FISHING_START}; - //propertyDayDate: {TdrDto.PROPERTY_FISHING_START_DATE}; - //propertyTimeDate: {TdrDto.PROPERTY_FISHING_START_TIME}; + propertyDayDate: {TdrUIModel.PROPERTY_FISHING_START_DATE}; + propertyTimeDate: {TdrUIModel.PROPERTY_FISHING_START_TIME}; _validatorLabel: {t("observe.tdr.fishingStart")}; } @@ -257,8 +257,8 @@ label:{t("observe.tdr.fishingEnd")}; date:{tableEditBean.getFishingEnd()}; propertyDate: {TdrDto.PROPERTY_FISHING_END}; - //propertyDayDate: {TdrDto.PROPERTY_FISHING_END_DATE}; - //propertyTimeDate: {TdrDto.PROPERTY_FISHING_END_TIME}; + propertyDayDate: {TdrUIModel.PROPERTY_FISHING_END_DATE}; + propertyTimeDate: {TdrUIModel.PROPERTY_FISHING_END_TIME}; _validatorLabel: {t("observe.tdr.fishingEnd")}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java index 6b561ca..0040110 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java @@ -30,9 +30,11 @@ import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; +import java.util.Date; import java.util.List; import java.util.Set; @@ -104,6 +106,22 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineDto, TdrDto> { public static final String PROPERTY_SPECIES_TAB_VALID = "speciesTabValid"; + public static final String PROPERTY_DEPLOYEMENT_START_DATE = "deployementStartDate"; + + public static final String PROPERTY_DEPLOYEMENT_START_TIME = "deployementStartTime"; + + public static final String PROPERTY_DEPLOYEMENT_END_DATE = "deployementEndDate"; + + public static final String PROPERTY_DEPLOYEMENT_END_TIME = "deployementEndTime"; + + public static final String PROPERTY_FISHING_START_DATE = "fishingStartDate"; + + public static final String PROPERTY_FISHING_START_TIME = "fishingStartTime"; + + public static final String PROPERTY_FISHING_END_DATE = "fishingEndDate"; + + public static final String PROPERTY_FISHING_END_TIME = "fishingEndTime"; + private static final long serialVersionUID = 1L; protected boolean caracteristicsTabValid; @@ -242,4 +260,108 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineDto, TdrDto> { this.timestampTabValid = timestampTabValid; firePropertyChange(PROPERTY_TIMESTAMP_TAB_VALID, null, timestampTabValid); } + + public Date getDeployementStartDate() { + Date deployementStart = tableEditBean.getDeployementStart(); + return deployementStart == null ? null : DateUtil.getDay(deployementStart); + } + + public Date getDeployementStartTime() { + Date deployementStart = tableEditBean.getDeployementStart(); + return deployementStart == null ? null : DateUtil.getTime(deployementStart, false, false); + } + + public Date getDeployementEndDate() { + Date deployementEnd = tableEditBean.getDeployementEnd(); + return deployementEnd == null ? null : DateUtil.getDay(deployementEnd); + } + + public Date getDeployementEndTime() { + Date deployementEnd = tableEditBean.getDeployementEnd(); + return deployementEnd == null ? null : DateUtil.getTime(deployementEnd, false, false); + } + + public Date getFishingStartDate() { + Date fishingStart = tableEditBean.getFishingStart(); + return fishingStart == null ? null : DateUtil.getDay(fishingStart); + } + + public Date getFishingStartTime() { + Date fishingStart = tableEditBean.getFishingStart(); + return fishingStart == null ? null : DateUtil.getTime(fishingStart, false, false); + } + + public Date getFishingEndDate() { + Date fishingEnd = tableEditBean.getFishingEnd(); + return fishingEnd == null ? null : DateUtil.getDay(fishingEnd); + } + + public Date getFishingEndTime() { + Date fishingEnd = tableEditBean.getFishingEnd(); + return fishingEnd == null ? null : DateUtil.getTime(fishingEnd, false, false); + } + + public void setDeployementStartDate(Date date) { + Date deployementStart = tableEditBean.getDeployementStart(); + if (deployementStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, deployementStart, true, false); + tableEditBean.setDeployementStart(dateAndTime); + } + } + + public void setDeployementStartTime(Date time) { + Date deployementStart = tableEditBean.getDeployementStart(); + if (deployementStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(deployementStart, time, false, false); + tableEditBean.setDeployementStart(dateAndTime); + } + } + + public void setDeployementEndDate(Date date) { + Date deployementEnd = tableEditBean.getDeployementEnd(); + if (deployementEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, deployementEnd, true, false); + tableEditBean.setDeployementEnd(dateAndTime); + } + } + + public void setDeployementEndTime(Date time) { + Date deployementEnd = tableEditBean.getDeployementEnd(); + if (deployementEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(deployementEnd, time, false, false); + tableEditBean.setDeployementEnd(dateAndTime); + } + } + + public void setFishingStartDate(Date date) { + Date fishingStart = tableEditBean.getFishingStart(); + if (fishingStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, fishingStart, true, false); + tableEditBean.setFishingStart(dateAndTime); + } + } + + public void setFishingStartTime(Date time) { + Date fishingStart = tableEditBean.getFishingStart(); + if (fishingStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(fishingStart, time, false, false); + tableEditBean.setFishingStart(dateAndTime); + } + } + + public void setFishingEndDate(Date date) { + Date fishingEnd = tableEditBean.getFishingEnd(); + if (fishingEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, fishingEnd, true, false); + tableEditBean.setFishingEnd(dateAndTime); + } + } + + public void setFishingEndTime(Date time) { + Date fishingEnd = tableEditBean.getFishingEnd(); + if (fishingEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(fishingEnd, time, false, false); + tableEditBean.setFishingEnd(dateAndTime); + } + } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

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 792ad97ca255af5bca09eeb469c9dca1e2b84df7 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 15 18:07:07 2015 +0200 fix predicates --- .../ird/observe/ui/content/open/impl/longline/TripLonglineUI.css | 7 +++---- .../fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css index ec27bed..8a86a12 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css @@ -60,8 +60,8 @@ NumberEditor { #captain { property:{TripLonglineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - //FIXME - //_listPredicate:{PersonDtos.newCaptainPredicate()}; + FIXME + _listPredicate:{PersonDtos.newCaptainPredicate(true)}; } #dataEntryOperatorLabel { @@ -72,8 +72,7 @@ NumberEditor { #dataEntryOperator { property:{TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - //FIXME - //_listPredicate:{PersonDtos.newDataEntryOperatorPredicate()}; + _listPredicate:{PersonDtos.newDataEntryOperatorPredicate(true)}; } #tripTypeLabel{ diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css index f6f99a1..c125cc0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css @@ -52,8 +52,7 @@ NumberEditor { #observer { property:{TripSeineDto.PROPERTY_OBSERVER}; selectedItem:{bean.getObserver()}; - //FIXME - //_listPredicate:{PersonDtos.newObserverPredicate()}; + _listPredicate:{PersonDtos.newObserverPredicate(true)}; } #captainLabel { @@ -64,8 +63,7 @@ NumberEditor { #captain { property:{TripSeineDto.PROPERTY_CAPTAIN}; selectedItem:{bean.getCaptain()}; - //FIXME - //_listPredicate:{PersonDtos.newCaptainPredicate()}; + _listPredicate:{PersonDtos.newCaptainPredicate(true)}; } #dataEntryOperatorLabel { @@ -76,8 +74,7 @@ NumberEditor { #dataEntryOperator { property:{TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR}; selectedItem:{bean.getDataEntryOperator()}; - //FIXME - //_listPredicate:{PersonDtos.newDataEntryOperatorPredicate()}; + _listPredicate:{PersonDtos.newDataEntryOperatorPredicate(true)}; } #vesselLabel { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.