aboutsummaryrefslogtreecommitdiff
path: root/client/src/View/Income
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/View/Income')
-rw-r--r--client/src/View/Income/Form.hs18
-rw-r--r--client/src/View/Income/Table.hs8
2 files changed, 13 insertions, 13 deletions
diff --git a/client/src/View/Income/Form.hs b/client/src/View/Income/Form.hs
index a4f7de8..ff6e55e 100644
--- a/client/src/View/Income/Form.hs
+++ b/client/src/View/Income/Form.hs
@@ -27,7 +27,7 @@ import qualified Component.Modal as Modal
import qualified Component.ModalForm as ModalForm
import qualified Util.Ajax as Ajax
-data In t = In
+data In = In
{ _in_operation :: Operation
}
@@ -36,7 +36,7 @@ data Operation
| Clone Income
| Edit Income
-view :: forall t m a. MonadWidget t m => In t -> Modal.Content t m Income
+view :: forall t m a. MonadWidget t m => In -> Modal.Content t m Income
view input cancel = do
rec
@@ -94,14 +94,14 @@ view input cancel = do
amount =
case op of
- New -> ""
- Clone income -> T.pack . show . _income_amount $ income
- Edit income -> T.pack . show . _income_amount $ income
+ New -> ""
+ Clone i -> T.pack . show . _income_amount $ i
+ Edit i -> T.pack . show . _income_amount $ i
date currentDay =
case op of
- Edit income -> _income_date income
- _ -> currentDay
+ Edit i -> _income_date i
+ _ -> currentDay
ajax =
case op of
@@ -115,5 +115,5 @@ view input cancel = do
mkPayload =
case op of
- Edit income -> \a b -> Aeson.toJSON $ EditIncomeForm (_income_id income) a b
- _ -> \a b -> Aeson.toJSON $ CreateIncomeForm a b
+ Edit i -> \a b -> Aeson.toJSON $ EditIncomeForm (_income_id i) a b
+ _ -> \a b -> Aeson.toJSON $ CreateIncomeForm a b
diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs
index 32ab27b..c623acb 100644
--- a/client/src/View/Income/Table.hs
+++ b/client/src/View/Income/Table.hs
@@ -80,14 +80,14 @@ headerLabel UserHeader = Msg.get Msg.Income_Name
headerLabel DateHeader = Msg.get Msg.Income_Date
headerLabel AmountHeader = Msg.get Msg.Income_Amount
-cell :: [User] -> Currency -> Header -> Income -> Text
+cell :: forall t m. MonadWidget t m => [User] -> Currency -> Header -> Income -> m ()
cell users currency header income =
case header of
UserHeader ->
- Maybe.fromMaybe "" . fmap _user_name $ CM.findUser (_income_userId income) users
+ R.text . Maybe.fromMaybe "" . fmap _user_name $ CM.findUser (_income_userId income) users
DateHeader ->
- Format.longDay . _income_date $ income
+ R.text . Format.longDay . _income_date $ income
AmountHeader ->
- Format.price currency . _income_amount $ income
+ R.text . Format.price currency . _income_amount $ income