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

chore(lms): minor fix reset tries conditions

Browse Source
This commit is contained in:
Steffen Jost 2023-08-29 15:26:13 +00:00
parent 1b668c7b28
commit da26901f8b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Handler/LMS.hs
View File

@ -726,8 +726,9 @@ postLmsR sid qsh = do
forM_ shortUsers $ upsertQualificationUser qid nowaday cutoff Nothing forM_ shortUsers $ upsertQualificationUser qid nowaday cutoff Nothing
fromIntegral <$> (if isReset fromIntegral <$> (if isReset
then updateWhereCount [LmsUserQualification ==. qid, LmsUserUser <-. usersList] [LmsUserResetTries =. True] then updateWhereCount ([LmsUserQualification ==. qid, LmsUserUser <-. usersList, LmsUserResetTries ==. False, LmsUserLocked ==. True]
else deleteWhereCount [LmsUserQualification ==. qid, LmsUserUser <-. usersList] ++ ([LmsUserStatus ==. Just LmsBlocked] ||. [LmsUserStatus ==. Just LmsExpired])) [LmsUserResetTries =. True]
else deleteWhereCount [LmsUserQualification ==. qid, LmsUserUser <-. usersList]
) )
unless isReset $ unless isReset $

12
src/Handler/Utils/LMS.hs
View File

@ -249,27 +249,27 @@ lmsUserStatusWidget isAdmin luser
lmsUserStatusWidgetAux _ LmsUser{lmsUserStatus=Just lStat, lmsUserStatusDay=Just aday} = lmsUserStatusWidgetAux _ LmsUser{lmsUserStatus=Just lStat, lmsUserStatusDay=Just aday} =
[whamlet|$newline never [whamlet|$newline never
^{formatTimeW SelFormatDate aday} ^{formatTimeW SelFormatDate aday}
\ ^{icon (lmsStatusIcon lStat)} \ ^{iconFixed (lmsStatusIcon lStat)}
|] |]
-- previously: IconWaitingForUser for lmsUserStatus==Nothing -- previously: IconWaitingForUser for lmsUserStatus==Nothing
lmsUserStatusWidgetAux _ LmsUser{lmsUserNotified=Just d} = lmsUserStatusWidgetAux _ LmsUser{lmsUserNotified=Just d} =
[whamlet|$newline never [whamlet|$newline never
^{formatTimeW SelFormatDate d} ^{formatTimeW SelFormatDate d}
\ ^{icon IconNotificationSent} \ ^{iconFixed IconNotificationSent}
|] |]
lmsUserStatusWidgetAux True LmsUser{lmsUserStarted} = -- E-Learning started, but not yet notified; only intended for Admins lmsUserStatusWidgetAux True LmsUser{lmsUserStarted} = -- E-Learning started, but not yet notified; only intended for Admins
[whamlet|$newline never [whamlet|$newline never
^{formatTimeW SelFormatDate lmsUserStarted} ^{formatTimeW SelFormatDate lmsUserStarted}
\ ^{icon IconPlanned} \ ^{iconFixed IconPlanned}
|] |]
lmsUserStatusWidgetAux _ _ = mempty lmsUserStatusWidgetAux _ _ = mempty
lockIcon lockIcon
| lmsUserLocked luser == lmsUserToLock luser = mempty | lmsUserLocked luser == lmsUserToLock luser = mempty
| lmsUserLocked luser = icon IconLocked | lmsUserLocked luser = iconFixed IconLocked
| otherwise = icon IconUnlocked | otherwise = iconFixed IconUnlocked
resetIcon resetIcon
| lmsUserResetTries luser = icon IconUndo | lmsUserResetTries luser = iconFixed IconUndo
| otherwise = mempty | otherwise = mempty