fix: filter submission by not having corrector

messages/uniworx/de.msg

@@ -415,6 +415,7 @@ CorrectionsUploaded num@Int64: #{display num} Korrekturen wurden gespeichert:
 NoCorrectionsUploaded: In der hochgeladenen Datei wurden keine Korrekturen gefunden.
 
 RatingBy: Korrigiert von
+HasCorrector: Korrektor zugeteilt
 AssignedTime: Zuteilung
 AchievedBonusPoints: Erreichte Bonuspunkte
 AchievedNormalPoints: Erreichte Punkte

src/Handler/Corrections.hs

@@ -334,6 +334,12 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
             | otherwise       -> corrector E.?. UserEmail `E.in_` E.justList (E.valList . catMaybes $ Set.toList emails)
                            E.||. (if Nothing `Set.member` emails then E.isNothing (corrector E.?. UserEmail) else E.val False)
         )
+      , ( "isassigned"
+        , FilterColumn $  \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) criterion -> case getLast (criterion :: Last Bool) of
+            Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
+            Just True -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingBy
+            Just False-> E.isNothing $ submission E.^. SubmissionRatingBy
+        )
       , ( "israted"
         , FilterColumn $  \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) criterion -> case getLast (criterion :: Last Bool) of
             Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
@@ -636,10 +642,11 @@ postCCorrectionsR tid ssh csh = do
       filterUI = Just $ \mPrev -> mconcat
         [ prismAForm (singletonFilter "user-name-email")      mPrev $ aopt textField (fslI MsgCourseMembers)
         , prismAForm (singletonFilter "user-matriclenumber")  mPrev $ aopt textField (fslI MsgMatrikelNr)
-        , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
+        -- "pseudonym" TODO DB only stores Word24
-          -- "pseudonym" TODO DB only stores Word24
         , Map.singleton "sheet-search" . maybeToList <$> aopt textField (fslI MsgSheet)        (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev)))
-        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField             (fslI MsgRatingTime)
+        , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
+        , prismAForm (singletonFilter "isassigned" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgHasCorrector)
+        , prismAForm (singletonFilter "israted"    . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgRatingTime)
         ]
       psValidator = def & defaultPagesize PagesizeAll -- Assisstant always want to see them all at once anyway
   correctionsR whereClause colonnade filterUI psValidator $ Map.fromList
@@ -669,8 +676,9 @@ postSSubsR tid ssh csh shn = do
         [ prismAForm (singletonFilter "user-name-email")      mPrev $ aopt textField (fslI MsgCourseMembers)
         , prismAForm (singletonFilter "user-matriclenumber")  mPrev $ aopt textField (fslI MsgMatrikelNr)
         , prismAForm (singletonFilter "corrector-name-email") mPrev $ aopt textField (fslI MsgCorrector)
-          -- "pseudonym" TODO DB only stores Word24
+        , prismAForm (singletonFilter "isassigned" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgHasCorrector)
-        , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField             (fslI MsgRatingTime)
+        , prismAForm (singletonFilter "israted"    . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgRatingTime)
+        -- "pseudonym" TODO DB only stores Word24
         ]
       psValidator = def & defaultPagesize PagesizeAll -- Assisstant always want to see them all at once anyway
   correctionsR whereClause colonnade filterUI psValidator $ Map.fromList

templates/table/layout.hamlet

@@ -2,6 +2,10 @@ $newline never
 $if null rows && (dbsEmptyStyle == DBESNoHeading)
   _{dbsEmptyMessage}
 $else
+  <div .table-header>
+    <div .table__row-count>
+      _{MsgRowCount rowCount}
+
   ^{table}
 
   <div .table-footer>

templates/table/layout.lucius

@@ -1,3 +1,10 @@
+/* TABLE HEADER */
+.table-header {
+  display: flex;
+  flex-flow: row-reverse;
+  justify-content: space-between;
+}
+
 /* TABLE FOOTER */
 .table-footer {
   display: flex;