diff --git a/src/main/java/catering/order/OrderController.java b/src/main/java/catering/order/OrderController.java index ec71149..ca2cd18 100644 --- a/src/main/java/catering/order/OrderController.java +++ b/src/main/java/catering/order/OrderController.java @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.time.LocalDate; import java.time.temporal.ChronoUnit; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; @@ -124,6 +125,7 @@ public class OrderController { for (LocalDate date : datesOfTheWeek) { ArrayList x = new ArrayList(2); x.add(Integer.toString(date.getDayOfMonth())); + x.add(date.format(DateTimeFormatter.ISO_LOCAL_DATE)); week_to_add_to_month.add(x); } //datesOfTheWeek.clear(); diff --git a/src/main/resources/templates/orders_calender.html b/src/main/resources/templates/orders_calender.html index 2cbfb88..53df363 100644 --- a/src/main/resources/templates/orders_calender.html +++ b/src/main/resources/templates/orders_calender.html @@ -64,18 +64,17 @@
+ +