From 6eb555c0fe3c91b02e3ad9d79180eb298423f5a6 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 10 Jul 2018 11:07:26 +0200 Subject: [PATCH] Fix db.hs --- db.hs | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/db.hs b/db.hs index 8b038debd..6db5f2188 100755 --- a/db.hs +++ b/db.hs @@ -5,6 +5,7 @@ {-# LANGUAGE PackageImports #-} {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE LambdaCase #-} +{-# LANGUAGE RecordWildCards #-} import "uniworx" Import hiding (Option(..)) import "uniworx" Application (db, getAppDevSettings) @@ -47,7 +48,7 @@ main = do fillDb :: DB () fillDb = do - defaultFavourites <- getsYesod $ appDefaultMaxFavourites . appSettings + AppSettings{..} <- getsYesod appSettings now <- liftIO getCurrentTime let summer2017 = TermIdentifier 2017 Summer @@ -61,7 +62,9 @@ fillDb = do , userDisplayName = "Gregor Kleen" , userMaxFavourites = 6 , userTheme = Default - , userDateTimeFormat = def + , userDateTimeFormat = appDefaultDateTimeFormat + , userDateFormat = appDefaultDateFormat + , userTimeFormat = appDefaultTimeFormat } fhamann <- insert User { userPlugin = "LDAP" @@ -69,9 +72,11 @@ fillDb = do , userMatrikelnummer = Nothing , userEmail = "felix.hamann@campus.lmu.de" , userDisplayName = "Felix Hamann" - , userMaxFavourites = defaultFavourites + , userMaxFavourites = appDefaultMaxFavourites , userTheme = Default - , userDateTimeFormat = def + , userDateTimeFormat = appDefaultDateTimeFormat + , userDateFormat = appDefaultDateFormat + , userTimeFormat = appDefaultTimeFormat } jost <- insert User { userPlugin = "LDAP" @@ -81,7 +86,9 @@ fillDb = do , userDisplayName = "Steffen Jost" , userMaxFavourites = 14 , userTheme = MossGreen - , userDateTimeFormat = def + , userDateTimeFormat = appDefaultDateTimeFormat + , userDateFormat = appDefaultDateFormat + , userTimeFormat = appDefaultTimeFormat } void . insert $ User { userPlugin = "LDAP" @@ -91,7 +98,9 @@ fillDb = do , userDisplayName = "Max Musterstudent" , userMaxFavourites = 7 , userTheme = AberdeenReds - , userDateTimeFormat = def + , userDateTimeFormat = appDefaultDateTimeFormat + , userDateFormat = appDefaultDateFormat + , userTimeFormat = appDefaultTimeFormat } void . insert $ Term { termName = summer2017