From 8e1b9b9abae0c794ce12f10e5f75f410f903d927 Mon Sep 17 00:00:00 2001
From: Luca Maio <maio@cip.ifi.lmu.de>
Date: Tue, 8 Feb 2022 23:43:32 +0100
Subject: [PATCH] feat(courses): add search bars for shorthands and titles

---
 .../uniworx/categories/courses/courses/de-de-formal.msg   | 4 +++-
 messages/uniworx/categories/courses/courses/en-eu.msg     | 4 +++-
 src/Handler/Course/List.hs                                | 8 ++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/messages/uniworx/categories/courses/courses/de-de-formal.msg b/messages/uniworx/categories/courses/courses/de-de-formal.msg
index 2e1880882..9d844abc2 100644
--- a/messages/uniworx/categories/courses/courses/de-de-formal.msg
+++ b/messages/uniworx/categories/courses/courses/de-de-formal.msg
@@ -4,6 +4,8 @@ FilterTerm !ident-ok: Semester
 FilterCourseSchoolShort: Institut
 FilterRegistered: Angemeldet
 FilterCourseSearch: Volltext-Suche
+FilterCourseSearchShorthand: Kürzel-Suche
+FilterCourseSearchTitle: Titel-Suche
 FilterCourseRegistered: Registriert
 FilterCourseRegisterOpen: Anmeldung möglich
 FilterCourseAllocation: Zentralanmeldung
@@ -279,4 +281,4 @@ LecturerInvitationAccepted lType@Text csh@CourseShorthand: Sie wurden als #{lTyp
 CourseExamRegistrationTime: Angemeldet seit
 CourseParticipantStateIsActiveFilter: Ansicht
 CourseApply: Zum Kurs bewerben
-CourseAdministrator: Kursadministrator:in
\ No newline at end of file
+CourseAdministrator: Kursadministrator:in
diff --git a/messages/uniworx/categories/courses/courses/en-eu.msg b/messages/uniworx/categories/courses/courses/en-eu.msg
index c4eda4efc..93ebd52a5 100644
--- a/messages/uniworx/categories/courses/courses/en-eu.msg
+++ b/messages/uniworx/categories/courses/courses/en-eu.msg
@@ -4,6 +4,8 @@ FilterTerm: Semester
 FilterCourseSchoolShort: Department
 FilterRegistered: Enrolled
 FilterCourseSearch: Text search
+FilterCourseSearchShorthand: Shorthand search
+FilterCourseSearchTitle: Title search
 FilterCourseRegistered: Registered
 FilterCourseRegisterOpen: Enrolment is allowed
 FilterCourseAllocation: Central allocation
@@ -278,4 +280,4 @@ LecturerInvitationAccepted lType csh: You were registered as #{lType} for #{csh}
 CourseExamRegistrationTime: Registered since
 CourseParticipantStateIsActiveFilter: View
 CourseApply: Apply for course
-CourseAdministrator: Course administrator
\ No newline at end of file
+CourseAdministrator: Course administrator
diff --git a/src/Handler/Course/List.hs b/src/Handler/Course/List.hs
index 02c5f7b43..c7ea11753 100644
--- a/src/Handler/Course/List.hs
+++ b/src/Handler/Course/List.hs
@@ -253,6 +253,12 @@ makeCourseTable colChoices psValidator' = do
           Just needle -> (E.castString (course E.^. CourseName) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
                    E.||. (E.castString (course E.^. CourseShorthand) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
                    E.||. (E.maybe (E.val mempty) (E.castString . esqueletoMarkupOutput) (course E.^. CourseDescription) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
+      , singletonMap "search-shorthand" . FilterColumn $ \(view queryCourse -> course) criterion -> case getLast (criterion :: Last Text) of
+          Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
+          Just needle -> (E.castString (course E.^. CourseShorthand) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
+      , singletonMap "search-title" . FilterColumn $ \(view queryCourse -> course) criterion -> case getLast (criterion :: Last Text) of
+          Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
+          Just needle -> (E.castString (course E.^. CourseName) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
       , singletonMap "allocation" . FilterColumn $ \row (criteria :: Set AllocationSearch) -> if
           | Set.null criteria -> E.true
           | otherwise -> flip E.any criteria $ \case
@@ -267,6 +273,8 @@ makeCourseTable colChoices psValidator' = do
       , pure $ prismAForm (singletonFilter "schoolshort" . maybePrism (_PathPiece . from _SchoolId)) mPrev $ aopt (hoistField lift schoolField) (fslI MsgTableCourseSchool)
       , pure $ prismAForm (singletonFilter "lecturer") mPrev $ aopt textField (fslI MsgCourseLecturer)
       , pure $ prismAForm (singletonFilter "search") mPrev $ aopt textField (fslI MsgFilterCourseSearch)
+      , pure $ prismAForm (singletonFilter "search-shorthand") mPrev $ aopt textField (fslI MsgFilterCourseSearchShorthand)
+      , pure $ prismAForm (singletonFilter "search-title") mPrev $ aopt textField (fslI MsgFilterCourseSearchTitle)
       , pure $ prismAForm (singletonFilter "openregistration" . maybePrism _PathPiece) mPrev $ fmap (\x -> if isJust x && not (fromJust x) then Nothing else x) . aopt checkBoxField (fslI MsgFilterCourseRegisterOpen)
       , guardOn (is _Just muid)
              $ prismAForm (singletonFilter "registered" . maybePrism _PathPiece) mPrev (aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFilterCourseRegistered))