summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorClint Adams <clint@softwarefreedom.org>2013-07-19 15:25:08 -0400
committerClint Adams <clint@softwarefreedom.org>2013-07-19 15:25:08 -0400
commitf8b325748a3631df00841f3524b6e1f95a4e30f4 (patch)
tree3eb0d418d8a2ece33774f770e6086108c3ef6c86 /config
parent10f6e8f4cce3303f53df359e0f40fcb5d584e85d (diff)
Update to newer Yesod.
Diffstat (limited to 'config')
-rw-r--r--config/models6
-rw-r--r--config/routes4
-rw-r--r--config/settings.yml3
3 files changed, 11 insertions, 2 deletions
diff --git a/config/models b/config/models
index 172af23..1bfa1c0 100644
--- a/config/models
+++ b/config/models
@@ -3,11 +3,17 @@ User
isAdmin Bool default=False
UniqueUser ident
deriving Show Eq
+Employment
+ user UserId
+ startDate Day
+ endDate Day Maybe
+ commitment Double
TimeEntry
user UserId
category TimeCategoryId
day Day
hours Double
+ note Text
timestamp UTCTime
deriving Show Eq
TimeCategory
diff --git a/config/routes b/config/routes
index a83a59f..a71d15d 100644
--- a/config/routes
+++ b/config/routes
@@ -4,5 +4,7 @@
/favicon.ico FaviconR GET
/robots.txt RobotsR GET
-/ HomeR GET POST
+/ HomeR GET
/user/#UserId UserR GET POST
+/category/#TimeCategoryId CategoryR GET POST
+/employment/#EmploymentId EmploymentR GET POST
diff --git a/config/settings.yml b/config/settings.yml
index 70828ae..686c9fc 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -2,7 +2,8 @@ Default: &defaults
host: "*4" # any IPv4 host
port: 3000
approot: "http://burrell.hq.sflc.info:80"
- copyright: Copyright (C) 2012 Clint Adams
+ copyright: sflctimekeeper pre-release
+ #Copyright (C) 2012-2013 Clint Adams
#analytics: UA-YOURCODE
Development: