From 594d8a5e0b77632f321bf9beca0dbee79a2bad01 Mon Sep 17 00:00:00 2001
From: Will Sargent <will.sargent@gmail.com>
Date: Sun, 23 Apr 2023 15:18:13 -0700
Subject: [PATCH] Use zoned date time parsing

---
 .../interfaces/booking/web/RouteAssignmentCommand.java | 10 ++++++----
 .../resources/templates/admin/selectItinerary.html     |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/se/citerus/dddsample/interfaces/booking/web/RouteAssignmentCommand.java b/src/main/java/se/citerus/dddsample/interfaces/booking/web/RouteAssignmentCommand.java
index 3774d225a..8e5c0b371 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/booking/web/RouteAssignmentCommand.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/booking/web/RouteAssignmentCommand.java
@@ -1,6 +1,8 @@
 package se.citerus.dddsample.interfaces.booking.web;
 
 import java.time.Instant;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -60,16 +62,16 @@ public Instant getFromDate() {
       return fromDate;
     }
 
-    public void setFromDate(Instant fromDate) {
-      this.fromDate = fromDate;
+    public void setFromDate(String fromDate) {
+      this.fromDate = ZonedDateTime.parse(fromDate).toInstant();
     }
 
     public Instant getToDate() {
       return toDate;
     }
 
-    public void setToDate(Instant toDate) {
-      this.toDate = toDate;
+    public void setToDate(String toDate) {
+      this.toDate = ZonedDateTime.parse(toDate).toInstant();
     }
   }
 }
diff --git a/src/main/resources/templates/admin/selectItinerary.html b/src/main/resources/templates/admin/selectItinerary.html
index a50648d09..14ed9b93b 100644
--- a/src/main/resources/templates/admin/selectItinerary.html
+++ b/src/main/resources/templates/admin/selectItinerary.html
@@ -44,9 +44,9 @@
                 <input type="hidden" th:name="|legs[${legStatus.index}].toUnLocode|" th:value="${leg.to}"/>
 
                 <input type="hidden" th:name="|legs[${legStatus.index}].fromDate|"
-                       th:value="${#dates.format(leg.loadTime,'yyyy-MM-dd hh:mm')}"/>
+                       th:value="${#dates.formatISO(leg.loadTime)}"/>
                 <input type="hidden" th:name="|legs[${legStatus.index}].toDate|"
-                       th:value="${#dates.format(leg.unloadTime,'yyyy-MM-dd hh:mm')}"/>
+                       th:value="${#dates.formatISO(leg.unloadTime)}"/>
                 <tr>
                     <td th:text="${leg.voyageNumber}"></td>
                     <td th:text="${leg.from}"></td>