diff --git a/src/Handler/ExternalExam/Correct.hs b/src/Handler/ExternalExam/Correct.hs index be769d3ab..b3ff402c8 100644 --- a/src/Handler/ExternalExam/Correct.hs +++ b/src/Handler/ExternalExam/Correct.hs @@ -105,7 +105,7 @@ postEECorrectR tid ssh coursen examn = do mOld = externalExamResultResult . entityVal <$> mOldResult in if | ciqGrade' /= mOld -> do - let resultTime = maybe now id externalExamDefaultTime -- TODO add option to override default? + let resultTime = fromMaybe now externalExamDefaultTime newResult <- upsert ExternalExamResult { externalExamResultExam = eeId , externalExamResultUser = uid diff --git a/src/Handler/Utils/ExternalExam/Users.hs b/src/Handler/Utils/ExternalExam/Users.hs index 3c352130d..6c2243cf0 100644 --- a/src/Handler/Utils/ExternalExam/Users.hs +++ b/src/Handler/Utils/ExternalExam/Users.hs @@ -492,7 +492,7 @@ makeExternalExamUsersTable mode (Entity eeId ExternalExam{..}) = do guessUser' :: ExternalExamUserTableCsv -> DB (Either (NonEmpty (Entity User)) (Entity User)) guessUser' ExternalExamUserTableCsv{..} = do - let criteria = PredDNF $ Set.singleton $ impureNonNull $ Set.fromList $ (PLVariable <$>) $ catMaybes $ + let criteria = PredDNF $ Set.singleton $ impureNonNull $ Set.fromList $ (PLVariable <$>) $ catMaybes [ GuessUserMatrikelnummer <$> csvEUserMatriculation , GuessUserDisplayName <$> csvEUserName , GuessUserSurname <$> csvEUserSurname