From e4b32ce15f8c92f3b477d3f3d4d301ba08f9b5e3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 23 Oct 2019 22:35:27 +0200
Subject: Edit an income

---
 client/src/Component/ModalForm.hs | 50 ++++++++++++++++++++-------------------
 client/src/Component/Table.hs     | 25 +++++++++++++++++---
 2 files changed, 48 insertions(+), 27 deletions(-)

(limited to 'client/src/Component')

diff --git a/client/src/Component/ModalForm.hs b/client/src/Component/ModalForm.hs
index ea53beb..f5bf287 100644
--- a/client/src/Component/ModalForm.hs
+++ b/client/src/Component/ModalForm.hs
@@ -15,6 +15,7 @@ import qualified Reflex.Dom         as R
 
 import qualified Common.Msg         as Msg
 import qualified Component.Button   as Button
+import qualified Component.Form     as Form
 import qualified Util.Either        as EitherUtil
 import qualified Util.Validation    as ValidationUtil
 import qualified Util.WaitFor       as WaitFor
@@ -38,32 +39,33 @@ view input =
     R.divClass "formHeader" $
       R.text (_in_headerLabel input)
 
-    R.divClass "formContent" $ do
-      rec
-        form <- _in_form input
+    Form.view $
+      R.divClass "formContent" $ do
+        rec
+          form <- _in_form input
 
-        (validate, cancel, confirm) <- R.divClass "buttons" $ do
-          rec
-            cancel <- Button._out_clic <$> (Button.view $
-              (Button.defaultIn (R.text $ Msg.get Msg.Dialog_Undo))
-                { Button._in_class = R.constDyn "undo" })
+          (validate, cancel, confirm) <- R.divClass "buttons" $ do
+            rec
+              cancel <- Button._out_clic <$> (Button.view $
+                (Button.defaultIn (R.text $ Msg.get Msg.Dialog_Undo))
+                  { Button._in_class = R.constDyn "undo" })
 
-            confirm <- Button._out_clic <$> (Button.view $
-              (Button.defaultIn (R.text $ Msg.get Msg.Dialog_Confirm))
-                { Button._in_class = R.constDyn "confirm"
-                , Button._in_waiting = waiting
-                , Button._in_submit = True
-                })
+              confirm <- Button._out_clic <$> (Button.view $
+                (Button.defaultIn (R.text $ Msg.get Msg.Dialog_Confirm))
+                  { Button._in_class = R.constDyn "confirm"
+                  , Button._in_waiting = waiting
+                  , Button._in_submit = True
+                  })
 
-            (validate, waiting) <- WaitFor.waitFor
-              (_in_ajax input)
-              (ValidationUtil.fireValidation form confirm)
+              (validate, waiting) <- WaitFor.waitFor
+                (_in_ajax input)
+                (ValidationUtil.fireValidation form confirm)
 
-          return (R.fmapMaybe EitherUtil.eitherToMaybe validate, cancel, confirm)
+            return (R.fmapMaybe EitherUtil.eitherToMaybe validate, cancel, confirm)
 
-      return Out
-        { _out_hide = R.leftmost [ cancel, () <$ validate ]
-        , _out_cancel = cancel
-        , _out_confirm = confirm
-        , _out_validate = validate
-        }
+        return Out
+          { _out_hide = R.leftmost [ cancel, () <$ validate ]
+          , _out_cancel = cancel
+          , _out_confirm = confirm
+          , _out_validate = validate
+          }
diff --git a/client/src/Component/Table.hs b/client/src/Component/Table.hs
index b3c70a0..a02eaa7 100644
--- a/client/src/Component/Table.hs
+++ b/client/src/Component/Table.hs
@@ -21,12 +21,14 @@ data In m t h r a = In
   , _in_perPage     :: Int
   , _in_resetPage   :: Event t ()
   , _in_cloneModal  :: r -> Modal.Content t m a
+  , _in_editModal   :: r -> Modal.Content t m a
   , _in_deleteModal :: r -> Modal.Content t m a
   , _in_isOwner     :: r -> Bool
   }
 
 data Out t a = Out
   { _out_add    :: Event t a
+  , _out_edit   :: Event t a
   , _out_delete :: Event t a
   }
 
@@ -43,6 +45,7 @@ view input =
 
           R.divClass "cell" $ R.blank
           R.divClass "cell" $ R.blank
+          R.divClass "cell" $ R.blank
 
         let rows = getRange
               (_in_perPage input)
@@ -71,6 +74,20 @@ view input =
 
             let isOwner = R.ffor r (_in_isOwner input)
 
+            edit <-
+              R.divClass "cell button" $
+                ReflexUtil.divVisibleIf isOwner $
+                  Button._out_clic <$> (Button.view $
+                    Button.defaultIn Icon.edit)
+
+            edited <-
+              Modal.view $ Modal.In
+                { Modal._in_show    = edit
+                , Modal._in_content = \curtainClick ->
+                  (R.dyn . R.ffor r $ \r2 -> _in_editModal input r2 curtainClick)
+                    >>= ReflexUtil.flattenTuple
+                }
+
             delete <-
               R.divClass "cell button" $
                 ReflexUtil.divVisibleIf isOwner $
@@ -85,7 +102,7 @@ view input =
                     >>= ReflexUtil.flattenTuple
                 }
 
-            return (cloned, deleted)
+            return (cloned, edited, deleted)
 
       pages <- Pages.view $ Pages.In
         { Pages._in_total = length <$> _in_rows input
@@ -93,11 +110,13 @@ view input =
         , Pages._in_reset = _in_resetPage input
         }
 
-    let add = R.switch . R.current . fmap (R.leftmost . map fst) $ result
-        delete = R.switch . R.current . fmap (R.leftmost . map snd) $ result
+    let add = R.switch . R.current . fmap (R.leftmost . map (\(a, _, _) -> a)) $ result
+        edit = R.switch . R.current . fmap (R.leftmost . map (\(_, a, _) -> a)) $ result
+        delete = R.switch . R.current . fmap (R.leftmost . map (\(_, _, a) -> a)) $ result
 
     return $ Out
       { _out_add = add
+      , _out_edit = edit
       , _out_delete = delete
       }
 
-- 
cgit v1.2.3