fix(letter): convenience links working again

This commit is contained in:
Steffen Jost 2024-06-26 15:07:19 +02:00
parent d4a0e1f201
commit 5f1af130ed

View File

@ -88,15 +88,16 @@ data LetterRenewQualification = LetterRenewQualification
-- this datatype is specific to this letter only, and just to avoid code duplication for derived data or constants -- this datatype is specific to this letter only, and just to avoid code duplication for derived data or constants
data LetterRenewQualificationData = LetterRenewQualificationData { lmsUrl, lmsUrlLogin, lmsIdent :: Text } data LetterRenewQualificationData = LetterRenewQualificationData { lmsUrl, lmsUrlLogin, lmsUrlPassword, lmsIdent :: Text }
deriving (Eq, Show) deriving (Eq, Show)
letterRenewalQualificationFData :: LetterRenewQualification -> LetterRenewQualificationData letterRenewalQualificationFData :: LetterRenewQualification -> LetterRenewQualificationData
letterRenewalQualificationFData LetterRenewQualification{lmsLogin} = LetterRenewQualificationData{..} letterRenewalQualificationFData LetterRenewQualification{lmsLogin, lmsPin} = LetterRenewQualificationData{..}
where where
lmsUrl = "drive.fraport.de" lmsUrl = "drive.fraport.de"
lmsUrlLogin = "https://" <> lmsUrl <> "/?login=" <> lmsIdent lmsUrlLogin = "https://" <> lmsUrl <> "/?username=" <> lmsIdent
lmsIdent = getLmsIdent lmsLogin lmsUrlPassword = lmsUrlLogin <> "&password=" <> lmsPin
lmsIdent = getLmsIdent lmsLogin
instance MDLetter LetterRenewQualification where instance MDLetter LetterRenewQualification where
@ -134,7 +135,7 @@ instance MDLetter LetterRenewQualification where
, toMeta "expiry" (format SelFormatDate qualExpiry) , toMeta "expiry" (format SelFormatDate qualExpiry)
, mbMeta "validduration" (show <$> qualDuration) , mbMeta "validduration" (show <$> qualDuration)
, toMeta "url-text" lmsUrl , toMeta "url-text" lmsUrl
, toMeta "url" lmsUrlLogin , toMeta "url" lmsUrlPassword -- ok for PDF, since it contains the PIN already
, toMeta "notice" $ defaultNotice lang qualName qualShort $ format SelFormatDate newExpire , toMeta "notice" $ defaultNotice lang qualName qualShort $ format SelFormatDate newExpire
, toMeta "de-subject" [st|Verlängerung Fahrberechtigung #{qualShort} (#{qualName})|] , toMeta "de-subject" [st|Verlängerung Fahrberechtigung #{qualShort} (#{qualName})|]
, toMeta "en-subject" [st|Renewal of driving licence #{qualShort} (#{qualName})|] , toMeta "en-subject" [st|Renewal of driving licence #{qualShort} (#{qualName})|]