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

feat(course-teaser): hide lecturer entry if empty

Browse Source
This commit is contained in:
Sarah Vaupel 2019-08-09 16:35:03 +02:00
parent c2c12b9643
commit f7fb3c1219
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Handler/Course/List.hs
View File

@ -158,7 +158,7 @@ makeCourseTable whereClause colChoices psValidator = do
, Just $ prismAForm (singletonFilter "schoolshort" . maybePrism (_PathPiece . from _SchoolId)) mPrev $ aopt (hoistField lift schoolField) (fslI MsgCourseSchool) , Just $ prismAForm (singletonFilter "schoolshort" . maybePrism (_PathPiece . from _SchoolId)) mPrev $ aopt (hoistField lift schoolField) (fslI MsgCourseSchool)
, Just $ prismAForm (singletonFilter "lecturer") mPrev $ aopt textField (fslI MsgCourseLecturer) , Just $ prismAForm (singletonFilter "lecturer") mPrev $ aopt textField (fslI MsgCourseLecturer)
, Just $ prismAForm (singletonFilter "search") mPrev $ aopt textField (fslI MsgCourseFilterSearch) , Just $ prismAForm (singletonFilter "search") mPrev $ aopt textField (fslI MsgCourseFilterSearch)
, Just $ prismAForm (singletonFilter "openregistration" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgCourseRegisterOpen) , Just $ prismAForm (singletonFilter "openregistration" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgCourseRegisterOpen) -- TODO: checkbox instead of boolField
, muid $> prismAForm (singletonFilter "registered" . maybePrism _PathPiece) mPrev (aopt boolField (fslI MsgCourseFilterRegistered)) , muid $> prismAForm (singletonFilter "registered" . maybePrism _PathPiece) mPrev (aopt boolField (fslI MsgCourseFilterRegistered))
] ]
, dbtStyle = def , dbtStyle = def

15
templates/table/course/course-teaser.hamlet
View File

@ -9,13 +9,14 @@
_{courseName} _{courseName}
$if isRegistered $if isRegistered
<div .course-teaser__registration>_{MsgRegistered} <div .course-teaser__registration>_{MsgRegistered}
<div .course-teaser__lecturer-label> $if not $ null courseLecturers
_{MsgLecturersForN (length courseLecturers)} <div .course-teaser__lecturer-label>
<div .course-teaser__lecturer-value> _{MsgLecturersForN (length courseLecturers)}
<ul .list--inline .list--comma-separated> <div .course-teaser__lecturer-value>
$forall lecturer <- courseLecturers <ul .list--inline .list--comma-separated>
<li> $forall lecturer <- courseLecturers
#{lecturer} <li>
#{lecturer}
$maybe regTo <- courseRegisterTo $maybe regTo <- courseRegisterTo
<div .course-teaser__duedate-label>_{MsgRegisterTo} <div .course-teaser__duedate-label>_{MsgRegisterTo}
<div .course-teaser__duedate-value>^{formatTimeW SelFormatDateTime regTo} <div .course-teaser__duedate-value>^{formatTimeW SelFormatDateTime regTo}