A bit of cleanup in report.php.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 29e2eea3229300f208644039769fde4ce5a3663c..e031d383241f0e3231c17fa650d56925255ae421 100644 (file)
--- 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>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.18.30.4642 | 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.30.4643 | 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>
             <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/report.php b/report.php
index 924c7801a984636ad677903b3cdb1d174799992c..cb563b9b04d49c3e18e28a60f2a2a455ed73428a 100644 (file)
--- a/report.php
+++ b/report.php
@@ -170,49 +170,32 @@ if ($request->isPost()) {
   }
 } // isPost
 
   }
 } // isPost
 

-$group_by = $bean->getAttribute('group_by1');
-

 $options = ttReportHelper::getReportOptions($bean);
 
 $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);
 
 $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 (ttReportHelper::grouping($options))
+if (ttReportHelper::grouping($options)) {

   $subtotals = ttReportHelper::getSubtotals($options);
   $subtotals = ttReportHelper::getSubtotals($options);

+  $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
+}

 $totals = ttReportHelper::getTotals($options);
 
 // Assign variables that are used to print subtotals.
 $totals = ttReportHelper::getTotals($options);
 
 // Assign variables that are used to print subtotals.

-if ($report_items && 'no_grouping' != $group_by1) {
+if ($report_items) {

   $smarty->assign('print_subtotals', true);
   $smarty->assign('first_pass', true);
   $smarty->assign('print_subtotals', true);
   $smarty->assign('first_pass', true);

-  $smarty->assign('group_by1', $group_by1);

   $smarty->assign('prev_grouped_by', '');
   $smarty->assign('cur_grouped_by', '');
 }
   $smarty->assign('prev_grouped_by', '');
   $smarty->assign('cur_grouped_by', '');
 }

-// 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', '');
 $smarty->assign('report_row_class', 'rowReportItem');
 
 // Assign variables that are used to alternate color of rows for different dates.
 $smarty->assign('prev_date', '');
 $smarty->assign('cur_date', '');
 $smarty->assign('report_row_class', 'rowReportItem');

-

 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

-

 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);