diff --git a/src/Application.hs b/src/Application.hs index b8c636ef8..f8fedf4f4 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -145,6 +145,7 @@ import Handler.Participants import Handler.StorageKey import Handler.Error import Handler.Upload +import Handler.Qualification import Handler.LMS -- This line actually creates our YesodDispatch instance. It is the second half diff --git a/src/Jobs/Handler/LMS.hs b/src/Jobs/Handler/LMS.hs index fff6a9d14..a3bf653fc 100644 --- a/src/Jobs/Handler/LMS.hs +++ b/src/Jobs/Handler/LMS.hs @@ -103,7 +103,7 @@ dispatchJobLmsDequeue _qid = -- wenn bestanden: qualification verlängern & LmsIdent löschen -- wenn durchgefallen: LmsIdent löschen -- wenn Zeit abgelaufen: LmsIdent löschen - error "lms dequeue stub" + error "TODO: lms dequeue stub" dispatchJobLmsResults :: QualificationId -> JobHandler UniWorX dispatchJobLmsResults qid = JobHandlerAtomic act diff --git a/src/Jobs/Handler/SendNotification/Qualification.hs b/src/Jobs/Handler/SendNotification/Qualification.hs index 10efb99c0..dfe145c8d 100644 --- a/src/Jobs/Handler/SendNotification/Qualification.hs +++ b/src/Jobs/Handler/SendNotification/Qualification.hs @@ -37,7 +37,7 @@ dispatchNotificationQualificationExpiry nQualification _nExpiry jRecipient = use dispatchNotificationQualificationRenewal :: QualificationId -> UserId -> Handler () dispatchNotificationQualificationRenewal nQualification jRecipient = userMailT jRecipient $ do - (User{..}, Qualification{..}, Entity _ QualificationUser{..}) <- liftHandler . runDB $ (,,) + (User{}, Qualification{..}, Entity _ QualificationUser{}) <- liftHandler . runDB $ (,,) <$> getJust jRecipient <*> getJust nQualification <*> getJustBy (UniqueQualificationUser nQualification jRecipient) @@ -46,6 +46,9 @@ dispatchNotificationQualificationRenewal nQualification jRecipient = userMailT j replaceMailHeader "Auto-Submitted" $ Just "auto-generated" setSubjectI $ MsgMailSubjectQualificationRenewal qname - -- editNotifications <- mkEditNotifications jRecipient -- TODO: add to hamlet file again - addHtmlMarkdownAlternatives $(i18nHamletFile "qualification/renewal") + _editNotifications <- mkEditNotifications jRecipient -- TODO: add to hamlet file again + --addHtmlMarkdownAlternatives $(i18nHamletFile "qualification/renewal") + -- TODO: this is just a dummy to continue while i18nHamletFile usage is unclear + error "TODO: QualificationRenewal notification no yet implemented" + -- addHtmlMarkdownAlternatives $(ihamletFile "templates/mail/qualificationExpiry.hamlet") \ No newline at end of file diff --git a/src/Model.hs b/src/Model.hs index 9c572b67a..17d96d08c 100644 --- a/src/Model.hs +++ b/src/Model.hs @@ -49,7 +49,9 @@ deriving newtype instance FromJSONKey UserId deriving newtype instance ToJSONKey ExamOccurrenceId deriving newtype instance FromJSONKey ExamOccurrenceId +-- required Show instances for use of getByJust deriving instance Show (Unique ExamPart) +deriving instance Show (Unique QualificationUser) -- ToMarkup and ToMessage instances for displaying selected database primary keys