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

lib: Refactor sortAccountTreeByAmount

Browse Source
This commit is contained in:
Stephen Morgan 2020-07-09 10:30:10 +10:00 committed by Simon Michael
parent 463eee7bf4
commit 99b74dc389
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hledger-lib/Hledger/Data/Account.hs
View File

@ -9,10 +9,10 @@ account, and subaccounting-excluding and -including balances.
module Hledger.Data.Account module Hledger.Data.Account
where where
import Data.List import Data.List (find, sortOn)
import Data.List.Extra (groupSort, groupOn) import Data.List.Extra (groupSort, groupOn)
import Data.Maybe import Data.Maybe (fromMaybe)
import Data.Ord import Data.Ord (Down(..))
import qualified Data.Map as M import qualified Data.Map as M
import Data.Text (pack,unpack) import Data.Text (pack,unpack)
import Safe (headMay, lookupJustDef) import Safe (headMay, lookupJustDef)
@ -20,7 +20,7 @@ import Text.Printf
import Hledger.Data.AccountName import Hledger.Data.AccountName
import Hledger.Data.Amount import Hledger.Data.Amount
import Hledger.Data.Posting() import Hledger.Data.Posting ()
import Hledger.Data.Types import Hledger.Data.Types
import Hledger.Utils import Hledger.Utils
@ -199,14 +199,11 @@ filterAccounts p a
-- if balances are normally negative, then the most negative balances -- if balances are normally negative, then the most negative balances
-- sort first, and vice versa. -- sort first, and vice versa.
sortAccountTreeByAmount :: NormalSign -> Account -> Account sortAccountTreeByAmount :: NormalSign -> Account -> Account
sortAccountTreeByAmount normalsign a sortAccountTreeByAmount normalsign = mapAccounts $ \a -> a{asubs=sortSubs $ asubs a}
| null $ asubs a = a
| otherwise = a{asubs=
sortBy (maybeflip $ comparing (normaliseMixedAmountSquashPricesForDisplay . aibalance)) $
map (sortAccountTreeByAmount normalsign) $ asubs a}
where where
maybeflip | normalsign==NormallyNegative = id sortSubs = case normalsign of
| otherwise = flip NormallyPositive -> sortOn (Down . normaliseMixedAmountSquashPricesForDisplay . aibalance)
NormallyNegative -> sortOn ( normaliseMixedAmountSquashPricesForDisplay . aibalance)
-- | Add extra info for this account derived from the Journal's -- | Add extra info for this account derived from the Journal's
-- account directives, if any (comment, tags, declaration order..). -- account directives, if any (comment, tags, declaration order..).