From 3be0cf95aac5b84ed1c85df5b81f932e4f7d30f4 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Tue, 28 Jun 2022 17:13:38 +0200 Subject: [PATCH] chore(printing): minor changes --- src/Handler/Admin/Apc.hs | 14 ++++++++++++++ src/Handler/Utils/Servant/Avs.hs | 2 +- templates/letter/din5008.latex | 2 +- templates/letter/fraport_renewal.md | 18 +++++++++--------- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/Handler/Admin/Apc.hs b/src/Handler/Admin/Apc.hs index bdf0ac790..540c28acb 100644 --- a/src/Handler/Admin/Apc.hs +++ b/src/Handler/Admin/Apc.hs @@ -11,7 +11,21 @@ import Import -- import Handler.Utils +{- +data MetaPinRenewal = MetaPinRenewal + { mppOpening + , mppClosing + , mppDate + , mppURL + , mppLogin + , mppPin + , mppRecipient :: Text + , mppAdress :: [Text] + , mppLang :: Text + , mppIsDe :: Bool + } +-} {- makePrintForm :: Maybe AvsPersonQuery -> Form AvsPersonQuery makeAvsPersonForm tmpl = identifyForm FIDAvsPersonQuery . validateForm validateAvsPersonQuery $ \html -> diff --git a/src/Handler/Utils/Servant/Avs.hs b/src/Handler/Utils/Servant/Avs.hs index 02479027a..7cea50128 100644 --- a/src/Handler/Utils/Servant/Avs.hs +++ b/src/Handler/Utils/Servant/Avs.hs @@ -87,7 +87,7 @@ runAvsPersonSearch qry = do case mbAvsConf of Nothing -> return $ Left "appAvsConfig is empty, i.e. invalid AVS configuration settings." Just avsConf -> do - -- TODO: consider using Servant.Client.Core.parseBaseUrl within Settings already at Startup! + -- TODO: consider using Servant.Client.Core.BaseUrl.Instances.parseBaseUrl' within Settings already at Startup! let avsServer = BaseUrl { baseUrlScheme = Https , baseUrlHost = avsHost avsConf diff --git a/templates/letter/din5008.latex b/templates/letter/din5008.latex index 6b40ab0c9..f4e271489 100644 --- a/templates/letter/din5008.latex +++ b/templates/letter/din5008.latex @@ -113,7 +113,7 @@ $endif$ \begin{letter}{% $for(address)$ $address$$sep$\\ - $endfor$ + $endfor$ } \opening{$opening$} diff --git a/templates/letter/fraport_renewal.md b/templates/letter/fraport_renewal.md index b62fa4527..daa9ed3f9 100644 --- a/templates/letter/fraport_renewal.md +++ b/templates/letter/fraport_renewal.md @@ -19,10 +19,10 @@ hyperrefoptions: hidelinks date: 11.11.1111 lang: de-de is-de: true -lms-login: 123456 -lms-pin: abcdef +login: 123456 +pin: abcdef # Emfpänger -name: E. M. Pfänger +recipient: E. M. Pfänger address: - Musterfirma GmbH - E. M. Pfänger @@ -42,15 +42,15 @@ URL Name: - : $name$ + : $recipient$ Login - : $lms-login$ + : $login$ Pin - : $lms-pin$ + : $pin$ Sobald die Frist abgelaufen ist, muss zur Wiedererlangung des Vorfeldführerscheins @@ -72,15 +72,15 @@ URL Name: - : $name$ + : $recipient$ Login - : $lms-login$ + : $login$ Pin - : $lms-pin$ + : $pin$ Should your apron driving licence expire before completing this