From f617d067f3b410b42748d64780c4e8dee9b90c25 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 5 May 2023 15:43:09 +0000 Subject: [PATCH] chore(avscard): fix filtering leading zeroes --- src/Model/Types/Avs.hs | 6 +++--- templates/letter/generic_template.html | 29 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 templates/letter/generic_template.html diff --git a/src/Model/Types/Avs.hs b/src/Model/Types/Avs.hs index a12980ed6..f1937c736 100644 --- a/src/Model/Types/Avs.hs +++ b/src/Model/Types/Avs.hs @@ -138,7 +138,7 @@ instance {-# OVERLAPS #-} Canonical (Maybe AvsInternalPersonalNo) where -- where x is an 8 digit AvsCardNo prefixed by zeros, see normalizeAvsCardNo -- and y is the 1 digit AvsVersionNo type AvsVersionNo = Text -- always 1 digit -newtype AvsCardNo = AvsCardNo { avsCardNo :: Text } -- always 8 digits +newtype AvsCardNo = AvsCardNo { avsCardNo :: Text } -- always 8 digits -- TODO: Create Smart Constructor deriving (Eq, Ord, Show, Generic) deriving newtype (NFData, PathPiece, Csv.ToField, Csv.FromField) -- No longer needed: @@ -162,7 +162,7 @@ data AvsFullCardNo = AvsFullCardNo { avsFullCardNo :: AvsCardNo, avsFullCardVers deriving (Eq, Ord, Generic, NFData) tshowAvsFullCardNo :: AvsFullCardNo -> Text -tshowAvsFullCardNo AvsFullCardNo{..} = avsCardNo avsFullCardNo <> Text.cons '.' avsFullCardVersion +tshowAvsFullCardNo AvsFullCardNo{..} = avsCardNo (canonical avsFullCardNo) <> Text.cons '.' avsFullCardVersion instance Show AvsFullCardNo where show = Text.unpack . tshowAvsFullCardNo @@ -170,7 +170,7 @@ instance Show AvsFullCardNo where readAvsFullCardNo :: Text -> Maybe AvsFullCardNo readAvsFullCardNo (Text.span Char.isDigit -> (c, Text.uncons -> Just ('.',v))) | not $ Text.null c, Just (Char.isDigit -> True, "") <- Text.uncons v - = Just $ AvsFullCardNo (AvsCardNo c) v + = Just $ AvsFullCardNo (AvsCardNo $ normalizeAvsCardNo c) v readAvsFullCardNo _ = Nothing instance PersistField AvsFullCardNo where diff --git a/templates/letter/generic_template.html b/templates/letter/generic_template.html new file mode 100644 index 000000000..f3183bebf --- /dev/null +++ b/templates/letter/generic_template.html @@ -0,0 +1,29 @@ + + + + + + + $for(author-meta)$ + $endfor$ $if(date-meta)$ + $endif$ $if(keywords)$ + $endif$ + $if(title-prefix)$$title-prefix$ \8211 $endif$$pagetitle$ + $for(css)$ + $endfor$ $if(math)$ $math$ $endif$ + + $for(header-includes)$ + $header-includes$ $endfor$ + + + $for(include-before)$ $include-before$ $endfor$ $if(title)$
+

$title$

$if(subtitle)$

$subtitle$

$endif$ $for(author)$

$author$

$endfor$ $if(date)$

$date$

$endif$ +
+ $endif$ $if(toc)$ + $endif$ $body$ $for(include-after)$ $include-after$ $endfor$ + + \ No newline at end of file