branch feature/7595-PSVérifÉcranActivités created (now 2fa8e60)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7595-PSVérifÉcranActivités in repository tutti. See http://git.codelutin.com/tutti.git at 2fa8e60 Ne pas proposer d'ajouté la calé (ou les DCP) si l'activité n'est pas sauvegardée. (de la même façon que l'on ne propose pas la création d'une nouvelle activité si celle courante est modifée) This branch includes the following new commits: new 22d3683 Ajout de trace dans les appels des services. new a1e681d ne pas se baser sur les données du DTO pour copier une entité vers un DTO new 9829bb5 - correction du binding entre le type de l'activité et l'activation du bouton "ajouter l'opération de pêche". - correction du binding entre le type de l'activité et l'activation des champs "Zone FPA". new 2fa8e60 Ne pas proposer d'ajouté la calé (ou les DCP) si l'activité n'est pas sauvegardée. (de la même façon que l'on ne propose pas la création d'une nouvelle activité si celle courante est modifée) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2fa8e60c1230de4cba44d0e5e38ee5cf6e0dd6ad Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 16:31:18 2016 +0100 Ne pas proposer d'ajouté la calé (ou les DCP) si l'activité n'est pas sauvegardée. (de la même façon que l'on ne propose pas la création d'une nouvelle activité si celle courante est modifée) commit 9829bb5f8661a67e0763d93186c0a62f5a72e112 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 16:29:47 2016 +0100 - correction du binding entre le type de l'activité et l'activation du bouton "ajouter l'opération de pêche". - correction du binding entre le type de l'activité et l'activation des champs "Zone FPA". commit a1e681d35625e98ef7668c7564492d8250b9dd29 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 16:26:40 2016 +0100 ne pas se baser sur les données du DTO pour copier une entité vers un DTO commit 22d3683545bbee9b32ad095fd513761f8c3d82b1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 15:03:53 2016 +0100 Ajout de trace dans les appels des services. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7595-PSVérifÉcranActivités in repository tutti. See http://git.codelutin.com/tutti.git commit 22d3683545bbee9b32ad095fd513761f8c3d82b1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 15:03:53 2016 +0100 Ajout de trace dans les appels des services. --- .../service/seine/ActivitySeineServiceTopia.java | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index ff31660..48cda67 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.seine; * #L% */ +import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; @@ -39,6 +40,8 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.type.CoordinateHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; import java.util.ArrayList; @@ -50,8 +53,13 @@ import java.util.List; */ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements ActivitySeineService { + private static final Log log = LogFactory.getLog(ActivitySeineServiceTopia.class); + @Override public DataReferenceSet<ActivitySeineDto> getActivitySeineByRoute(String routeId) { + if (log.isTraceEnabled()) { + log.trace("getActivitySeineByRoute(" + routeId + ")"); + } ReferentialLocale referenceLocale = getReferentialLocale(); @@ -67,6 +75,10 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override public int getActivitySeinePositionInRoute(String routeId, String activitySeineId) { + if (log.isTraceEnabled()) { + log.trace("getActivitySeinePositionInRoute(" + routeId + ", " + activitySeineId + ")"); + } + Route route = loadEntity(RouteDto.class, routeId); ActivitySeine activitySeine = route.getActivitySeineByTopiaId(activitySeineId); @@ -78,6 +90,9 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override public DataReference<ActivitySeineDto> loadReferenceToRead(String activitySeineId) { + if (log.isTraceEnabled()) { + log.trace("loadReferenceToRead(" + activitySeineId + ")"); + } ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, activitySeineId); @@ -88,11 +103,18 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override public ActivitySeineDto loadDto(String activitySeineId) { + if (log.isTraceEnabled()) { + log.trace("loadDto(" + activitySeineId + ")"); + } + return loadEntityToDataDto(ActivitySeineDto.class, activitySeineId); } @Override public boolean exists(String activitySeineId) { + if (log.isTraceEnabled()) { + log.trace("exists(" + activitySeineId + ")"); + } return existsEntity(ActivitySeine.class, activitySeineId); @@ -100,6 +122,9 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override public Form<ActivitySeineDto> loadForm(String activitySeineId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + activitySeineId + ")"); + } ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, activitySeineId); @@ -116,6 +141,9 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override public Form<ActivitySeineDto> preCreate(String routeId) { + if (log.isTraceEnabled()) { + log.trace("preCreate(" + routeId + ")"); + } Route route = loadEntity(RouteDto.class, routeId); @@ -173,6 +201,9 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override public SaveResultDto save(String routeId, ActivitySeineDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + routeId + ", " + dto.getId() + ")"); + } Route route = loadEntity(RouteDto.class, routeId); @@ -192,6 +223,9 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override public void delete(String routeId, String activitySeineId) { + if (log.isTraceEnabled()) { + log.trace("delete(" + routeId + ", " + activitySeineId + ")"); + } Route route = loadEntity(RouteDto.class, routeId); @@ -207,6 +241,9 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override public int moveActivitySeineToRoute(String activitySeineId, String routeId) { + if (log.isTraceEnabled()) { + log.trace("moveActivitySeineToRoute(" + activitySeineId + ", " + routeId + ")"); + } ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, activitySeineId); Route route = loadEntity(RouteDto.class, routeId); @@ -220,6 +257,9 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override public List<Integer> moveActivitySeinesToRoute(List<String> activitySeineIds, String routeId) { + if (log.isTraceEnabled()) { + log.trace("moveActivitySeinesToRoute([" + Joiner.on(", ").join(activitySeineIds) + "]" + routeId + ")"); + } Route route = loadEntity(RouteDto.class, routeId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7595-PSVérifÉcranActivités in repository tutti. See http://git.codelutin.com/tutti.git commit a1e681d35625e98ef7668c7564492d8250b9dd29 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 16:26:40 2016 +0100 ne pas se baser sur les données du DTO pour copier une entité vers un DTO --- .../observe/services/binder/data/ActivitySeineBinder.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java index 3ed93ba..b079959 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java @@ -58,13 +58,13 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi copyEntityDataFieldsToDto(entity, dto); - dto.setTime(dto.getTime()); - dto.setLatitude(dto.getLatitude()); - dto.setLongitude(dto.getLongitude()); - dto.setVesselSpeed(dto.getVesselSpeed()); - dto.setSeaSurfaceTemperature(dto.getSeaSurfaceTemperature()); - dto.setObservedSystemDistance(dto.getObservedSystemDistance()); - dto.setErsId(dto.getErsId()); + dto.setTime(entity.getTime()); + dto.setLatitude(entity.getLatitude()); + dto.setLongitude(entity.getLongitude()); + dto.setVesselSpeed(entity.getVesselSpeed()); + dto.setSeaSurfaceTemperature(entity.getSeaSurfaceTemperature()); + dto.setObservedSystemDistance(entity.getObservedSystemDistance()); + dto.setErsId(entity.getErsId()); dto.setVesselActivitySeine(toReferentialReference(referentialLocale, entity.getVesselActivitySeine(), VesselActivitySeineDto.class)); dto.setSurroundingActivity(toReferentialReference(referentialLocale, entity.getSurroundingActivity(), SurroundingActivityDto.class)); dto.setWind(toReferentialReference(referentialLocale, entity.getWind(), WindDto.class)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7595-PSVérifÉcranActivités in repository tutti. See http://git.codelutin.com/tutti.git commit 9829bb5f8661a67e0763d93186c0a62f5a72e112 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 16:29:47 2016 +0100 - correction du binding entre le type de l'activité et l'activation du bouton "ajouter l'opération de pêche". - correction du binding entre le type de l'activité et l'activation des champs "Zone FPA". --- .../open/impl/seine/ActivitySeineUIModel.java | 38 ++++++++++++++++++---- .../referential/seine/VesselActivitySeineDtos.java | 35 ++++++++++++++++++++ 2 files changed, 66 insertions(+), 7 deletions(-) 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 ccbc9d9..1972ecc 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 @@ -23,9 +23,14 @@ package fr.ird.observe.ui.content.open.impl.seine; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.Set; /** @@ -40,8 +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 String PROPERTY_SET_OPERATION = "setOperation"; + + public static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation"; public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(ActivitySeineDto.PROPERTY_TIME, @@ -69,6 +75,24 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt public ActivitySeineUIModel() { super(ActivitySeineDto.class); + getBean().addPropertyChangeListener(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + boolean oldValue = VesselActivitySeineDtos.isSetOperation((ReferentialReference<VesselActivitySeineDto>) evt.getOldValue()); + boolean newValue = VesselActivitySeineDtos.isSetOperation((ReferentialReference<VesselActivitySeineDto>) evt.getNewValue()); + firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue); + } + }); + + getBean().addPropertyChangeListener(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + boolean oldValue = VesselActivitySeineDtos.isChangedZoneOperation((ReferentialReference<VesselActivitySeineDto>) evt.getOldValue()); + boolean newValue = VesselActivitySeineDtos.isChangedZoneOperation((ReferentialReference<VesselActivitySeineDto>) evt.getNewValue()); + firePropertyChange(PROPERTY_CHANGED_ZONE_OPERATION, oldValue, newValue); + } + }); + } public boolean isMeasurementsTabValid() { @@ -91,12 +115,12 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); } + public boolean isSetOperation() { + return VesselActivitySeineDtos.isSetOperation(bean.getVesselActivitySeine()); + } + public boolean isChangedZoneOperation() { - //FIXME -// ReferentialReference<VesselActivitySeineDto> vesselActivitySeine = bean.getVesselActivitySeine(); -// Serializable code = vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE); -// return vesselActivitySeine != null && ACTIVITY_CHANGED_ZONE.equals(code); - return false; + return VesselActivitySeineDtos.isChangedZoneOperation(bean.getVesselActivitySeine()); } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java new file mode 100644 index 0000000..c28a393 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java @@ -0,0 +1,35 @@ +package fr.ird.observe.services.dto.referential.seine; + +import fr.ird.observe.services.dto.referential.ReferentialReference; + +public class VesselActivitySeineDtos extends AbstractVesselActivitySeineDtos { + + private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586"; + + public static final String VESSEL_ACTIVITY_ID_CHANGED_ZONE = "fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1379684416896#0.38648073770690594"; + + public static boolean isSetOpreration(String id) { + return VESSEL_ACTIVITY_ID_FOR_SET.equals(id); + } + + public static boolean isSetOperation(VesselActivitySeineDto vesselActivitySeineDto) { + return vesselActivitySeineDto != null && isSetOpreration(vesselActivitySeineDto.getId()); + } + + public static boolean isSetOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { + return vesselActivitySeineRef != null && isSetOpreration(vesselActivitySeineRef.getId()); + } + + public static boolean isChangedZoneOperation(String id) { + return VESSEL_ACTIVITY_ID_CHANGED_ZONE.equals(id); + } + + public static boolean isChangedZoneOperation(VesselActivitySeineDto vesselActivitySeineDto) { + return vesselActivitySeineDto != null && isChangedZoneOperation(vesselActivitySeineDto.getId()); + } + + public static boolean isChangedZoneOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { + return vesselActivitySeineRef != null && isChangedZoneOperation(vesselActivitySeineRef.getId()); + } + +} //VesselActivitySeineDtos -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7595-PSVérifÉcranActivités in repository tutti. See http://git.codelutin.com/tutti.git commit 2fa8e60c1230de4cba44d0e5e38ee5cf6e0dd6ad Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 16:31:18 2016 +0100 Ne pas proposer d'ajouté la calé (ou les DCP) si l'activité n'est pas sauvegardée. (de la même façon que l'on ne propose pas la création d'une nouvelle activité si celle courante est modifée) --- .../fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c9fd164..a250b60 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 @@ -211,14 +211,14 @@ } #addSet { - enabled:{model.isValid()};//FIXME && bean.isSetOperation() && bean.getSetSeine() == null}; + enabled:{!model.isModified() && model.isValid() && model.isSetOperation() && bean.getSetSeine() == null}; text:"observe.action.add.set"; toolTipText:"observe.action.add.set.tip"; actionIcon:"add"; } #addDCP { - enabled:{model.isValid()}; + enabled:{!model.isModified() && model.isValid()}; text:"observe.action.add.floatingObject"; toolTipText:"observe.action.add.floatingObject.tip"; actionIcon:"add"; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm