1 files changed, 17 insertions, 8 deletions

diff --git a/ws2015/ffp/blaetter/11/FFP_U11-3_Yesod.hs b/ws2015/ffp/blaetter/11/FFP_U11-3_Yesod.hs
index badd9e0..78c057c 100644
--- a/ws2015/ffp/blaetter/11/FFP_U11-3_Yesod.hs
+++ b/ws2015/ffp/blaetter/11/FFP_U11-3_Yesod.hs
@@ -46,8 +46,10 @@
 
 
 import Yesod
-import Data.Text
+import Data.Text (Text)
+import qualified Data.Text as T
 import Control.Applicative
+import Data.Traversable (sequenceA)
 import Yesod.Form 
 
 
@@ -83,21 +85,28 @@ carAForm = Car
     <*> areq intField  "Year"   (Just 1996)
     <*> aopt textField "Color"  Nothing
 
-carForm :: Html -> MForm Handler (FormResult Car, Widget)
-carForm = renderBootstrap2 carAForm
-
 -- Beispiel zur Kombination zweier applikativer Formulare zu einem:
 twoCarAForm :: AForm Handler (Car,Car)
 twoCarAForm = (,) <$> carAForm <*> carAForm
 
 
 handleHomeR :: Handler Html
-handleHomeR = redirect $ CarR 3
+handleHomeR = do
+  ((result, widget), enctype) <- runFormPost . renderBootstrap2 $ areq intField "Number of Cars" Nothing
+  case result of
+    FormMissing -> defaultLayout $ do
+      [whamlet|
+        <h2>Form Demo
+        <form method=post action=@{HomeR} enctype=#{enctype}>
+          ^{widget}
+          <button>Submit
+       |]
+    FormSuccess n -> redirect $ CarR n
 
 
 handleCarR :: Int -> Handler Html
 handleCarR n = do
-  ((result,widget), enctype) <- runFormPost $ carForm
+  ((result,widget), enctype) <- runFormPost . renderBootstrap2 . sequenceA . replicate n $ carAForm
   case result of
     FormMissing -> defaultLayout $ do
       setTitle "Form Demo"
@@ -108,12 +117,12 @@ handleCarR n = do
           <button>Submit
       |]
 
-    FormSuccess car -> defaultLayout $ do
+    FormSuccess cars -> defaultLayout $ do
       setTitle "Form Auswerten"
       [whamlet|
         <h2>#{n} Cars should have been received:
         <ul>
-          $forall acar <- [car]
+          $forall acar <- cars
             <li>#{show acar}
         <p>
           <a href=@{HomeR}>Zurück