From 71aa9b98ca612ee06b7ccf28949c91f3cc453566 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Tue, 21 Jan 2020 20:15:06 +0100
Subject: [PATCH] WIP

---
 pom.xml                                | 6 ++++++
 src/main/java/de/juplo/demo/Form.java  | 6 ++++--
 src/main/resources/templates/form.html | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 982eb2f..826a489 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,12 @@
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
+    </dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<dependency>
diff --git a/src/main/java/de/juplo/demo/Form.java b/src/main/java/de/juplo/demo/Form.java
index 382c335..7dceac3 100644
--- a/src/main/java/de/juplo/demo/Form.java
+++ b/src/main/java/de/juplo/demo/Form.java
@@ -1,7 +1,9 @@
 package de.juplo.demo;
 
 
+import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
 
 /**
@@ -10,8 +12,8 @@ import java.util.Map;
  */
 public class Form
 {
-  Map<Integer, Map<String, Boolean>> cards;
-  Map<Integer, String> row;
+  Map<Integer, Map<String, Boolean>> cards = new TreeMap<>();
+  Map<Integer, String> row = new HashMap<>();
 
 
   public Map<Integer, Map<String, Boolean>> getCards()
diff --git a/src/main/resources/templates/form.html b/src/main/resources/templates/form.html
index 586a812..b1f53d8 100644
--- a/src/main/resources/templates/form.html
+++ b/src/main/resources/templates/form.html
@@ -12,11 +12,11 @@
     </nav>
     <main class="container mt-5">
       <form action="#" th:action="@{/}" th:object="${form}" method="get">
-        <div class="card" th:each="card : *{cards.rowSet()}">
+        <div class="card" th:each="card : *{cards.entrySet()}">
           <div class="card-header"><h1 th:text="|Card #${card.key}|">Card #X</h1></div>
           <div class="card-body">
             <div class="card-text">
-              <div class="form-group" th:each="row : ${card.value.rowSet()}">
+              <div class="form-group" th:each="row : ${card.value.entrySet()}">
                 <input type="checkbox" id="x" class="form-control" th:field="*{cards[__${card.key}__][__${row.key}__]}" />
                 <label for="x" th:for="${#ids.prev('cards[__${card.key}__][__${row.key}__]')}" th:text="${row.value}">ROW_NAME</label>
                 <button type="submit" name="removeRow" class="btn btn-primary" th:value="|${card.key}:${row.key}|">Remove</button>
-- 
2.20.1