From 3858f106228557983630694a9e871422ec671b5e Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Tue, 5 Jun 2012 20:35:00 +0000 Subject: fix quarterly code --- en/about/reports/template.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'en') diff --git a/en/about/reports/template.php b/en/about/reports/template.php index deb7d9b18..914564fe6 100644 --- a/en/about/reports/template.php +++ b/en/about/reports/template.php @@ -109,22 +109,25 @@ $flow['revenue_op'] = $count; $arr = array(); $qRevenues = 0; $qExpenses = 0; - $i = 0; - $j = 0; + $i = 1; + $j = 1; $qarr = array(); foreach ($flow['revenue'] as $month => $val) { + $arr[] = sprintf("['%s', %s, %s]", $_months[$month], str_replace(',', '.', $val), str_replace(',', '.', $flow['expenses'][$month])); - $i += 1; - if ($i == 3) { - $j += 1; + + if ($i == 4) { $qarr[] = sprintf("['%s', %s, %s]", 'Q' . $j, $qRevenues, $qExpenses); $qRevenues = 0; $qExpenses = 0; - $i = 0; - } else { - $qRevenues += str_replace(',', '.', $val); - $qExpenses += str_replace(',', '.', $flow['expenses'][$month]); + $i = 1; + $j += 1; } + + $qRevenues += str_replace(',', '.', $val); + $qExpenses += str_replace(',', '.', $flow['expenses'][$month]); + + $i += 1; } echo implode(', ', $arr); ?> -- cgit v1.2.1