From 318c403b34baaaf0ac73acef498d0d1af19e44d7 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 13 May 2022 16:33:02 +0200 Subject: [PATCH] chore(pdf): add pdflatex depency; also merge minor stuff --- nix/docker/default.nix | 1 + .../Handler/SendNotification/Qualification.hs | 32 +++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/nix/docker/default.nix b/nix/docker/default.nix index f03f950ea..8cefccbe8 100644 --- a/nix/docker/default.nix +++ b/nix/docker/default.nix @@ -23,6 +23,7 @@ let prev.dockerTools.binSh findutils coreutils cups # needed for interface with print center # texlive.combined.scheme-medium # Causes container to be too large! However, might be needed by the pandoc library to produce PDFs, but nix ought to include the necessary parts already + texlive.combined.scheme-basic # for PDFLaTeX for pandoc PDF creation # pandoc # just for manual testing within the pod, remove for production, since we use the library instead! curl wget netcat # just for manual testing within the pod, remove for production! openldap # just for manual testing within the pod, remove for production! diff --git a/src/Jobs/Handler/SendNotification/Qualification.hs b/src/Jobs/Handler/SendNotification/Qualification.hs index 8891f4c69..124dfb676 100644 --- a/src/Jobs/Handler/SendNotification/Qualification.hs +++ b/src/Jobs/Handler/SendNotification/Qualification.hs @@ -35,19 +35,31 @@ dispatchNotificationQualificationExpiry nQualification _nExpiry jRecipient = use addHtmlMarkdownAlternatives $(ihamletFile "templates/mail/qualificationExpiry.hamlet") +checkEmailOk :: a -> Bool +checkEmailOk = const True -- TODO + + dispatchNotificationQualificationRenewal :: QualificationId -> UserId -> Handler () -dispatchNotificationQualificationRenewal nQualification jRecipient = userMailT jRecipient $ do - (User{..}, Qualification{..}, Entity _ QualificationUser{..}) <- liftHandler . runDB $ (,,) +dispatchNotificationQualificationRenewal nQualification jRecipient = do + (User{..}, Qualification{..}, Entity _ QualificationUser{..}) <- runDB $ (,,) <$> getJust jRecipient <*> getJust nQualification <*> getJustBy (UniqueQualificationUser nQualification jRecipient) + let qname = CI.original qualificationName + _content = $(i18nWidgetFile "qualification/renewal") + if | checkEmailOk userEmail -> userMailT jRecipient $ do + + replaceMailHeader "Auto-Submitted" $ Just "auto-generated" + setSubjectI $ MsgMailSubjectQualificationRenewal qname + + editNotifications <- mkEditNotifications jRecipient -- TODO: add to hamlet file again + -- addHtmlMarkdownAlternatives $(i18nWidgetFile "qualification/renewal") + -- TODO: this is just a dummy to continue while i18nHamletFile usage is unclear + addHtmlMarkdownAlternatives $(ihamletFile "templates/mail/qualificationRenewal.hamlet") + + | otherwise -> do + let _letterHead = error "TODO" + -- makePDF "pdflatex" [] writer woptions pandoc + error "TODO" - let qname = CI.original qualificationName - replaceMailHeader "Auto-Submitted" $ Just "auto-generated" - setSubjectI $ MsgMailSubjectQualificationRenewal qname - - 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 - addHtmlMarkdownAlternatives $(ihamletFile "templates/mail/qualificationRenewal.hamlet") \ No newline at end of file