X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=report.php;h=f6abcc4c6a691613a2ee8f65fc58f58631efda91;hb=f9e704d00a2d21b1a94332e088f78c22da03d37c;hp=efbaccea8ea74136a23b14d4bbeeaf8612c71c81;hpb=47b6c704a5375b9f98376bf4eb727d4ee49fe3e2;p=timetracker.git diff --git a/report.php b/report.php index efbaccea..f6abcc4c 100644 --- a/report.php +++ b/report.php @@ -178,7 +178,7 @@ $report_items = ttReportHelper::getItems($options); 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,12 +192,14 @@ 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)); } // Assign variables that are used to alternate color of rows for different dates. $smarty->assign('prev_date', '');