From 1be333a09a39a19791600f4d40e7a146ce9b7f0a Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 16 Jul 2019 11:46:14 +0200 Subject: [PATCH] chore(course-teaser): focussing on course information Using lenses to focus on course, lecturer list and register status. TODO: moved .julius file (no courseId available). TODO: overwrite default template mode for course list and define lenses there --- src/Handler/Utils/Table/Pagination.hs | 10 +++++----- templates/table/cell/course-teaser.hamlet | 4 ++-- .../{course-teaser.julius => course-teaser_old.julius} | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename templates/table/cell/{course-teaser.julius => course-teaser_old.julius} (100%) diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs index d308a6679..500ae400d 100644 --- a/src/Handler/Utils/Table/Pagination.hs +++ b/src/Handler/Utils/Table/Pagination.hs @@ -390,7 +390,7 @@ data DBStyle r = DBStyle , dbsCellTemplate :: DBSTemplateMode r } -data DBSTemplateMode r = DBSTDefault | DBSTCourse (Lens' r (Entity Course)) +data DBSTemplateMode r = DBSTDefault | DBSTCourse (Lens' r (Entity Course)) (Traversal' r (Entity User)) (Lens' r Bool) instance Default (DBStyle r) where def = DBStyle @@ -868,11 +868,11 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db wHeaders <- maybe (return Nothing) (fmap Just . genHeaders) pSortable wRows <- forM rows $ \row' -> forM (oneColonnadeEncode <$> getColonnade dbtColonnade) $ \(($ row') -> cell') -> case dbsCellTemplate of - DBSTCourse c -> let + DBSTCourse c l r -> let Course{..} = row' ^. c . _entityVal - courseId = "cid" :: Text -- TODO: - courseLecturer = "courseLecturer" :: Text -- TODO: use tuple of lenses in DBStyle - isRegistered = False -- TODO: + lecturers = toListOf l row' + courseLecturers = intercalate ", " $ userSurname . entityVal <$> lecturers + isRegistered = row' ^. r courseSchoolName = unSchoolKey courseSchool in return $(widgetFile "table/cell/course-teaser") DBSTDefault -> do diff --git a/templates/table/cell/course-teaser.hamlet b/templates/table/cell/course-teaser.hamlet index 4b31e3968..9ccfbb4b0 100644 --- a/templates/table/cell/course-teaser.hamlet +++ b/templates/table/cell/course-teaser.hamlet @@ -1,11 +1,11 @@ -
+
_{courseShorthand}