slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: note some Account JSON issues (#985)

Browse Source 
[ci skip]
This commit is contained in:
Simon Michael 2019-03-09 15:28:30 -08:00
parent fca14ace98
commit 92fb24b1af
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hledger-web/Hledger/Web/Json.hs
View File

@ -54,6 +54,7 @@ instance ToJSON BalanceAssertion
instance ToJSON Price instance ToJSON Price
instance ToJSON MarketPrice instance ToJSON MarketPrice
instance ToJSON PostingType instance ToJSON PostingType
instance ToJSON Posting where instance ToJSON Posting where
toJSON Posting{..} = object toJSON Posting{..} = object
["pdate" .= toJSON pdate ["pdate" .= toJSON pdate
@ -71,7 +72,9 @@ instance ToJSON Posting where
-- This is probably not wanted in json, we discard it. -- This is probably not wanted in json, we discard it.
,"poriginal" .= toJSON (Nothing :: Maybe Posting) ,"poriginal" .= toJSON (Nothing :: Maybe Posting)
] ]
instance ToJSON Transaction instance ToJSON Transaction
instance ToJSON Account where instance ToJSON Account where
toJSON a = object toJSON a = object
["aname" .= toJSON (aname a) ["aname" .= toJSON (aname a)
@ -82,10 +85,12 @@ instance ToJSON Account where
-- To avoid a cycle, show just the parent account's name -- To avoid a cycle, show just the parent account's name
-- in a dummy field. When re-parsed, there will be no parent. -- in a dummy field. When re-parsed, there will be no parent.
,"aparent_" .= toJSON (maybe "" aname $ aparent a) ,"aparent_" .= toJSON (maybe "" aname $ aparent a)
-- To avoid a cycle, drop the subaccounts, showing just their names -- Just the names of subaccounts, as a dummy field, ignored when parsed.
-- in a dummy field. When re-parsed, there will be no subaccounts.
,"asubs" .= toJSON ([]::[Account])
,"asubs_" .= toJSON (map aname $ asubs a) ,"asubs_" .= toJSON (map aname $ asubs a)
-- The actual subaccounts (and their subs..), making a (probably highly redundant) tree
-- ,"asubs" .= toJSON (asubs a)
-- Omit the actual subaccounts
,"asubs" .= toJSON ([]::[Account])
] ]
-- From JSON -- From JSON
@ -104,6 +109,9 @@ instance FromJSON PostingType
instance FromJSON Posting instance FromJSON Posting
instance FromJSON Transaction instance FromJSON Transaction
instance FromJSON AccountDeclarationInfo instance FromJSON AccountDeclarationInfo
-- XXX The ToJSON instance replaces subaccounts with just names.
-- Here we should try to make use of those to reconstruct the
-- parent-child relationships.
instance FromJSON Account instance FromJSON Account
-- Decimal, various attempts -- Decimal, various attempts