Merge branch 'features/categories' into 'master'

Features/categories

See merge request !1

1 files changed, 33 insertions, 24 deletions

diff --git a/src/client/elm/Dialog/AddPayment/Model.elm b/src/client/elm/Dialog/AddPayment/Model.elm
index 19326f0..a287d37 100644
--- a/src/client/elm/Dialog/AddPayment/Model.elm
+++ b/src/client/elm/Dialog/AddPayment/Model.elm
@@ -4,6 +4,7 @@ module Dialog.AddPayment.Model exposing
   , initialAdd
   , initialClone
   , initialEdit
+  , validation
   )
 
 import Date exposing (Date)
@@ -16,46 +17,54 @@ import Validation
 
 import Model.Payment as Payment exposing (Payment, Frequency, PaymentId)
 import Model.Translations exposing (Translations)
+import Model.Category as Category exposing (Categories, CategoryId)
+
+import Utils.Maybe as Maybe
 
 type alias Model =
   { id : Maybe PaymentId
   , name : String
   , cost : Int
   , date : Date
+  , category : CategoryId
   , frequency : Frequency
   }
 
 init : Form String Model
-init = Form.initial [] validation
+init = Form.initial [] (validation Category.empty)
 
 initialAdd : Translations -> Date -> Frequency -> List (String, Field)
 initialAdd translations date frequency =
-  [ ("date", Field.Text (Date.shortView date translations))
-  , ("frequency", Field.Radio (toString frequency))
+  [ ("date", Field.string (Date.shortView date translations))
+  , ("frequency", Field.string (toString frequency))
+  , ("category", Field.string "")
   ]
 
-initialClone : Translations -> Date -> Payment -> List (String, Field)
-initialClone translations date payment =
-  [ ("name", Field.Text payment.name)
-  , ("cost", Field.Text (toString payment.cost))
-  , ("date", Field.Text (Date.shortView date translations))
-  , ("frequency", Field.Radio (toString payment.frequency))
+initialClone : Translations -> Date -> Maybe CategoryId -> Payment -> List (String, Field)
+initialClone translations date category payment =
+  [ ("name", Field.string payment.name)
+  , ("cost", Field.string (toString payment.cost))
+  , ("date", Field.string (Date.shortView date translations))
+  , ("frequency", Field.string (toString payment.frequency))
+  , ("category", Field.string (Maybe.map toString category |> Maybe.withDefault ""))
   ]
 
-initialEdit : Translations -> Payment -> List (String, Field)
-initialEdit translations payment =
-  [ ("id", Field.Text (toString payment.id))
-  , ("name", Field.Text payment.name)
-  , ("cost", Field.Text (toString payment.cost))
-  , ("date", Field.Text (Date.shortView payment.date translations))
-  , ("frequency", Field.Radio (toString payment.frequency))
+initialEdit : Translations -> Maybe CategoryId -> Payment -> List (String, Field)
+initialEdit translations category payment =
+  [ ("id", Field.string (toString payment.id))
+  , ("name", Field.string payment.name)
+  , ("cost", Field.string (toString payment.cost))
+  , ("date", Field.string (Date.shortView payment.date translations))
+  , ("frequency", Field.string (toString payment.frequency))
+  , ("category", Field.string (Maybe.map toString category |> Maybe.withDefault ""))
   ]
 
-validation : Validation String Model
-validation =
-  Validate.form5 Model
-    (Validate.get "id" (Validate.maybe Validate.int))
-    (Validate.get "name" (Validate.string `Validate.andThen` (Validate.nonEmpty)))
-    (Validate.get "cost" (Validate.int `Validate.andThen` (Validate.minInt 1)))
-    (Validate.get "date" Validation.date)
-    (Validate.get "frequency" Payment.validateFrequency)
+validation : Categories -> Validation String Model
+validation categories =
+  Validate.map6 Model
+    (Validate.field "id" (Validate.maybe Validate.int))
+    (Validate.field "name" (Validate.string |> Validate.andThen Validate.nonEmpty))
+    (Validate.field "cost" (Validate.int |> Validate.andThen (Validate.minInt 1)))
+    (Validate.field "date" Validation.date)
+    (Validate.field "category" (Validation.category categories))
+    (Validate.field "frequency" Payment.validateFrequency)