From 87e6dcff8f782286fb9da70a0a8352373fbd0f49 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Sat, 17 Jun 2023 20:57:24 -0400 Subject: [PATCH] FIX typos --- lib/Internal/History.hs | 2 +- lib/Internal/Types/Dhall.hs | 4 ++++ lib/Internal/Utils.hs | 12 ++++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/Internal/History.hs b/lib/Internal/History.hs index 8d90ae0..6de2fe9 100644 --- a/lib/Internal/History.hs +++ b/lib/Internal/History.hs @@ -105,7 +105,7 @@ txPair day from to cur val desc = , dtxDate = day , dtxEntries = [ EntrySet - { desTotalValue = val + { desTotalValue = -val , desCurrency = cur , desFromEntry0 = entry from , desToEntryBal = entry to diff --git a/lib/Internal/Types/Dhall.hs b/lib/Internal/Types/Dhall.hs index 9988d6d..a8e0a07 100644 --- a/lib/Internal/Types/Dhall.hs +++ b/lib/Internal/Types/Dhall.hs @@ -495,6 +495,10 @@ deriving instance Show (FieldMatcher T.Text) data TxSubGetter = TxSubGetter { tsgFromAcnt :: !EntryAcnt , tsgToAcnt :: !EntryAcnt + , tsgFromComment :: !T.Text + , tsgToComment :: !T.Text + , tsgFromTags :: ![TagID] + , tsgToTags :: ![TagID] , tsgValue :: !EntryNumGetter , tsgCurrency :: !EntryCur , tsgFromEntries :: ![EntryGetter] diff --git a/lib/Internal/Utils.hs b/lib/Internal/Utils.hs index 3bebb16..c902370 100644 --- a/lib/Internal/Utils.hs +++ b/lib/Internal/Utils.hs @@ -361,6 +361,10 @@ resolveSubGetter TxSubGetter { tsgFromAcnt , tsgToAcnt + , tsgFromTags + , tsgToTags + , tsgFromComment + , tsgToComment , tsgValue , tsgCurrency , tsgFromEntries @@ -374,15 +378,15 @@ resolveSubGetter Entry { eAcnt = fa , eValue = () - , eComment = "" -- TODO actually fill this in - , eTags = [] -- TODO what goes here? + , eComment = tsgFromComment + , eTags = tsgFromTags } let toEntry = Entry { eAcnt = ta , eValue = () - , eComment = "" - , eTags = [] + , eComment = tsgToComment + , eTags = tsgToTags } return EntrySet