diff --git a/frontend/src/icons.scss b/frontend/src/icons.scss index 61c10ea40..e0b3cbf30 100644 --- a/frontend/src/icons.scss +++ b/frontend/src/icons.scss @@ -35,7 +35,7 @@ $icons: new, file-upload, file-zip, file-csv, - file-circle-minus, + file-missing, sft-question, sft-hint, sft-solution, @@ -101,7 +101,8 @@ $icons: new, user-edit, placeholder, glasses, - id-badge, + user-badge, + user-unknown, loading; diff --git a/src/Handler/School/DayTasks.hs b/src/Handler/School/DayTasks.hs index bfa6b0773..584654635 100644 --- a/src/Handler/School/DayTasks.hs +++ b/src/Handler/School/DayTasks.hs @@ -563,12 +563,12 @@ mkDailyTable isAdmin ssh nd dcrs = getDayTutorials ssh (nd,nd) >>= \case -- , ("check-fail" , SortColumn $ queryParticipant >>> (\pid -> pid E.^. TutorialParticipantId `E.in_` E.vals (maybeEmpty dcrs $ dcrResults >>> Map.keys))) , let dcrsLevels = maybeEmpty dcrs $ dcrSeverityGroups . dcrResults in ("check-fail" , SortColumn $ queryParticipant >>> (\((E.^. TutorialParticipantId) -> pid) -> E.case_ - [ E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _1)) E.then_ (E.val 1) - , E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _2)) E.then_ (E.val 2) - , E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _3)) E.then_ (E.val 3) - , E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _4)) E.then_ (E.val 4) - , E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _5)) E.then_ (E.val 5) - ](E.else_ E.val (99 :: Int64)) + [ E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _1)) E.then_ (E.val 1) + , E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _2)) E.then_ (E.val 2) + , E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _3)) E.then_ (E.val 3) + , E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _4)) E.then_ (E.val 4) + , E.when_ (pid `E.in_` E.vals (dcrsLevels ^. _5)) E.then_ (E.val 5) + ] (E.else_ E.val (99 :: Int64)) )) ] dbtFilter = Map.fromList @@ -736,11 +736,11 @@ dcr2widget _ _ = text2widget "Kein Pr dcrSeverity :: DayCheckResult -> Int -dcrSeverity DayCheckResult{dcAvsKnown=False} = 1 -dcrSeverity DayCheckResult{dcApronAccess=False} = 2 -dcrSeverity DayCheckResult{dcBookingFirmOk=False} = 3 -dcrSeverity DayCheckResult{dcEyeFitsPermit=Nothing} = 4 -dcrSeverity DayCheckResult{dcEyeFitsPermit=Just False} = 5 +dcrSeverity DayCheckResult{dcAvsKnown=False} = 1 +dcrSeverity DayCheckResult{dcApronAccess=False} = 2 +dcrSeverity DayCheckResult{dcBookingFirmOk=False} = 3 +dcrSeverity DayCheckResult{dcEyeFitsPermit=Nothing} = 4 +dcrSeverity DayCheckResult{dcEyeFitsPermit=Just False} = 5 dcrSeverity _ = 99 dcrSeverityGroups :: Map TutorialParticipantId DayCheckResult -> (Set TutorialParticipantId,Set TutorialParticipantId,Set TutorialParticipantId,Set TutorialParticipantId,Set TutorialParticipantId)