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

cli: Cli.Commands.Balance: support tree mode for HTML, CSV and FODS output

Browse Source 
indentation using non-breakable space character
This commit is contained in:
Henning Thielemann 2024-09-30 16:13:03 +02:00 committed by Simon Michael
parent f8daba5e98
commit 3e2685fe95
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hledger/Hledger/Cli/Commands/Balance.hs
View File

@ -691,9 +691,10 @@ balanceReportAsSpreadsheet ::
balanceReportAsSpreadsheet opts (items, total) = balanceReportAsSpreadsheet opts (items, total) =
(if transpose_ opts then Ods.transpose else id) $ (if transpose_ opts then Ods.transpose else id) $
headers : headers :
concatMap (\(a, _, _, b) -> rows Value a b) items ++ concatMap (rows Value) items ++
if no_total_ opts then [] if no_total_ opts then []
else addTotalBorders $ rows Total totalRowHeadingSpreadsheet total else addTotalBorders $
rows Total (totalRowHeadingSpreadsheet, totalRowHeadingSpreadsheet, 0, total)
where where
cell = Ods.defaultCell cell = Ods.defaultCell
headers = headers =
@ -702,14 +703,14 @@ balanceReportAsSpreadsheet opts (items, total) =
LayoutBare -> ["commodity", "balance"] LayoutBare -> ["commodity", "balance"]
_ -> ["balance"] _ -> ["balance"]
rows :: rows ::
RowClass -> AccountName -> RowClass -> BalanceReportItem ->
MixedAmount -> [[Ods.Cell Ods.NumLines Text]] [[Ods.Cell Ods.NumLines Text]]
rows rc name ma = rows rc (name, dispName, dep, ma) =
let accountCell = let accountCell =
setAccountAnchor setAccountAnchor
(guard (rc==Value) >> balance_base_url_ opts) (guard (rc==Value) >> balance_base_url_ opts)
(querystring_ opts) name $ (querystring_ opts) name $
cell $ accountNameDrop (drop_ opts) name in cell $ renderBalanceAcct opts (name, dispName, dep) in
addRowSpanHeader accountCell $ addRowSpanHeader accountCell $
case layout_ opts of case layout_ opts of
LayoutBare -> LayoutBare ->
@ -806,7 +807,7 @@ multiBalanceReportAsSpreadsheetParts ishtml opts@ReportOpts{..} (PeriodicReport
where acctName = prrFullName row where acctName = prrFullName row
anchorCell = anchorCell =
setAccountAnchor balance_base_url_ querystring_ acctName $ setAccountAnchor balance_base_url_ querystring_ acctName $
accountCell $ accountNameDrop drop_ acctName accountCell $ renderPeriodicAcct opts row
totalrows = totalrows =
if no_total_ if no_total_
then [] then []
@ -1046,7 +1047,7 @@ budgetReportAsText ropts@ReportOpts{..} budgetr = TB.toLazyText $
-- | Build a 'Table' from a multi-column balance report. -- | Build a 'Table' from a multi-column balance report.
budgetReportAsTable :: ReportOpts -> BudgetReport -> Table Text Text WideBuilder budgetReportAsTable :: ReportOpts -> BudgetReport -> Table Text Text WideBuilder
budgetReportAsTable ReportOpts{..} (PeriodicReport spans items totrow) = budgetReportAsTable ropts@ReportOpts{..} (PeriodicReport spans items totrow) =
maybetransposetable $ maybetransposetable $
addtotalrow $ addtotalrow $
Table Table
@ -1152,17 +1153,10 @@ budgetReportAsTable ReportOpts{..} (PeriodicReport spans items totrow) =
shownitems = shownitems =
map (\i -> map (\i ->
let let
addacctcolumn = map (\(cs, cvals) -> (renderacct i, cs, cvals)) addacctcolumn = map (\(cs, cvals) -> (renderPeriodicAcct ropts i, cs, cvals))
isunbudgetedrow = displayFull (prrName i) == unbudgetedAccountName isunbudgetedrow = displayFull (prrName i) == unbudgetedAccountName
in addacctcolumn $ showrow isunbudgetedrow $ rowToBudgetCells i) in addacctcolumn $ showrow isunbudgetedrow $ rowToBudgetCells i)
items items
where
-- FIXME. Have to check explicitly for which to render here, since
-- budgetReport sets accountlistmode to ALTree. Find a principled way to do
-- this.
renderacct row = case accountlistmode_ of
ALTree -> T.replicate ((prrDepth row - 1)*2) " " <> prrDisplayName row
ALFlat -> accountNameDrop (drop_) $ prrFullName row
(totrowcs, totrowtexts) = unzip $ concat showntotrow (totrowcs, totrowtexts) = unzip $ concat showntotrow
where where
@ -1332,6 +1326,20 @@ budgetReportAsSpreadsheet
querystring_ name (cell name) querystring_ name (cell name)
renderBalanceAcct :: ReportOpts -> (AccountName, AccountName, Int) -> Text
renderBalanceAcct opts (fullName, displayName, dep) =
case accountlistmode_ opts of
ALTree -> T.replicate ((dep - 1)*2) "\160" <> displayName
ALFlat -> accountNameDrop (drop_ opts) fullName
-- FIXME. Have to check explicitly for which to render here, since
-- budgetReport sets accountlistmode to ALTree. Find a principled way to do
-- this.
renderPeriodicAcct :: ReportOpts -> PeriodicReportRow DisplayName a -> Text
renderPeriodicAcct opts row =
renderBalanceAcct opts (prrFullName row, prrDisplayName row, prrDepth row)
-- tests -- tests
tests_Balance = testGroup "Balance" [ tests_Balance = testGroup "Balance" [