fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
SJost 2018-09-11 14:18:07 +02:00
parent a575deda78
commit f7f8514f5e
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Handler/Profile.hs
View File

@ -235,7 +235,7 @@ getProfileDataR = do
, dbtSQLQuery = courseData , dbtSQLQuery = courseData
, dbtColonnade = mconcat , dbtColonnade = mconcat
[ dbRow [ dbRow
, colCourseDescr $ _dbrOutput . _1 . _entityVal -- TODO , colsCourseDescr $ _dbrOutput . _1 . _entityVal
, sortable (Just "time") (i18nCell MsgRegistered) $ do , sortable (Just "time") (i18nCell MsgRegistered) $ do
regTime <- view $ _dbrOutput . _2 . _unValue regTime <- view $ _dbrOutput . _2 . _unValue
return $ timeCell regTime return $ timeCell regTime

34
src/Handler/Utils/Table/Convenience.hs
View File

@ -89,38 +89,24 @@ submissionCell (crse, E.Value shn, submission) =
-- Generic Columns -- Generic Columns
-- -colCourseDescr :: (HasEntity c Course, HasDBRow s r, IsDBTable m a) =>
-- - ((c -> Const Course c) -> r -> Const Course r) -> Colonnade Sortable s (DBCell m a)
-- -colCourseDescr courseLens = sortable (Just "course") (i18nCell MsgCourse) $ do
-- - crs <- view $ _dbrOutput . courseLens . _entityVal
-- - return $ courseCell crs
-- -
colCourseDescr :: IsDBTable m a => Getting Course s Course -> Colonnade Sortable s (DBCell m a) colCourseDescr :: IsDBTable m a => Getting Course s Course -> Colonnade Sortable s (DBCell m a)
colCourseDescr getter = colCourseDescr getter =
sortable (Just "course") (i18nCell MsgCourse) $ do sortable (Just "course") (i18nCell MsgCourse) $ do
crs <- view getter course <- view getter
return $ courseCell crs return $ courseCell course
{-
colCourseDescrG :: (HasCourse s, IsDBTable m a) => Colonnade Sortable s (DBCell m a)
colCourseDescrG =
sortable (Just "course") (i18nCell MsgCourse) $ do
crs <- view course
return $ courseCell crs
colsCourseCompleteG :: (HasCourse s, IsDBTable m a) => Colonnade Sortable s (DBCell m a) colsCourseDescr :: IsDBTable m a => Getting Course s Course -> Colonnade Sortable s (DBCell m a)
colsCourseCompleteG = mconcat colsCourseDescr getter = mconcat
[ sortable (Just "term") (i18nCell MsgTerm) $ do [ sortable (Just "term") (i18nCell MsgTerm) $ do
crs <- view course course <- view getter
return $ termCell $ courseTerm crs return $ termCell $ courseTerm course
, sortable (Just "school") (i18nCell MsgCourseSchool) $ do , sortable (Just "school") (i18nCell MsgCourseSchool) $ do
crs <- view course course <- view getter
return $ schoolCell (Just $ courseTerm crs) (courseSchool crs) return $ schoolCell (Just $ courseTerm course) (courseSchool course)
, sortable (Just "course") (i18nCell MsgCourse) $ do , sortable (Just "course") (i18nCell MsgCourse) $ do
crs <- view course course <- view getter
return $ courseCell crs return $ courseCell course
] ]
-}
colsCourseLink :: (IsDBTable m a) => Getting CourseLink s CourseLink -> Colonnade Sortable s (DBCell m a) colsCourseLink :: (IsDBTable m a) => Getting CourseLink s CourseLink -> Colonnade Sortable s (DBCell m a)
colsCourseLink getter = mconcat colsCourseLink getter = mconcat