From 8816cf758119a6a2073e561c8df297a833630986 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 8 Aug 2016 20:58:17 +0200
Subject: Show incomes in a table and update like payments are updated

---
 src/client/elm/Dialog/Model.elm | 53 ++++++-----------------------------------
 1 file changed, 7 insertions(+), 46 deletions(-)

(limited to 'src/client/elm/Dialog/Model.elm')

diff --git a/src/client/elm/Dialog/Model.elm b/src/client/elm/Dialog/Model.elm
index b49d8f1..a3901f9 100644
--- a/src/client/elm/Dialog/Model.elm
+++ b/src/client/elm/Dialog/Model.elm
@@ -1,10 +1,6 @@
 module Dialog.Model exposing
   ( Model
-  , AddPayment
   , init
-  , addPaymentInitial
-  , clonePaymentInitial
-  , editPaymentInitial
   )
 
 import Date exposing (Date)
@@ -18,51 +14,16 @@ import Validation
 import Model.Payment as Payment exposing (Payment, Frequency, PaymentId)
 import Model.Translations exposing (Translations)
 
-type alias Model =
-  { addPayment : Form String AddPayment
-  }
+import Dialog.AddPayment.Model as AddPayment
+import Dialog.AddIncome.Model as AddIncome
 
-type alias AddPayment =
-  { id : Maybe PaymentId
-  , name : String
-  , cost : Int
-  , date : Date
-  , frequency : Frequency
+type alias Model =
+  { addPayment : Form String AddPayment.Model
+  , addIncome : Form String AddIncome.Model
   }
 
 init : Model
 init =
-  { addPayment = Form.initial [] addPaymentValidation
+  { addPayment = AddPayment.init
+  , addIncome = AddIncome.init
   }
-
-addPaymentInitial : Translations -> Date -> Frequency -> List (String, Field)
-addPaymentInitial translations date frequency =
-  [ ("date", Field.Text (Date.shortView date translations))
-  , ("frequency", Field.Radio (toString frequency))
-  ]
-
-clonePaymentInitial : Translations -> Date -> Payment -> List (String, Field)
-clonePaymentInitial 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))
-  ]
-
-editPaymentInitial : Translations -> Payment -> List (String, Field)
-editPaymentInitial 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))
-  ]
-
-addPaymentValidation : Validation String AddPayment
-addPaymentValidation =
-  Validate.form5 AddPayment
-    (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)
-- 
cgit v1.2.3