A bit more refactoring in reports.

[timetracker.git] / report.php

diff --git a/report.php b/report.php
index 3f2074491e64dec85e64864858281048c4f09fdd..61b3587ffed4b362a0ac620cdeba1294079d1a95 100644 (file)
--- a/report.php
+++ b/report.php
@@ -172,14 +172,15 @@ if ($request->isPost()) {
 
 $group_by = $bean->getAttribute('group_by');
 
 
 $group_by = $bean->getAttribute('group_by');
 

-$report_items = ttReportHelper::getItems($bean);
+$options = ttReportHelper::getReportOptions($bean);
+$report_items = ttReportHelper::getItems($bean, $options);

 // Store record ids in session in case user wants to act on records such as marking them all paid.
 if ($request->isGet() && $user->isPluginEnabled('ps'))
   ttReportHelper::putInSession($report_items);
 
 if ('no_grouping' != $group_by)
 // Store record ids in session in case user wants to act on records such as marking them all paid.
 if ($request->isGet() && $user->isPluginEnabled('ps'))
   ttReportHelper::putInSession($report_items);
 
 if ('no_grouping' != $group_by)

-  $subtotals = ttReportHelper::getSubtotals($bean);
-$totals = ttReportHelper::getTotals($bean);
+  $subtotals = ttReportHelper::getSubtotals($bean, $options);
+$totals = ttReportHelper::getTotals($bean, $options);

 
 // Assign variables that are used to print subtotals.
 if ($report_items && 'no_grouping' != $group_by) {
 
 // Assign variables that are used to print subtotals.
 if ($report_items && 'no_grouping' != $group_by) {