X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=b5208bc7f6c8d0f13aebbfe59001c9a6f8891fcc;hb=f0e54f23029d8b109c0ab554ab2b49195d204391;hp=6ba55e366e151c2a7284fd17b2f0e4b7afaad7d6;hpb=3f7ed883e1c7d75aacc49900b403f8e84a68dc3f;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 6ba55e36..b5208bc7 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -231,6 +231,10 @@ class ttReportHelper {
global $user;
$mdb2 = getConnection();
+ // Determine these once as they are used in multiple places in this function.
+ $canViewReports = $user->can('view_reports');
+ $isClient = $user->isClient();
+
$group_by_option = $bean->getAttribute('group_by');
$convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish'));
@@ -239,7 +243,7 @@ class ttReportHelper {
array_push($fields, 'l.id as id');
array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
array_push($fields, 'l.date as date');
- if($user->can('view_reports') || $user->isClient())
+ if($canViewReports || $isClient)
array_push($fields, 'u.name as user');
// Add client name if it is selected.
if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
@@ -285,20 +289,27 @@ class ttReportHelper {
array_push($fields, "null as expense");
}
// Add paid status.
- if ($user->canManageTeam() && $bean->getAttribute('chpaid'))
+ if ($canViewReports && $bean->getAttribute('chpaid'))
array_push($fields, 'l.paid as paid');
+ // Add IP address.
+ if ($canViewReports && $bean->getAttribute('chip')) {
+ 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 (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice'))
+ if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
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)
$left_joins .= " left join tt_clients c on (c.id = l.client_id)";
- if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice'))
+ if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
$left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";
- if ($user->canManageTeam() || $user->isClient() || $user->isPluginEnabled('ex'))
+ 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)
$left_joins .= " left join tt_projects p on (p.id = l.project_id)";
@@ -329,7 +340,7 @@ class ttReportHelper {
array_push($fields, 'ei.id');
array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
array_push($fields, 'ei.date');
- if($user->canManageTeam() || $user->isClient())
+ if($canViewReports || $isClient)
array_push($fields, 'u.name as user');
// Add client name if it is selected.
if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
@@ -355,21 +366,29 @@ class ttReportHelper {
array_push($fields, 'ei.cost as cost');
array_push($fields, 'ei.cost as expense');
// Add paid status.
- if ($user->canManageTeam() && $bean->getAttribute('chpaid'))
+ if ($canViewReports && $bean->getAttribute('chpaid'))
array_push($fields, 'ei.paid as paid');
+ // Add IP address. NULL for now for expenses.
+ if ($canViewReports && $bean->getAttribute('chip')) {
+ array_push($fields, 'null as created');
+ array_push($fields, 'null as created_ip');
+ array_push($fields, 'null as modified');
+ array_push($fields, 'null as modified_ip');
+ }
+
// Add invoice name if it is selected.
- if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice'))
+ if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
array_push($fields, 'i.name as invoice');
// Prepare sql query part for left joins.
$left_joins = null;
- if ($user->canManageTeam() || $user->isClient())
+ if ($canViewReports || $isClient)
$left_joins .= " left join tt_users u on (u.id = ei.user_id)";
if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
$left_joins .= " left join tt_clients c on (c.id = ei.client_id)";
if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
$left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
- if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice'))
+ if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
$left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
$where = ttReportHelper::getExpenseWhere($bean);
@@ -387,7 +406,7 @@ class ttReportHelper {
$sort_part .= 'date';
else
$sort_part .= $group_by_option.', date';
- if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option)
+ if (($canViewReports || $isClient) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option)
$sort_part .= ', user, type';
if ($bean->getAttribute('chstart'))
$sort_part .= ', unformatted_start';
@@ -477,6 +496,10 @@ class ttReportHelper {
global $user;
$mdb2 = getConnection();
+ // Determine these once as they are used in multiple places in this function.
+ $canViewReports = $user->can('view_reports');
+ $isClient = $user->isClient();
+
$group_by_option = $report['group_by'];
$convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($report['show_start'] || $report['show_end']);
@@ -485,7 +508,7 @@ class ttReportHelper {
array_push($fields, 'l.id as id');
array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
array_push($fields, 'l.date as date');
- if($user->canManageTeam() || $user->isClient())
+ if($canViewReports || $isClient)
array_push($fields, 'u.name as user');
// Add client name if it is selected.
if ($report['show_client'] || 'client' == $group_by_option)
@@ -531,16 +554,16 @@ class ttReportHelper {
array_push($fields, "null as expense");
}
// Add invoice name if it is selected.
- if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice'])
+ if (($canViewReports || $isClient) && $report['show_invoice'])
array_push($fields, 'i.name as invoice');
// Prepare sql query part for left joins.
$left_joins = null;
if ($report['show_client'] || 'client' == $group_by_option)
$left_joins .= " left join tt_clients c on (c.id = l.client_id)";
- if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice'])
+ if (($canViewReports || $isClient) && $report['show_invoice'])
$left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)";
- if ($user->canManageTeam() || $user->isClient() || $user->isPluginEnabled('ex'))
+ if ($canViewReports || $isClient || $user->isPluginEnabled('ex'))
$left_joins .= " left join tt_users u on (u.id = l.user_id)";
if ($report['show_project'] || 'project' == $group_by_option)
$left_joins .= " left join tt_projects p on (p.id = l.project_id)";
@@ -571,7 +594,7 @@ class ttReportHelper {
array_push($fields, 'ei.id');
array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
array_push($fields, 'ei.date');
- if($user->canManageTeam() || $user->isClient())
+ if($canViewReports || $isClient)
array_push($fields, 'u.name as user');
// Add client name if it is selected.
if ($report['show_client'] || 'client' == $group_by_option)
@@ -597,18 +620,18 @@ class ttReportHelper {
array_push($fields, 'ei.cost as cost');
array_push($fields, 'ei.cost as expense');
// Add invoice name if it is selected.
- if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice'])
+ if (($canViewReports || $isClient) && $report['show_invoice'])
array_push($fields, 'i.name as invoice');
// Prepare sql query part for left joins.
$left_joins = null;
- if ($user->canManageTeam() || $user->isClient())
+ if ($canViewReports || $isClient)
$left_joins .= " left join tt_users u on (u.id = ei.user_id)";
if ($report['show_client'] || 'client' == $group_by_option)
$left_joins .= " left join tt_clients c on (c.id = ei.client_id)";
if ($report['show_project'] || 'project' == $group_by_option)
$left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
- if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice'])
+ if (($canViewReports || $isClient) && $report['show_invoice'])
$left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
$where = ttReportHelper::getFavExpenseWhere($report);
@@ -626,7 +649,7 @@ class ttReportHelper {
$sort_part .= 'date';
else
$sort_part .= $group_by_option.', date';
- if (($user->canManageTeam() || $user->isClient()) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option)
+ if (($canViewReports || $isClient) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option)
$sort_part .= ', user, type';
if ($report['show_start'])
$sort_part .= ', unformatted_start';
@@ -1113,6 +1136,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::getItems($bean);
$group_by = $bean->getAttribute('group_by');
if ($group_by && 'no_grouping' != $group_by)
@@ -1175,7 +1202,7 @@ class ttReportHelper {
}
if ($bean->getAttribute('chcost')) {
$body .= '
';
- $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses'];
+ $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
$body .= ' | ';
}
$body .= '';
@@ -1192,7 +1219,7 @@ class ttReportHelper {
}
if ($bean->getAttribute('chcost')) {
$body .= ''.htmlspecialchars($user->currency).' ';
- $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
+ $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= ' | ';
}
$body .= '';
@@ -1205,7 +1232,7 @@ class ttReportHelper {
$body .= '';
$body .= '';
$body .= ''.$i18n->getKey('label.date').' | ';
- if ($user->canManageTeam() || $user->isClient())
+ if ($canViewReports || $isClient)
$body .= ''.$i18n->getKey('label.user').' | ';
if ($bean->getAttribute('chclient'))
$body .= ''.$i18n->getKey('label.client').' | ';
@@ -1254,7 +1281,7 @@ class ttReportHelper {
$body .= '
';
$body .= ''.$i18n->getKey('label.subtotal').' | ';
$subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
- if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | ';
+ if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | ';
if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | ';
if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | ';
if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | ';
@@ -1265,7 +1292,7 @@ class ttReportHelper {
if ($bean->getAttribute('chnote')) $body .= ' | ';
if ($bean->getAttribute('chcost')) {
$body .= '';
- $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 .= ' | ';
}
if ($bean->getAttribute('chpaid')) $body .= ' | ';
@@ -1281,7 +1308,7 @@ class ttReportHelper {
$row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
$body .= '
';
$body .= ''.$record['date'].' | ';
- if ($user->canManageTeam() || $user->isClient())
+ if ($canViewReports || $isClient)
$body .= ''.htmlspecialchars($record['user']).' | ';
if ($bean->getAttribute('chclient'))
$body .= ''.htmlspecialchars($record['client']).' | ';
@@ -1321,7 +1348,7 @@ class ttReportHelper {
$body .= '
';
$body .= ''.$i18n->getKey('label.subtotal').' | ';
$subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
- if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | ';
+ if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | ';
if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | ';
if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | ';
if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | ';
@@ -1332,7 +1359,7 @@ class ttReportHelper {
if ($bean->getAttribute('chnote')) $body .= ' | ';
if ($bean->getAttribute('chcost')) {
$body .= '';
- $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 .= ' | ';
}
if ($bean->getAttribute('chpaid')) $body .= ' | ';
@@ -1344,7 +1371,7 @@ class ttReportHelper {
$body .= '
|
';
$body .= '';
$body .= ''.$i18n->getKey('label.total').' | ';
- if ($user->canManageTeam() || $user->isClient()) $body .= ' | ';
+ if ($canViewReports || $isClient) $body .= ' | ';
if ($bean->getAttribute('chclient')) $body .= ' | ';
if ($bean->getAttribute('chproject')) $body .= ' | ';
if ($bean->getAttribute('chtask')) $body .= ' | ';
@@ -1355,7 +1382,7 @@ class ttReportHelper {
if ($bean->getAttribute('chnote')) $body .= ' | ';
if ($bean->getAttribute('chcost')) {
$body .= ''.htmlspecialchars($user->currency).' ';
- $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
+ $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= ' | ';
}
if ($bean->getAttribute('chpaid')) $body .= ' | ';
@@ -1395,6 +1422,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)
@@ -1457,7 +1488,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 .= '
';
@@ -1474,7 +1505,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 .= '';
@@ -1487,7 +1518,7 @@ class ttReportHelper {
$body .= '';
$body .= '';
$body .= ''.$i18n->getKey('label.date').' | ';
- if ($user->canManageTeam() || $user->isClient())
+ if ($canViewReports || $isClient)
$body .= ''.$i18n->getKey('label.user').' | ';
if ($report['show_client'])
$body .= ''.$i18n->getKey('label.client').' | ';
@@ -1536,7 +1567,7 @@ class ttReportHelper {
$body .= '
';
$body .= ''.$i18n->getKey('label.subtotal').' | ';
$subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
- if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | ';
+ if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | ';
if ($report['show_client']) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | ';
if ($report['show_project']) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | ';
if ($report['show_task']) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | ';
@@ -1547,7 +1578,7 @@ class ttReportHelper {
if ($report['show_note']) $body .= ' | ';
if ($report['show_cost']) {
$body .= '';
- $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 .= ' | ';
}
if ($report['show_paid']) $body .= ' | ';
@@ -1563,7 +1594,7 @@ class ttReportHelper {
$row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
$body .= '
';
$body .= ''.$record['date'].' | ';
- if ($user->canManageTeam() || $user->isClient())
+ if ($canViewReports || $isClient)
$body .= ''.htmlspecialchars($record['user']).' | ';
if ($report['show_client'])
$body .= ''.htmlspecialchars($record['client']).' | ';
@@ -1603,7 +1634,7 @@ class ttReportHelper {
$body .= '
';
$body .= ''.$i18n->getKey('label.subtotal').' | ';
$subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
- if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | ';
+ if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | ';
if ($report['show_client']) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | ';
if ($report['show_project']) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | ';
if ($report['show_task']) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | ';
@@ -1614,7 +1645,7 @@ class ttReportHelper {
if ($report['show_note']) $body .= ' | ';
if ($report['show_cost']) {
$body .= '';
- $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 .= ' | ';
}
if ($report['show_paid']) $body .= ' | ';
@@ -1626,7 +1657,7 @@ class ttReportHelper {
$body .= '
|
';
$body .= '';
$body .= ''.$i18n->getKey('label.total').' | ';
- 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 .= ' | ';
@@ -1637,7 +1668,7 @@ class ttReportHelper {
if ($report['show_note']) $body .= ' | ';
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 .= ' | ';
}
if ($report['show_paid']) $body .= ' | ';