Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0868dd83 by tchemit at 2019-06-09T15:54:00Z Pas de vérification de vitesses entre 2 activités - Closes #1285 - - - - - 035fd8f0 by tchemit at 2019-06-09T15:54:20Z [PS Route] Lors de la sauvegarde d'une route le nœud Marée n'est pas mis à jour - Closes #1320 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveRouteSeineUIAction.java - dto/pom.xml - dto/src/main/java/fr/ird/observe/dto/data/ps/observation/ActivitySeineDto.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveRouteSeineUIAction.java ===================================== @@ -25,6 +25,8 @@ package fr.ird.observe.client.ui.actions.content.data.ps.save; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.open.SaveOpenDataUIActionSupport; import fr.ird.observe.client.ui.content.data.ps.observation.RouteUI; +import fr.ird.observe.client.ui.tree.navigation.nodes.seine.TripSeineNavigationTreeNode; +import fr.ird.observe.dto.data.ps.common.TripSeineDto; import fr.ird.observe.dto.data.ps.common.TripSeineReference; import fr.ird.observe.dto.data.ps.observation.RouteDto; import fr.ird.observe.dto.data.ps.observation.RouteReference; @@ -75,6 +77,8 @@ public class SaveRouteSeineUIAction extends SaveOpenDataUIActionSupport<RouteDto @Override protected void afterSave(RouteUI ui, RouteDto bean, ReferenceNode<RouteDto, RouteReference> node, boolean notPersisted) { - getNavigationTree().reloadNode(ReferenceNode.upToReferenceNode(TripSeineReference.class, node), false); + TripSeineNavigationTreeNode tripNode = (TripSeineNavigationTreeNode) ReferenceNode.upToReferenceNode(TripSeineReference.class, node); + tripNode.reload(); + getNavigationTree().reloadNode(tripNode, false); } } ===================================== dto/pom.xml ===================================== @@ -78,6 +78,10 @@ <groupId>io.ultreia.java4all</groupId> <artifactId>java-bean</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-util</artifactId> + </dependency> <!-- commons dependencies --> <dependency> ===================================== dto/src/main/java/fr/ird/observe/dto/data/ps/observation/ActivitySeineDto.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.dto.data.ps.observation; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -24,7 +24,7 @@ package fr.ird.observe.dto.data.ps.observation; import fr.ird.observe.dto.referential.ps.common.VesselActivitySeineHelper; import fr.ird.observe.dto.referential.ps.common.VesselActivitySeineReference; -import org.nuiton.util.DateUtil; +import io.ultreia.java4all.util.Dates; import java.util.Date; @@ -57,7 +57,12 @@ public class ActivitySeineDto extends GeneratedActivitySeineDto { firePropertyChange(PROPERTY_SET_OPERATION, null, isSetOperation()); } + @Override + public void setTime(Date time) { + super.setTime(time == null ? null : Dates.getTime(time, false, false)); + } + public Date getTimeSecond() { - return DateUtil.getTime(time, false, false); + return Dates.getTime(time, false, false); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2cc16312eb03e844e30f8e9f7a0... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2cc16312eb03e844e30f8e9f7a0... You're receiving this email because of your account on gitlab.com.