From 9ec84e3a20c767f6525639f58cd22715e302b88d Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 26 Jun 2016 12:31:24 +0200
Subject: Add an editable date field for punctual payment creation

---
 src/server/Model/Json/AddIncome.hs     | 17 -----------------
 src/server/Model/Json/CreateIncome.hs  | 17 +++++++++++++++++
 src/server/Model/Json/CreatePayment.hs | 22 ++++++++++++++++++++++
 src/server/Model/Json/Income.hs        |  2 +-
 src/server/Model/Json/Payment.hs       |  4 ++--
 5 files changed, 42 insertions(+), 20 deletions(-)
 delete mode 100644 src/server/Model/Json/AddIncome.hs
 create mode 100644 src/server/Model/Json/CreateIncome.hs
 create mode 100644 src/server/Model/Json/CreatePayment.hs

(limited to 'src/server/Model/Json')

diff --git a/src/server/Model/Json/AddIncome.hs b/src/server/Model/Json/AddIncome.hs
deleted file mode 100644
index 6570ba9..0000000
--- a/src/server/Model/Json/AddIncome.hs
+++ /dev/null
@@ -1,17 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Model.Json.AddIncome
-  ( AddIncome(..)
-  ) where
-
-import GHC.Generics
-
-import Data.Aeson
-import Data.Time.Calendar (Day)
-
-data AddIncome = AddIncome
-  { day :: Day
-  , amount :: Int
-  } deriving (Show, Generic)
-
-instance FromJSON AddIncome
diff --git a/src/server/Model/Json/CreateIncome.hs b/src/server/Model/Json/CreateIncome.hs
new file mode 100644
index 0000000..cf9b1c3
--- /dev/null
+++ b/src/server/Model/Json/CreateIncome.hs
@@ -0,0 +1,17 @@
+{-# LANGUAGE DeriveGeneric #-}
+
+module Model.Json.CreateIncome
+  ( CreateIncome(..)
+  ) where
+
+import GHC.Generics
+
+import Data.Aeson
+import Data.Time.Calendar (Day)
+
+data CreateIncome = CreateIncome
+  { date :: Day
+  , amount :: Int
+  } deriving (Show, Generic)
+
+instance FromJSON CreateIncome
diff --git a/src/server/Model/Json/CreatePayment.hs b/src/server/Model/Json/CreatePayment.hs
new file mode 100644
index 0000000..f117daf
--- /dev/null
+++ b/src/server/Model/Json/CreatePayment.hs
@@ -0,0 +1,22 @@
+{-# LANGUAGE DeriveGeneric #-}
+
+module Model.Json.CreatePayment
+  ( CreatePayment(..)
+  ) where
+
+import GHC.Generics
+
+import Data.Aeson
+import Data.Time.Calendar (Day)
+import Data.Text (Text)
+
+import Model.Frequency (Frequency)
+
+data CreatePayment = CreatePayment
+  { date :: Day
+  , name :: Text
+  , cost :: Int
+  , frequency :: Frequency
+  } deriving (Show, Generic)
+
+instance FromJSON CreatePayment
diff --git a/src/server/Model/Json/Income.hs b/src/server/Model/Json/Income.hs
index e80ab63..bb1ac97 100644
--- a/src/server/Model/Json/Income.hs
+++ b/src/server/Model/Json/Income.hs
@@ -14,7 +14,7 @@ import Model.Database (IncomeId, UserId)
 data Income = Income
   { id :: IncomeId
   , userId :: UserId
-  , day :: Day
+  , date :: Day
   , amount :: Int
   } deriving (Show, Generic)
 
diff --git a/src/server/Model/Json/Payment.hs b/src/server/Model/Json/Payment.hs
index 7f4de15..04c6de8 100644
--- a/src/server/Model/Json/Payment.hs
+++ b/src/server/Model/Json/Payment.hs
@@ -6,16 +6,16 @@ module Model.Json.Payment
 
 import GHC.Generics
 
-import Data.Time
 import Data.Text (Text)
 import Data.Aeson
+import Data.Time.Calendar (Day)
 
 import Model.Database (PaymentId, UserId)
 import Model.Frequency
 
 data Payment = Payment
   { id :: PaymentId
-  , creation :: UTCTime
+  , date :: Day
   , name :: Text
   , cost :: Int
   , userId :: UserId
-- 
cgit v1.2.3