fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(lms): add error-call to renewal notification to allow compilation until i18nHamletFile works

Browse Source
This commit is contained in:
Steffen Jost 2022-04-25 12:57:24 +02:00
parent e0c429cd1e
commit 9fe564ee25
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Application.hs
View File

@ -145,6 +145,7 @@ import Handler.Participants
import Handler.StorageKey import Handler.StorageKey
import Handler.Error import Handler.Error
import Handler.Upload import Handler.Upload
import Handler.Qualification
import Handler.LMS import Handler.LMS
-- This line actually creates our YesodDispatch instance. It is the second half -- This line actually creates our YesodDispatch instance. It is the second half

2
src/Jobs/Handler/LMS.hs
View File

@ -103,7 +103,7 @@ dispatchJobLmsDequeue _qid =
-- wenn bestanden: qualification verlängern & LmsIdent löschen -- wenn bestanden: qualification verlängern & LmsIdent löschen
-- wenn durchgefallen: LmsIdent löschen -- wenn durchgefallen: LmsIdent löschen
-- wenn Zeit abgelaufen: LmsIdent löschen -- wenn Zeit abgelaufen: LmsIdent löschen
error "lms dequeue stub" error "TODO: lms dequeue stub"
dispatchJobLmsResults :: QualificationId -> JobHandler UniWorX dispatchJobLmsResults :: QualificationId -> JobHandler UniWorX
dispatchJobLmsResults qid = JobHandlerAtomic act dispatchJobLmsResults qid = JobHandlerAtomic act

9
src/Jobs/Handler/SendNotification/Qualification.hs
View File

@ -37,7 +37,7 @@ dispatchNotificationQualificationExpiry nQualification _nExpiry jRecipient = use
dispatchNotificationQualificationRenewal :: QualificationId -> UserId -> Handler () dispatchNotificationQualificationRenewal :: QualificationId -> UserId -> Handler ()
dispatchNotificationQualificationRenewal nQualification jRecipient = userMailT jRecipient $ do dispatchNotificationQualificationRenewal nQualification jRecipient = userMailT jRecipient $ do
(User{..}, Qualification{..}, Entity _ QualificationUser{..}) <- liftHandler . runDB $ (,,) (User{}, Qualification{..}, Entity _ QualificationUser{}) <- liftHandler . runDB $ (,,)
<$> getJust jRecipient <$> getJust jRecipient
<*> getJust nQualification <*> getJust nQualification
<*> getJustBy (UniqueQualificationUser nQualification jRecipient) <*> getJustBy (UniqueQualificationUser nQualification jRecipient)
@ -46,6 +46,9 @@ dispatchNotificationQualificationRenewal nQualification jRecipient = userMailT j
replaceMailHeader "Auto-Submitted" $ Just "auto-generated" replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
setSubjectI $ MsgMailSubjectQualificationRenewal qname setSubjectI $ MsgMailSubjectQualificationRenewal qname
-- editNotifications <- mkEditNotifications jRecipient -- TODO: add to hamlet file again _editNotifications <- mkEditNotifications jRecipient -- TODO: add to hamlet file again
addHtmlMarkdownAlternatives $(i18nHamletFile "qualification/renewal") --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")

2
src/Model.hs
View File

@ -49,7 +49,9 @@ deriving newtype instance FromJSONKey UserId
deriving newtype instance ToJSONKey ExamOccurrenceId deriving newtype instance ToJSONKey ExamOccurrenceId
deriving newtype instance FromJSONKey ExamOccurrenceId deriving newtype instance FromJSONKey ExamOccurrenceId
-- required Show instances for use of getByJust
deriving instance Show (Unique ExamPart) deriving instance Show (Unique ExamPart)
deriving instance Show (Unique QualificationUser)
-- ToMarkup and ToMessage instances for displaying selected database primary keys -- ToMarkup and ToMessage instances for displaying selected database primary keys