Merge branch 'features/categories' into 'master'

Features/categories

See merge request !1

2 files changed, 125 insertions, 0 deletions

diff --git a/src/client/elm/Dialog/AddCategory/Model.elm b/src/client/elm/Dialog/AddCategory/Model.elm
new file mode 100644
index 0000000..8aeec1a
--- /dev/null
+++ b/src/client/elm/Dialog/AddCategory/Model.elm
@@ -0,0 +1,53 @@
+module Dialog.AddCategory.Model exposing
+  ( Model
+  , init
+  , initialAdd
+  , initialClone
+  , initialEdit
+  , validation
+  )
+
+import Date exposing (Date)
+import View.Date as Date
+
+import Form exposing (Form)
+import Form.Field as Field exposing (Field)
+import Form.Validate as Validate exposing (Validation)
+import Validation
+
+import Model.Translations exposing (Translations)
+import Model.Category exposing (Category, CategoryId)
+
+type alias Model =
+  { id : Maybe CategoryId
+  , name : String
+  , color : String
+  }
+
+init : Form String Model
+init = Form.initial [] validation
+
+initialAdd : Translations -> List (String, Field)
+initialAdd translations =
+  [ ("color", Field.string "#000000")
+  ]
+
+initialClone : Translations -> Category -> List (String, Field)
+initialClone translations category =
+  [ ("name", Field.string category.name)
+  , ("color", Field.string category.color)
+  ]
+
+initialEdit : Translations -> CategoryId -> Category -> List (String, Field)
+initialEdit translations categoryId category =
+  [ ("id", Field.string (toString categoryId))
+  , ("name", Field.string category.name)
+  , ("color", Field.string category.color)
+  ]
+
+validation : Validation String Model
+validation =
+  Validate.map3 Model
+    (Validate.field "id" (Validate.maybe Validate.int))
+    (Validate.field "name" (Validate.string |> Validate.andThen Validate.nonEmpty))
+    (Validate.field "color" (Validate.string |> Validate.andThen Validate.nonEmpty))
diff --git a/src/client/elm/Dialog/AddCategory/View.elm b/src/client/elm/Dialog/AddCategory/View.elm
new file mode 100644
index 0000000..6c02351
--- /dev/null
+++ b/src/client/elm/Dialog/AddCategory/View.elm
@@ -0,0 +1,72 @@
+module Dialog.AddCategory.View exposing
+  ( button
+  )
+
+import Html exposing (..)
+import Html.Attributes exposing (..)
+import Html.Events exposing (..)
+import Task
+
+import Form exposing (Form)
+import Form.Field as Field exposing (Field)
+import Utils.Form as Form
+
+import Dialog
+import Dialog.AddCategory.Model as AddCategory
+import Dialog.Msg as DialogMsg
+
+import Tooltip
+
+import View.Form as Form
+import View.Events exposing (onSubmitPrevDefault)
+
+import Msg exposing (Msg)
+import LoggedIn.Msg as LoggedInMsg
+import LoggedIn.Home.Msg as HomeMsg
+
+import Model.Translations exposing (getMessage)
+import Model.View exposing (View(LoggedInView))
+
+import LoggedData exposing (LoggedData)
+import LoggedIn.Home.Model as HomeModel
+
+button : LoggedData -> List (String, Field) -> String -> Html Msg -> Maybe String -> Html Msg
+button loggedData initialForm title buttonContent tooltip =
+  let dialogConfig =
+        { className = "categoryDialog"
+        , title = getMessage loggedData.translations title
+        , body = \model -> addCategoryForm loggedData model.addCategory
+        , confirm = getMessage loggedData.translations "Confirm"
+        , confirmMsg = submitForm << .addCategory
+        , undo = getMessage loggedData.translations "Undo"
+        }
+  in  Html.button
+        (  ( case tooltip of
+               Just message -> Tooltip.show Msg.Tooltip message
+               Nothing -> []
+           )
+        ++ [ onClick (Msg.Dialog <| Dialog.OpenWithUpdate dialogConfig (DialogMsg.Init "categoryname" (DialogMsg.AddCategoryMsg <| Form.Reset initialForm))) ]
+         )
+        [ buttonContent ]
+
+addCategoryForm : LoggedData -> Form String AddCategory.Model -> Html Msg
+addCategoryForm loggedData addCategory =
+  let htmlMap = Html.map (Msg.Dialog << Dialog.Update << DialogMsg.AddCategoryMsg)
+  in  Html.form
+        [ onSubmitPrevDefault Msg.NoOp ]
+        [ htmlMap <| Form.textInput loggedData.translations addCategory "category" "name"
+        , htmlMap <| Form.colorInput loggedData.translations addCategory "category" "color"
+        , Form.hiddenSubmit (submitForm addCategory)
+        ]
+
+submitForm : Form String AddCategory.Model -> Msg
+submitForm addCategory =
+  case Form.getOutput addCategory of
+    Just data ->
+      case data.id of
+        Just categoryId ->
+          Msg.Dialog <| Dialog.UpdateAndClose <| Msg.EditCategory categoryId data.name data.color
+        Nothing ->
+          Msg.Dialog <| Dialog.UpdateAndClose <| Msg.CreateCategory data.name data.color
+    Nothing ->
+      Msg.Dialog <| Dialog.Update <| DialogMsg.AddCategoryMsg <| Form.Submit