X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=report.php;h=28e086c4dadd0306ee99b14df37dc3957344a9a9;hb=a48e5ff4ad629b551f6a94143a5e9d0f235b1953;hp=5f7e687bf18013b55ef1e83665654472a7a7d98b;hpb=405a3dc75eaf770313b2da57bc25088e5c6e76bd;p=timetracker.git diff --git a/report.php b/report.php index 5f7e687b..28e086c4 100644 --- a/report.php +++ b/report.php @@ -173,12 +173,14 @@ if ($request->isPost()) { $group_by = $bean->getAttribute('group_by1'); $options = ttReportHelper::getReportOptions($bean); + +$group_by_tag = ttReportHelper::makeGroupByXmlTag($options); $report_items = ttReportHelper::getItems($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) +if (ttReportHelper::grouping($options)) $subtotals = ttReportHelper::getSubtotals($options); $totals = ttReportHelper::getTotals($options); @@ -201,6 +203,9 @@ if ('no_grouping' != $group_by) { } */ $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options)); } + +$smarty->assign('group_by', $group_by_tag); + // Assign variables that are used to alternate color of rows for different dates. $smarty->assign('prev_date', ''); $smarty->assign('cur_date', '');