X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=1f797ace4580068bd21bbaede3dd291f12c64650;hb=09a0f5eb840d00b4dca766ed24c42f50546c0e39;hp=41ddd0fe32ce6c7175a0f2e2a90b6b8fcf5dc506;hpb=343bde69ae7c9d8efc8a814ce891a3f04b8f502c;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 41ddd0fe..1f797ace 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -58,11 +58,11 @@ class ttReportHelper {
// Prepare user list part.
$userlist = -1;
- if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')))
+ if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users')))
$userlist = join(',', $bean->getAttribute('users'));
// Prepare sql query part for user list.
$user_list_part = null;
- if ($user->canManageTeam() || $user->isClient())
+ if ($user->can('view_reports') || $user->isClient())
$user_list_part = " and l.user_id in ($userlist)";
else
$user_list_part = " and l.user_id = ".$user->id;
@@ -98,10 +98,12 @@ class ttReportHelper {
if ($report['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
if ($report['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
if ($report['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+ if ($report['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
+ if ($report['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
// Prepare user list part.
$userlist = -1;
- if (($user->canManageTeam() || $user->isClient())) {
+ if (($user->can('view_reports') || $user->isClient())) {
if ($report['users'])
$userlist = $report['users'];
else {
@@ -113,7 +115,7 @@ class ttReportHelper {
}
// Prepare sql query part for user list.
$user_list_part = null;
- if ($user->canManageTeam() || $user->isClient())
+ if ($user->can('view_reports') || $user->isClient())
$user_list_part = " and l.user_id in ($userlist)";
else
$user_list_part = " and l.user_id = ".$user->id;
@@ -145,14 +147,16 @@ class ttReportHelper {
if ($bean->getAttribute('project')) $dropdown_parts .= ' and ei.project_id = '.$bean->getAttribute('project');
if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
+ if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and ei.paid = 1';
+ if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and ei.paid = 0';
// Prepare user list part.
$userlist = -1;
- if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')))
+ if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users')))
$userlist = join(',', $bean->getAttribute('users'));
// Prepare sql query part for user list.
$user_list_part = null;
- if ($user->canManageTeam() || $user->isClient())
+ if ($user->can('view_reports') || $user->isClient())
$user_list_part = " and ei.user_id in ($userlist)";
else
$user_list_part = " and ei.user_id = ".$user->id;
@@ -184,10 +188,12 @@ class ttReportHelper {
if ($report['project_id']) $dropdown_parts .= ' and ei.project_id = '.$report['project_id'];
if ($report['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
if ($report['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
+ if ($report['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
+ if ($report['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
// Prepare user list part.
$userlist = -1;
- if (($user->canManageTeam() || $user->isClient())) {
+ if (($user->can('view_reports') || $user->isClient())) {
if ($report['users'])
$userlist = $report['users'];
else {
@@ -199,7 +205,7 @@ class ttReportHelper {
}
// Prepare sql query part for user list.
$user_list_part = null;
- if ($user->canManageTeam() || $user->isClient())
+ if ($user->can('view_reports') || $user->isClient())
$user_list_part = " and ei.user_id in ($userlist)";
else
$user_list_part = " and ei.user_id = ".$user->id;
@@ -225,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'));
@@ -233,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->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)
@@ -279,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)";
@@ -323,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)
@@ -348,19 +365,30 @@ 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 && $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 (($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);
@@ -378,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';
@@ -428,6 +456,39 @@ class ttReportHelper {
return $report_items;
}
+ // putInSession stores tt_log and tt_expense_items ids from a report in user session
+ // as 2 comma-separated lists.
+ static function putInSession($report_items) {
+ unset($_SESSION['report_item_ids']);
+ unset($_SESSION['report_item_expense_ids']);
+
+ // Iterate through records and build 2 comma-separated lists.
+ foreach($report_items as $item) {
+ if ($item['type'] == 1)
+ $report_item_ids .= ','.$item['id'];
+ else if ($item['type'] == 2)
+ $report_item_expense_ids .= ','.$item['id'];
+ }
+ $report_item_ids = trim($report_item_ids, ',');
+ $report_item_expense_ids = trim($report_item_expense_ids, ',');
+
+ // The lists are reqdy. Put them in session.
+ if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids;
+ if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids;
+ }
+
+ // getFromSession obtains tt_log and tt_expense_items ids stored in user session.
+ static function getFromSession() {
+ $items = array();
+ $report_item_ids = $_SESSION['report_item_ids'];
+ if ($report_item_ids)
+ $items['report_item_ids'] = explode(',', $report_item_ids);
+ $report_item_expense_ids = $_SESSION['report_item_expense_ids'];
+ if ($report_item_expense_ids)
+ $items['report_item_expense_ids'] = explode(',', $report_item_expense_ids);
+ return $items;
+ }
+
// getFavItems retrieves all items associated with a favorite report.
// It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all.
// Expense items use the "note" field for item name.
@@ -435,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']);
@@ -443,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)
@@ -488,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)";
@@ -529,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)
@@ -554,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);
@@ -584,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';
@@ -1048,12 +1133,33 @@ class ttReportHelper {
}
}
+ // The markPaid marks a set of records as either paid or unpaid.
+ static function markPaid($time_log_ids, $expense_item_ids, $paid = true)
+ {
+ $mdb2 = getConnection();
+ $paid_val = (int) $paid;
+ if ($time_log_ids) {
+ $sql = "update tt_log set paid = $paid_val where id in(".join(', ', $time_log_ids).")";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+ }
+ if ($expense_item_ids) {
+ $sql = "update tt_expense_items set paid = $paid_val where id in(".join(', ', $expense_item_ids).")";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+ }
+ }
+
// prepareReportBody - prepares an email body for report.
static function prepareReportBody($bean, $comment)
{
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)
@@ -1116,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 .= '';
@@ -1133,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 .= '';
@@ -1146,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').' | ';
@@ -1168,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 .= '
';
@@ -1195,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 : '').' | ';
@@ -1206,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 .= ' |
';
@@ -1222,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']).' | ';
@@ -1247,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 .= '
';
@@ -1262,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 : '').' | ';
@@ -1273,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 .= '
';
}
@@ -1285,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 .= ' | ';
@@ -1296,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 .= '
';
@@ -1322,7 +1438,7 @@ class ttReportHelper {
$items = ttReportHelper::getFavItems($report);
$condition = str_replace('count', '', $condition);
- $count_required = intval(trim(str_replace('>', '', $condition)));
+ $count_required = (int) trim(str_replace('>', '', $condition));
if (count($items) > $count_required)
return true; // Condition ok.
@@ -1336,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)
@@ -1398,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 .= '';
@@ -1415,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 .= '';
@@ -1428,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').' | ';
@@ -1448,6 +1568,10 @@ class ttReportHelper {
$body .= ''.$i18n->getKey('label.note').' | ';
if ($report['show_cost'])
$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 .= '
';
@@ -1475,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 : '').' | ';
@@ -1486,9 +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 .= ' |
';
@@ -1501,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']).' | ';
@@ -1521,6 +1647,16 @@ class ttReportHelper {
$body .= ''.htmlspecialchars($record['note']).' | ';
if ($report['show_cost'])
$body .= ''.$record['cost'].' | ';
+ if ($report['show_paid']) {
+ $body .= '';
+ $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 .= '
';
@@ -1536,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 : '').' | ';
@@ -1547,9 +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 .= '
';
}
@@ -1558,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 .= ' | ';
@@ -1569,9 +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 .= '
';