fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix built with workaround

Browse Source
This commit is contained in:
SJost 2019-02-18 22:49:08 +01:00
parent 1dd2b92374
commit cbd2a23a2c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Handler/Users.hs
View File

@ -101,7 +101,7 @@ getUsersR = do
| Set.null criterion -> eTrue -- TODO: why can this be eFalse and work still? | Set.null criterion -> eTrue -- TODO: why can this be eFalse and work still?
| otherwise -> | otherwise ->
-- (user E.^. UserMatrikelnummer) `E.in_` (E.valList $ Set.toList criterion) -- (user E.^. UserMatrikelnummer) `E.in_` (E.valList $ Set.toList criterion)
(user E.^. UserMatrikelnummer) `E.in_` (E.justList $ E.valList $ Set.toList criterion) user E.^. UserMatrikelnummer `E.in_` E.justList (E.valList $ Set.toList criterion)
) )
, ( "school", FilterColumn $ \user criterion -> if , ( "school", FilterColumn $ \user criterion -> if
| Set.null criterion -> E.val True :: E.SqlExpr (E.Value Bool) | Set.null criterion -> E.val True :: E.SqlExpr (E.Value Bool)

6
test/Database.hs
View File

@ -41,7 +41,7 @@ argsDescr =
, Option ['f'] ["fill"] (NoArg DBFill) "Fill database with example data" , Option ['f'] ["fill"] (NoArg DBFill) "Fill database with example data"
] ]
main :: IO () main :: IO ()
main = do main = do
args <- map unpack <$> getArgs args <- map unpack <$> getArgs
@ -141,7 +141,7 @@ fillDb = do
maxMuster <- insert User maxMuster <- insert User
{ userIdent = "max@campus.lmu.de" { userIdent = "max@campus.lmu.de"
, userAuthentication = AuthLDAP , userAuthentication = AuthLDAP
, userMatrikelnummer = Nothing , userMatrikelnummer = Just "1299"
, userEmail = "max@campus.lmu.de" , userEmail = "max@campus.lmu.de"
, userDisplayName = "Max Musterstudent" , userDisplayName = "Max Musterstudent"
, userSurname = "Musterstudent" , userSurname = "Musterstudent"
@ -325,7 +325,7 @@ fillDb = do
, sheetMarkingText = Nothing , sheetMarkingText = Nothing
, sheetVisibleFrom = Just now , sheetVisibleFrom = Just now
, sheetActiveFrom = now , sheetActiveFrom = now
, sheetActiveTo = (14 * nominalDay) `addUTCTime` now , sheetActiveTo = (14 * nominalDay) `addUTCTime` now
, sheetSubmissionMode = CorrectorSubmissions , sheetSubmissionMode = CorrectorSubmissions
, sheetUploadMode = Upload True , sheetUploadMode = Upload True
, sheetHintFrom = Nothing , sheetHintFrom = Nothing