From c905b814006d0b426eb04ae8f7e419fc69af1858 Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Tue, 29 Jan 2013 18:33:59 +0000 Subject: updates for 2013 report display --- en/about/reports/index.php | 5 ++--- en/about/reports/template.php | 14 ++++++++++---- en/about/reports/template_lib.php | 4 +--- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'en/about/reports') diff --git a/en/about/reports/index.php b/en/about/reports/index.php index 693b2e21a..811aec653 100644 --- a/en/about/reports/index.php +++ b/en/about/reports/index.php @@ -24,10 +24,9 @@ _lang_load($locale, 'about/reports');

diff --git a/en/about/reports/template.php b/en/about/reports/template.php index 8947f961f..24c2e5e53 100644 --- a/en/about/reports/template.php +++ b/en/about/reports/template.php @@ -73,10 +73,13 @@ $flow = array( $list = array(); $count = array(); + +// FIXME take ## Other revenues lines into account. foreach ($parsed['# Income details > ## Donations monthly summary'] as $line) { $list[] = $line[2]; $count[] = $line[1]; } + unset($list[0]); unset($list[13]); unset($count[0]); @@ -87,7 +90,7 @@ $flow['revenue_op'] = $count; include 'template_lib.php'; -$R = get_revenues($parsed['# Income details > ## Donations monthly summary']); +$R = get_revenues($parsed['# Income details > ## Donations monthly summary'], $_months); $expenses_total = array_sum($expenses_monthly_summary[0]); @@ -194,6 +197,7 @@ $expenses_total = array_sum($expenses_monthly_summary[0]); #summary { width: 300px; float: left; text-align: left; background: #fff; border-bottom: 1px solid #ddd; } #report { text-align: left; width: 800px; float: left; border: 1px solid #ddd; border-top: 0; } #links { width: 150px; float: left; background: #fff; text-align: left; border-right: 1px solid #ddd; border-bottom: 1px solid #ddd; padding: 1em;} + .accounts tr.total { font-weight: 600; }