Features/categories

1 files changed, 31 insertions, 11 deletions

diff --git a/src/client/elm/LoggedIn/Home/View/Table.elm b/src/client/elm/LoggedIn/Home/View/Table.elm
index 6423bf9..8828488 100644
--- a/src/client/elm/LoggedIn/Home/View/Table.elm
+++ b/src/client/elm/LoggedIn/Home/View/Table.elm
@@ -2,8 +2,8 @@ module LoggedIn.Home.View.Table exposing
   ( view
   )
 
-import Dict exposing (..)
 import Date exposing (Date)
+import Dict exposing (..)
 import String exposing (append)
 
 import FontAwesome
@@ -26,12 +26,13 @@ import LoggedData exposing (LoggedData)
 import LoggedIn.Msg as LoggedInMsg
 
 import LoggedIn.Home.Model as Home
-import View.Date as Date
 import LoggedIn.View.Format as Format
+import View.Date as Date
 
-import Model.User exposing (getUserName)
 import Model.Payment as Payment exposing (..)
+import Model.PaymentCategory as PaymentCategory
 import Model.Translations exposing (getMessage)
+import Model.User exposing (getUserName)
 
 view : LoggedData -> Home.Model -> Payments -> Frequency -> Html Msg
 view loggedData homeModel payments frequency =
@@ -60,6 +61,7 @@ headerLine loggedData frequency =
     [ div [ class "cell category" ] [ text <| getMessage loggedData.translations "Name" ]
     , div [ class "cell cost" ] [ text <| getMessage loggedData.translations "Cost" ]
     , div [ class "cell user" ] [ text <| getMessage loggedData.translations "Payer" ]
+    , div [ class "cell user" ] [ text <| getMessage loggedData.translations "PaymentCategory" ]
     , case frequency of
         Punctual -> div [ class "cell date" ] [ text <| getMessage loggedData.translations "Date" ]
         Monthly -> text ""
@@ -72,7 +74,7 @@ paymentLine : LoggedData -> Home.Model -> Frequency -> Payment -> Html Msg
 paymentLine loggedData homeModel frequency payment =
   div
     [ class "row" ]
-    [ div [ class "cell category" ] [ text payment.name ]
+    [ div [ class "cell name" ] [ text payment.name ]
     , div
         [ classList
             [ ("cell cost", True)
@@ -87,6 +89,22 @@ paymentLine loggedData homeModel frequency payment =
             |> Maybe.withDefault "−"
             |> text
         ]
+    , div
+        [ class "cell category" ]
+        ( let mbCategory =
+                PaymentCategory.search payment.name loggedData.paymentCategories
+                  |> Maybe.andThen (\category -> Dict.get category loggedData.categories)
+          in  case mbCategory of
+                Just category ->
+                  [ span
+                      [ class "tag"
+                      , style [("background-color", category.color)]
+                      ]
+                      [ text category.name ]
+                  ]
+                Nothing ->
+                  []
+        )
     , case frequency of
         Punctual ->
           div
@@ -103,9 +121,10 @@ paymentLine loggedData homeModel frequency payment =
     , div
         [ class "cell button" ]
         [ let currentDate = Date.fromTime loggedData.currentTime
+              category = PaymentCategory.search payment.name loggedData.paymentCategories
           in  AddPayment.button
                 loggedData
-                (AddPayment.initialClone loggedData.translations currentDate payment)
+                (AddPayment.initialClone loggedData.translations currentDate category payment)
                 "ClonePayment"
                 (FontAwesome.clone Color.chestnutRose 18)
                 (Just (getMessage loggedData.translations "Clone"))
@@ -116,12 +135,13 @@ paymentLine loggedData homeModel frequency payment =
             then
               text ""
             else
-              AddPayment.button
-                loggedData
-                (AddPayment.initialEdit loggedData.translations payment)
-                "EditPayment"
-                (FontAwesome.pencil Color.chestnutRose 18)
-                (Just (getMessage loggedData.translations "Edit"))
+              let category = PaymentCategory.search payment.name loggedData.paymentCategories
+              in  AddPayment.button
+                    loggedData
+                    (AddPayment.initialEdit loggedData.translations category payment)
+                    "EditPayment"
+                    (FontAwesome.pencil Color.chestnutRose 18)
+                    (Just (getMessage loggedData.translations "Edit"))
         ]
     , div
         [ class "cell button" ]