From d02e62ec20b8cdc9dd6144de558895885ad1e692 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 29 Mar 2023 10:32:14 +0200 Subject: [PATCH] fix(lms): lms-direct/deletion-days setting now represent #days to presever lms (used to be #days+1) --- src/Handler/Utils/LMS.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/Utils/LMS.hs b/src/Handler/Utils/LMS.hs index 05c410486..a444e6f68 100644 --- a/src/Handler/Utils/LMS.hs +++ b/src/Handler/Utils/LMS.hs @@ -113,7 +113,7 @@ lmsDeletionDate = do lmsUserToDeleteExpr :: Day -> E.SqlExpr (Entity LmsUser) -> E.SqlExpr (E.Value Bool) lmsUserToDeleteExpr cutoff lmslist = E.isNothing (lmslist E.^. LmsUserEnded) E.&&. E.not_ (E.isNothing $ lmslist E.^. LmsUserStatus) - E.&&. E.explicitUnsafeCoerceSqlExprValue "timestamp" ((lmslist E.^. LmsUserStatus) E.#>>. "{day}") E.<. E.val cutoff + E.&&. E.explicitUnsafeCoerceSqlExprValue "timestamp" ((lmslist E.^. LmsUserStatus) E.#>>. "{day}") E.<=. E.val cutoff -- | Is everything since cutoff day or before? lmsUserToDelete :: Day -> LmsUser -> Bool @@ -179,4 +179,4 @@ lmsUserStatusWidget LmsUser{lmsUserStarted} = [whamlet|$newline never ^{formatTimeW SelFormatDate lmsUserStarted} \ ^{icon IconWaitingForUser} - |] \ No newline at end of file + |]