diff --git a/src/Utils/Print/RenewQualification.hs b/src/Utils/Print/RenewQualification.hs index 795470218..749a1caa9 100644 --- a/src/Utils/Print/RenewQualification.hs +++ b/src/Utils/Print/RenewQualification.hs @@ -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 -data LetterRenewQualificationData = LetterRenewQualificationData { lmsUrl, lmsUrlLogin, lmsIdent :: Text } +data LetterRenewQualificationData = LetterRenewQualificationData { lmsUrl, lmsUrlLogin, lmsUrlPassword, lmsIdent :: Text } deriving (Eq, Show) letterRenewalQualificationFData :: LetterRenewQualification -> LetterRenewQualificationData -letterRenewalQualificationFData LetterRenewQualification{lmsLogin} = LetterRenewQualificationData{..} +letterRenewalQualificationFData LetterRenewQualification{lmsLogin, lmsPin} = LetterRenewQualificationData{..} where - lmsUrl = "drive.fraport.de" - lmsUrlLogin = "https://" <> lmsUrl <> "/?login=" <> lmsIdent - lmsIdent = getLmsIdent lmsLogin + lmsUrl = "drive.fraport.de" + lmsUrlLogin = "https://" <> lmsUrl <> "/?username=" <> lmsIdent + lmsUrlPassword = lmsUrlLogin <> "&password=" <> lmsPin + lmsIdent = getLmsIdent lmsLogin instance MDLetter LetterRenewQualification where @@ -134,7 +135,7 @@ instance MDLetter LetterRenewQualification where , toMeta "expiry" (format SelFormatDate qualExpiry) , mbMeta "validduration" (show <$> qualDuration) , 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 "de-subject" [st|Verlängerung Fahrberechtigung „#{qualShort}“ (#{qualName})|] , toMeta "en-subject" [st|Renewal of driving licence „#{qualShort}“ (#{qualName})|]