From b859fc87dd294eaac78be9b19e11ef823d6e23f8 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Wed, 14 Mar 2018 15:27:44 +0000 Subject: [PATCH] Some more refactoring. --- WEB-INF/lib/ttReportHelper.class.php | 24 ++++++++++++++---------- WEB-INF/templates/footer.tpl | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 223d8e4b..f2ae6202 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -1407,6 +1407,10 @@ class ttReportHelper { global $user; global $i18n; + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $items = ttReportHelper::getFavItems($report); $group_by = $report['group_by']; if ($group_by && 'no_grouping' != $group_by) @@ -1469,7 +1473,7 @@ class ttReportHelper { } if ($report['show_cost']) { $body .= ''; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; $body .= ''; } $body .= ''; @@ -1486,7 +1490,7 @@ class ttReportHelper { } if ($report['show_cost']) { $body .= ''.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= ''; } $body .= ''; @@ -1499,7 +1503,7 @@ class ttReportHelper { $body .= ''; $body .= ''; $body .= ''; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''; if ($report['show_client']) $body .= ''; @@ -1548,7 +1552,7 @@ class ttReportHelper { $body .= ''; $body .= ''; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ''; if ($report['show_client']) $body .= ''; if ($report['show_project']) $body .= ''; if ($report['show_task']) $body .= ''; @@ -1559,7 +1563,7 @@ class ttReportHelper { if ($report['show_note']) $body .= ''; if ($report['show_cost']) { $body .= ''; } if ($report['show_paid']) $body .= ''; @@ -1575,7 +1579,7 @@ class ttReportHelper { $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem; $body .= ''; $body .= ''; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''; if ($report['show_client']) $body .= ''; @@ -1615,7 +1619,7 @@ class ttReportHelper { $body .= ''; $body .= ''; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ''; if ($report['show_client']) $body .= ''; if ($report['show_project']) $body .= ''; if ($report['show_task']) $body .= ''; @@ -1626,7 +1630,7 @@ class ttReportHelper { if ($report['show_note']) $body .= ''; if ($report['show_cost']) { $body .= ''; } if ($report['show_paid']) $body .= ''; @@ -1638,7 +1642,7 @@ class ttReportHelper { $body .= ''; $body .= ''; $body .= ''; - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ''; if ($report['show_client']) $body .= ''; if ($report['show_project']) $body .= ''; if ($report['show_task']) $body .= ''; @@ -1649,7 +1653,7 @@ class ttReportHelper { if ($report['show_note']) $body .= ''; if ($report['show_cost']) { $body .= ''; } if ($report['show_paid']) $body .= ''; diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 84d18319..f7e7f6bf 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
'.$i18n->getKey('label.date').''.$i18n->getKey('label.user').''.$i18n->getKey('label.client').'
'.$i18n->getKey('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; $body .= '
'.$record['date'].''.htmlspecialchars($record['user']).''.htmlspecialchars($record['client']).'
'.$i18n->getKey('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; $body .= '
 
'.$i18n->getKey('label.total').''.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= '
-
 Anuko Time Tracker 1.17.43.4074 | Copyright © Anuko | +  Anuko Time Tracker 1.17.43.4075 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1