chore(letter): html expiry letter working

messages/uniworx/categories/print/de-de-formal.msg

@@ -22,3 +22,4 @@ PrintPDF !ident-ok: PDF
 PrintManualRenewal: Vorfeldführerschein Renewal-Brief testweise versenden
 PrintLmsUser: E‑Learning Id
 PrintJobs: Druckaufräge
+PrintLetterType: Brieftypkürzel

messages/uniworx/categories/print/en-eu.msg

@@ -22,3 +22,4 @@ PrintPDF: PDF
 PrintManualRenewal: Manual sending of an apron driver's licence renewal letter
 PrintLmsUser: E‑learning id
 PrintJobs: Print jobs
+PrintLetterType: Letter type shorthand

src/Handler/PrintCenter.hs

@@ -53,7 +53,7 @@ makeRenewalForm :: Maybe LRQF -> Form LRQF
 makeRenewalForm tmpl = identifyForm FIDLmsLetter . validateForm validateLetterRenewQualificationF $ \html -> do
   -- now_day <- utctDay <$> liftIO getCurrentTime
   flip (renderAForm FormStandard) html $ LRQF
-    <$> areq textField                  (fslI MsgLmsUser)                      (lrqfLetter <$> tmpl)
+    <$> areq textField                  (fslI MsgPrintLetterType)              (lrqfLetter <$> tmpl)
     <*> areq (userField False Nothing)  (fslI MsgLmsUser)                      (lrqfUser   <$> tmpl)
     <*> aopt (userField False Nothing)  (fslI MsgTableSupervisor)              (lrqfSuper  <$> tmpl)
     <*> areq qualificationFieldEnt      (fslI MsgQualificationName)            (lrqfQuali  <$> tmpl)
@@ -88,10 +88,11 @@ lrqf2letter LRQF{..}
           , qualDuration  = lrqfQuali ^. _qualificationValidDuration
           }
     return (fromMaybe usr rcvr, SomeLetter letter)
-  | lrqfLetter == "e" = do 
+  | lrqfLetter == "e" || lrqfLetter == "E" = do 
     rcvr    <- mapM getUser lrqfSuper
     usr     <-      getUser lrqfUser
     usrUuid <- encrypt $ entityKey usr
+    urender <- liftHandler getUrlRender
     let letter = LetterExpireQualificationF 
           { leqfHolderUUID  = usrUuid
           , leqfHolderID    = usr ^. _entityKey
@@ -102,6 +103,7 @@ lrqf2letter LRQF{..}
           , leqfName        = lrqfQuali ^. _qualificationName      . _CI
           , leqfShort       = lrqfQuali ^. _qualificationShorthand . _CI
           , leqfSchool      = lrqfQuali ^. _qualificationSchool          
+          , leqfUrl         = pure . urender $ ForProfileDataR usrUuid
           }
     return (fromMaybe usr rcvr, SomeLetter letter)
   | otherwise = error "Unknown Letter Type encountered. Use 'e' or 'r' only."
@@ -311,18 +313,26 @@ postPrintSendR = do
       def_lrqf = mkLetter <$> mbQual
 
   ((sendResult, sendWidget), sendEnctype) <- runFormPost $ makeRenewalForm def_lrqf
-  let procFormSend lrqf = do
+  let procFormSend lrqf = case lrqfLetter lrqf of 
-        ok <- (runDB (lrqf2letter lrqf) >>= printLetter (Just uid)) >>= \case
+        "E" -> (runDB (lrqf2letter lrqf) >>= printHtml (Just uid)) >>= \case
-          Left err -> do
+            Right html -> sendResponse $ toTypedContent html
-            let msg = "PDF printing failed with error: " <> err
+            Left err -> do
-            $logErrorS "LPR" msg
+              let msg = "PDF printing failed with error: " <> err
-            addMessage Error $ toHtml msg
+              $logErrorS "LPR" msg
-            pure False
+              addMessage Error $ toHtml msg
-          Right (ok, fpath) -> do
+              pure ()
-            let response = if null ok then mempty else  " Response: " <> ok
+        _ -> do 
-            addMessage Success $ toHtml $ "Druckauftrag angelegt: " <> pack fpath <> response
+            ok <- (runDB (lrqf2letter lrqf) >>= printLetter (Just uid)) >>= \case
-            pure True
+              Left err -> do
-        when ok $ redirect PrintCenterR
+                let msg = "PDF printing failed with error: " <> err
+                $logErrorS "LPR" msg
+                addMessage Error $ toHtml msg
+                pure False
+              Right (ok, fpath) -> do
+                let response = if null ok then mempty else  " Response: " <> ok
+                addMessage Success $ toHtml $ "Druckauftrag angelegt: " <> pack fpath <> response
+                pure True
+            when ok $ redirect PrintCenterR
   formResult sendResult procFormSend
   -- actionUrl <- fromMaybe AdminAvsR <$> getCurrentRoute
   siteLayoutMsg MsgPrintManualRenewal $ do

src/Utils/Print.hs

@@ -9,6 +9,7 @@ module Utils.Print
   , renderLetters
   , sendEmailOrLetter   -- directly print or sends by email
   , printLetter         -- always send a letter
+  , printHtml           -- return letter as Html only
   , letterApcIdent      -- create acknowledge string for APC
   , letterFileName      -- default filename
   , encryptPDF
@@ -165,24 +166,29 @@ renderLetterPDF rcvrEnt@Entity{entityVal=rcvr} mdl apcIdent = do
   actRight e_md $ pdfLaTeX kind
 
 
--- renderLetterHtml :: (MDLetter l) => Entity User -> l -> Text -> Handler (Either Text Html)
+renderLetterHtml :: (MDLetter l) => Entity User -> l -> Text -> Handler (Either Text Html)
--- renderLetterHtml rcvrEnt@Entity{entityVal=rcvr} mdl apcIdent = do
+renderLetterHtml rcvrEnt@Entity{entityVal=rcvr} mdl apcIdent = do
---   now <- liftIO getCurrentTime  
+    now <- liftIO getCurrentTime  
---   formatter@DateTimeFormatter{ format } <- getDateTimeFormatterUser' rcvr
+    formatter@DateTimeFormatter{ format } <- getDateTimeFormatterUser' rcvr
---   let lang = selectDeEn $ rcvr & userLanguages   -- select either German or English only, default de; see Utils.Lang
+    let lang = selectDeEn $ rcvr & userLanguages   -- select either German or English only, default de; see Utils.Lang
---       kind = getLetterKind        mdl
+        kind = getLetterKind        mdl
---       tmpl = getTemplate          mdl
+        tmpl = getTemplate          mdl
---       meta = addApcIdent apcIdent
+        meta = addApcIdent apcIdent
---           <> letterMeta mdl formatter lang rcvrEnt
+            <> letterMeta mdl formatter lang rcvrEnt
---           <> mkMeta
+            <> mkMeta
---             [ -- toMeta "lang" lang -- receiver language is decided in MDLetter instance, since some letters have fixed languages
+              [ -- toMeta "lang" lang -- receiver language is decided in MDLetter instance, since some letters have fixed languages
---               toMeta "date"       $ format SelFormatDate now
+                toMeta "date"       $ format SelFormatDate now
---             , toMeta "rcvr-name"  $ rcvr & userDisplayName
+              , toMeta "rcvr-name"  $ rcvr & userDisplayName
---             , toMeta "address"    $ fromMaybe [rcvr & userDisplayName] $ getPostalAddress rcvr
+              , toMeta "address"    $ fromMaybe [rcvr & userDisplayName] $ getPostalAddress rcvr
---             --, toMeta "rcvr-email"    $ rcvr & userDisplayEmail -- note that some templates use "email" already otherwise
+              --, toMeta "rcvr-email"    $ rcvr & userDisplayEmail -- note that some templates use "email" already otherwise
---             ]
+              ]
---   e_md <- mdTemplating tmpl meta
+    e_md <- mdTemplating tmpl meta
---   actRight e_md $ pdfLaTeX kind
+    actRight e_md $ \md -> pure . over _Left P.renderError . P.runPure $ do   
+      html_tmpl <- compileTemplate $ templateHtml kind
+      -- html_tmpl <- ExceptT $ memcachedBy (Just . Right $ 6 * diffHour) ("LetterKind-Html: \n" <> tshow lk) (pure . over _Left P.renderError . P.runPure $ compileTemplate $ templateHtml lk)
+      let writerOpts  = def { P.writerExtensions = P.pandocExtensions
+                            , P.writerTemplate   = Just html_tmpl }
+      P.writeHtml5 writerOpts $ appMeta setIsDeFromLang md
 
 -- TODO: apcIdent does not make sense for multiple letters 
 renderLetters :: (MDLetter l, Foldable f) => Entity User -> f l -> Text -> Handler (Either Text LBS.ByteString)
@@ -220,6 +226,15 @@ renderLetters rcvrEnt@Entity{entityVal=rcvr} mdls apcIdent
 -- PrintJobs --
 ---------------
 
+-- Only used in print-test-handler for PrintSendR
+printHtml ::  (MDLetter l) => Maybe UserId -> (Entity User, l) -> Handler (Either Text Html)
+printHtml _senderId (rcvr, letter) = do
+  let rcvrId = rcvr ^. _entityKey
+  encRecipient :: CryptoUUIDUser <- encrypt rcvrId
+  now <- liftIO getCurrentTime
+  apcIdent <- letterApcIdent letter encRecipient now
+  renderLetterHtml rcvr letter apcIdent
+  
 -- Only used in print-test-handler for PrintSendR
 printLetter :: (MDLetter l) => Maybe UserId -> (Entity User, l) -> Handler (Either Text (Text, FilePath))
 printLetter senderId (rcvr, letter) = do
@@ -284,6 +299,15 @@ sendEmailOrLetter recipient letter = do
   oks <- forM receivers $ \rcvrEnt@Entity{ entityKey = svr, entityVal = rcvrUsr } -> do
     encRecipient :: CryptoUUIDUser <- encrypt svr
     apcIdent <- letterApcIdent letter encRecipient now
+    -- case getPostalPreferenceAndAddress rcvrUsr of 
+    --   (True, Nothing) -> do -- neither email nor postal is known
+    --     let msg = "Notification failed for " <> tshow encRecipient <> ", who has neither a known email nor postal address. Notification: " <> tshow pjid
+    --     $logErrorS "LETTER" msg
+    --     return False
+    --      
+    --   (False, _) -> do -- send Email
+    --     if attachPDFLetter 
+    --
     let (preferPost, postal) = getPostalPreferenceAndAddress rcvrUsr
     -- mailBody <- getMailBody letter formatter
     renderLetterPDF rcvrEnt letter apcIdent >>= \case

src/Utils/Print/ExpireQualification.hs

@@ -29,6 +29,7 @@ data LetterExpireQualificationF = LetterExpireQualificationF
     , leqfName      :: Text             
     , leqfShort     :: Text             
     , leqfSchool    :: SchoolId
+    , leqfUrl       :: Maybe Text   
     }
   deriving (Eq, Show)
 
@@ -53,6 +54,7 @@ instance MDMail LetterExpireQualificationF where
      -- [shamlet|#Ansprache #{html}|] um Html umzuwandeln!
      -- 
 
+
 instance MDLetter LetterExpireQualificationF where  
   encryptPDFfor     _ = NoPassword
   getLetterKind     _ = Din5008
@@ -70,6 +72,7 @@ instance MDLetter LetterExpireQualificationF where
       [ toMeta "lang"           lang
       , toMeta "licenceholder"  leqfHolderDN
       , mbMeta "expiry"         (format SelFormatDate <$> leqfExpiry)      
+      , mbMeta "licence-url"    leqfUrl
       ] 
 
   getPJId LetterExpireQualificationF{..} =

src/Utils/Print/Letters.hs

@@ -152,6 +152,9 @@ paperKind Plain     = "a4wht"   -- Ohne Logo
 paperKind Din5008   = "a4log"   -- Mit Logo
 paperKind PlainLogo = "a4log"
 
+templateHtml :: LetterKind -> Text
+-- templateHtml Din5008 = decodeUtf8 $(Data.FileEmbed.embedFile "templates/letter/generic_template.html")
+templateHtml _ = decodeUtf8 $(Data.FileEmbed.embedFile "templates/letter/generic_template.html")
 
 
 ---------------

templates/letter/fraport_f_expiry.md

@@ -65,7 +65,12 @@ nicht mehr gültig.
 
 
 $if(supervisor)$
-$licenceholder$ darf 
+$if(licence-url)$
+[$licenceholder$]($licence-url$) 
+$else$
+$licenceholder$ 
+$endif$
+darf 
 $else$
   Sie dürfen
 $endif$
@@ -83,7 +88,7 @@ Telefon
 
 Email
   
-  : $email$
+  : [$email$](mailto:$email$)
 
 $else$
 Hierfür wenden Sie sich bitte an Ihren Arbeitgeber.
@@ -109,7 +114,11 @@ $else$
 $endif$ 
 
 $if(supervisor)$
-  $licenceholder$
+$if(licence-url)$
+[$licenceholder$]($licence-url$) 
+$else$
+$licenceholder$ 
+$endif$  
 $else$
   You
 $endif$
@@ -128,7 +137,7 @@ Phone
 
 Email
   
-  : $email$
+  : [$email$](mailto:$email$)
 
 $else$
 Please contact your employer to book a course for you.

templates/letter/generic_template.html

@@ -4,26 +4,259 @@
 <head>
   <meta charset=\"utf-8\" />
   <meta name=\"generator\" content=\"pandoc\" />
-  <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, user-scalable=yes\" /> $for(author-meta)$
+  <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, user-scalable=yes\" /> 
-  <meta name=\"author\" content=\"$author-meta$\" /> $endfor$ $if(date-meta)$
+  $for(author-meta)$ <meta name=\"author\" content=\"$author-meta$\" /> $endfor$ 
-  <meta name=\"dcterms.date\" content=\"$date-meta$\" /> $endif$ $if(keywords)$
+  $if(date-meta)$ <meta name=\"dcterms.date\" content=\"$date-meta$\" /> $endif$ 
-  <meta name=\"keywords\" content=\"$for(keywords)$$keywords$$sep$, $endfor$\" /> $endif$ <title>
+  $if(keywords)$ <meta name=\"keywords\" content=\"$for(keywords)$$keywords$$sep$, $endfor$\" /> 
-    $if(title-prefix)$$title-prefix$ \8211 $endif$$pagetitle$</title>
+  $endif$ 
+  <title>$if(title-prefix)$$title-prefix$ \8211 $endif$$pagetitle$</title>
   <style>
-    $styles.html()$
+    $if(document-css)$
-  </style> $for(css)$
+html {
-  <link rel=\"stylesheet\" href=\"$css$\" /> $endfor$ $if(math)$ $math$ $endif$
+$if(mainfont)$
+  font-family: $mainfont$;
+$endif$
+$if(fontsize)$
+  font-size: $fontsize$;
+$endif$
+$if(linestretch)$
+  line-height: $linestretch$;
+$endif$
+  color: $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+  background-color: $if(backgroundcolor)$$backgroundcolor$$else$#fdfdfd$endif$;
+}
+body {
+  margin: 0 auto;
+  max-width: $if(maxwidth)$$maxwidth$$else$36em$endif$;
+  padding-left: $if(margin-left)$$margin-left$$else$50px$endif$;
+  padding-right: $if(margin-right)$$margin-right$$else$50px$endif$;
+  padding-top: $if(margin-top)$$margin-top$$else$50px$endif$;
+  padding-bottom: $if(margin-bottom)$$margin-bottom$$else$50px$endif$;
+  hyphens: auto;
+  overflow-wrap: break-word;
+  text-rendering: optimizeLegibility;
+  font-kerning: normal;
+}
+@media (max-width: 600px) {
+  body {
+    font-size: 0.9em;
+    padding: 12px;
+  }
+  h1 {
+    font-size: 1.8em;
+  }
+}
+@media print {
+  html {
+    background-color: $if(backgroundcolor)$$backgroundcolor$$else$white$endif$;
+  }
+  body {
+    background-color: transparent;
+    color: black;
+    font-size: 12pt;
+  }
+  p, h2, h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2, h3, h4 {
+    page-break-after: avoid;
+  }
+}
+p {
+  margin: 1em 0;
+}
+a {
+  color: $if(linkcolor)$$linkcolor$$else$#1a1a1a$endif$;
+}
+a:visited {
+  color: $if(linkcolor)$$linkcolor$$else$#1a1a1a$endif$;
+}
+img {
+  max-width: 100%;
+}
+h1, h2, h3, h4, h5, h6 {
+  margin-top: 1.4em;
+}
+h5, h6 {
+  font-size: 1em;
+  font-style: italic;
+}
+h6 {
+  font-weight: normal;
+}
+ol, ul {
+  padding-left: 1.7em;
+  margin-top: 1em;
+}
+li > ol, li > ul {
+  margin-top: 0;
+}
+blockquote {
+  margin: 1em 0 1em 1.7em;
+  padding-left: 1em;
+  border-left: 2px solid #e6e6e6;
+  color: #606060;
+}
+$if(abstract)$
+div.abstract {
+  margin: 2em 2em 2em 2em;
+  text-align: left;
+  font-size: 85%;
+}
+div.abstract-title {
+  font-weight: bold;
+  text-align: center;
+  padding: 0;
+  margin-bottom: 0.5em;
+}
+$endif$
+code {
+  font-family: $if(monofont)$$monofont$$else$Menlo, Monaco, Consolas, 'Lucida Console', monospace$endif$;
+$if(monobackgroundcolor)$
+  background-color: $monobackgroundcolor$;
+  padding: .2em .4em;
+$endif$
+  font-size: 85%;
+  margin: 0;
+  hyphens: manual;
+}
+pre {
+  margin: 1em 0;
+$if(monobackgroundcolor)$
+  background-color: $monobackgroundcolor$;
+  padding: 1em;
+$endif$
+  overflow: auto;
+}
+pre code {
+  padding: 0;
+  overflow: visible;
+  overflow-wrap: normal;
+}
+.sourceCode {
+ background-color: transparent;
+ overflow: visible;
+}
+hr {
+  background-color: #1a1a1a;
+  border: none;
+  height: 1px;
+  margin: 1em 0;
+}
+table {
+  margin: 1em 0;
+  border-collapse: collapse;
+  width: 100%;
+  overflow-x: auto;
+  display: block;
+  font-variant-numeric: lining-nums tabular-nums;
+}
+table caption {
+  margin-bottom: 0.75em;
+}
+tbody {
+  margin-top: 0.5em;
+  border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+  border-bottom: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+}
+th {
+  border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+  padding: 0.25em 0.5em 0.25em 0.5em;
+}
+td {
+  padding: 0.125em 0.5em 0.25em 0.5em;
+}
+header {
+  margin-bottom: 4em;
+  text-align: center;
+}
+#TOC li {
+  list-style: none;
+}
+#TOC ul {
+  padding-left: 1.3em;
+}
+#TOC > ul {
+  padding-left: 0;
+}
+#TOC a:not(:hover) {
+  text-decoration: none;
+}
+$endif$
+code{white-space: pre-wrap;}
+span.smallcaps{font-variant: small-caps;}
+div.columns{display: flex; gap: min(4vw, 1.5em);}
+div.column{flex: auto; overflow-x: auto;}
+div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+/* The extra [class] is a hack that increases specificity enough to
+   override a similar rule in reveal.js */
+ul.task-list[class]{list-style: none;}
+ul.task-list li input[type="checkbox"] {
+  font-size: inherit;
+  width: 0.8em;
+  margin: 0 0.8em 0.2em -1.6em;
+  vertical-align: middle;
+}
+$if(quotes)$
+q { quotes: "“" "”" "‘" "’"; }
+$endif$
+$if(displaymath-css)$
+.display.math{display: block; text-align: center; margin: 0.5rem auto;}
+$endif$
+$if(highlighting-css)$
+/* CSS for syntax highlighting */
+$highlighting-css$
+$endif$
+$if(csl-css)$
+/* CSS for citations */
+div.csl-bib-body { }
+div.csl-entry {
+  clear: both;
+$if(csl-entry-spacing)$
+  margin-bottom: $csl-entry-spacing$;
+$endif$
+}
+.hanging-indent div.csl-entry {
+  margin-left:2em;
+  text-indent:-2em;
+}
+div.csl-left-margin {
+  min-width:2em;
+  float:left;
+}
+div.csl-right-inline {
+  margin-left:2em;
+  padding-left:1em;
+}
+div.csl-indent {
+  margin-left: 2em;
+}
+$endif$
+  </style> 
+  $for(css)$ <link rel=\"stylesheet\" href=\"$css$\" /> $endfor$ 
+  $if(math)$ $math$ $endif$
   <!--[if lt IE 9]>     <script src=\"//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js\"></script>   <![endif]-->
-  $for(header-includes)$
+  $for(header-includes)$ $header-includes$ $endfor$
-  $header-includes$ $endfor$
 </head>
 
-<body> $for(include-before)$ $include-before$ $endfor$ $if(title)$ <header id=\"title-block-header\">
+<body> 
+  $for(include-before)$ $include-before$ $endfor$ 
+  $if(title)$ <header id=\"title-block-header\">
     <h1 class=\"title\">$title$</h1> $if(subtitle)$ <p class=\"subtitle\">$subtitle$</p> $endif$ $for(author)$ <p
       class=\"author\">$author$</p> $endfor$ $if(date)$ <p class=\"date\">$date$</p> $endif$
-  </header>
+    </header>
-  $endif$ $if(toc)$ <nav id=\"$idprefix$TOC\" role=\"doc-toc\"> $if(toc-title)$ <h2 id=\"$idprefix$toc-title\">
+  $endif$ 
-      $toc-title$</h2> $endif$ $table-of-contents$ </nav>
+  $if(toc)$ <nav id=\"$idprefix$TOC\" role=\"doc-toc\"> 
-  $endif$ $body$ $for(include-after)$ $include-after$ $endfor$ </body>
+    $if(toc-title)$ <h2 id=\"$idprefix$toc-title\"> $toc-title$</h2> $endif$ 
+    $table-of-contents$ </nav>
+  $endif$ 
+  
+  $if(is-de)$ $de-opening$ $else$ $en-opening$ $endif$
+  $body$ 
+  $if(is-de)$ $de-closing$ $else$ $en-closing$ $endif$
+  
+  $for(include-after)$ $include-after$ $endfor$ 
+</body>
 
 </html>