This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bc887a9b31f67dee29ff168a2a9166417d73b5ae Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 22 12:47:16 2015 +0200 migration des détails de l'operation pour les palangre (refs #7613) --- .../ui/content/impl/longline/SetLonglineUI.css | 16 -- .../ui/content/impl/longline/SetLonglineUI.jaxx | 5 - .../impl/longline/SetLonglineUIHandler.java | 133 ++----------- .../content/impl/longline/SetLonglineUIModel.java | 216 ++++----------------- .../open/impl/longline/ActivityLonglineUI.css | 2 +- .../loadors/ActivityLonglineNodeChildLoador.java | 23 +-- .../v1/longline/SetLonglineServiceController.java | 3 +- .../service/longline/SetLonglineService.java | 3 +- .../services/dto/longline/ActivityLonglineDto.java | 2 +- .../main/xmi/observe-services-dto-longline.zargo | Bin 63036 -> 63139 bytes .../services/dto/ObserveDtosInitializer.java | 2 +- .../longline/ActivityLonglineServiceTopia.java | 12 +- .../service/longline/SetLonglineServiceTopia.java | 6 +- 13 files changed, 89 insertions(+), 334 deletions(-) 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 dca6af3..9c65608 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,6 @@ label:{t("observe.setLongline.settingStartTimeStamp")}; date:{bean.getSettingStartTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP}; - propertyDayDate: {SetLonglineUIModel.PROPERTY_SETTING_START_DATE}; - propertyTimeDate: {SetLonglineUIModel.PROPERTY_SETTING_START_TIME}; _validatorLabel:{t("observe.setLongline.settingStartTimeStamp")}; } @@ -81,10 +79,8 @@ #settingStartCoordinates { propertyLatitude:{SetLonglineDto.PROPERTY_SETTING_START_LATITUDE}; propertyLongitude:{SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE}; - /*propertyQuadrant:{SetLonglineDto.PROPERTY_SETTING_START_QUADRANT};*/ latitude:{bean.getSettingStartLatitude()}; longitude:{bean.getSettingStartLongitude()}; - //quadrant:{bean.getSettingStartQuadrant()}; _validatorLabel:{t("observe.setLongline.settingStartCoordinates")}; } @@ -92,8 +88,6 @@ label:{t("observe.setLongline.settingEndTimeStamp")}; date:{bean.getSettingEndTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP}; - propertyDayDate: {SetLonglineUIModel.PROPERTY_SETTING_END_DATE}; - propertyTimeDate: {SetLonglineUIModel.PROPERTY_SETTING_END_TIME}; _validatorLabel:{t("observe.setLongline.settingEndTimeStamp")}; } @@ -104,10 +98,8 @@ #settingEndCoordinates { propertyLatitude:{SetLonglineDto.PROPERTY_SETTING_END_LATITUDE}; propertyLongitude:{SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE}; - /*propertyQuadrant:{SetLonglineDto.PROPERTY_SETTING_END_QUADRANT};*/ latitude:{bean.getSettingEndLatitude()}; longitude:{bean.getSettingEndLongitude()}; - //quadrant:{bean.getSettingEndQuadrant()}; _validatorLabel:{t("observe.setLongline.settingEndCoordinates")}; } @@ -367,18 +359,14 @@ label:{t("observe.setLongline.haulingStartTimeStamp")}; date:{bean.getHaulingStartTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP}; - propertyDayDate: {SetLonglineUIModel.PROPERTY_HAULING_START_DATE}; - propertyTimeDate: {SetLonglineUIModel.PROPERTY_HAULING_START_TIME}; _validatorLabel:{t("observe.setLongline.haulingStartTimeStamp")}; } #haulingStartCoordinates { propertyLatitude:{SetLonglineDto.PROPERTY_HAULING_START_LATITUDE}; propertyLongitude:{SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE}; - /*propertyQuadrant:{SetLonglineDto.PROPERTY_HAULING_START_QUADRANT};*/ latitude:{bean.getHaulingStartLatitude()}; longitude:{bean.getHaulingStartLongitude()}; - //quadrant:{bean.getHaulingStartQuadrant()}; _validatorLabel:{t("observe.setLongline.haulingStartCoordinates")}; } @@ -386,18 +374,14 @@ label:{t("observe.setLongline.haulingEndTimeStamp")}; date:{bean.getHaulingEndTimeStamp()}; propertyDate: {SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP}; - propertyDayDate: {SetLonglineUIModel.PROPERTY_HAULING_END_DATE}; - propertyTimeDate: {SetLonglineUIModel.PROPERTY_HAULING_END_TIME}; _validatorLabel:{t("observe.setLongline.haulingEndTimeStamp")}; } #haulingEndCoordinates { propertyLatitude:{SetLonglineDto.PROPERTY_HAULING_END_LATITUDE}; propertyLongitude:{SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE}; - /*propertyQuadrant:{SetLonglineDto.PROPERTY_HAULING_END_QUADRANT};*/ latitude:{bean.getHaulingEndLatitude()}; longitude:{bean.getHaulingEndLongitude()}; - //quadrant:{bean.getHaulingEndQuadrant()}; _validatorLabel:{t("observe.setLongline.haulingEndCoordinates")}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx index 76f4dac..8ff2397 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx @@ -70,22 +70,17 @@ beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> - <!--FIXME--> <field name='settingStartLongitude' component='settingStartCoordinates'/> <field name='settingStartLatitude' component='settingStartCoordinates'/> - <!--<field name='settingStartQuadrant' component='settingStartCoordinates'/>--> <field name='settingEndLongitude' component='settingEndCoordinates'/> <field name='settingEndLatitude' component='settingEndCoordinates'/> - <!--<field name='settingEndQuadrant' component='settingEndCoordinates'/>--> <field name='haulingStartLongitude' component='haulingStartCoordinates'/> <field name='haulingStartLatitude' component='haulingStartCoordinates'/> - <!--<field name='haulingStartQuadrant' component='haulingStartCoordinates'/>--> <field name='haulingEndLongitude' component='haulingEndCoordinates'/> <field name='haulingEndLatitude' component='haulingEndCoordinates'/> - <!--<field name='haulingEndQuadrant' component='haulingEndCoordinates'/>--> </BeanValidator> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 9aef8d7..da73f47 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -22,14 +22,18 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDtos; +import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -145,7 +149,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } - if (dataContext.isSelectedOpen(ActivityLonglineDto.class)) { + if (getOpenDataManager().isOpenActivityLongline(dataContext.getSelectedActivityLonglineId())) { // l'activité est ouverte, mode édition return ContentMode.UPDATE; @@ -228,9 +232,10 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { getModel().setFormDto(formDto); SetLonglineDtos.copySetLonglineDto(formDto.getForm(), bean); - //FIXME - // passage en coordonnes absolues + utilisation du quadrant -// bean.initCoordinates(); + getUi().getSettingStartCoordinates().setLatitudeAndLongitude(bean.getSettingStartLatitude(), bean.getSettingStartLongitude()); + getUi().getSettingEndCoordinates().setLatitudeAndLongitude(bean.getSettingEndLatitude(), bean.getSettingEndLongitude()); + getUi().getHaulingStartCoordinates().setLatitudeAndLongitude(bean.getHaulingStartLatitude(), bean.getHaulingStartLongitude()); + getUi().getHaulingEndCoordinates().setLatitudeAndLongitude(bean.getHaulingEndLatitude(), bean.getHaulingEndLongitude()); // utilisation du mode requis setContentMode(mode); @@ -249,32 +254,6 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } - //FIXME -// @Override -// protected void onLoad(TopiaContext tx, SetLongline bean) throws TopiaException { -// -// Float settingStartLatitude = bean.getSettingStartLatitude(); -// Float settingStartLongitude = bean.getSettingStartLongitude(); -// Float settingEndLatitude = bean.getSettingEndLatitude(); -// Float settingEndLongitude = bean.getSettingEndLongitude(); -// Float haulingStartLatitude = bean.getHaulingStartLatitude(); -// Float haulingStartLongitude = bean.getHaulingStartLongitude(); -// Float haulingEndLatitude = bean.getHaulingEndLatitude(); -// Float haulingEndLongitude = bean.getHaulingEndLongitude(); -// -// super.onLoad(tx, bean); -// -// getBean().setSettingStartLatitude(settingStartLatitude); -// getBean().setSettingStartLongitude(settingStartLongitude); -// getBean().setSettingEndLatitude(settingEndLatitude); -// getBean().setSettingEndLongitude(settingEndLongitude); -// getBean().setHaulingStartLatitude(haulingStartLatitude); -// getBean().setHaulingStartLongitude(haulingStartLongitude); -// getBean().setHaulingEndLatitude(haulingEndLatitude); -// getBean().setHaulingEndLongitude(haulingEndLongitude); -// -// } - @Override protected void closeSafeUI() { @@ -288,36 +267,6 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } - //FIXME -// @Override -// protected SetLongline onPreCreate(TopiaContext tx, -// Object parent, -// SetLongline bean) throws TopiaException { -// -// ActivityLongline parentBean = (ActivityLongline) parent; -// -// // on utilise la date - heure de l'activité pour initialiser les horodatages -// // de l'opération de peche -// Date timeStamp = parentBean.getTimeStamp(); -// bean.setSettingStartTimeStamp(timeStamp); -// bean.setSettingEndTimeStamp(DateUtils.addHours(timeStamp, 1)); -// bean.setHaulingStartTimeStamp(DateUtils.addHours(timeStamp, 2)); -// bean.setHaulingEndTimeStamp(DateUtils.addHours(timeStamp, 3)); -// -// // on reporte la position de l'activité pour la position de début de filage -// Float latitude = parentBean.getLatitude(); -// Float longitude = parentBean.getLongitude(); -// -// // On enregistre deux fois les coordonnées car la première fois on perd le signe à cause de l'éditeur -// bean.setSettingStartLatitude(latitude); -// bean.setSettingStartLongitude(longitude); -// bean.setSettingStartLatitude(latitude); -// bean.setSettingStartLongitude(longitude); -// -// return bean; -// -// } - @Override public void startEditUI(String... binding) { @@ -340,12 +289,10 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { SetLonglineUI.BINDING_SETTING_START_TIME_STAMP_DATE, SetLonglineUI.BINDING_SETTING_START_COORDINATES_LATITUDE, SetLonglineUI.BINDING_SETTING_START_COORDINATES_LONGITUDE, -// SetLonglineUI.BINDING_SETTING_START_COORDINATES_QUADRANT, SetLonglineUI.BINDING_SETTING_END_TIME_STAMP_DATE, SetLonglineUI.BINDING_SETTING_END_COORDINATES_LATITUDE, SetLonglineUI.BINDING_SETTING_END_COORDINATES_LONGITUDE, -// SetLonglineUI.BINDING_SETTING_END_COORDINATES_QUADRANT, // setting caracteristics tab SetLonglineUI.BINDING_SETTING_VESSEL_SPEED_MODEL, @@ -375,12 +322,10 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { SetLonglineUI.BINDING_HAULING_START_TIME_STAMP_DATE, SetLonglineUI.BINDING_HAULING_START_COORDINATES_LATITUDE, SetLonglineUI.BINDING_HAULING_START_COORDINATES_LONGITUDE, -// SetLonglineUI.BINDING_HAULING_START_COORDINATES_QUADRANT, SetLonglineUI.BINDING_HAULING_END_TIME_STAMP_DATE, SetLonglineUI.BINDING_HAULING_END_COORDINATES_LATITUDE, SetLonglineUI.BINDING_HAULING_END_COORDINATES_LONGITUDE, -// SetLonglineUI.BINDING_HAULING_END_COORDINATES_QUADRANT, SetLonglineUI.BINDING_HAULING_BREAKS_MODEL); @@ -388,51 +333,19 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } - //FIXME @Override protected boolean doSave(SetLonglineDto bean) throws Exception { String activityId = getSelectedParentId(); - String beanId = getSetLonglineService().save(activityId, bean); - bean.setId(beanId); + SaveResultDto saveResult = getSetLonglineService().save(activityId, bean); + bean.setId(saveResult.getId()); + bean.setLastUpdate(saveResult.getLastUpdate()); return true; } - //FIXME -// @Override -// protected SetLongline onCreate(TopiaContext tx, Object parent, SetLongline editBean) throws TopiaException { -// -// ActivityLongline parentBean = (ActivityLongline) parent; -// SetLongline beanToSave = ObserveDAOHelper.getSetLonglineDAO(tx).create(); -// editBean.setTopiaId(beanToSave.getTopiaId()); -// parentBean.setSetLongline(beanToSave); -// return beanToSave; -// -// } - - //FIXME -// @Override -// protected SetLongline onUpdate(TopiaContext tx, -// Object parentBean, -// SetLongline beanToSave) throws TopiaException { -// -// getLoadBinder().copyExcluding(getBean(), -// beanToSave, -// SetLongline.PROPERTY_BAITS_COMPOSITION, -// SetLongline.PROPERTY_FLOATLINES_COMPOSITION, -// SetLongline.PROPERTY_HOOKS_COMPOSITION, -// SetLongline.PROPERTY_BRANCHLINES_COMPOSITION, -// SetLongline.PROPERTY_SECTION, -// SetLongline.PROPERTY_CATCH_LONGLINE, -// SetLongline.PROPERTY_MITIGATION_TYPE, -// SetLongline.PROPERTY_TDR); -// return beanToSave; -// -// } - @Override protected void afterSave(boolean refresh) { @@ -453,8 +366,9 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { // remove old node and recreate new node ObserveNode parentNode = treeHelper.removeNode(node); - //FIXME -// node = treeHelper.addSet(parentNode, bean); + + ReferenceDto<SetLonglineDto> refBean = ReferenceDtos.newReferenceDto(bean, ImmutableSet.<String>of()); + node = treeHelper.addSetLongline(parentNode, refBean); stopEditUI(); treeHelper.selectNode(node); @@ -483,21 +397,6 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } - //FIXME -// @Override -// protected void onDelete(TopiaContext tx, Object parent, SetLongline beanToDelete) throws TopiaException { -// -// ActivityLongline parentBean = (ActivityLongline) parent; -// -// // on doit supprimer physiquement la set -// // car il n'y a pas de delete-orphan sur une telle -// // relation -// ObserveDAOHelper.getSetLonglineDAO(tx).delete(parentBean.getSetLongline()); -// // supprime la reference sur l'activity -// parentBean.setSetLongline(null); -// -// } - protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { Set<String> errorProperties = new HashSet<String>(); 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 9a9bc26..cffbf8a 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 @@ -25,9 +25,7 @@ package fr.ird.observe.ui.content.impl.longline; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.util.DateUtil; -import java.util.Date; import java.util.Set; /** @@ -44,82 +42,53 @@ 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, - - SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, - SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, - SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, - //FIXME -// SetLonglineDto.PROPERTY_SETTING_START_QUADRANT, - - SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, - SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, - SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE - //FIXME -// SetLonglineDto.PROPERTY_SETTING_END_QUADRANT + ImmutableSet.<String>builder().add( + SetLonglineDto.PROPERTY_HOME_ID, + SetLonglineDto.PROPERTY_NUMBER, + SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, + SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE ).build(); public static final Set<String> SETTING_CARACTERISTICS_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(SetLonglineDto.PROPERTY_SETTING_SHAPE, - SetLonglineDto.PROPERTY_LINE_TYPE, - SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, - SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, - SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, - SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED, - SetLonglineDto.PROPERTY_SHOOTER_USED, - SetLonglineDto.PROPERTY_SHOOTER_SPEED, - SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL, - SetLonglineDto.PROPERTY_SWIVEL_WEIGHT, - SetLonglineDto.PROPERTY_WEIGHTED_SNAP, - SetLonglineDto.PROPERTY_SNAP_WEIGHT, - SetLonglineDto.PROPERTY_MONITORED, - SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS, - SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, - SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, - SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, - SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, - SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT, - SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT).build(); + ImmutableSet.<String>builder().add( + SetLonglineDto.PROPERTY_SETTING_SHAPE, + SetLonglineDto.PROPERTY_LINE_TYPE, + SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, + SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, + SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, + SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED, + SetLonglineDto.PROPERTY_SHOOTER_USED, + SetLonglineDto.PROPERTY_SHOOTER_SPEED, + SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL, + SetLonglineDto.PROPERTY_SWIVEL_WEIGHT, + SetLonglineDto.PROPERTY_WEIGHTED_SNAP, + SetLonglineDto.PROPERTY_SNAP_WEIGHT, + SetLonglineDto.PROPERTY_MONITORED, + SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS, + SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, + SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT + ).build(); public static final Set<String> HAULING_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, - SetLonglineDto.PROPERTY_HAULING_START_LATITUDE, - SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE, - SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, - //FIXME -// SetLonglineDto.PROPERTY_HAULING_START_QUADRANT, - SetLonglineDto.PROPERTY_HAULING_END_LATITUDE, - SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE, - SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, - //FIXME -// SetLonglineDto.PROPERTY_HAULING_END_QUADRANT, - SetLonglineDto.PROPERTY_HAULING_BREAKS).build(); + ImmutableSet.<String>builder().add( + SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, + SetLonglineDto.PROPERTY_HAULING_START_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_END_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_BREAKS + ).build(); private static final long serialVersionUID = 1L; @@ -160,107 +129,4 @@ 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/open/impl/longline/ActivityLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css index b743036..355f424 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 @@ -95,5 +95,5 @@ actionIcon:add; text:"observe.action.add.setLongline"; toolTipText:"observe.action.add.setLongline.tip"; - enabled:{model.isValid() && model.isSetOperation()}; // FIXME && bean.getSetLongline() == null}; + enabled:{model.isValid() && model.isSetOperation() && ! bean.isHasSetLongline()}; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 2bbd351..039af11 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -23,9 +23,11 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.ui.tree.ActivityLonglineNode; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.SetLonglineNode; @@ -71,17 +73,16 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str { - //FIXME -// ActivityLongline activity = ((ActivityLonglineNode) parentNode).getEntity(); -// -// SetLongline setLongline = activity.getSetLongline(); -// if (setLongline != null) { -// -// // si set present, ajout d'un noeud -// ObserveNode child = createSetNode(setLongline); -// parentNode.add(child); -// -// } + ReferenceDto<ActivityLonglineDto> activityLonglineRef = ((ActivityLonglineNode) parentNode).getEntity(); + + ReferenceDto<SetLonglineDto> setLonglineRef = (ReferenceDto<SetLonglineDto>) activityLonglineRef.getPropertyValue(ActivityLonglineDto.PROPERTY_SET_LONGLINE); + if (setLonglineRef != null) { + + // si set present, ajout d'un noeud + ObserveNode child = createSetNode(setLonglineRef); + parentNode.add(child); + + } } // ajout des autres fils avant la calée diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java index 50a55de..9d48f49 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java @@ -26,6 +26,7 @@ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceC import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.SetLonglineService; /** @@ -58,7 +59,7 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public String save(String activityLonglineId, SetLonglineDto dto) { + public SaveResultDto save(String activityLonglineId, SetLonglineDto dto) { return service.save(activityLonglineId, dto); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java index 38cc8a5..8cf0fad 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java @@ -26,6 +26,7 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; @@ -52,7 +53,7 @@ public interface SetLonglineService extends ObserveService { @WriteDataPermission @Write @PostRequest - String save(String activityLonglineId, SetLonglineDto dto); + SaveResultDto save(String activityLonglineId, SetLonglineDto dto); @Write @WriteDataPermission diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java index 93b9a77..b41b530 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java @@ -8,7 +8,7 @@ public class ActivityLonglineDto extends AbstractActivityLonglineDto { private static final long serialVersionUID = 3991657324991701860L; - public static final String PROPERTY_HAS_SET_LONGLINE = "hasSetLongline"; + public static final String PROPERTY_SET_LONGLINE = "setLongline"; public static final String PROPERTY_DATE = "date"; diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index ddc81be..f085a22 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index 7f7cb9a..fdb88cc 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -607,7 +607,7 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, - SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE, SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index aef1b6a..bfcc5a8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -40,6 +40,7 @@ import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; @@ -70,12 +71,13 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements ReferenceDto<ActivityLonglineDto> stub = ReferenceDtos.newReferenceDto(ActivityLonglineDto.class, Lists.newArrayList(ActivityLonglineDto.PROPERTY_TIME_STAMP, ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLonglineDto.PROPERTY_HAS_SET_LONGLINE)); + ActivityLonglineDto.PROPERTY_SET_LONGLINE)); stub.setId(activityLongline.getTopiaId()); stub.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, activityLongline.getTimeStamp()); stub.setPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, referenceLocale.getLabel(activityLongline.getVesselActivityLongline())); - stub.setPropertyValue(ActivityLonglineDto.PROPERTY_HAS_SET_LONGLINE, activityLongline.getSetLongline() != null); - + if (activityLongline.getSetLongline() != null) { + stub.setPropertyValue(ActivityLonglineDto.PROPERTY_SET_LONGLINE, entityToReferenceDto(SetLonglineDto.class, activityLongline.getSetLongline())); + } stubs.add(stub); } @@ -108,6 +110,8 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements FormDto<ActivityLonglineDto> form = entityToReadFormDto(ActivityLonglineDto.class, ActivityLongline.class, activityLongline); + form.getForm().setHasSetLongline(activityLongline.getSetLongline() != null); + return form; } @@ -130,6 +134,8 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements FormDto<ActivityLonglineDto> form = entityToEditFormDto(ActivityLonglineDto.class, ActivityLongline.class, activityLongline); + form.getForm().setHasSetLongline(activityLongline.getSetLongline() != null); + return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java index 09f9ca6..a41c969 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java @@ -29,6 +29,8 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.service.DataNotFoundException; import org.apache.commons.lang3.time.DateUtils; @@ -103,7 +105,7 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } @Override - public String save(String activityLonglineId, SetLonglineDto setLonglineDto) { + public SaveResultDto save(String activityLonglineId, SetLonglineDto setLonglineDto) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); @@ -119,7 +121,7 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } - return setLongline.getTopiaId(); + return SaveResultDtos.newSaveResult(setLongline.getTopiaId(), setLongline.getLastUpdate()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.