Slightly clean up course filter UI

This commit is contained in:
Gregor Kleen 2018-12-29 13:53:45 +01:00
parent f238759270
commit 87ababdeb9
2 changed files with 5 additions and 4 deletions

View File

@ -16,7 +16,7 @@ import Data.Function ((&))
import Data.Monoid (Last(..)) import Data.Monoid (Last(..))
import Data.Maybe import Data.Maybe (fromJust)
import qualified Data.Set as Set import qualified Data.Set as Set
import qualified Data.Map as Map import qualified Data.Map as Map
@ -175,9 +175,9 @@ makeCourseTable whereClause colChoices psValidator = do
E.||. (E.castString (course E.^. CourseDescription) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%)) E.||. (E.castString (course E.^. CourseDescription) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
) )
] ]
, dbtFilterUI = \mPrev -> mconcat , dbtFilterUI = \mPrev -> mconcat $ catMaybes
[ Map.singleton "search" . maybeToList <$> aopt textField (fslI MsgCourseFilterSearch) (Just <$> listToMaybe =<< Map.lookup "search" =<< mPrev) [ Just $ Map.singleton "search" . maybeToList <$> aopt (searchField True) (fslI MsgCourseFilterSearch) (Just <$> listToMaybe =<< Map.lookup "search" =<< mPrev)
, Map.singleton "registered" . fmap toPathPiece . maybeToList <$> aopt boolField (fslI MsgCourseFilterRegistered) (Just <$> fromPathPiece =<< listToMaybe =<< Map.lookup "registered" =<< mPrev) , muid $> (Map.singleton "registered" . fmap toPathPiece . maybeToList <$> aopt boolField (fslI MsgCourseFilterRegistered) (Just <$> fromPathPiece =<< listToMaybe =<< Map.lookup "registered" =<< mPrev))
] ]
, dbtStyle = def { dbsFilterLayout = defaultDBSFilterLayout } , dbtStyle = def { dbsFilterLayout = defaultDBSFilterLayout }
, dbtParams = def , dbtParams = def

View File

@ -65,6 +65,7 @@
/* TEXT INPUTS */ /* TEXT INPUTS */
input[type="text"], input[type="text"],
input[type="search"],
input[type="password"], input[type="password"],
input[type="url"], input[type="url"],
input[type="number"], input[type="number"],