From: Nik Okuntseff <support@anuko.com>
Date: Wed, 1 Aug 2018 00:06:10 +0000 (+0000)
Subject: A bit more refactoring...
X-Git-Tag: timetracker_1.19-1~785
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0092d0f0e70b66795f5ab0fcff4bfcef89842f3d;p=timetracker.git

A bit more refactoring...
---

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 71fcb08f..612180a9 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -190,31 +190,28 @@ class ttReportHelper {
     // Add paid status.
     if ($canViewReports && $options['show_paid'])
       array_push($fields, 'l.paid as paid');
-
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
     // Add IP address.
-    if ($canViewReports && $bean->getAttribute('chip')) {
+    if ($canViewReports && $options['show_ip']) {
       array_push($fields, 'l.created as created');
       array_push($fields, 'l.created_ip as created_ip');
       array_push($fields, 'l.modified as modified');
       array_push($fields, 'l.modified_ip as modified_ip');
     }
-
     // Add invoice name if it is selected.
-    if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
+    if (($canViewReports || $isClient) && $options['show_invoice'])
       array_push($fields, 'i.name as invoice');
 
     // Prepare sql query part for left joins.
     $left_joins = null;
-    if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+    if ($options['show_client'] || 'client' == $group_by_option)
       $left_joins .= " left join tt_clients c on (c.id = l.client_id)";
-    if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
+    if (($canViewReports || $isClient) && $options['show_invoice'])
       $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";
     if ($canViewReports || $isClient || $user->isPluginEnabled('ex'))
        $left_joins .= " left join tt_users u on (u.id = l.user_id)";
-    if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
+    if ($options['show_project'] || 'project' == $group_by_option)
       $left_joins .= " left join tt_projects p on (p.id = l.project_id)";
-    if ($bean->getAttribute('chtask') || 'task' == $group_by_option)
+    if ($options['show_task'] || 'task' == $group_by_option)
       $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
     if ($include_cf_1) {
       if ($cf_1_type == CustomFields::TYPE_TEXT)
@@ -234,6 +231,8 @@ class ttReportHelper {
     // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
     // with an exception of sorting part, that is added in the end.
 
+// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
+
     // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
     if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled
 
@@ -1806,15 +1805,9 @@ class ttReportHelper {
     $options['period_start'] = $bean->getAttribute('start_date');
     $options['period_end'] = $bean->getAttribute('end_date');
     $options['show_client'] = $bean->getAttribute('chclient');
-
-/*
- * TODO: remaining fields to fill in...
-  `show_invoice` tinyint(4) NOT NULL default 0,          # whether to show invoice column
-*/
+    $options['show_invoice'] = $bean->getAttribute('chinvoice');
     $options['show_paid'] = $bean->getAttribute('chpaid');
-/*
-  `show_ip` tinyint(4) NOT NULL default 0,               # whether to show ip column
-*/
+    $options['show_ip'] = $bean->getAttribute('chip');
     $options['show_project'] = $bean->getAttribute('chproject');
     $options['show_start'] = $bean->getAttribute('chstart');
     $options['show_duration'] = $bean->getAttribute('chduration');
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 14d389b6..f620d850 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.17.97.4307 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.97.4308 | 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>