From 178e3a234b9a1139d5e810092bcf97be3b750578 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 29 Mar 2018 22:35:06 +0100 Subject: [PATCH] ui/web: -E toggles zeroes at startup, with opposite default to cli --- doc/lib.m4 | 2 +- hledger-ui/Hledger/UI/Main.hs | 4 ++-- hledger-ui/hledger-ui.1 | 2 +- hledger-ui/hledger-ui.info | 26 +++++++++++++------------- hledger-ui/hledger-ui.txt | 2 +- hledger-web/Handler/Common.hs | 5 ++++- hledger-web/hledger-web.1 | 2 +- hledger-web/hledger-web.info | 2 +- hledger-web/hledger-web.txt | 2 +- hledger/hledger.1 | 2 +- hledger/hledger.info | 2 +- hledger/hledger.txt | 2 +- 12 files changed, 28 insertions(+), 25 deletions(-) diff --git a/doc/lib.m4 b/doc/lib.m4 index cb5f67bff..74cb98029 100644 --- a/doc/lib.m4 +++ b/doc/lib.m4 @@ -147,7 +147,7 @@ m4_define({{_reportingoptions_}}, {{ : hide/aggregate accounts or postings more than NUM levels deep `-E --empty` -: show items with zero amount, normally hidden (except in hledger-ui/hledger-web) +: show items with zero amount, normally hidden (and vice-versa in hledger-ui/hledger-web) `-B --cost` : convert amounts to their cost at transaction time diff --git a/hledger-ui/Hledger/UI/Main.hs b/hledger-ui/Hledger/UI/Main.hs index 0040ea945..105eb2fd1 100644 --- a/hledger-ui/Hledger/UI/Main.hs +++ b/hledger-ui/Hledger/UI/Main.hs @@ -108,8 +108,8 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} j = do [v | (k,v) <- rawopts_ copts, k=="args", not $ any (`isPrefixOf` v) ["depth","date"]], -- always disable boring account name eliding, unlike the CLI, for a more regular tree no_elide_=True, - -- show items with zero amount by default, unlike the CLI - empty_=True, + -- flip the default for items with zero amounts, show them by default + empty_=not $ empty_ ropts, -- show historical balances by default, unlike the CLI balancetype_=HistoricalBalance } diff --git a/hledger-ui/hledger-ui.1 b/hledger-ui/hledger-ui.1 index b35b052fb..aa2e3e26b 100644 --- a/hledger-ui/hledger-ui.1 +++ b/hledger-ui/hledger-ui.1 @@ -172,7 +172,7 @@ hide/aggregate accounts or postings more than NUM levels deep .RE .TP .B \f[C]\-E\ \-\-empty\f[] -show items with zero amount, normally hidden (except in +show items with zero amount, normally hidden (and vice\-versa in hledger\-ui/hledger\-web) .RS .RE diff --git a/hledger-ui/hledger-ui.info b/hledger-ui/hledger-ui.info index 376c8e396..f690a1ec6 100644 --- a/hledger-ui/hledger-ui.info +++ b/hledger-ui/hledger-ui.info @@ -122,7 +122,7 @@ the data. hide/aggregate accounts or postings more than NUM levels deep '-E --empty' - show items with zero amount, normally hidden (except in + show items with zero amount, normally hidden (and vice-versa in hledger-ui/hledger-web) '-B --cost' @@ -379,17 +379,17 @@ Tag Table: Node: Top71 Node: OPTIONS827 Ref: #options924 -Node: KEYS4133 -Ref: #keys4228 -Node: SCREENS7187 -Ref: #screens7272 -Node: Accounts screen7362 -Ref: #accounts-screen7490 -Node: Register screen9720 -Ref: #register-screen9875 -Node: Transaction screen11949 -Ref: #transaction-screen12107 -Node: Error screen12977 -Ref: #error-screen13099 +Node: KEYS4141 +Ref: #keys4236 +Node: SCREENS7195 +Ref: #screens7280 +Node: Accounts screen7370 +Ref: #accounts-screen7498 +Node: Register screen9728 +Ref: #register-screen9883 +Node: Transaction screen11957 +Ref: #transaction-screen12115 +Node: Error screen12985 +Ref: #error-screen13107  End Tag Table diff --git a/hledger-ui/hledger-ui.txt b/hledger-ui/hledger-ui.txt index 3aa6b2775..2527ff9a7 100644 --- a/hledger-ui/hledger-ui.txt +++ b/hledger-ui/hledger-ui.txt @@ -118,7 +118,7 @@ OPTIONS hide/aggregate accounts or postings more than NUM levels deep -E --empty - show items with zero amount, normally hidden (except in + show items with zero amount, normally hidden (and vice-versa in hledger-ui/hledger-web) -B --cost diff --git a/hledger-web/Handler/Common.hs b/hledger-web/Handler/Common.hs index bf1f0b5ef..98fb8d194 100644 --- a/hledger-web/Handler/Common.hs +++ b/hledger-web/Handler/Common.hs @@ -73,7 +73,10 @@ sidebar vd@VD{..} = |] where journalcurrent = if here == JournalR then "inacct" else "" :: String - accounts = balanceReportAsHtml opts vd $ balanceReport (reportopts_ $ cliopts_ opts){empty_=True} am j + ropts = reportopts_ $ cliopts_ opts + -- flip the default for items with zero amounts, show them by default + ropts' = ropts{empty_=not $ empty_ ropts} + accounts = balanceReportAsHtml opts vd $ balanceReport ropts' am j showmd = if showsidebar then "col-md-4" else "col-any-0" :: String showsm = if showsidebar then "col-sm-4" else "" :: String diff --git a/hledger-web/hledger-web.1 b/hledger-web/hledger-web.1 index 8b93d321c..e0a3d9916 100644 --- a/hledger-web/hledger-web.1 +++ b/hledger-web/hledger-web.1 @@ -227,7 +227,7 @@ hide/aggregate accounts or postings more than NUM levels deep .RE .TP .B \f[C]\-E\ \-\-empty\f[] -show items with zero amount, normally hidden (except in +show items with zero amount, normally hidden (and vice\-versa in hledger\-ui/hledger\-web) .RS .RE diff --git a/hledger-web/hledger-web.info b/hledger-web/hledger-web.info index 1772a8124..0a43a0459 100644 --- a/hledger-web/hledger-web.info +++ b/hledger-web/hledger-web.info @@ -167,7 +167,7 @@ options as shown above. hide/aggregate accounts or postings more than NUM levels deep '-E --empty' - show items with zero amount, normally hidden (except in + show items with zero amount, normally hidden (and vice-versa in hledger-ui/hledger-web) '-B --cost' diff --git a/hledger-web/hledger-web.txt b/hledger-web/hledger-web.txt index cc809b75e..3ee0a0755 100644 --- a/hledger-web/hledger-web.txt +++ b/hledger-web/hledger-web.txt @@ -163,7 +163,7 @@ OPTIONS hide/aggregate accounts or postings more than NUM levels deep -E --empty - show items with zero amount, normally hidden (except in + show items with zero amount, normally hidden (and vice-versa in hledger-ui/hledger-web) -B --cost diff --git a/hledger/hledger.1 b/hledger/hledger.1 index 54f2c5c1f..948a27741 100644 --- a/hledger/hledger.1 +++ b/hledger/hledger.1 @@ -282,7 +282,7 @@ hide/aggregate accounts or postings more than NUM levels deep .RE .TP .B \f[C]\-E\ \-\-empty\f[] -show items with zero amount, normally hidden (except in +show items with zero amount, normally hidden (and vice\-versa in hledger\-ui/hledger\-web) .RS .RE diff --git a/hledger/hledger.info b/hledger/hledger.info index e0716562b..0c16873d1 100644 --- a/hledger/hledger.info +++ b/hledger/hledger.info @@ -225,7 +225,7 @@ by most hledger commands, run 'hledger -h'. hide/aggregate accounts or postings more than NUM levels deep '-E --empty' - show items with zero amount, normally hidden (except in + show items with zero amount, normally hidden (and vice-versa in hledger-ui/hledger-web) '-B --cost' diff --git a/hledger/hledger.txt b/hledger/hledger.txt index 3bcdb5be1..050f24500 100644 --- a/hledger/hledger.txt +++ b/hledger/hledger.txt @@ -192,7 +192,7 @@ OPTIONS hide/aggregate accounts or postings more than NUM levels deep -E --empty - show items with zero amount, normally hidden (except in + show items with zero amount, normally hidden (and vice-versa in hledger-ui/hledger-web) -B --cost