From: Nik Okuntseff <support@anuko.com>
Date: Sun, 28 Oct 2018 20:46:08 +0000 (+0000)
Subject: Fixed report exports to files for a renamed field.
X-Git-Tag: timetracker_1.19-1~753
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e6463e1944221a524f49668b3b23032c3b9335f3;p=timetracker.git

Fixed report exports to files for a renamed field.
---

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a54d6aa6..5d3d36a6 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.01.4326 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.01.4327 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
diff --git a/tofile.php b/tofile.php
index a40dbf0a..42b73433 100644
--- a/tofile.php
+++ b/tofile.php
@@ -84,12 +84,12 @@ if ('xml' == $type) {
   print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
   print "<rows>\n";
 
-  $group_by = $bean->getAttribute('group_by');
+  $group_by1 = $bean->getAttribute('group_by1');
   if ($totals_only) {
     // Totals only report. Print subtotals.
     foreach ($subtotals as $subtotal) {
       print "<row>\n";
-      print "\t<".$group_by."><![CDATA[".$subtotal['name']."]]></".$group_by.">\n";
+      print "\t<".$group_by1."><![CDATA[".$subtotal['name']."]]></".$group_by1.">\n";
       if ($bean->getAttribute('chduration')) {
         $val = $subtotal['time'];
         if($val && defined('EXPORT_DECIMAL_DURATION') && isTrue(EXPORT_DECIMAL_DURATION))
@@ -161,15 +161,15 @@ if ('csv' == $type) {
   $bom = chr(239).chr(187).chr(191); // 0xEF 0xBB 0xBF in the beginning of the file is UTF8 BOM.
   print $bom; // Without this Excel does not display UTF8 characters properly.
 
-  $group_by = $bean->getAttribute('group_by');
+  $group_by1 = $bean->getAttribute('group_by1');
   if ($totals_only) {
     // Totals only report.
 
     // Determine group_by header.
-    if ('cf_1' == $group_by)
+    if ('cf_1' == $group_by1)
       $group_by_header = $custom_fields->fields[0]['label'];
     else {
-      $key = 'label.'.$group_by;
+      $key = 'label.'.$group_by1;
       $group_by_header = $i18n->get($key);
     }
 
diff --git a/topdf.php b/topdf.php
index 69f5816d..7d3fa009 100644
--- a/topdf.php
+++ b/topdf.php
@@ -63,12 +63,12 @@ $bean = new ActionForm('reportBean', new Form('reportForm'), $request);
 $totals_only = ($bean->getAttribute('chtotalsonly') == '1');
 
 // Determine group by header.
-$group_by = $bean->getAttribute('group_by');
-if ('no_grouping' != $group_by) {
-  if ('cf_1' == $group_by)
+$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_by;
+    $key = 'label.'.$group_by1;
     $group_by_header = $i18n->get($key);
   }
 }
@@ -77,12 +77,12 @@ if ('no_grouping' != $group_by) {
 $options = ttReportHelper::getReportOptions($bean);
 if (!$totals_only)
   $items = ttReportHelper::getItems($options); // Individual entries.
-if ($totals_only || 'no_grouping' != $group_by)
+if ($totals_only || 'no_grouping' != $group_by1)
   $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_by) {
+if ($items && 'no_grouping' != $group_by1) {
   $print_subtotals = true;
   $first_pass = true;
   $prev_grouped_by = '';
@@ -181,27 +181,27 @@ if ($totals_only) {
         $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
         if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
             $html .= '<td>';
-            if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chclient')) {
             $html .= '<td>';
-            if ($group_by == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chproject')) {
             $html .= '<td>';
-            if ($group_by == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chtask')) {
             $html .= '<td>';
-            if ($group_by == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chcf_1')) {
             $html .= '<td>';
-            if ($group_by == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+            if ($group_by1 == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
             $html .= '</td>';
         }
         if ($bean->getAttribute('chstart')) $html .= '<td></td>';
@@ -270,27 +270,27 @@ if ($totals_only) {
     $html .= '<td>'.$i18n->get('label.subtotal').'</td>';
     if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
       $html .= '<td>';
-      if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chclient')) {
       $html .= '<td>';
-      if ($group_by == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chproject')) {
       $html .= '<td>';
-      if ($group_by == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chtask')) {
       $html .= '<td>';
-      if ($group_by == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chcf_1')) {
       $html .= '<td>';
-      if ($group_by == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+      if ($group_by1 == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
       $html .= '</td>';
     }
     if ($bean->getAttribute('chstart')) $html .= '<td></td>';