From ffda17ada0a3e9a74c12e70946c5a35accda4705 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Wed, 16 Jan 2019 16:17:38 +0100
Subject: [PATCH] Towards #270

---
 src/Handler/Corrections.hs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 8eb025a30..9fac257df 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -268,6 +268,11 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d
             | Set.null tids -> E.val True :: E.SqlExpr (E.Value Bool)
             | otherwise     -> course E.^. CourseTerm `E.in_` E.valList (Set.toList tids)
         )
+      , ( "school"
+        , FilterColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) sids -> if
+            | Set.null sids -> E.val True :: E.SqlExpr (E.Value Bool)
+            | otherwise     -> course E.^. CourseSchool `E.in_` E.valList (Set.toList sids)
+        )
       , ( "course"
         , FilterColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) cshs -> if
             | Set.null cshs -> E.val True :: E.SqlExpr (E.Value Bool)
@@ -486,12 +491,19 @@ postCorrectionsR = do
         , colRated
         ] -- Continue here
       filterUI = Just $ \mPrev -> mconcat
-        [ Map.singleton "course" . maybeToList <$> aopt (lift `hoistField` selectField courseOptions) (fslI MsgCourse) (Just <$> listToMaybe =<< Map.lookup "course" =<< mPrev)
-
+        [ Map.singleton "course" . maybeToList <$> aopt (lift `hoistField` selectField courseOptions) (fslI MsgCourse)       (Just <$> listToMaybe =<< Map.lookup "course" =<< mPrev)
+        , Map.singleton "term"   . maybeToList <$> aopt (lift `hoistField` selectField termOptions)   (fslI MsgTerm)         (Just <$> listToMaybe =<< Map.lookup "term"   =<< mPrev)
+        , Map.singleton "school" . maybeToList <$> aopt (lift `hoistField` selectField schoolOptions) (fslI MsgCourseSchool) (Just <$> listToMaybe =<< Map.lookup "school" =<< mPrev)
         ]
       courseOptions = runDB $ do
         courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessDB (CourseR courseTerm courseSchool courseShorthand CNotesR) False)
         optionsPairs $ map (id &&& id) $ nub $ map (CI.original . courseShorthand . entityVal) courses
+      termOptions = runDB $ do
+        courses <- selectList [] [Asc CourseTerm]      >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessDB (CourseR courseTerm courseSchool courseShorthand CNotesR) False)
+        optionsPairs $ map (id &&& id) $ nub $ map (termToText . unTermKey . courseTerm . entityVal) courses
+      schoolOptions = runDB $ do
+        courses <- selectList [] [Asc CourseSchool]    >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessDB (CourseR courseTerm courseSchool courseShorthand CNotesR) False)
+        optionsPairs $ map (id &&& id) $ nub $ map (CI.original . unSchoolKey . courseSchool . entityVal) courses
 
       psValidator = def
         & restrictFilter (\name _ -> name /= "corrector") -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information