X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=1f797ace4580068bd21bbaede3dd291f12c64650;hb=62dc3d09ec2703764869f5e76e5bc82b351938a2;hp=ed5c0cab0d00f2d4048fd42945e85ff06d293aec;hpb=585ffedd49344ba7f2cd4873f76f6ac71360a55c;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index ed5c0cab..1f797ace 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -291,6 +291,13 @@ class ttReportHelper {
// Add paid status.
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 (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
@@ -361,6 +368,14 @@ class ttReportHelper {
// Add paid status.
if ($canViewReports && $bean->getAttribute('chpaid'))
array_push($fields, 'ei.paid as paid');
+ // Add IP address.
+ if ($canViewReports && $bean->getAttribute('chip')) {
+ array_push($fields, 'ei.created as created');
+ array_push($fields, 'ei.created_ip as created_ip');
+ array_push($fields, 'ei.modified as modified');
+ array_push($fields, 'ei.modified_ip as modified_ip');
+ }
+
// Add invoice name if it is selected.
if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
array_push($fields, 'i.name as invoice');
@@ -481,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']);
@@ -489,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)
@@ -534,17 +553,27 @@ class ttReportHelper {
array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
array_push($fields, "null as expense");
}
+ // Add paid status.
+ if ($canViewReports && $report['show_paid'])
+ array_push($fields, 'l.paid as paid');
+ // Add IP address.
+ if ($canViewReports && $report['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 (($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)";
@@ -575,7 +604,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)
@@ -600,19 +629,29 @@ class ttReportHelper {
array_push($fields, 'ei.name as note');
array_push($fields, 'ei.cost as cost');
array_push($fields, 'ei.cost as expense');
+ // Add paid status.
+ if ($canViewReports && $report['show_paid'])
+ array_push($fields, 'ei.paid as paid');
+ // Add IP address.
+ if ($canViewReports && $report['show_ip']) {
+ array_push($fields, 'ei.created as created');
+ array_push($fields, 'ei.created_ip as created_ip');
+ array_push($fields, 'ei.modified as modified');
+ array_push($fields, 'ei.modified_ip as modified_ip');
+ }
// 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);
@@ -630,7 +669,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';
@@ -1117,6 +1156,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)
@@ -1179,7 +1222,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 .= '';
@@ -1196,7 +1239,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 .= '';
@@ -1209,7 +1252,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').' | ';
@@ -1231,6 +1274,8 @@ class ttReportHelper {
$body .= ''.$i18n->getKey('label.cost').' | ';
if ($bean->getAttribute('chpaid'))
$body .= ''.$i18n->getKey('label.paid').' | ';
+ if ($bean->getAttribute('chip'))
+ $body .= ''.$i18n->getKey('label.ip').' | ';
if ($bean->getAttribute('chinvoice'))
$body .= ''.$i18n->getKey('label.invoice').' | ';
$body .= '
';
@@ -1258,7 +1303,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 : '').' | ';
@@ -1269,10 +1314,11 @@ 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 .= ' | ';
+ if ($bean->getAttribute('chip')) $body .= ' | ';
if ($bean->getAttribute('chinvoice')) $body .= ' | ';
$body .= '
';
$body .= ' |
';
@@ -1285,7 +1331,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']).' | ';
@@ -1310,6 +1356,11 @@ class ttReportHelper {
$body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
$body .= '';
}
+ if ($bean->getAttribute('chip')) {
+ $body .= '';
+ $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created'];
+ $body .= ' | ';
+ }
if ($bean->getAttribute('chinvoice'))
$body .= ''.htmlspecialchars($record['invoice']).' | ';
$body .= '
';
@@ -1325,7 +1376,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 : '').' | ';
@@ -1336,10 +1387,11 @@ 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 .= ' | ';
+ if ($bean->getAttribute('chip')) $body .= ' | ';
if ($bean->getAttribute('chinvoice')) $body .= ' | ';
$body .= '
';
}
@@ -1348,7 +1400,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 .= ' | ';
@@ -1359,10 +1411,11 @@ 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 .= ' | ';
+ if ($bean->getAttribute('chip')) $body .= ' | ';
if ($bean->getAttribute('chinvoice')) $body .= ' | ';
$body .= '
';
@@ -1399,6 +1452,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)
@@ -1461,7 +1518,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 .= '';
@@ -1478,7 +1535,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 .= '';
@@ -1491,7 +1548,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').' | ';
@@ -1513,6 +1570,8 @@ class ttReportHelper {
$body .= ''.$i18n->getKey('label.cost').' | ';
if ($report['show_paid'])
$body .= ''.$i18n->getKey('label.paid').' | ';
+ if ($report['show_ip'])
+ $body .= ''.$i18n->getKey('label.ip').' | ';
if ($report['show_invoice'])
$body .= ''.$i18n->getKey('label.invoice').' | ';
$body .= '
';
@@ -1540,7 +1599,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 : '').' | ';
@@ -1551,10 +1610,11 @@ 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 .= ' | ';
+ if ($report['show_ip']) $body .= ' | ';
if ($report['show_invoice']) $body .= ' | ';
$body .= '
';
$body .= ' |
';
@@ -1567,7 +1627,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']).' | ';
@@ -1592,6 +1652,11 @@ class ttReportHelper {
$body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
$body .= '';
}
+ if ($report['show_ip']) {
+ $body .= '';
+ $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created'];
+ $body .= ' | ';
+ }
if ($report['show_invoice'])
$body .= ''.htmlspecialchars($record['invoice']).' | ';
$body .= '
';
@@ -1607,7 +1672,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 : '').' | ';
@@ -1618,10 +1683,11 @@ 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 .= ' | ';
+ if ($report['show_ip']) $body .= ' | ';
if ($report['show_invoice']) $body .= ' | ';
$body .= '
';
}
@@ -1630,7 +1696,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 .= ' | ';
@@ -1641,10 +1707,11 @@ 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 .= ' | ';
+ if ($report['show_ip']) $body .= ' | ';
if ($report['show_invoice']) $body .= ' | ';
$body .= '
';