From 84671e469d59bdd1095ed3b580444ed7ef3e1119 Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Tue, 5 Jun 2012 20:45:24 +0000 Subject: real fix --- en/about/reports/template.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'en/about/reports/template.php') diff --git a/en/about/reports/template.php b/en/about/reports/template.php index 914564fe6..86b6ca197 100644 --- a/en/about/reports/template.php +++ b/en/about/reports/template.php @@ -114,19 +114,22 @@ $flow['revenue_op'] = $count; $qarr = array(); foreach ($flow['revenue'] as $month => $val) { + // save monthly data $arr[] = sprintf("['%s', %s, %s]", $_months[$month], str_replace(',', '.', $val), str_replace(',', '.', $flow['expenses'][$month])); - if ($i == 4) { + // sum quarterly data + $qRevenues += str_replace(',', '.', $val); + $qExpenses += str_replace(',', '.', $flow['expenses'][$month]); + + // save quarterly data + if ($i % 3 == 0) { $qarr[] = sprintf("['%s', %s, %s]", 'Q' . $j, $qRevenues, $qExpenses); + $qRevenues = 0; $qExpenses = 0; - $i = 1; $j += 1; } - $qRevenues += str_replace(',', '.', $val); - $qExpenses += str_replace(',', '.', $flow['expenses'][$month]); - $i += 1; } echo implode(', ', $arr); -- cgit v1.2.1