X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=582d289ddb6153e6b29c0e2b5a564869fe9bf68c;hb=a331cbeee550ed74a5333c6ac361418161d84bd7;hp=ac7d6794b5dacfe344c1ca88da0482f2bd0472d0;hpb=993450e17195b87dc406c3135ee22dafe9b825fb;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index ac7d6794..582d289d 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -40,11 +40,11 @@ class ttReportHelper {
static function getWhere($bean) {
global $user;
- // Prepare dropdown parts.
+ // Prepare dropdown parts.
$dropdown_parts = '';
if ($bean->getAttribute('client'))
$dropdown_parts .= ' and l.client_id = '.$bean->getAttribute('client');
- else if ($user->isClient() && $user->client_id)
+ elseif ($user->isClient() && $user->client_id)
$dropdown_parts .= ' and l.client_id = '.$user->client_id;
if ($bean->getAttribute('option')) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$bean->getAttribute('option').')';
if ($bean->getAttribute('project')) $dropdown_parts .= ' and l.project_id = '.$bean->getAttribute('project');
@@ -53,7 +53,7 @@ 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';
-
+
// Prepare user list part.
$userlist = -1;
if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')))
@@ -64,7 +64,7 @@ class ttReportHelper {
$user_list_part = " and l.user_id in ($userlist)";
else
$user_list_part = " and l.user_id = ".$user->id;
-
+
// Prepare sql query part for where.
if ($bean->getAttribute('period'))
$period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format));
@@ -78,16 +78,16 @@ class ttReportHelper {
" $user_list_part $dropdown_parts";
return $where;
}
-
+
// getFavWhere prepares a WHERE clause for a favorite report query.
static function getFavWhere($report) {
global $user;
- // Prepare dropdown parts.
+ // Prepare dropdown parts.
$dropdown_parts = '';
if ($report['client_id'])
$dropdown_parts .= ' and l.client_id = '.$report['client_id'];
- else if ($user->isClient() && $user->client_id)
+ elseif ($user->isClient() && $user->client_id)
$dropdown_parts .= ' and l.client_id = '.$user->client_id;
if ($report['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$report['cf_1_option_id'].')';
if ($report['project_id']) $dropdown_parts .= ' and l.project_id = '.$report['project_id'];
@@ -96,14 +96,14 @@ 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';
-
+
// Prepare user list part.
$userlist = -1;
if (($user->canManageTeam() || $user->isClient())) {
if ($report['users'])
$userlist = $report['users'];
else {
- $active_users = ttTeamHelper::getActiveUsers();
+ $active_users = ttTeamHelper::getActiveUsers();
foreach ($active_users as $single_user)
$users[] = $single_user['id'];
$userlist = join(',', $users);
@@ -115,7 +115,7 @@ class ttReportHelper {
$user_list_part = " and l.user_id in ($userlist)";
else
$user_list_part = " and l.user_id = ".$user->id;
-
+
// Prepare sql query part for where.
if ($report['period'])
$period = new Period($report['period'], new DateAndTime($user->date_format));
@@ -129,21 +129,21 @@ class ttReportHelper {
" $user_list_part $dropdown_parts";
return $where;
}
-
+
// getExpenseWhere prepares WHERE clause for expenses query in a report.
static function getExpenseWhere($bean) {
global $user;
- // Prepare dropdown parts.
+ // Prepare dropdown parts.
$dropdown_parts = '';
if ($bean->getAttribute('client'))
$dropdown_parts .= ' and ei.client_id = '.$bean->getAttribute('client');
- else if ($user->isClient() && $user->client_id)
+ elseif ($user->isClient() && $user->client_id)
$dropdown_parts .= ' and ei.client_id = '.$user->client_id;
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';
-
+
// Prepare user list part.
$userlist = -1;
if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')))
@@ -154,7 +154,7 @@ class ttReportHelper {
$user_list_part = " and ei.user_id in ($userlist)";
else
$user_list_part = " and ei.user_id = ".$user->id;
-
+
// Prepare sql query part for where.
if ($bean->getAttribute('period'))
$period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format));
@@ -173,16 +173,16 @@ class ttReportHelper {
static function getFavExpenseWhere($report) {
global $user;
- // Prepare dropdown parts.
+ // Prepare dropdown parts.
$dropdown_parts = '';
if ($report['client_id'])
$dropdown_parts .= ' and ei.client_id = '.$report['client_id'];
- else if ($user->isClient() && $user->client_id)
+ elseif ($user->isClient() && $user->client_id)
$dropdown_parts .= ' and ei.client_id = '.$user->client_id;
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';
-
+
// Prepare user list part.
$userlist = -1;
if (($user->canManageTeam() || $user->isClient())) {
@@ -201,7 +201,7 @@ class ttReportHelper {
$user_list_part = " and ei.user_id in ($userlist)";
else
$user_list_part = " and ei.user_id = ".$user->id;
-
+
// Prepare sql query part for where.
if ($report['period'])
$period = new Period($report['period'], new DateAndTime($user->date_format));
@@ -215,17 +215,17 @@ class ttReportHelper {
" $user_list_part $dropdown_parts";
return $where;
}
-
+
// getItems retrieves all items associated with a 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.
static function getItems($bean) {
global $user;
$mdb2 = getConnection();
-
+
$group_by_option = $bean->getAttribute('group_by');
$convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish'));
-
+
// Prepare a query for time items in tt_log table.
$fields = array(); // An array of fields for database query.
array_push($fields, 'l.id as id');
@@ -248,9 +248,9 @@ class ttReportHelper {
$custom_fields = new CustomFields($user->team_id);
$cf_1_type = $custom_fields->fields[0]['type'];
if ($cf_1_type == CustomFields::TYPE_TEXT) {
- array_push($fields, 'cfl.value as cf_1');
- } else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
- array_push($fields, 'cfo.value as cf_1');
+ array_push($fields, 'cfl.value as cf_1');
+ } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+ array_push($fields, 'cfo.value as cf_1');
}
}
// Add start time.
@@ -289,30 +289,30 @@ class ttReportHelper {
if ($user->canManageTeam() || $user->isClient() || in_array('ex', explode(',', $user->plugins)))
$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)";
+ $left_joins .= " left join tt_projects p on (p.id = l.project_id)";
if ($bean->getAttribute('chtask') || 'task' == $group_by_option)
- $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
+ $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
if ($include_cf_1) {
if ($cf_1_type == CustomFields::TYPE_TEXT)
$left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
- else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+ elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
$left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
" left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
}
}
if ($includeCost && MODE_TIME != $user->tracking_mode)
$left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
-
+
$where = ttReportHelper::getWhere($bean);
-
- // Construct sql query for tt_log items.
+
+ // Construct sql query for tt_log items.
$sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
// If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
// with an exception of sorting part, that is added in the end.
// However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
if ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled
-
+
$fields = array(); // An array of fields for database query.
array_push($fields, 'ei.id');
array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
@@ -345,7 +345,7 @@ class ttReportHelper {
// Add invoice name if it is selected.
if (($user->canManageTeam() || $user->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())
@@ -353,19 +353,19 @@ class ttReportHelper {
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)";
+ $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
if (($user->canManageTeam() || $user->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);
-
+
// Construct sql query for expense items.
$sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
-
+
// Construct a union.
$sql = "($sql) union all ($sql_for_expense_items)";
}
-
+
// Determine sort part.
$sort_part = ' order by ';
if ('no_grouping' == $group_by_option || 'date' == $group_by_option)
@@ -377,62 +377,61 @@ class ttReportHelper {
if ($bean->getAttribute('chstart'))
$sort_part .= ', unformatted_start';
$sort_part .= ', id';
-
+
$sql .= $sort_part;
// By now we are ready with sql.
// Obtain items for report.
$res = $mdb2->query($sql);
- if (!is_a($res, 'PEAR_Error')) {
- while ($val = $res->fetchRow()) {
- if ($convertTo12Hour) {
- if($val['start'] != '')
- $val['start'] = ttTimeHelper::to12HourFormat($val['start']);
- if($val['finish'] != '')
- $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
- }
- if (isset($val['cost'])) {
- if ('.' != $user->decimal_mark)
- $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
- }
- if (isset($val['expense'])) {
- if ('.' != $user->decimal_mark)
- $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
- }
- if ('no_grouping' != $group_by_option) {
- $val['grouped_by'] = $val[$group_by_option];
- if ('date' == $group_by_option) {
- // This is needed to get the date in user date format.
- $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
- $val['grouped_by'] = $o_date->toString($user->date_format);
- unset($o_date);
- }
- }
-
+ if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+ while ($val = $res->fetchRow()) {
+ if ($convertTo12Hour) {
+ if($val['start'] != '')
+ $val['start'] = ttTimeHelper::to12HourFormat($val['start']);
+ if($val['finish'] != '')
+ $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
+ }
+ if (isset($val['cost'])) {
+ if ('.' != $user->decimal_mark)
+ $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+ }
+ if (isset($val['expense'])) {
+ if ('.' != $user->decimal_mark)
+ $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
+ }
+ if ('no_grouping' != $group_by_option) {
+ $val['grouped_by'] = $val[$group_by_option];
+ if ('date' == $group_by_option) {
// This is needed to get the date in user date format.
- $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']);
- $val['date'] = $o_date->toString($user->date_format);
+ $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
+ $val['grouped_by'] = $o_date->toString($user->date_format);
unset($o_date);
-
- $row = $val;
- $report_items[] = $row;
}
- } else
- die($res->getMessage());
+ }
+
+ // This is needed to get the date in user date format.
+ $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']);
+ $val['date'] = $o_date->toString($user->date_format);
+ unset($o_date);
+
+ $row = $val;
+ $report_items[] = $row;
+ }
return $report_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.
static function getFavItems($report) {
global $user;
$mdb2 = getConnection();
-
+
$group_by_option = $report['group_by'];
$convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($report['show_start'] || $report['show_end']);
-
+
// Prepare a query for time items in tt_log table.
$fields = array(); // An array of fields for database query.
array_push($fields, 'l.id as id');
@@ -455,9 +454,9 @@ class ttReportHelper {
$custom_fields = new CustomFields($user->team_id);
$cf_1_type = $custom_fields->fields[0]['type'];
if ($cf_1_type == CustomFields::TYPE_TEXT) {
- array_push($fields, 'cfl.value as cf_1');
- } else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
- array_push($fields, 'cfo.value as cf_1');
+ array_push($fields, 'cfl.value as cf_1');
+ } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+ array_push($fields, 'cfo.value as cf_1');
}
}
// Add start time.
@@ -496,30 +495,30 @@ class ttReportHelper {
if ($user->canManageTeam() || $user->isClient() || in_array('ex', explode(',', $user->plugins)))
$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)";
+ $left_joins .= " left join tt_projects p on (p.id = l.project_id)";
if ($report['show_task'] || 'task' == $group_by_option)
- $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
+ $left_joins .= " left join tt_tasks t on (t.id = l.task_id)";
if ($include_cf_1) {
if ($cf_1_type == CustomFields::TYPE_TEXT)
$left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)";
- else if ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
+ elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) {
$left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)".
" left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
}
}
if ($includeCost && MODE_TIME != $user->tracking_mode)
$left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
-
+
$where = ttReportHelper::getFavWhere($report);
-
- // Construct sql query for tt_log items.
+
+ // Construct sql query for tt_log items.
$sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
// If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need,
// with an exception of sorting part, that is added in the end.
// However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
if ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled
-
+
$fields = array(); // An array of fields for database query.
array_push($fields, 'ei.id');
array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
@@ -552,7 +551,7 @@ class ttReportHelper {
// Add invoice name if it is selected.
if (($user->canManageTeam() || $user->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())
@@ -560,19 +559,19 @@ class ttReportHelper {
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)";
+ $left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
if (($user->canManageTeam() || $user->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);
-
+
// Construct sql query for expense items.
$sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where";
-
+
// Construct a union.
$sql = "($sql) union all ($sql_for_expense_items)";
}
-
+
// Determine sort part.
$sort_part = ' order by ';
if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option) // TODO: fix DB for NULL values in group_by field.
@@ -584,68 +583,67 @@ class ttReportHelper {
if ($report['show_start'])
$sort_part .= ', unformatted_start';
$sort_part .= ', id';
-
+
$sql .= $sort_part;
// By now we are ready with sql.
// Obtain items for report.
$res = $mdb2->query($sql);
- if (!is_a($res, 'PEAR_Error')) {
- while ($val = $res->fetchRow()) {
- if ($convertTo12Hour) {
- if($val['start'] != '')
- $val['start'] = ttTimeHelper::to12HourFormat($val['start']);
- if($val['finish'] != '')
- $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
- }
- if (isset($val['cost'])) {
- if ('.' != $user->decimal_mark)
- $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
- }
- if (isset($val['expense'])) {
- if ('.' != $user->decimal_mark)
- $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
- }
- if ('no_grouping' != $group_by_option) {
- $val['grouped_by'] = $val[$group_by_option];
- if ('date' == $group_by_option) {
- // This is needed to get the date in user date format.
- $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
- $val['grouped_by'] = $o_date->toString($user->date_format);
- unset($o_date);
- }
- }
-
+ if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+ while ($val = $res->fetchRow()) {
+ if ($convertTo12Hour) {
+ if($val['start'] != '')
+ $val['start'] = ttTimeHelper::to12HourFormat($val['start']);
+ if($val['finish'] != '')
+ $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
+ }
+ if (isset($val['cost'])) {
+ if ('.' != $user->decimal_mark)
+ $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+ }
+ if (isset($val['expense'])) {
+ if ('.' != $user->decimal_mark)
+ $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
+ }
+ if ('no_grouping' != $group_by_option) {
+ $val['grouped_by'] = $val[$group_by_option];
+ if ('date' == $group_by_option) {
// This is needed to get the date in user date format.
- $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']);
- $val['date'] = $o_date->toString($user->date_format);
+ $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']);
+ $val['grouped_by'] = $o_date->toString($user->date_format);
unset($o_date);
-
- $row = $val;
- $report_items[] = $row;
}
- } else
- die($res->getMessage());
+ }
+
+ // This is needed to get the date in user date format.
+ $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']);
+ $val['date'] = $o_date->toString($user->date_format);
+ unset($o_date);
+
+ $row = $val;
+ $report_items[] = $row;
+ }
return $report_items;
}
-
+
// getSubtotals calculates report items subtotals when a report is grouped by.
// Without expenses, it's a simple select with group by.
// With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
static function getSubtotals($bean) {
- global $user;
-
+ global $user;
+
$group_by_option = $bean->getAttribute('group_by');
if ('no_grouping' == $group_by_option) return null;
-
+
$mdb2 = getConnection();
-
+
// Start with sql to obtain subtotals for time items. This simple sql will be used when we have no expenses.
-
+
// Determine group by field and a required join.
switch ($group_by_option) {
- case 'date':
+ case 'date':
$group_field = 'l.date';
$group_join = '';
break;
@@ -658,54 +656,54 @@ class ttReportHelper {
$group_join = 'left join tt_clients c on (l.client_id = c.id) ';
break;
case 'project':
- $group_field = 'p.name';
+ $group_field = 'p.name';
$group_join = 'left join tt_projects p on (l.project_id = p.id) ';
- break;
+ break;
case 'task':
- $group_field = 't.name';
+ $group_field = 't.name';
$group_join = 'left join tt_tasks t on (l.task_id = t.id) ';
- break;
+ break;
case 'cf_1':
- $group_field = 'cfo.value';
- $custom_fields = new CustomFields($user->team_id);
- if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
+ $group_field = 'cfo.value';
+ $custom_fields = new CustomFields($user->team_id);
+ if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
$group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';
- else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+ elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
$group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';
- break;
+ break;
}
$where = ttReportHelper::getWhere($bean);
if ($bean->getAttribute('chcost')) {
if (MODE_TIME == $user->tracking_mode) {
- if ($group_by_option != 'user')
- $left_join = 'left join tt_users u on (l.user_id = u.id)';
+ if ($group_by_option != 'user')
+ $left_join = 'left join tt_users u on (l.user_id = u.id)';
$sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
null as expenses from tt_log l
- $group_join $left_join $where group by $group_field";
+ $group_join $left_join $where group by $group_field";
} else {
// If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
$sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time,
sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
- null as expenses from tt_log l
+ null as expenses from tt_log l
$group_join
left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field";
}
} else {
- $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l
+ $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l
$group_join $where group by $group_field";
}
// By now we have sql for time items.
-
+
// However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
if ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled
-
+
// Determine group by field and a required join.
$group_join = null;
$group_field = 'null';
switch ($group_by_option) {
- case 'date':
+ case 'date':
$group_field = 'ei.date';
$group_join = '';
break;
@@ -718,9 +716,9 @@ class ttReportHelper {
$group_join = 'left join tt_clients c on (ei.client_id = c.id) ';
break;
case 'project':
- $group_field = 'p.name';
+ $group_field = 'p.name';
$group_join = 'left join tt_projects p on (ei.project_id = p.id) ';
- break;
+ break;
}
$where = ttReportHelper::getExpenseWhere($bean);
@@ -728,37 +726,36 @@ class ttReportHelper {
$group_join $where";
// Add a "group by" clause if we are grouping.
if ('null' != $group_field) $sql_for_expenses .= " group by $group_field";
-
+
// Create a combined query.
$sql = "select group_field, sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field";
}
-
+
// Execute query.
$res = $mdb2->query($sql);
- if (!is_a($res, 'PEAR_Error')) {
- while ($val = $res->fetchRow()) {
- if ('date' == $group_by_option) {
- // This is needed to get the date in user date format.
- $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']);
- $val['group_field'] = $o_date->toString($user->date_format);
- unset($o_date);
- }
- $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
- if ($bean->getAttribute('chcost')) {
- if ('.' != $user->decimal_mark) {
- $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
- $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
- }
- $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']);
- } else
- $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time);
+ if (is_a($res, 'PEAR_Error')) die($res->getMessage());
+
+ while ($val = $res->fetchRow()) {
+ if ('date' == $group_by_option) {
+ // This is needed to get the date in user date format.
+ $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']);
+ $val['group_field'] = $o_date->toString($user->date_format);
+ unset($o_date);
}
- } else
- die($res->getMessage());
+ $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
+ if ($bean->getAttribute('chcost')) {
+ if ('.' != $user->decimal_mark) {
+ $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+ $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
+ }
+ $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']);
+ } else
+ $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time);
+ }
return $subtotals;
}
-
+
// getFavSubtotals calculates report items subtotals when a favorite report is grouped by.
// Without expenses, it's a simple select with group by.
// With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
@@ -799,7 +796,7 @@ class ttReportHelper {
$custom_fields = new CustomFields($user->team_id);
if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
$group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) ';
- else if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
+ elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
$group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) ';
break;
}
@@ -1055,13 +1052,13 @@ class ttReportHelper {
// prepareReportBody - prepares an email body for report.
static function prepareReportBody($bean, $comment)
{
- global $user;
- global $i18n;
+ global $user;
+ global $i18n;
$items = ttReportHelper::getItems($bean);
$group_by = $bean->getAttribute('group_by');
if ($group_by && 'no_grouping' != $group_by)
- $subtotals = ttReportHelper::getSubtotals($bean);
+ $subtotals = ttReportHelper::getSubtotals($bean);
$totals = ttReportHelper::getTotals($bean);
// Use custom fields plugin if it is enabled.
@@ -1301,7 +1298,8 @@ class ttReportHelper {
}
// Output footer.
- $body .= ''.$i18n->getKey('form.mail.footer').'
';
+ if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false))
+ $body .= ''.$i18n->getKey('form.mail.footer').'
';
// Finish creating email body.
$body .= '