From 143b4d6116cfec0ddd6f49e410c69aa7168fed45 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 6 Jul 2018 18:43:58 +0200 Subject: [PATCH] Fix deployment build --- src/Handler/Course.hs | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index bebf18334..b9c3446e5 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -7,7 +7,6 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE OverloadedLists #-} module Handler.Course where @@ -19,6 +18,8 @@ import qualified Data.Text as T import Data.Function ((&)) -- import Yesod.Form.Bootstrap3 +import qualified Data.Map as Map + import Colonnade hiding (fromMaybe,bool) -- import Yesod.Colonnade @@ -67,22 +68,23 @@ getTermCourseListR tid = do Nothing -> MsgCourseMembersCount num Just max -> MsgCourseMembersCountLimited num max ] - , dbtSorting = [ ( "shorthand" - , SortColumn $ \course -> course E.^. CourseShorthand - ) - , ( "register-from" - , SortColumn $ \course -> course E.^. CourseRegisterFrom - ) - , ( "register-to" - , SortColumn $ \course -> course E.^. CourseRegisterTo - ) - , ( "members" - , SortColumn $ \course -> E.sub_select . E.from $ \courseParticipant -> do - E.where_ $ courseParticipant E.^. CourseParticipantCourse E.==. course E.^. CourseId - return (E.countRows :: E.SqlExpr (E.Value Int64)) - ) - ] - , dbtFilter = [] + , dbtSorting = Map.fromList + [ ( "shorthand" + , SortColumn $ \course -> course E.^. CourseShorthand + ) + , ( "register-from" + , SortColumn $ \course -> course E.^. CourseRegisterFrom + ) + , ( "register-to" + , SortColumn $ \course -> course E.^. CourseRegisterTo + ) + , ( "members" + , SortColumn $ \course -> E.sub_select . E.from $ \courseParticipant -> do + E.where_ $ courseParticipant E.^. CourseParticipantCourse E.==. course E.^. CourseId + return (E.countRows :: E.SqlExpr (E.Value Int64)) + ) + ] + , dbtFilter = mempty , dbtAttrs = tableDefault , dbtIdent = "courses" :: Text }