summaryrefslogtreecommitdiff
path: root/src/output.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-02-17 19:48:42 -0400
committerJohn Wiegley <johnw@newartisans.com>2009-02-17 19:48:42 -0400
commit93d195f1d97c376c26e5a7e88d6b0fc6e3b8e2d0 (patch)
treef72c2d5adb24d446eaa763f56b2db47342df0045 /src/output.cc
parent07f4aefdfde719c57aa4574a53e1f33b6e295a58 (diff)
downloadfork-ledger-93d195f1d97c376c26e5a7e88d6b0fc6e3b8e2d0.tar.gz
fork-ledger-93d195f1d97c376c26e5a7e88d6b0fc6e3b8e2d0.tar.bz2
fork-ledger-93d195f1d97c376c26e5a7e88d6b0fc6e3b8e2d0.zip
Only display a final balance total if necessary
In the case where only one top-level account is being reported, there is no reason to duplicate the total balance shown.
Diffstat (limited to 'src/output.cc')
-rw-r--r--src/output.cc42
1 files changed, 26 insertions, 16 deletions
diff --git a/src/output.cc b/src/output.cc
index 35633889..2e068631 100644
--- a/src/output.cc
+++ b/src/output.cc
@@ -210,8 +210,10 @@ void format_entries::operator()(xact_t& xact)
last_entry = xact.entry;
}
-void format_accounts::post_accounts(account_t& account)
+std::size_t format_accounts::post_accounts(account_t& account)
{
+ std::size_t displayed = 0;
+
// Don't ever print the top-most account
if (account.parent) {
bind_scope_t bound_scope(report, account);
@@ -242,30 +244,36 @@ void format_accounts::post_accounts(account_t& account)
" No, neither it nor its children were eligible for display");
}
- if (format_account)
+ if (format_account) {
+ account.xdata().add_flags(ACCOUNT_EXT_DISPLAYED);
+ displayed++;
+
format.format(report.output_stream, bound_scope);
+ }
}
- foreach (accounts_map::value_type pair, account.accounts)
- post_accounts(*pair.second);
+ foreach (accounts_map::value_type pair, account.accounts) {
+ if (post_accounts(*pair.second) > 0)
+ displayed++;
+ }
+
+ return displayed;
}
void format_accounts::flush()
{
std::ostream& out(report.output_stream);
- post_accounts(*report.session.master.get());
+ std::size_t top_displayed = post_accounts(*report.session.master.get());
- if (print_final_total) {
- assert(report.session.master->has_xdata());
- account_t::xdata_t& xdata(report.session.master->xdata());
+ assert(report.session.master->has_xdata());
+ account_t::xdata_t& xdata(report.session.master->xdata());
- if (! report.HANDLED(collapse) && xdata.total) {
- out << "--------------------\n";
- xdata.value = xdata.total;
- bind_scope_t bound_scope(report, *report.session.master);
- format.format(out, bound_scope);
- }
+ if (top_displayed > 1 && ! report.HANDLED(collapse) && xdata.total) {
+ out << "--------------------\n";
+ xdata.value = xdata.total;
+ bind_scope_t bound_scope(report, *report.session.master);
+ format.format(out, bound_scope);
}
out.flush();
@@ -341,12 +349,12 @@ void format_equity::flush()
out.flush();
}
-void format_equity::post_accounts(account_t& account)
+std::size_t format_equity::post_accounts(account_t& account)
{
std::ostream& out(report.output_stream);
if (! account.has_flags(ACCOUNT_EXT_MATCHING))
- return;
+ return 0;
value_t val = account.xdata().value;
@@ -368,6 +376,8 @@ void format_equity::post_accounts(account_t& account)
next_lines_format.format(out, bound_scope);
}
total += val;
+
+ return 1;
}
} // namespace ledger