From 4835ab15cac19bccbaccc8acc5409003d982cc39 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Wed, 16 Aug 2023 21:12:11 -0400 Subject: [PATCH] ADD missing defaults --- dhall/Types.dhall | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dhall/Types.dhall b/dhall/Types.dhall index 7d8b4ec..2982509 100644 --- a/dhall/Types.dhall +++ b/dhall/Types.dhall @@ -289,6 +289,11 @@ let TxAmount1_ = re } +let TxAmount1 = + { Type = TxAmount1_ Text + , default = { a1Column = "Amount", a1Fmt = "([-+])?([0-9\\.]+)" } + } + let TxAmount2_ = \(re : Type) -> { a2Positive : Text @@ -301,6 +306,15 @@ let TxAmount2_ = re } +let TxAmount2 = + { Type = TxAmount2_ Text + , default = + { a2Positive = "Deposit" + , a2Negative = "Withdraw" + , a2Fmt = "([0-9\\.]+)" + } + } + let TxAmountSpec_ = \(re : Type) -> < AmountSingle : TxAmount1_ re | AmountDual : TxAmount2_ re > @@ -349,9 +363,7 @@ let TxOpts = { Type = TxOpts_ Text , default = { toDate = "Date" - , toAmount = - TxAmountSpec.AmountSingle - { a1Column = "Amount", a1Fmt = "([-+])?([0-9\\.]+)" } + , toAmount = TxAmountSpec.AmountSingle TxAmount1::{=} , toDesc = "Description" , toOther = [] : List Text , toDateFmt = "%0m/%0d/%Y" @@ -1204,4 +1216,6 @@ in { CurID , TxAmountSpec_ , TxAmount1_ , TxAmount2_ + , TxAmount1 + , TxAmount2 }