X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fdemo%2FDemoController.java;h=7c65a6022b6a3228c324cc5cbaef199bfab739c2;hb=648e5f3e5c91243d7dee158a1310920de1dbcb21;hp=cc2fcbacc3ec19ba2727d25b5242129ea7941f9b;hpb=957eb8c9fb0e2fe94a871e3e25cc40610d5abdd6;p=demos%2Fspring-boot

diff --git a/src/main/java/de/juplo/demo/DemoController.java b/src/main/java/de/juplo/demo/DemoController.java
index cc2fcba..7c65a60 100644
--- a/src/main/java/de/juplo/demo/DemoController.java
+++ b/src/main/java/de/juplo/demo/DemoController.java
@@ -2,6 +2,7 @@ package de.juplo.demo;
 
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +23,7 @@ public class DemoController
       LoggerFactory.getLogger(DemoController.class);
 
 
-  @RequestMapping("/")
+  @RequestMapping(path = "/", params = { "!card", "!add", "!remove" })
   public String display(@ModelAttribute Form form)
   {
     for (Integer id : form.cards.keySet())
@@ -41,8 +42,15 @@ public class DemoController
             .stream()
             .reduce(0, (a, b) -> a > b ? a : b) + 1;
 
-    LOG.info("Adding new card #{}", next);
-    form.cards.put(next, new HashMap<>());
+    Map<String, Boolean> content = new LinkedHashMap<>();
+    content.put(form.names.get(0), Boolean.FALSE);
+    LOG.info("Adding new card #{} with content: {}", next, content);
+    form.cards.put(next, content);
+
+    for (Integer id : form.cards.keySet())
+      for (String entry : form.cards.get(id).keySet())
+        LOG.info("{} - {}: {}", id, entry, form.cards.get(id).get(entry));
+
     return "form";
   }
 
@@ -51,14 +59,24 @@ public class DemoController
   {
     Map<String, Boolean> content = form.cards.remove(card);
     LOG.info("Removed card #{} with content: {}", card, content);
+
+    for (Integer id : form.cards.keySet())
+      for (String entry : form.cards.get(id).keySet())
+        LOG.info("{} - {}: {}", id, entry, form.cards.get(id).get(entry));
+
     return "form";
   }
 
   @RequestMapping(path = "/", params = "add")
   public String addRow(@ModelAttribute Form form, @RequestParam Integer add)
   {
-    LOG.info("Adding row {} to card #{}", form.row.get(add), add);
-    form.cards.get(add).put(form.row.get(add), Boolean.FALSE);
+    LOG.info("Adding row {} to card #{}", form.names.get(add), add);
+    form.cards.get(add).put(form.names.get(add), Boolean.FALSE);
+
+    for (Integer id : form.cards.keySet())
+      for (String entry : form.cards.get(id).keySet())
+        LOG.info("{} - {}: {}", id, entry, form.cards.get(id).get(entry));
+
     return "form";
   }
 
@@ -70,6 +88,17 @@ public class DemoController
     String row = parts[1];
     Boolean value = form.cards.get(card).remove(row);
     LOG.info("Removed row {} with value {} from card #{}", row, value, card);
+
+    if (form.cards.get(card).isEmpty())
+    {
+      LOG.info("Card #{} is empty: Removing card!", card);
+      form.cards.remove(card);
+    }
+
+    for (Integer id : form.cards.keySet())
+      for (String entry : form.cards.get(id).keySet())
+        LOG.info("{} - {}: {}", id, entry, form.cards.get(id).get(entry));
+
     return "form";
   }
 }