X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=report.php;h=28e086c4dadd0306ee99b14df37dc3957344a9a9;hb=1a6b352052d17eff5027ff20fe4f204f08893ec3;hp=efbaccea8ea74136a23b14d4bbeeaf8612c71c81;hpb=47b6c704a5375b9f98376bf4eb727d4ee49fe3e2;p=timetracker.git

diff --git a/report.php b/report.php
index efbaccea..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);
 
@@ -192,13 +194,18 @@ if ($report_items && 'no_grouping' != $group_by1) {
 }
 // Determine group by header.
 if ('no_grouping' != $group_by) {
+  /*
   if ('cf_1' == $group_by)
     $smarty->assign('group_by_header', $custom_fields->fields[0]['label']);
   else {
     $key = 'label.'.$group_by;
     $smarty->assign('group_by_header', $i18n->get($key));
-  }
+  } */
+  $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', '');