Merge branch 'features/categories' into 'master'

Features/categories

See merge request !1

1 files changed, 8 insertions, 7 deletions

diff --git a/src/client/elm/LoggedIn/Income/Model.elm b/src/client/elm/LoggedIn/Income/Model.elm
index cf1bf57..7d852b9 100644
--- a/src/client/elm/LoggedIn/Income/Model.elm
+++ b/src/client/elm/LoggedIn/Income/Model.elm
@@ -3,12 +3,13 @@ module LoggedIn.Income.Model exposing
   , AddIncome
   , init
   , initForm
+  , validation
   )
 
 import Date exposing (Date)
 
 import Form exposing (Form)
-import Form.Validate as Validate exposing (..)
+import Form.Validate as Validate exposing (Validation)
 import Validation
 
 type alias Model =
@@ -26,10 +27,10 @@ init =
   }
 
 initForm : Form String AddIncome
-initForm = Form.initial [] validate
+initForm = Form.initial [] validation
 
-validate : Validation String AddIncome
-validate =
-  form2 AddIncome
-    (get "amount" (int `andThen` (minInt 1)))
-    (get "date" Validation.date)
+validation : Validation String AddIncome
+validation =
+  Validate.map2 AddIncome
+    (Validate.field "amount" (Validate.int |> Validate.andThen (Validate.minInt 1)))
+    (Validate.field "date" Validation.date)