This is an automated email from the git hooks/post-receive script. New commit to branch feature/7592-LLVerifÉcranDeRoute in repository tutti. See http://git.codelutin.com/tutti.git commit b19f55e584f8b3bf33356d173cae5d03e3ea7ec3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 09:26:01 2016 +0100 - Fermer la route après sa suppression - correction de l'id du noeud "Activités" de l'arbre, - a la création automatique de l'activité de fin de veille, initaliser l'heure de à 23h59 (évite des NPE) --- .../ird/observe/ui/content/open/impl/seine/RouteUIHandler.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index d8ca426..995a960 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -247,6 +247,9 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { String tripId = getSelectedParentId(); boolean wasEndDateUpdated = getRouteService ().delete(tripId, bean.getId()); + if (getOpenDataManager().isOpenRoute(getSelectedId())) { + getOpenDataManager().closeRoute(getSelectedId()); + } if (log.isInfoEnabled()) { log.info("Delete done for Route " + bean.getId()); @@ -370,7 +373,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { ObserveNode parentNode = treeHelper.getSelectedNode(); parentNode = treeHelper.findNode( parentNode, - n("observe.common.activities") + n("observe.tree.activitySeine") ); if (log.isDebugEnabled()) { log.debug("PARENT NODE = " + parentNode); @@ -393,6 +396,10 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // on la positionne sur le bean d'édition selectedUI.getBean().setVesselActivitySeine(vesselActivitySeine); + + // on initialise la fin de veille a la dernière minute du jour + selectedUI.getBean().setTime(DateUtil.getEndOfDay(DateUtil.createDate(0, 0, 0))); + if (close) { // on sauvegarde l'activity -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.