Added an index on tt_custom_field_log for faster reporting, a few fixes.

[timetracker.git] / topdf.php

diff --git a/topdf.php b/topdf.php
index 7d3fa0096ea36bf3117ec72e09eae0d9c356324f..15ac1ee92b15b6fa86f79822845035c3fed7c624 100644 (file)
--- a/topdf.php
+++ b/topdf.php
@@ -62,27 +62,17 @@ $bean = new ActionForm('reportBean', new Form('reportForm'), $request);
 // is grouped by either date, user, client, project, task or cf_1 and user only needs to see subtotals by group.
 $totals_only = ($bean->getAttribute('chtotalsonly') == '1');
 
-// Determine group by header.
-$group_by1 = $bean->getAttribute('group_by1');
-if ('no_grouping' != $group_by1) {
-  if ('cf_1' == $group_by1)
-    $group_by_header = $custom_fields->fields[0]['label'];
-  else {
-    $key = 'label.'.$group_by1;
-    $group_by_header = $i18n->get($key);
-  }
-}
-
 // Obtain items for report.
 $options = ttReportHelper::getReportOptions($bean);
+$grouping = ttReportHelper::grouping($options);
 if (!$totals_only)
   $items = ttReportHelper::getItems($options); // Individual entries.
-if ($totals_only || 'no_grouping' != $group_by1)
+if ($totals_only || $grouping)
   $subtotals = ttReportHelper::getSubtotals($options); // Subtotals for groups of items.
 $totals = ttReportHelper::getTotals($options); // Totals for the entire report.
 
 // Assign variables that are used to print subtotals.
-if ($items && 'no_grouping' != $group_by1) {
+if ($items && $grouping) {
   $print_subtotals = true;
   $first_pass = true;
   $prev_grouped_by = '';
@@ -104,6 +94,7 @@ $html .= '<table border="1" cellpadding="3" cellspacing="0" width="100%">';
 
 if ($totals_only) {
   // We are building a "totals only" report with only subtotals and total.
+  $group_by_header = ttReportHelper::makeGroupByHeader($options);
   $colspan = 1; // Column span for an empty row.
   // Table header.
   $html .= '<thead>';