branch feature/7594 updated (743b122 -> b1741e7)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7594 in repository observe. See http://git.codelutin.com/observe.git from 743b122 migration de l'ecran des activités palangre (refs #7594) new b1741e7 migration de l'ecran des activités palangre suite (refs #7594) The 1 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 b1741e77369fae2ef7959139180d0f7128e924db Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 13 17:26:59 2015 +0200 migration de l'ecran des activités palangre suite (refs #7594) Summary of changes: .../impl/longline/ActivityLonglineUIHandler.java | 4 ++ .../loadors/ProgramLonglineNodeChildLoador.java | 6 +-- ...ivityLonglineDto-n1-update-error-validation.xml | 23 ----------- .../services/dto/longline/ActivityLonglineDto.java | 45 ++++++++++++++++++++++ 4 files changed, 52 insertions(+), 26 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java -- 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/7594 in repository observe. See http://git.codelutin.com/observe.git commit b1741e77369fae2ef7959139180d0f7128e924db Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 13 17:26:59 2015 +0200 migration de l'ecran des activités palangre suite (refs #7594) --- .../impl/longline/ActivityLonglineUIHandler.java | 4 ++ .../loadors/ProgramLonglineNodeChildLoador.java | 6 +-- ...ivityLonglineDto-n1-update-error-validation.xml | 23 ----------- .../services/dto/longline/ActivityLonglineDto.java | 45 ++++++++++++++++++++++ 4 files changed, 52 insertions(+), 26 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index c5c87af..8665a95 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -274,6 +274,10 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity log.info("Delete done for Activity " + bean.getId()); } + if (wasTripEndDateUpdated) { + getOpenDataManager().closeActivityLongline(bean.getId()); + } + setUpdateMareeNodeTag(wasTripEndDateUpdated); return true; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index a50907d..58ffcee 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceDtos; @@ -66,9 +67,8 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa ObserveNode parentNode, NavDataProvider dataProvider) throws Exception { - //FIXME -// DataSelectionModel selectionModel = getSelectionModel(dataProvider); -// addChilds = selectionModel == null; + DataSelectionModel selectionModel = getSelectionModel(dataProvider); + addChilds = selectionModel == null; try { super.loadChilds(model, parentNode, dataProvider); diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-error-validation.xml index 8e16a39..dc1689b 100644 --- a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-error-validation.xml +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-n1-update-error-validation.xml @@ -61,29 +61,6 @@ </field> - <field name="quadrant"> - - <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.quadrant</message> - </field-validator> - - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - tripLonglineEntity.ocean == null || quadrant == null || quadrant == 0 - || (tripLonglineEntity.ocean.code == 3) - || (tripLonglineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (tripLonglineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) - ]]> - </param> - <message> - validator.activity.invalid.quadrant##${tripLonglineEntity.ocean.libelle} - </message> - </field-validator> - - </field> - <field name="seaSurfaceTemperature"> <!-- temperature surface non saisie || 12.0 <= temperature surface <= 35.0 --> 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 new file mode 100644 index 0000000..54b3022 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDto.java @@ -0,0 +1,45 @@ +package fr.ird.observe.services.dto.longline; + +import org.nuiton.util.DateUtil; + +import java.util.Date; + +public class ActivityLonglineDto extends AbstractActivityLonglineDto { + + private static final long serialVersionUID = 3991657324991701860L; + + String PROPERTY_DATE = "date"; + + String PROPERTY_TIME = "time"; + + public Date getDate() { + return timeStamp == null ? null : DateUtil.getDay(timeStamp); + } + + public Date getTime() { + return timeStamp == null ? null : DateUtil.getTime(timeStamp, false, false); + } + + public void setDate(Date date) { + if (timeStamp != null) { + Date dateAndTime = date == null ? timeStamp : DateUtil.getDateAndTime(date, timeStamp, true, false); + setTimeStamp(dateAndTime); + } + } + + public void setTime(Date time) { + if (timeStamp != null) { + Date dateAndTime = time == null ? timeStamp : DateUtil.getDateAndTime(timeStamp, time, false, false); + setTimeStamp(dateAndTime); + } + } + + public void setTimeStamp(Date timeStamp) { + Date oldDate = getDate(); + Date oldTime = getTime(); + super.setTimeStamp(timeStamp); + firePropertyChange(PROPERTY_DATE, oldDate, getDate()); + firePropertyChange(PROPERTY_TIME, oldTime, getTime()); + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm