From ecd7bec9aa36591854ee42e3feba3d8186f872b7 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Mon, 2 Mar 2020 10:18:39 +0100
Subject: [PATCH] feat(course-users): match filter titles with column titles

---
 messages/uniworx/de-de-formal.msg | 4 +++-
 messages/uniworx/en-eu.msg        | 6 +++++-
 src/Handler/Course/Users.hs       | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 832c31a53..3c6070379 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -158,7 +158,9 @@ CourseFilterNone: —
 BoolIrrelevant: —
 CourseDeleteQuestion: Wollen Sie den unten aufgeführten Kurs wirklich löschen?
 CourseDeleted: Kurs gelöscht
+CourseUserTutorial: Angemeldetes Tutorium
 CourseUserTutorials: Angemeldete Tutorien
+CourseUserExam: Angemeldete Prüfung
 CourseUserExams: Angemeldete Prüfungen
 CourseUserNote: Notiz
 CourseUserNoteTooltip: Nur für Verwalter dieses Kurses einsehbar
@@ -2375,4 +2377,4 @@ AllocationPrioritiesTitle tid@TermId ssh@SchoolId ash@AllocationShorthand: #{tid
 AllocationPrioritiesFile: CSV-Datei
 AllocationPrioritiesSunk num@Int64: Zentrale Prioritäten für #{num} Bewerber erfolgreich hinterlegt
 AllocationPrioritiesMissing num@Int64: Für #{num} Bewerber ist keine zentrale Priorität hinterlegt, da in der hochgeladenen CSV-Datei die #{pluralDE num "entsprechende Matrikelnummer" "entsprechenden Matrikelnummern"} nicht gefunden #{pluralDE num "wurde" "wurden"}
-AllocationMissingPrioritiesIgnored: Bewerber, für die keine zentrale Priorität angegeben wird, werden bei der Vergabe ignoriert!
\ No newline at end of file
+AllocationMissingPrioritiesIgnored: Bewerber, für die keine zentrale Priorität angegeben wird, werden bei der Vergabe ignoriert!
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index ec1f07c68..5195ea531 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -159,7 +159,9 @@ BoolIrrelevant: —
 CourseDeleteQuestion: Are you sure you want to delete the below-mentioned course?
 CourseDeleted: Course deleted
 CourseUserRegister: Enrol for course
+CourseUserTutorial: Registered tutorial
 CourseUserTutorials: Registered tutorials
+CourseUserExam: Registered exam
 CourseUserExams: Registered exams
 CourseUserNote: Note
 CourseUserNoteTooltip: Only visible to administrators of this course
@@ -2375,4 +2377,6 @@ AllocationPrioritiesTitle tid ssh ash: #{tid}-#{ssh}-#{ash}: Central priorities
 AllocationPrioritiesFile: CSV file
 AllocationPrioritiesSunk num: Successfully registered central priorities for #{num} #{pluralEN num "applicant" "applicants"}
 AllocationPrioritiesMissing num: Could not register central priorities for #{num} #{pluralEN num "applicant" "applicants"} because their matriculation was not found in the uploaded CSV file
-AllocationMissingPrioritiesIgnored: Applicants for whom no central priority has been registered will be ignored during assignment!
\ No newline at end of file
+AllocationMissingPrioritiesIgnored: Applicants for whom no central priority has been registered will be ignored during assignment!
+ParticipantsIntersectCourseOption tid@TermId ssh@SchoolId coursen@CourseName: #{tid} - #{ssh} - #{coursen}
+ParticipantsIntersectCourses: Courses
diff --git a/src/Handler/Course/Users.hs b/src/Handler/Course/Users.hs
index 3ed25eee1..4ed0c1c40 100644
--- a/src/Handler/Course/Users.hs
+++ b/src/Handler/Course/Users.hs
@@ -381,8 +381,8 @@ makeCourseUserTable cid acts restrict colChoices psValidator csvColumns = do
           [ fltrUserSexUI mPrev | showSex ] ++
           [ prismAForm (singletonFilter "degree")   mPrev $ aopt textField (fslI MsgStudyFeatureDegree)
           , prismAForm (singletonFilter "field")    mPrev $ aopt textField (fslI MsgCourseStudyFeature)
-          , prismAForm (singletonFilter "tutorial") mPrev $ aopt textField (fslI MsgCourseTutorial)
-          , prismAForm (singletonFilter "exam")     mPrev $ aopt textField (fslI MsgCourseExam)
+          , prismAForm (singletonFilter "tutorial") mPrev $ aopt textField (fslI MsgCourseUserTutorial)
+          , prismAForm (singletonFilter "exam")     mPrev $ aopt textField (fslI MsgCourseUserExam)
           ]
         dbtParams    = DBParamsForm
           { dbParamsFormMethod = POST