From 2ceced4b64fac1f8f684531f49730938c0e234bd Mon Sep 17 00:00:00 2001 From: Sarah Vaupel <> Date: Mon, 9 Nov 2020 11:30:14 +0100 Subject: [PATCH] feat(schedule-opts): enhance course schedule opt messages --- messages/uniworx/de-de-formal.msg | 11 +++++++++++ messages/uniworx/en-eu.msg | 11 +++++++++++ src/Handler/Course/Schedule.hs | 6 +++--- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg index 5d7dd1695..32f8ba5fe 100644 --- a/messages/uniworx/de-de-formal.msg +++ b/messages/uniworx/de-de-formal.msg @@ -152,6 +152,17 @@ ScheduleOptDeleteSuccess: Terminabonnement erfolgreich zurückgesetzt ScheduleOptError: Termin konnte nicht (de)abonniert werden ScheduleOptDeleteError: Terminabonnement konnte nicht zurückgesetzt werden +CourseScheduleOptIn: Kurs abonnieren +CourseScheduleOptOut: Kurs deabonnieren +CourseScheduleOptDelete: Auf Standard zurücksetzen + +CourseScheduleOptInSuccess: Kurs erfolgreich abonniert +CourseScheduleOptOutSuccess: Kurs erfolgreich deabonniert +CourseScheduleOptDeleteSuccess: Kursabonnement erfolgreich zurückgesetzt + +CourseScheduleOptError: Kurs konnte nicht (de)abonniert werden +CourseScheduleOptDeleteError: Kursabonnement konnte nicht zurückgesetzt werden + ScheduleReset: Standard ScheduleTableHeadTime: Zeit diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg index b4f544598..a80e9eab3 100644 --- a/messages/uniworx/en-eu.msg +++ b/messages/uniworx/en-eu.msg @@ -153,6 +153,17 @@ ScheduleOptDeleteSuccess: Successfully reset occurrence subscription ScheduleOptError: An error occurred while subscribing to / unsubscribing from occurrence ScheduleOptDeleteError: An error occurred while resetting occurrence subscription +CourseScheduleOptIn: Subscribe to course +CourseScheduleOptOut: Unsubscribe from course +CourseScheduleOptDelete: Reset to default + +CourseScheduleOptInSuccess: Successfully subscribed to course +CourseScheduleOptOutSuccess: Successfully unsubscribed from course +CourseScheduleOptDeleteSuccess: Successfully reset course subscription + +CourseScheduleOptError: An error occurred while subscribing to / unsubscribing from course +CourseScheduleOptDeleteError: An error occurred while resetting course subscription + ScheduleReset: Default ScheduleTableHeadTime: Time diff --git a/src/Handler/Course/Schedule.hs b/src/Handler/Course/Schedule.hs index e809e74a4..271cc5a7e 100644 --- a/src/Handler/Course/Schedule.hs +++ b/src/Handler/Course/Schedule.hs @@ -23,8 +23,8 @@ postCScheduleOptSetR tid ssh csh opt = do return $ Just scheduleOpt case mResult of - Just (Entity _ CourseScheduleOpt{..}) -> addMessageI Success $ bool MsgScheduleOptOutSuccess MsgScheduleOptInSuccess courseScheduleOptOpt - Nothing -> addMessageI Error MsgScheduleOptError + Just (Entity _ CourseScheduleOpt{..}) -> addMessageI Success $ bool MsgCourseScheduleOptOutSuccess MsgCourseScheduleOptInSuccess courseScheduleOptOpt + Nothing -> addMessageI Error MsgCourseScheduleOptError redirect $ CourseR tid ssh csh CShowR @@ -37,5 +37,5 @@ postCScheduleOptDelR tid ssh csh = do cid <- MaybeT . getKeyBy $ TermSchoolCourseShort tid ssh csh lift . deleteBy $ UniqueCourseScheduleOpt cid uid - addMessageI Success MsgScheduleOptDeleteSuccess + addMessageI Success MsgCourseScheduleOptDeleteSuccess redirect $ CourseR tid ssh csh CShowR