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

chore(lms): fix convenience link formatting in lms mails and pdf

Browse Source
This commit is contained in:
Steffen Jost 2022-09-15 15:42:27 +02:00
parent 17f760a522
commit 4d375e7680
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,7 @@ dispatchNotificationQualificationRenewal nQualification jRecipient = do
expiryDate <- formatTimeUser SelFormatDate qualificationUserValidUntil $ Just entRecipient expiryDate <- formatTimeUser SelFormatDate qualificationUserValidUntil $ Just entRecipient
let printJobName = "RenewalPin" let printJobName = "RenewalPin"
lmsUrl = "https://drive.fraport.de"
prepAddress upa = userDisplayName : (upa & html2textlines) -- TODO: use supervisor's address prepAddress upa = userDisplayName : (upa & html2textlines) -- TODO: use supervisor's address
lmsIdent = lmsUserIdent & getLmsIdent lmsIdent = lmsUserIdent & getLmsIdent
pdfMeta = mkMeta pdfMeta = mkMeta
@ -77,7 +78,8 @@ dispatchNotificationQualificationRenewal nQualification jRecipient = do
, mbMeta "address" (prepAddress <$> userPostAddress) , mbMeta "address" (prepAddress <$> userPostAddress)
, toMeta "expiry" expiryDate , toMeta "expiry" expiryDate
, mbMeta "validduration" (show <$> qualificationValidDuration) , mbMeta "validduration" (show <$> qualificationValidDuration)
, toMeta "url" ("[https://drive.fraport.de](https://drive.fraport.de/?login=" <> lmsIdent <> ")") , toMeta "url-text" lmsUrl
, toMeta "url" (lmsUrl <> "/?login=" <> lmsIdent)
] ]
pdfRenewal pdfMeta >>= \case pdfRenewal pdfMeta >>= \case
Left err -> do Left err -> do

7
templates/letter/fraport_renewal.md
View File

@ -21,7 +21,8 @@ encludes:
hyperrefoptions: hidelinks hyperrefoptions: hidelinks
### Metadaten, welche automatisch ersetzt werden: ### Metadaten, welche automatisch ersetzt werden:
url: <https://drive.fraport.de> url-text: 'https://drive.fraport.de'
url: 'https://drive.fraport.de'
date: 11.11.1111 date: 11.11.1111
expiry: 00.00.0000 expiry: 00.00.0000
lang: de-de lang: de-de
@ -66,7 +67,7 @@ Prüfling
URL URL
: $url$ : [$url-text$]($url$)
Sobald die Frist abgelaufen ist, muss zur Wiedererlangung des Vorfeldführerscheins Sobald die Frist abgelaufen ist, muss zur Wiedererlangung des Vorfeldführerscheins
@ -93,7 +94,7 @@ Examinee
URL URL
: $url$ :[$url-text$]($url$)
Should your apron driving licence expire before completing this Should your apron driving licence expire before completing this

2
templates/mail/userAuthModeUpdate.hamlet
View File

@ -27,7 +27,7 @@ $newline never
$if is _AuthPWHash userAuthentication $if is _AuthPWHash userAuthentication
<p> <p>
_{SomeMessage MsgAuthPWHashTip} _{SomeMessage MsgAuthPWHashTip}
<dd> <dl>
<dt> <dt>
_{SomeMessage MsgPWHashIdent} _{SomeMessage MsgPWHashIdent}
<dd .email> <dd .email>