From fdce8dcf4534cdf4bdabffd539c95af88f11d39a Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Tue, 9 May 2023 10:07:20 +0200 Subject: [PATCH 1/2] chore(lms): reorder filter options as requested by AVN-AR --- src/Handler/LMS.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs index 1499ebb1d..defb1d531 100644 --- a/src/Handler/LMS.hs +++ b/src/Handler/LMS.hs @@ -452,12 +452,12 @@ mkLmsTable isAdmin (Entity qid quali) acts cols psValidator = do ) ] dbtFilterUI mPrev = mconcat - [ prismAForm (singletonFilter "lms-ident" . maybePrism _PathPiece) mPrev $ aopt (hoistField lift textField) (fslI MsgTableLmsIdent) - , fltrUserNameEmailHdrUI MsgLmsUser mPrev + [ fltrUserNameEmailHdrUI MsgLmsUser mPrev , prismAForm (singletonFilter "user-company") mPrev $ aopt textField (fslI MsgTableCompany) , prismAForm (singletonFilter "personal-number" ) mPrev $ aopt textField (fslI MsgCompanyPersonalNumber) , prismAForm (singletonFilter "avs-card" ) mPrev $ aopt textField (fslI MsgAvsCardNo) , prismAForm (singletonFilter "avs-number" ) mPrev $ aopt textField (fslI MsgAvsPersonNo) + , prismAForm (singletonFilter "lms-ident" . maybePrism _PathPiece) mPrev $ aopt (hoistField lift textField) (fslI MsgTableLmsIdent) , prismAForm (singletonFilter "validity" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFilterLmsValid) , prismAForm (singletonFilter "lms-notified" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFilterLmsNotified) -- , prismAForm (singletonFilter "lms-status" . maybePrism _PathPiece) mPrev $ aopt (selectField' (Just $ SomeMessage MsgTableNoFilter) $ return (optionsPairs [(MsgTableLmsSuccess,"success"::Text),(MsgTableLmsFailed,"blocked")])) (fslI MsgTableLmsStatus) From de241caf8df67b3178934be276d0c68d08c5f707 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Tue, 9 May 2023 15:11:12 +0200 Subject: [PATCH 2/2] chore(letter): fix some minor erroneous blanks in fraport_f_expiry.md --- templates/letter/fraport_f_expiry.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/letter/fraport_f_expiry.md b/templates/letter/fraport_f_expiry.md index 8df73e7ea..542eaf959 100644 --- a/templates/letter/fraport_f_expiry.md +++ b/templates/letter/fraport_f_expiry.md @@ -72,7 +72,7 @@ $licenceholder$ $endif$ darf $else$ - Sie dürfen + Sie dürfen $endif$ ab sofort keine Fahrzeuge mehr eigenständig auf dem Vorfeld des Frankfurter Flughafens führen. @@ -118,7 +118,7 @@ $if(licence-url)$ [$licenceholder$]($licence-url$) $else$ $licenceholder$ -$endif$ +$endif$ $else$ You $endif$