From cfca18262c1ff48dcb683ddab7d03cf8e55573ff Mon Sep 17 00:00:00 2001
From: Joris
Date: Fri, 24 Mar 2017 09:21:04 +0000
Subject: Features/categories

---
 src/client/elm/Dialog/AddPayment/View.elm | 41 ++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 14 deletions(-)

(limited to 'src/client/elm/Dialog/AddPayment/View.elm')

diff --git a/src/client/elm/Dialog/AddPayment/View.elm b/src/client/elm/Dialog/AddPayment/View.elm
index df1ad3b..078d5b7 100644
--- a/src/client/elm/Dialog/AddPayment/View.elm
+++ b/src/client/elm/Dialog/AddPayment/View.elm
@@ -2,10 +2,10 @@ module Dialog.AddPayment.View exposing
   ( button
   )
 
+import Dict
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (..)
-import Html.App as Html
 import Task
 
 import Form exposing (Form)
@@ -18,15 +18,17 @@ import Dialog.Msg as DialogMsg
 
 import Tooltip
 
-import View.Form as Form
 import View.Events exposing (onSubmitPrevDefault)
+import View.Form as Form
 
-import Msg exposing (Msg)
-import LoggedIn.Msg as LoggedInMsg
 import LoggedIn.Home.Msg as HomeMsg
+import LoggedIn.Msg as LoggedInMsg
+import Msg exposing (Msg)
 
-import Model.Translations exposing (getMessage)
+import Model.Category exposing (Categories)
 import Model.Payment as Payment exposing (Frequency(..))
+import Model.PaymentCategory exposing (PaymentCategories)
+import Model.Translations exposing (getMessage)
 import Model.View exposing (View(LoggedInView))
 
 import LoggedData exposing (LoggedData)
@@ -39,7 +41,7 @@ button loggedData initialForm title buttonContent tooltip =
         , title = getMessage loggedData.translations title
         , body = \model -> addPaymentForm loggedData model.addPayment
         , confirm = getMessage loggedData.translations "Confirm"
-        , confirmMsg = submitForm << .addPayment
+        , confirmMsg = submitForm loggedData.categories loggedData.paymentCategories << .addPayment
         , undo = getMessage loggedData.translations "Undo"
         }
   in  Html.button
@@ -48,14 +50,19 @@ button loggedData initialForm title buttonContent tooltip =
                Nothing -> []
            )
         ++ [ class "addPayment"
-           , onClick (Msg.Dialog <| Dialog.OpenWithUpdate dialogConfig (DialogMsg.AddPaymentMsg <| Form.Reset initialForm))
+           , onClick (Msg.Dialog <| Dialog.OpenWithUpdate dialogConfig (DialogMsg.Init "paymentname" (DialogMsg.AddPaymentMsg loggedData.categories loggedData.paymentCategories <| Form.Reset initialForm)))
            ]
          )
         [ buttonContent ]
 
 addPaymentForm : LoggedData -> Form String AddPayment.Model -> Html Msg
 addPaymentForm loggedData addPayment =
-  let htmlMap = Html.map (Msg.Dialog << Dialog.Update << DialogMsg.AddPaymentMsg)
+  let htmlMap = Html.map (Msg.Dialog << Dialog.Update << DialogMsg.AddPaymentMsg loggedData.categories loggedData.paymentCategories)
+      categoryOptions =
+        loggedData.categories
+          |> Dict.toList
+          |> List.sortBy (.name << Tuple.second)
+          |> List.map (\(id, category) -> (toString id, category.name))
   in  Html.form
         [ class "addPayment"
         , onSubmitPrevDefault Msg.NoOp
@@ -65,18 +72,24 @@ addPaymentForm loggedData addPayment =
         , if (Form.getFieldAsString "frequency" addPayment).value == Just (toString Punctual)
             then htmlMap <| Form.textInput loggedData.translations addPayment "payment" "date"
             else text ""
+        , htmlMap <| Form.selectInput loggedData.translations addPayment "payment" "category" categoryOptions
+
         , htmlMap <| Form.radioInputs loggedData.translations addPayment "payment" "frequency" [ toString Punctual, toString Monthly ]
-        , Form.hiddenSubmit (submitForm addPayment)
+        , Form.hiddenSubmit (submitForm loggedData.categories loggedData.paymentCategories addPayment)
         ]
 
-submitForm : Form String AddPayment.Model -> Msg
-submitForm addPayment =
+submitForm : Categories -> PaymentCategories -> Form String AddPayment.Model -> Msg
+submitForm categories paymentCategories addPayment =
   case Form.getOutput addPayment of
     Just data ->
       case data.id of
         Just paymentId ->
-          Msg.Dialog <| Dialog.UpdateAndClose <| Msg.EditPayment paymentId data.name data.cost data.date data.frequency
+          Msg.Dialog
+            <| Dialog.UpdateAndClose
+            <| Msg.EditPayment paymentId data.name data.cost data.date data.category data.frequency
         Nothing ->
-          Msg.Dialog <| Dialog.UpdateAndClose <| Msg.CreatePayment data.name data.cost data.date data.frequency
+          Msg.Dialog
+            <| Dialog.UpdateAndClose
+            <| Msg.CreatePayment data.name data.cost data.date data.category data.frequency
     Nothing ->
-      Msg.Dialog <| Dialog.Update <| DialogMsg.AddPaymentMsg <| Form.Submit
+      Msg.Dialog <| Dialog.Update <| DialogMsg.AddPaymentMsg categories paymentCategories <| Form.Submit
-- 
cgit v1.2.3