Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
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:
| ... | ... | @@ -25,6 +25,8 @@ package fr.ird.observe.client.ui.actions.content.data.ps.save; |
| 25 | 25 |
import fr.ird.observe.client.ui.ObserveMainUI;
|
| 26 | 26 |
import fr.ird.observe.client.ui.actions.content.api.data.open.SaveOpenDataUIActionSupport;
|
| 27 | 27 |
import fr.ird.observe.client.ui.content.data.ps.observation.RouteUI;
|
| 28 |
+import fr.ird.observe.client.ui.tree.navigation.nodes.seine.TripSeineNavigationTreeNode;
|
|
| 29 |
+import fr.ird.observe.dto.data.ps.common.TripSeineDto;
|
|
| 28 | 30 |
import fr.ird.observe.dto.data.ps.common.TripSeineReference;
|
| 29 | 31 |
import fr.ird.observe.dto.data.ps.observation.RouteDto;
|
| 30 | 32 |
import fr.ird.observe.dto.data.ps.observation.RouteReference;
|
| ... | ... | @@ -75,6 +77,8 @@ public class SaveRouteSeineUIAction extends SaveOpenDataUIActionSupport<RouteDto |
| 75 | 77 |
|
| 76 | 78 |
@Override
|
| 77 | 79 |
protected void afterSave(RouteUI ui, RouteDto bean, ReferenceNode<RouteDto, RouteReference> node, boolean notPersisted) {
|
| 78 |
- getNavigationTree().reloadNode(ReferenceNode.upToReferenceNode(TripSeineReference.class, node), false);
|
|
| 80 |
+ TripSeineNavigationTreeNode tripNode = (TripSeineNavigationTreeNode) ReferenceNode.upToReferenceNode(TripSeineReference.class, node);
|
|
| 81 |
+ tripNode.reload();
|
|
| 82 |
+ getNavigationTree().reloadNode(tripNode, false);
|
|
| 79 | 83 |
}
|
| 80 | 84 |
}
|
| ... | ... | @@ -78,6 +78,10 @@ |
| 78 | 78 |
<groupId>io.ultreia.java4all</groupId>
|
| 79 | 79 |
<artifactId>java-bean</artifactId>
|
| 80 | 80 |
</dependency>
|
| 81 |
+ <dependency>
|
|
| 82 |
+ <groupId>io.ultreia.java4all</groupId>
|
|
| 83 |
+ <artifactId>java-util</artifactId>
|
|
| 84 |
+ </dependency>
|
|
| 81 | 85 |
|
| 82 | 86 |
<!-- commons dependencies -->
|
| 83 | 87 |
<dependency>
|
| ... | ... | @@ -10,12 +10,12 @@ package fr.ird.observe.dto.data.ps.observation; |
| 10 | 10 |
* it under the terms of the GNU General Public License as
|
| 11 | 11 |
* published by the Free Software Foundation, either version 3 of the
|
| 12 | 12 |
* License, or (at your option) any later version.
|
| 13 |
- *
|
|
| 13 |
+ *
|
|
| 14 | 14 |
* This program is distributed in the hope that it will be useful,
|
| 15 | 15 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| 16 | 16 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
| 17 | 17 |
* GNU General Public License for more details.
|
| 18 |
- *
|
|
| 18 |
+ *
|
|
| 19 | 19 |
* You should have received a copy of the GNU General Public
|
| 20 | 20 |
* License along with this program. If not, see
|
| 21 | 21 |
* <http://www.gnu.org/licenses/gpl-3.0.html>.
|
| ... | ... | @@ -24,7 +24,7 @@ package fr.ird.observe.dto.data.ps.observation; |
| 24 | 24 |
|
| 25 | 25 |
import fr.ird.observe.dto.referential.ps.common.VesselActivitySeineHelper;
|
| 26 | 26 |
import fr.ird.observe.dto.referential.ps.common.VesselActivitySeineReference;
|
| 27 |
-import org.nuiton.util.DateUtil;
|
|
| 27 |
+import io.ultreia.java4all.util.Dates;
|
|
| 28 | 28 |
|
| 29 | 29 |
import java.util.Date;
|
| 30 | 30 |
|
| ... | ... | @@ -57,7 +57,12 @@ public class ActivitySeineDto extends GeneratedActivitySeineDto { |
| 57 | 57 |
firePropertyChange(PROPERTY_SET_OPERATION, null, isSetOperation());
|
| 58 | 58 |
}
|
| 59 | 59 |
|
| 60 |
+ @Override
|
|
| 61 |
+ public void setTime(Date time) {
|
|
| 62 |
+ super.setTime(time == null ? null : Dates.getTime(time, false, false));
|
|
| 63 |
+ }
|
|
| 64 |
+ |
|
| 60 | 65 |
public Date getTimeSecond() {
|
| 61 |
- return DateUtil.getTime(time, false, false);
|
|
| 66 |
+ return Dates.getTime(time, false, false);
|
|
| 62 | 67 |
}
|
| 63 | 68 |
}
|