From 5c88c13cf835425a7ecbd9a0ed054b1ed5c67a12 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Fri, 9 Aug 2019 11:39:33 +0200
Subject: [PATCH] feat(course-teaser): no display of chevron without
 description

---
 messages/uniworx/de.msg                     | 1 +
 src/Handler/Course/List.hs                  | 7 +++++++
 templates/table/course/course-teaser.hamlet | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 1875d51fa..51ea7771b 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -86,6 +86,7 @@ CourseCapacityTip: Anzahl erlaubter Kursanmeldungen, leer lassen für unbeschrä
 CourseNoCapacity: In diesem Kurs sind keine Plätze mehr frei.
 TutorialNoCapacity: In dieser Übung sind keine Plätze mehr frei.
 CourseNotEmpty: In diesem Kurs sind momentan Teilnehmer angemeldet.
+CourseRegisterOpen: Anmeldung möglich
 CourseRegisterOk: Anmeldung erfolgreich
 CourseDeregisterOk: Erfolgreich abgemeldet
 CourseDeregisterLecturerTip: Wenn Sie den Teilnehmer vom Kurs abmelden kann es sein, dass sie Zugriff auf diese Daten verlieren
diff --git a/src/Handler/Course/List.hs b/src/Handler/Course/List.hs
index f94ad982e..16b67cb9c 100644
--- a/src/Handler/Course/List.hs
+++ b/src/Handler/Course/List.hs
@@ -135,6 +135,12 @@ makeCourseTable whereClause colChoices psValidator = do
                   user <- lecturerQuery (course E.^. CourseId) t
                   E.where_ $ E.any (E.hasInfix (user E.^. UserSurname) . E.val) (criterias :: Set.Set Text)
           )
+        -- , ( "openregistration", FilterColumn $ \(course `E.InnerJoin` _school) criterion -> case getLast (criterion :: Last Bool) of
+        --     Nothing     -> E.val True :: E.SqlExpr (E.Value Bool)
+        --     -- TODO: get current time??
+        --     Just True   -> (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.<=.) today) $ course E.^. CourseRegisterTo) E.&&. (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.>.) today) $ course E.^. CourseRegisterFrom)
+        --     _           -> E.val False :: E.SqlExpr (E.Value Bool)  -- TODO: rethink
+        --   )
         , ( "registered", FilterColumn $ \tExpr criterion -> case getLast (criterion :: Last Bool) of
               Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
               Just needle -> course2Registered muid tExpr E.==. E.val needle
@@ -151,6 +157,7 @@ makeCourseTable whereClause colChoices psValidator = do
       , 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 "search") mPrev $ aopt textField (fslI MsgCourseFilterSearch)
+      -- , Just  $ prismAForm (singletonFilter "openregistration" . maybePrism _PathPiece) mPrev $ aopt checkboxField (fslI MsgCourseRegisterOpen)
       , muid $> prismAForm (singletonFilter "registered" . maybePrism _PathPiece) mPrev (aopt boolField (fslI MsgCourseFilterRegistered))
       ]
     , dbtStyle = def
diff --git a/templates/table/course/course-teaser.hamlet b/templates/table/course/course-teaser.hamlet
index 183ac86f7..4ef13ef08 100644
--- a/templates/table/course/course-teaser.hamlet
+++ b/templates/table/course/course-teaser.hamlet
@@ -1,5 +1,4 @@
 <div uw-course-teaser :isRegistered:.course-teaser__registered tabindex='1'>
-  <div .course-teaser__chevron>
   <div .course-teaser__semester>
     <a href=@{TermCourseListR courseTerm}>_{courseSemester}
   <div .course-teaser__school-value>
@@ -22,5 +21,6 @@
     <div .course-teaser__duedate-value>^{formatTimeW SelFormatDateTime regTo}
   $nothing
   $maybe desc <- courseDescription
+    <div .course-teaser__chevron>
     <div .course-teaser__description>#{desc}
   $nothing