diff options
Diffstat (limited to 'client/src/View/Income')
| -rw-r--r-- | client/src/View/Income/Form.hs | 2 | ||||
| -rw-r--r-- | client/src/View/Income/Header.hs | 3 | ||||
| -rw-r--r-- | client/src/View/Income/Income.hs | 1 | ||||
| -rw-r--r-- | client/src/View/Income/Init.hs | 11 | ||||
| -rw-r--r-- | client/src/View/Income/Table.hs | 11 | 
5 files changed, 7 insertions, 21 deletions
diff --git a/client/src/View/Income/Form.hs b/client/src/View/Income/Form.hs index ff6e55e..59f6a0d 100644 --- a/client/src/View/Income/Form.hs +++ b/client/src/View/Income/Form.hs @@ -36,7 +36,7 @@ data Operation    | Clone Income    | Edit Income -view :: forall t m a. MonadWidget t m => In -> Modal.Content t m Income +view :: forall t m a. MonadWidget t m => In -> Modal.Content t m  view input cancel = do    rec diff --git a/client/src/View/Income/Header.hs b/client/src/View/Income/Header.hs index 9e1c5b6..a26e16a 100644 --- a/client/src/View/Income/Header.hs +++ b/client/src/View/Income/Header.hs @@ -21,7 +21,6 @@ import qualified Common.View.Format     as Format  import qualified Component.Button       as Button  import qualified Component.Modal        as Modal  import qualified View.Income.Form       as Form -import           View.Income.Init       (Init (..))  data In t = In    { _in_users    :: [User] @@ -30,7 +29,7 @@ data In t = In    }  data Out t = Out -  { _out_add :: Event t Income +  { _out_add :: Event t ()    }  view :: forall t m. MonadWidget t m => In t -> m (Out t) diff --git a/client/src/View/Income/Income.hs b/client/src/View/Income/Income.hs index e83ba80..7be8091 100644 --- a/client/src/View/Income/Income.hs +++ b/client/src/View/Income/Income.hs @@ -21,7 +21,6 @@ import qualified Util.Ajax           as AjaxUtil  import qualified Util.Reflex         as ReflexUtil  import qualified Util.Reflex         as ReflexUtil  import qualified View.Income.Header  as Header -import           View.Income.Init    (Init (..))  import qualified View.Income.Reducer as Reducer  import qualified View.Income.Table   as Table diff --git a/client/src/View/Income/Init.hs b/client/src/View/Income/Init.hs deleted file mode 100644 index 4f3ef99..0000000 --- a/client/src/View/Income/Init.hs +++ /dev/null @@ -1,11 +0,0 @@ -module View.Income.Init -  ( Init(..) -  ) where - -import           Common.Model (Income, Payment, User) - -data Init = Init -  { _init_users    :: [User] -  , _init_incomes  :: [Income] -  , _init_payments :: [Payment] -  } deriving (Show) diff --git a/client/src/View/Income/Table.hs b/client/src/View/Income/Table.hs index c623acb..c7f172b 100644 --- a/client/src/View/Income/Table.hs +++ b/client/src/View/Income/Table.hs @@ -4,7 +4,6 @@ module View.Income.Table    , Out(..)    ) where -import qualified Data.List               as L  import qualified Data.Maybe              as Maybe  import           Data.Text               (Text)  import qualified Data.Text               as T @@ -31,9 +30,9 @@ data In t = In    }  data Out t = Out -  { _out_add    :: Event t Income -  , _out_edit   :: Event t Income -  , _out_delete :: Event t Income +  { _out_add    :: Event t () +  , _out_edit   :: Event t () +  , _out_delete :: Event t ()    }  view :: forall t m. MonadWidget t m => In t -> m (Out t) @@ -41,7 +40,7 @@ view input = do    table <- Table.view $ Table.In      { Table._in_headerLabel = headerLabel -    , Table._in_rows = reverse . L.sortOn _income_date $ _in_incomes input +    , Table._in_rows = _in_incomes input      , Table._in_cell = cell (_in_users input) (_in_currency input)      , Table._in_cloneModal = \income ->        Form.view $ Form.In @@ -58,7 +57,7 @@ view input = do            res <- Ajax.delete              (R.constDyn $ T.concat ["/api/income/", T.pack . show $ _income_id income])              e -          return $ income <$ R.fmapMaybe EitherUtil.eitherToMaybe res +          return $ () <$ R.fmapMaybe EitherUtil.eitherToMaybe res          }      , Table._in_isOwner = (== (_in_currentUser input)) . _income_userId      }  | 
