From da26901f8bb7073e16213884cbef16091d747757 Mon Sep 17 00:00:00 2001
From: Steffen Jost <S.Jost@Fraport.de>
Date: Tue, 29 Aug 2023 15:26:13 +0000
Subject: [PATCH] chore(lms): minor fix reset tries conditions

---
 src/Handler/LMS.hs       |  5 +++--
 src/Handler/Utils/LMS.hs | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs
index 935012e97..68c05a41d 100644
--- a/src/Handler/LMS.hs
+++ b/src/Handler/LMS.hs
@@ -726,8 +726,9 @@ postLmsR sid qsh = do
           forM_ shortUsers $ upsertQualificationUser qid nowaday cutoff Nothing
 
         fromIntegral <$> (if isReset
-            then updateWhereCount [LmsUserQualification ==. qid, LmsUserUser <-. usersList] [LmsUserResetTries =. True]
-            else deleteWhereCount [LmsUserQualification ==. qid, LmsUserUser <-. usersList]
+            then updateWhereCount ([LmsUserQualification ==. qid, LmsUserUser <-. usersList, LmsUserResetTries ==. False, LmsUserLocked ==. True]
+                                    ++ ([LmsUserStatus ==. Just LmsBlocked] ||. [LmsUserStatus ==. Just LmsExpired]))     [LmsUserResetTries =. True]
+            else deleteWhereCount  [LmsUserQualification ==. qid, LmsUserUser <-. usersList]
           )
 
       unless isReset $ 
diff --git a/src/Handler/Utils/LMS.hs b/src/Handler/Utils/LMS.hs
index a7d8f7467..cb803a89d 100644
--- a/src/Handler/Utils/LMS.hs
+++ b/src/Handler/Utils/LMS.hs
@@ -249,27 +249,27 @@ lmsUserStatusWidget isAdmin luser
     lmsUserStatusWidgetAux _ LmsUser{lmsUserStatus=Just lStat, lmsUserStatusDay=Just aday} =
       [whamlet|$newline never
         ^{formatTimeW SelFormatDate aday}
-        \ ^{icon (lmsStatusIcon lStat)}
+        \ ^{iconFixed (lmsStatusIcon lStat)}
       |]
     -- previously: IconWaitingForUser for lmsUserStatus==Nothing
     lmsUserStatusWidgetAux _ LmsUser{lmsUserNotified=Just d} =
       [whamlet|$newline never
         ^{formatTimeW SelFormatDate d}
-        \ ^{icon IconNotificationSent}
+        \ ^{iconFixed IconNotificationSent}
       |]
     lmsUserStatusWidgetAux True LmsUser{lmsUserStarted} =  -- E-Learning started, but not yet notified; only intended for Admins
       [whamlet|$newline never
         ^{formatTimeW SelFormatDate lmsUserStarted}
-        \ ^{icon IconPlanned}
+        \ ^{iconFixed IconPlanned}
       |]
     lmsUserStatusWidgetAux _ _ = mempty
 
     lockIcon
       | lmsUserLocked luser == lmsUserToLock luser = mempty
-      | lmsUserLocked luser                        = icon IconLocked
-      | otherwise                                  = icon IconUnlocked
+      | lmsUserLocked luser                        = iconFixed IconLocked
+      | otherwise                                  = iconFixed IconUnlocked
 
     resetIcon
-      | lmsUserResetTries luser = icon IconUndo
+      | lmsUserResetTries luser = iconFixed IconUndo
       | otherwise = mempty