diff --git a/package.yaml b/package.yaml index aa46feb3e..fb495c5a8 100644 --- a/package.yaml +++ b/package.yaml @@ -91,7 +91,6 @@ library: - -Wall - -fwarn-tabs - -O0 - - -ddump-splices cpp-options: -DDEVELOPMENT else: ghc-options: diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index 77c42835f..9e7b109a8 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -74,7 +74,7 @@ getCourseListTermR tidini = do -- defaultLayout $ do setTitle "Semesterkurse" linkButton "Neuen Kurs anlegen" BCPrimary CourseEditR - encodeHeadedWidgetTable tableDefault colonnadeTerms courses -- (map entityVal courses) + encodeWidgetTable tableDefault colonnadeTerms courses -- (map entityVal courses) getCourseShowR :: TermId -> Text -> Handler Html getCourseShowR tid csh = do diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 28bacf0b3..4edfaa7bb 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -129,7 +129,7 @@ getSheetList courseEnt = do setTitle $ toHtml $ T.append "Übungsblätter " csh if null sheets then [whamlet|Es wurden noch keine Übungsblätter angelegt.|] - else encodeHeadedWidgetTable tableDefault colSheets sheets + else encodeWidgetTable tableDefault colSheets sheets -- Show single sheet getSheetShowR :: TermId -> Text -> Text -> Handler Html diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs index aafa70cd7..b854655da 100644 --- a/src/Handler/Term.hs +++ b/src/Handler/Term.hs @@ -69,7 +69,7 @@ getTermShowR = do ] defaultLayout $ do setTitle "Freigeschaltete Semester" - encodeHeadedWidgetTable tableDefault colonnadeTerms termData + encodeWidgetTable tableDefault colonnadeTerms termData getTermEditR :: Handler Html diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs index 7ac3bd00c..df9175e4f 100644 --- a/src/Handler/Users.hs +++ b/src/Handler/Users.hs @@ -41,5 +41,5 @@ getUsersR = do -- ++ map (\school -> headed (text2widget $ schoolName $ entityVal school) (\u -> "xx")) schools defaultLayout $ do setTitle "Comprehensive User List" - let userList = encodeHeadedWidgetTable tableDefault colonnadeUsers users + let userList = encodeWidgetTable tableDefault colonnadeUsers users $(widgetFile "users") diff --git a/src/Handler/Utils/Table.hs b/src/Handler/Utils/Table.hs index 786bb6357..e2aca0bb4 100644 --- a/src/Handler/Utils/Table.hs +++ b/src/Handler/Utils/Table.hs @@ -36,7 +36,7 @@ pairColonnade a b = mconcat [ lmap fst a, lmap snd b] -- Table Modification encodeHeadedWidgetTableNumbered :: Attribute -> Colonnade Headed a (WidgetT site IO ()) -> [a] -> WidgetT site IO () encodeHeadedWidgetTableNumbered attrs colo tdata = - encodeHeadedWidgetTable attrs (mconcat [numberCol, lmap snd colo]) (zip [1..] tdata) + encodeWidgetTable attrs (mconcat [numberCol, lmap snd colo]) (zip [1..] tdata) where numberCol :: Colonnade Headed (Int,a) (WidgetT site IO ()) numberCol = headed "Nr" (fromString.show.fst) @@ -86,5 +86,5 @@ headedRowSelector toExternal fromExternal attrs colonnade tdata = do collectResult (FormSuccess x:rs) = (x :) <$> collectResult rs return ( catMaybes <$> collectResult selectionResults - , encodeHeadedCellTable attrs (pairColonnade selColonnade colonnade) (zip [0..] tdata) + , encodeCellTable attrs (pairColonnade selColonnade colonnade) (zip [0..] tdata) ) diff --git a/stack.yaml b/stack.yaml index 7530e7647..180aa43b0 100644 --- a/stack.yaml +++ b/stack.yaml @@ -30,8 +30,8 @@ packages: extra-dep: true extra-deps: - - colonnade-1.1.1 - - yesod-colonnade-1.1.0 + - colonnade-1.2.0 + - yesod-colonnade-1.2.0 - conduit-resumablesink-0.2