X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=f2ae6202685759b615f4c860e975d1676b56c6d1;hb=7218f84ad58ed22a926b3ffa7a152ca7f93f0204;hp=c66cb33aa3a25e2a54d6f4482513b19eb5cc72c3;hpb=1b6699f3d4ad1961fa4055ec0033bc10f0b06b83;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index c66cb33a..f2ae6202 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -53,14 +53,16 @@ class ttReportHelper {
if ($bean->getAttribute('include_records')=='2') $dropdown_parts .= ' and l.billable = 0';
if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+ if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and l.paid = 1';
+ if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and l.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 l.user_id in ($userlist)";
else
$user_list_part = " and l.user_id = ".$user->id;
@@ -74,7 +76,7 @@ class ttReportHelper {
new DateAndTime($user->date_format, $bean->getAttribute('start_date')),
new DateAndTime($user->date_format, $bean->getAttribute('end_date')));
}
- $where = " where l.status = 1 and l.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
+ $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
" $user_list_part $dropdown_parts";
return $where;
}
@@ -96,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 {
@@ -111,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;
@@ -125,7 +129,7 @@ class ttReportHelper {
new DateAndTime($user->date_format, $report['period_start']),
new DateAndTime($user->date_format, $report['period_end']));
}
- $where = " where l.status = 1 and l.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
+ $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
" $user_list_part $dropdown_parts";
return $where;
}
@@ -143,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;
@@ -164,7 +170,7 @@ class ttReportHelper {
new DateAndTime($user->date_format, $bean->getAttribute('start_date')),
new DateAndTime($user->date_format, $bean->getAttribute('end_date')));
}
- $where = " where ei.status = 1 and ei.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
+ $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
" $user_list_part $dropdown_parts";
return $where;
}
@@ -182,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 {
@@ -197,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;
@@ -211,7 +219,7 @@ class ttReportHelper {
new DateAndTime($user->date_format, $report['period_start']),
new DateAndTime($user->date_format, $report['period_end']));
}
- $where = " where ei.status = 1 and ei.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
+ $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
" $user_list_part $dropdown_parts";
return $where;
}
@@ -223,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'));
@@ -231,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)
@@ -276,17 +288,21 @@ 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 && $bean->getAttribute('chpaid'))
+ array_push($fields, 'l.paid as paid');
+
// 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)";
@@ -317,7 +333,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)
@@ -342,19 +358,22 @@ 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 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);
@@ -372,7 +391,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';
@@ -422,6 +441,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.
@@ -429,6 +481,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']);
@@ -437,7 +493,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)
@@ -483,16 +539,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)";
@@ -523,7 +579,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)
@@ -549,18 +605,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);
@@ -578,7 +634,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';
@@ -945,7 +1001,7 @@ class ttReportHelper {
new DateAndTime($user->date_format, $bean->getAttribute('end_date')));
}
- $totals['start_date'] = $period->getBeginDate();
+ $totals['start_date'] = $period->getStartDate();
$totals['end_date'] = $period->getEndDate();
$totals['time'] = $total_time;
$totals['cost'] = $total_cost;
@@ -1015,7 +1071,7 @@ class ttReportHelper {
new DateAndTime($user->date_format, $report['period_end']));
}
- $totals['start_date'] = $period->getBeginDate();
+ $totals['start_date'] = $period->getStartDate();
$totals['end_date'] = $period->getEndDate();
$totals['time'] = $total_time;
$totals['cost'] = $total_cost;
@@ -1042,12 +1098,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)
@@ -1062,7 +1139,7 @@ class ttReportHelper {
$style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
$tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
$tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
- $rowItem = 'background-color: #ccccce;';
+ $rowItem = 'background-color: #ffffff;';
$rowItemAlt = 'background-color: #f5f5f5;';
$rowSubtotal = 'background-color: #e0e0e0;';
$cellLeftAligned = 'text-align: left; vertical-align: top;';
@@ -1110,7 +1187,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 .= '';
@@ -1127,7 +1204,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 .= '';
@@ -1140,7 +1217,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').' | ';
@@ -1160,6 +1237,8 @@ class ttReportHelper {
$body .= ''.$i18n->getKey('label.note').' | ';
if ($bean->getAttribute('chcost'))
$body .= ''.$i18n->getKey('label.cost').' | ';
+ if ($bean->getAttribute('chpaid'))
+ $body .= ''.$i18n->getKey('label.paid').' | ';
if ($bean->getAttribute('chinvoice'))
$body .= ''.$i18n->getKey('label.invoice').' | ';
$body .= '
';
@@ -1187,7 +1266,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 : '').' | ';
@@ -1198,9 +1277,10 @@ 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('chinvoice')) $body .= ' | ';
$body .= '
';
$body .= ' |
';
@@ -1213,7 +1293,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']).' | ';
@@ -1233,6 +1313,11 @@ class ttReportHelper {
$body .= ''.htmlspecialchars($record['note']).' | ';
if ($bean->getAttribute('chcost'))
$body .= ''.$record['cost'].' | ';
+ if ($bean->getAttribute('chpaid')) {
+ $body .= '';
+ $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
+ $body .= ' | ';
+ }
if ($bean->getAttribute('chinvoice'))
$body .= ''.htmlspecialchars($record['invoice']).' | ';
$body .= '
';
@@ -1248,7 +1333,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 : '').' | ';
@@ -1259,9 +1344,10 @@ 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('chinvoice')) $body .= ' | ';
$body .= '
';
}
@@ -1270,7 +1356,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 .= ' | ';
@@ -1281,9 +1367,10 @@ 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('chinvoice')) $body .= ' | ';
$body .= '
';
@@ -1306,7 +1393,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.
@@ -1320,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)
@@ -1334,7 +1425,7 @@ class ttReportHelper {
$style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
$tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
$tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
- $rowItem = 'background-color: #ccccce;';
+ $rowItem = 'background-color: #ffffff;';
$rowItemAlt = 'background-color: #f5f5f5;';
$rowSubtotal = 'background-color: #e0e0e0;';
$cellLeftAligned = 'text-align: left; vertical-align: top;';
@@ -1382,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 .= '';
@@ -1399,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 .= '';
@@ -1412,7 +1503,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').' | ';
@@ -1432,6 +1523,8 @@ 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_invoice'])
$body .= ''.$i18n->getKey('label.invoice').' | ';
$body .= '
';
@@ -1459,7 +1552,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 : '').' | ';
@@ -1470,9 +1563,10 @@ 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_invoice']) $body .= ' | ';
$body .= '
';
$body .= ' |
';
@@ -1485,7 +1579,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']).' | ';
@@ -1505,6 +1599,11 @@ 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_invoice'])
$body .= ''.htmlspecialchars($record['invoice']).' | ';
$body .= '
';
@@ -1520,7 +1619,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 : '').' | ';
@@ -1531,9 +1630,10 @@ 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_invoice']) $body .= ' | ';
$body .= '
';
}
@@ -1542,7 +1642,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 .= ' | ';
@@ -1553,9 +1653,10 @@ 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_invoice']) $body .= ' | ';
$body .= '
';