X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=280b70dbeda161e46bc511671cdf2a278020d1d6;hb=b027028b5322fcbfb6de53e7a74529cbac7931de;hp=0900f7f9d0e440717d5bbcfc8886b689e3373503;hpb=8ec1dac1bcf71ce282ab116413d335f582b5e8f3;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 0900f7f9..280b70db 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -37,97 +37,41 @@ require_once(dirname(__FILE__).'/../../plugins/CustomFields.class.php'); class ttReportHelper { // getWhere prepares a WHERE clause for a report query. - static function getWhere($bean) { + static function getWhere($options) { global $user; // Prepare dropdown parts. $dropdown_parts = ''; - if ($bean->getAttribute('client')) - $dropdown_parts .= ' and l.client_id = '.$bean->getAttribute('client'); + if ($options['client_id']) + $dropdown_parts .= ' and l.client_id = '.$options['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'); - if ($bean->getAttribute('task')) $dropdown_parts .= ' and l.task_id = '.$bean->getAttribute('task'); - if ($bean->getAttribute('include_records')=='1') $dropdown_parts .= ' and l.billable = 1'; - 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->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->can('view_reports') || $user->isClient()) - $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)); - else { - $period = new Period(); - $period->setPeriod( - 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->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". - " $user_list_part $dropdown_parts"; - return $where; - } - - // getFavWhere prepares a WHERE clause for a favorite report query. - static function getFavWhere($report) { - global $user; + if ($options['cf_1_option_id']) $dropdown_parts .= ' and l.id in(select log_id from tt_custom_field_log where status = 1 and option_id = '.$options['cf_1_option_id'].')'; + if ($options['project_id']) $dropdown_parts .= ' and l.project_id = '.$options['project_id']; + if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id']; + if ($options['billable']=='1') $dropdown_parts .= ' and l.billable = 1'; + if ($options['billable']=='2') $dropdown_parts .= ' and l.billable = 0'; + if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL'; + if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL'; + if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1'; + if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0'; - // Prepare dropdown parts. - $dropdown_parts = ''; - if ($report['client_id']) - $dropdown_parts .= ' and l.client_id = '.$report['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']; - if ($report['task_id']) $dropdown_parts .= ' and l.task_id = '.$report['task_id']; - if ($report['billable']=='1') $dropdown_parts .= ' and l.billable = 1'; - 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->can('view_reports') || $user->isClient())) { - if ($report['users']) - $userlist = $report['users']; - else { - $active_users = ttTeamHelper::getActiveUsers(); - foreach ($active_users as $single_user) - $users[] = $single_user['id']; - $userlist = join(',', $users); - } - } // Prepare sql query part for user list. - $user_list_part = null; - if ($user->can('view_reports') || $user->isClient()) + $userlist = $options['users'] ? $options['users'] : '-1'; + if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; + $user_list_part .= " and l.group_id = ".$user->getActiveGroup(); // Prepare sql query part for where. - if ($report['period']) - $period = new Period($report['period'], new DateAndTime($user->date_format)); + if ($options['period']) + $period = new Period($options['period'], new DateAndTime($user->date_format)); else { $period = new Period(); $period->setPeriod( - new DateAndTime($user->date_format, $report['period_start']), - new DateAndTime($user->date_format, $report['period_end'])); + new DateAndTime($user->date_format, $options['period_start']), + new DateAndTime($user->date_format, $options['period_end'])); } $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; @@ -135,89 +79,37 @@ class ttReportHelper { } // getExpenseWhere prepares WHERE clause for expenses query in a report. - static function getExpenseWhere($bean) { + static function getExpenseWhere($options) { global $user; // Prepare dropdown parts. $dropdown_parts = ''; - if ($bean->getAttribute('client')) - $dropdown_parts .= ' and ei.client_id = '.$bean->getAttribute('client'); + if ($options['client_id']) + $dropdown_parts .= ' and ei.client_id = '.$options['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'; - 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->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->can('view_reports') || $user->isClient()) - $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)); - else { - $period = new Period(); - $period->setPeriod( - 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->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". - " $user_list_part $dropdown_parts"; - return $where; - } - - // getFavExpenseWhere prepares a WHERE clause for expenses query in a favorite report. - static function getFavExpenseWhere($report) { - global $user; + if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id']; + if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL'; + if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL'; + if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1'; + if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0'; - // Prepare dropdown parts. - $dropdown_parts = ''; - if ($report['client_id']) - $dropdown_parts .= ' and ei.client_id = '.$report['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'; - 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->can('view_reports') || $user->isClient())) { - if ($report['users']) - $userlist = $report['users']; - else { - $active_users = ttTeamHelper::getActiveUsers(); - foreach ($active_users as $single_user) - $users[] = $single_user['id']; - $userlist = join(',', $users); - } - } // Prepare sql query part for user list. - $user_list_part = null; - if ($user->can('view_reports') || $user->isClient()) + $userlist = $options['users'] ? $options['users'] : '-1'; + if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; + $user_list_part .= " and ei.group_id = ".$user->getActiveGroup(); // Prepare sql query part for where. - if ($report['period']) - $period = new Period($report['period'], new DateAndTime($user->date_format)); + if ($options['period']) + $period = new Period($options['period'], new DateAndTime($user->date_format)); else { $period = new Period(); $period->setPeriod( - new DateAndTime($user->date_format, $report['period_start']), - new DateAndTime($user->date_format, $report['period_end'])); + new DateAndTime($user->date_format, $options['period_start']), + new DateAndTime($user->date_format, $options['period_end'])); } $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; @@ -227,16 +119,26 @@ class ttReportHelper { // 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) { + static function getItems($options) { global $user; $mdb2 = getConnection(); // Determine these once as they are used in multiple places in this function. - $canViewReports = $user->can('view_reports'); + $canViewReports = $user->can('view_reports') || $user->can('view_all_reports'); $isClient = $user->isClient(); - $group_by_option = $bean->getAttribute('group_by'); - $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish')); + $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') && + ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') && + ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping'); + $grouping_by_date = ($options['group_by1'] == 'date'|| $options['group_by2'] == 'date' || $options['group_by3'] == 'date'); + $grouping_by_client = ($options['group_by1'] == 'client'|| $options['group_by2'] == 'client' || $options['group_by3'] == 'client'); + $grouping_by_project = ($options['group_by1'] == 'project'|| $options['group_by2'] == 'project' || $options['group_by3'] == 'project'); + $grouping_by_task = ($options['group_by1'] == 'task'|| $options['group_by2'] == 'task' || $options['group_by3'] == 'task'); + $grouping_by_user = ($options['group_by1'] == 'user'|| $options['group_by2'] == 'user' || $options['group_by3'] == 'user'); + $grouping_by_cf_1 = ($options['group_by1'] == 'cf_1'|| $options['group_by2'] == 'cf_1' || $options['group_by3'] == 'cf_1'); + + $group_by_option = $options['group_by1']; + $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']); // Prepare a query for time items in tt_log table. $fields = array(); // An array of fields for database query. @@ -246,16 +148,16 @@ class ttReportHelper { 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) + if ($options['show_client'] || $grouping_by_client) array_push($fields, 'c.name as client'); // Add project name if it is selected. - if ($bean->getAttribute('chproject') || 'project' == $group_by_option) + if ($options['show_project'] || $grouping_by_project) array_push($fields, 'p.name as project'); // Add task name if it is selected. - if ($bean->getAttribute('chtask') || 'task' == $group_by_option) + if ($options['show_task'] || $grouping_by_task) array_push($fields, 't.name as task'); // Add custom field. - $include_cf_1 = $bean->getAttribute('chcf_1') || 'cf_1' == $group_by_option; + $include_cf_1 = $options['show_custom_field_1'] || $grouping_by_cf_1; if ($include_cf_1) { $custom_fields = new CustomFields($user->group_id); $cf_1_type = $custom_fields->fields[0]['type']; @@ -266,24 +168,28 @@ class ttReportHelper { } } // Add start time. - if ($bean->getAttribute('chstart')) { + if ($options['show_start']) { array_push($fields, "l.start as unformatted_start"); array_push($fields, "TIME_FORMAT(l.start, '%k:%i') as start"); } // Add finish time. - if ($bean->getAttribute('chfinish')) + if ($options['show_end']) array_push($fields, "TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), '%k:%i') as finish"); // Add duration. - if ($bean->getAttribute('chduration')) + if ($options['show_duration']) array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration"); // Add work units. - if ($bean->getAttribute('chunits')) - array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units"); + if ($options['show_work_units']) { + if ($user->unit_totals_only) + array_push($fields, "null as units"); + else + array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units"); + } // Add note. - if ($bean->getAttribute('chnote')) + if ($options['show_note']) array_push($fields, 'l.comment as note'); // Handle cost. - $includeCost = $bean->getAttribute('chcost'); + $includeCost = $options['show_cost']; if ($includeCost) { if (MODE_TIME == $user->tracking_mode) array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use default user rate. @@ -292,31 +198,30 @@ class ttReportHelper { array_push($fields, "null as expense"); } // Add paid status. - if ($canViewReports && $bean->getAttribute('chpaid')) + if ($canViewReports && $options['show_paid']) array_push($fields, 'l.paid as paid'); // Add IP address. - if ($canViewReports && $bean->getAttribute('chip')) { + if ($canViewReports && $options['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 (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $options['show_invoice']) 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) + if ($options['show_client'] || $grouping_by_client) $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; - if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $options['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; 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) + if ($options['show_project'] || $grouping_by_project) $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; - if ($bean->getAttribute('chtask') || 'task' == $group_by_option) + if ($options['show_task'] || $grouping_by_task) $left_joins .= " left join tt_tasks t on (t.id = l.task_id)"; if ($include_cf_1) { if ($cf_1_type == CustomFields::TYPE_TEXT) @@ -329,15 +234,15 @@ class ttReportHelper { 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); + $where = ttReportHelper::getWhere($options); // 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, + // If we don't have expense items (such as when the Expenses plugin is disabled), 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') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled + if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled $fields = array(); // An array of fields for database query. array_push($fields, 'ei.id'); @@ -346,59 +251,56 @@ class ttReportHelper { 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) + if ($options['show_client'] || $grouping_by_client) array_push($fields, 'c.name as client'); // Add project name if it is selected. - if ($bean->getAttribute('chproject') || 'project' == $group_by_option) + if ($options['show_project'] || $grouping_by_project) array_push($fields, 'p.name as project'); - if ($bean->getAttribute('chtask') || 'task' == $group_by_option) + if ($options['show_task'] || $grouping_by_task) array_push($fields, 'null'); // null for task name. We need to match column count for union. - if ($bean->getAttribute('chcf_1') || 'cf_1' == $group_by_option) + if ($options['show_custom_field_1'] || $grouping_by_cf_1) array_push($fields, 'null'); // null for cf_1. - if ($bean->getAttribute('chstart')) { + if ($options['show_start']) { array_push($fields, 'null'); // null for unformatted_start. array_push($fields, 'null'); // null for start. } - if ($bean->getAttribute('chfinish')) + if ($options['show_end']) array_push($fields, 'null'); // null for finish. - if ($bean->getAttribute('chduration')) + if ($options['show_duration']) array_push($fields, 'null'); // null for duration. + if ($options['show_work_units']) + array_push($fields, 'null as units'); // null for work units. // Use the note field to print item name. - if ($bean->getAttribute('chnote')) + if ($options['show_note']) 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')) + if ($canViewReports && $options['show_paid']) array_push($fields, 'ei.paid as paid'); // Add IP address. - if ($canViewReports && $bean->getAttribute('chip')) { + if ($canViewReports && $options['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 (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $options['show_invoice']) array_push($fields, 'i.name as invoice'); - // Add work units. - if ($bean->getAttribute('chunits')) - array_push($fields, 'null'); // null for work units. - // Prepare sql query part for left joins. $left_joins = null; if ($canViewReports || $isClient) $left_joins .= " left join tt_users u on (u.id = ei.user_id)"; - if ($bean->getAttribute('chclient') || 'client' == $group_by_option) + if ($options['show_client'] || $grouping_by_client) $left_joins .= " left join tt_clients c on (c.id = ei.client_id)"; - if ($bean->getAttribute('chproject') || 'project' == $group_by_option) + if ($options['show_project'] || $grouping_by_project) $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; - if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $options['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)"; - $where = ttReportHelper::getExpenseWhere($bean); + $where = ttReportHelper::getExpenseWhere($options); // Construct sql query for expense items. $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where"; @@ -409,13 +311,18 @@ class ttReportHelper { // Determine sort part. $sort_part = ' order by '; - if ('no_grouping' == $group_by_option || 'date' == $group_by_option) + if ($no_grouping) $sort_part .= 'date'; - else - $sort_part .= $group_by_option.', date'; - if (($canViewReports || $isClient) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option) + else { + $sort_part2 .= ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') ? ', '.$options['group_by1'] : ''; + $sort_part2 .= ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') ? ', '.$options['group_by2'] : ''; + $sort_part2 .= ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') ? ', '.$options['group_by3'] : ''; + if (!$grouping_by_date) $sort_part2 .= ', date'; + $sort_part .= ltrim($sort_part2, ', '); // Remove leading comma and space. + } + if (($canViewReports || $isClient) && $options['users'] && !$grouping_by_user) $sort_part .= ', user, type'; - if ($bean->getAttribute('chstart')) + if ($options['show_start']) $sort_part .= ', unformatted_start'; $sort_part .= ', id'; @@ -441,13 +348,16 @@ class ttReportHelper { if ('.' != $user->decimal_mark) $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']); } +// CODING STOPPED RIGHT HERE replace with a combined key... 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); + //$o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']); + //$val['grouped_by'] = $o_date->toString($user->date_format); + //unset($o_date); + + $val['grouped_by'] = ttDateToUserFormat($val['grouped_by']); } } @@ -496,249 +406,13 @@ class ttReportHelper { 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. - static function getFavItems($report) { - 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']); - - // 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'); - array_push($fields, '1 as type'); // Type 1 is for tt_log entries. - array_push($fields, 'l.date as date'); - 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) - array_push($fields, 'c.name as client'); - // Add project name if it is selected. - if ($report['show_project'] || 'project' == $group_by_option) - array_push($fields, 'p.name as project'); - // Add task name if it is selected. - if ($report['show_task'] || 'task' == $group_by_option) - array_push($fields, 't.name as task'); - // Add custom field. - $include_cf_1 = $report['show_custom_field_1'] || 'cf_1' == $group_by_option; - if ($include_cf_1) { - $custom_fields = new CustomFields($user->group_id); - $cf_1_type = $custom_fields->fields[0]['type']; - if ($cf_1_type == CustomFields::TYPE_TEXT) { - 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. - if ($report['show_start']) { - array_push($fields, "l.start as unformatted_start"); - array_push($fields, "TIME_FORMAT(l.start, '%k:%i') as start"); - } - // Add finish time. - if ($report['show_end']) - array_push($fields, "TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), '%k:%i') as finish"); - // Add duration. - if ($report['show_duration']) - array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration"); - // Add work units. - if ($report['show_work_units']) - array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit)) as units"); - - // Add note. - if ($report['show_note']) - array_push($fields, 'l.comment as note'); - // Handle cost. - $includeCost = $report['show_cost']; - if ($includeCost) { - if (MODE_TIME == $user->tracking_mode) - array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use default user rate. - else - 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 (($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 (($canViewReports || $isClient) && $report['show_invoice']) - $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; - 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)"; - if ($report['show_task'] || 'task' == $group_by_option) - $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)"; - 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. - $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'] && $user->isPluginEnabled('ex')) { // 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. - array_push($fields, 'ei.date'); - 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) - array_push($fields, 'c.name as client'); - // Add project name if it is selected. - if ($report['show_project'] || 'project' == $group_by_option) - array_push($fields, 'p.name as project'); - if ($report['show_task'] || 'task' == $group_by_option) - array_push($fields, 'null'); // null for task name. We need to match column count for union. - if ($report['show_custom_field_1'] || 'cf_1' == $group_by_option) - array_push($fields, 'null'); // null for cf_1. - if ($report['show_start']) { - array_push($fields, 'null'); // null for unformatted_start. - array_push($fields, 'null'); // null for start. - } - if ($report['show_end']) - array_push($fields, 'null'); // null for finish. - if ($report['show_duration']) - array_push($fields, 'null'); // null for duration. - if ($report['show_work_units']) - array_push($fields, 'null'); // null for work units. - // Use the note field to print item name. - if ($report['show_note']) - 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 (($canViewReports || $isClient) && $report['show_invoice']) - array_push($fields, 'i.name as invoice'); - - // Prepare sql query part for left joins. - $left_joins = null; - 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 (($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); - - // 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. - $sort_part .= 'date'; - else - $sort_part .= $group_by_option.', date'; - if (($canViewReports || $isClient) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option) - $sort_part .= ', user, type'; - 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')) 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['grouped_by']); - $val['grouped_by'] = $o_date->toString($user->date_format); - unset($o_date); - } - } - - // 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) { + static function getSubtotals($options) { global $user; - $group_by_option = $bean->getAttribute('group_by'); + $group_by_option = $options['group_by1']; if ('no_grouping' == $group_by_option) return null; $mdb2 = getConnection(); @@ -777,35 +451,50 @@ class ttReportHelper { break; } - $where = ttReportHelper::getWhere($bean); - if ($bean->getAttribute('chcost')) { + $where = ttReportHelper::getWhere($options); + if ($options['show_cost']) { if (MODE_TIME == $user->tracking_mode) { 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(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost, + $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time"; + if ($options['show_work_units']) { + if ($user->unit_totals_only) + $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units"; + else + $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units"; + } + $sql .= ", 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"; } 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(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - 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 + $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time"; + if ($options['show_work_units']) { + if ($user->unit_totals_only) + $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units"; + else + $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units"; + } + $sql .= ", 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 $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, - sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - null as expenses from tt_log l + $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time"; + if ($options['show_work_units']) { + if ($user->unit_totals_only) + $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units"; + else + $sql .= ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units"; + } + $sql .= ", 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') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled + if ($options['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled // Determine group by field and a required join. $group_join = null; @@ -829,14 +518,18 @@ class ttReportHelper { break; } - $where = ttReportHelper::getExpenseWhere($bean); - $sql_for_expenses = "select $group_field as group_field, null as time, null as units, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei - $group_join $where"; + $where = ttReportHelper::getExpenseWhere($options); + $sql_for_expenses = "select $group_field as group_field, null as time"; + if ($options['show_work_units']) $sql_for_expenses .= ", null as units"; + $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $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(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field"; + $combined = "select group_field, sum(time) as time"; + if ($options['show_work_units']) $combined .= ", sum(units) as units"; + $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field"; + $sql = $combined; } // Execute query. @@ -851,12 +544,12 @@ class ttReportHelper { unset($o_date); } $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; - if ($bean->getAttribute('chcost')) { + if ($options['show_cost']) { 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, 'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']); + $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units'], 'cost'=>$val['cost'],'expenses'=>$val['expenses']); } else $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']); } @@ -864,253 +557,50 @@ class ttReportHelper { 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". - static function getFavSubtotals($report) { + // getTotals calculates total hours and cost for all report items. + static function getTotals($options) + { global $user; - $group_by_option = $report['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. + $where = ttReportHelper::getWhere($options); - // Determine group by field and a required join. - switch ($group_by_option) { - case 'date': - $group_field = 'l.date'; - $group_join = ''; - break; - case 'user': - $group_field = 'u.name'; - $group_join = 'left join tt_users u on (l.user_id = u.id) '; - break; - case 'client': - $group_field = 'c.name'; - $group_join = 'left join tt_clients c on (l.client_id = c.id) '; - break; - case 'project': - $group_field = 'p.name'; - $group_join = 'left join tt_projects p on (l.project_id = p.id) '; - break; - case 'task': - $group_field = 't.name'; - $group_join = 'left join tt_tasks t on (l.task_id = t.id) '; - break; - case 'cf_1': - $group_field = 'cfo.value'; - $custom_fields = new CustomFields($user->group_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) '; - 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; + // Prepare parts. + $time_part = "sum(time_to_sec(l.duration)) as time"; + if ($options['show_work_units']) { + $units_part = $user->unit_totals_only ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units"; } - - $where = ttReportHelper::getFavWhere($report); - if ($report['show_cost']) { - if (MODE_TIME == $user->tracking_mode) { - 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(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - 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"; - } 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(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - 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 - $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"; - } + if ($options['show_cost']) { + if (MODE_TIME == $user->tracking_mode) + $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses"; + else + $cost_part = ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses"; } else { - $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, - sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - 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 ($report['show_cost'] && $user->isPluginEnabled('ex')) { // 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': - $group_field = 'ei.date'; - $group_join = ''; - break; - case 'user': - $group_field = 'u.name'; - $group_join = 'left join tt_users u on (ei.user_id = u.id) '; - break; - case 'client': - $group_field = 'c.name'; - $group_join = 'left join tt_clients c on (ei.client_id = c.id) '; - break; - case 'project': - $group_field = 'p.name'; - $group_join = 'left join tt_projects p on (ei.project_id = p.id) '; - break; - } - - $where = ttReportHelper::getFavExpenseWhere($report); - $sql_for_expenses = "select $group_field as group_field, null as time, null as units, sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei - $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(units) as units, 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')) 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); - } - $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; - if ($report['show_cost']) { - 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, 'units'=> $val['units'], 'cost'=>$val['cost'],'expenses'=>$val['expenses']); - } else - $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']); + $cost_part = ", null as cost, null as expenses"; } - - return $subtotals; - } - - // getTotals calculates total hours and cost for all report items. - static function getTotals($bean) - { - global $user; - - $mdb2 = getConnection(); - - $where = ttReportHelper::getWhere($bean); - - // TODO: build query in parts so the work units inclusion is conditional. - - // Start with a query for time items. - if ($bean->getAttribute('chcost')) { + if ($options['show_cost']) { if (MODE_TIME == $user->tracking_mode) { - $sql = "select sum(time_to_sec(l.duration)) as time, - sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - 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 - left join tt_users u on (l.user_id = u.id) $where"; + $left_joins = "left join tt_users u on (l.user_id = u.id)"; } else { - $sql = "select sum(time_to_sec(l.duration)) as time, - sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - 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 - left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where"; + $left_joins = "left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)"; } - } else - $sql = "select sum(time_to_sec(l.duration)) as time," - ." sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units," - ." null as cost, null as expenses from tt_log l $where"; - - // If we have expenses, query becomes a bit more complex. - if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { - $where = ttReportHelper::getExpenseWhere($bean); - $sql_for_expenses = "select null as time, null as units, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where"; - - // Create a combined query. - $sql = "select sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t"; - } - - // Execute query. - $res = $mdb2->query($sql); - if (is_a($res, 'PEAR_Error')) die($res->getMessage()); - - $val = $res->fetchRow(); - $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; - if ($bean->getAttribute('chcost')) { - $total_cost = $val['cost']; - if (!$total_cost) $total_cost = '0.00'; - if ('.' != $user->decimal_mark) - $total_cost = str_replace('.', $user->decimal_mark, $total_cost); - $total_expenses = $val['expenses']; - if (!$total_expenses) $total_expenses = '0.00'; - if ('.' != $user->decimal_mark) - $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses); - } - - if ($bean->getAttribute('period')) - $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format)); - else { - $period = new Period(); - $period->setPeriod( - new DateAndTime($user->date_format, $bean->getAttribute('start_date')), - new DateAndTime($user->date_format, $bean->getAttribute('end_date'))); } - - $totals['start_date'] = $period->getStartDate(); - $totals['end_date'] = $period->getEndDate(); - $totals['time'] = $total_time; - $totals['units'] = $val['units']; - $totals['cost'] = $total_cost; - $totals['expenses'] = $total_expenses; - - return $totals; - } - - // getFavTotals calculates total hours and cost for all favorite report items. - static function getFavTotals($report) - { - global $user; - - $mdb2 = getConnection(); - - $where = ttReportHelper::getFavWhere($report); - - // Start with a query for time items. - if ($report['show_cost']) { - if (MODE_TIME == $user->tracking_mode) { - $sql = "select sum(time_to_sec(l.duration)) as time, - sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - 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 - left join tt_users u on (l.user_id = u.id) $where"; - } else { - $sql = "select sum(time_to_sec(l.duration)) as time, - sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - 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 - left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where"; - } - } else - $sql = "select sum(time_to_sec(l.duration)) as time, - sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units, - null as cost, null as expenses from tt_log l $where"; + // Prepare a query for time items. + $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $where"; // If we have expenses, query becomes a bit more complex. - if ($report['show_cost'] && $user->isPluginEnabled('ex')) { - $where = ttReportHelper::getFavExpenseWhere($report); - $sql_for_expenses = "select null as time, null as units, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where"; + if ($options['show_cost'] && $user->isPluginEnabled('ex')) { + $where = ttReportHelper::getExpenseWhere($options); + $sql_for_expenses = "select null as time"; + if ($options['show_work_units']) $sql_for_expenses .= ", null as units"; + $sql_for_expenses .= ", sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where"; + // Create a combined query. - $sql = "select sum(time) as time, sum(units) as units, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t"; + $combined = "select sum(time) as time"; + if ($options['show_work_units']) $combined .= ", sum(units) as units"; + $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t"; + $sql = $combined; } // Execute query. @@ -1119,7 +609,7 @@ class ttReportHelper { $val = $res->fetchRow(); $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; - if ($report['show_cost']) { + if ($options['show_cost']) { $total_cost = $val['cost']; if (!$total_cost) $total_cost = '0.00'; if ('.' != $user->decimal_mark) @@ -1130,13 +620,13 @@ class ttReportHelper { $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses); } - if ($report['period']) - $period = new Period($report['period'], new DateAndTime($user->date_format)); + if ($options['period']) + $period = new Period($options['period'], new DateAndTime($user->date_format)); else { $period = new Period(); $period->setPeriod( - new DateAndTime($user->date_format, $report['period_start']), - new DateAndTime($user->date_format, $report['period_end'])); + new DateAndTime($user->date_format, $options['period_start']), + new DateAndTime($user->date_format, $options['period_end'])); } $totals['start_date'] = $period->getStartDate(); @@ -1185,20 +675,20 @@ class ttReportHelper { } // prepareReportBody - prepares an email body for report. - static function prepareReportBody($bean, $comment) + static function prepareReportBody($options, $comment = null) { global $user; global $i18n; // Determine these once as they are used in multiple places in this function. - $canViewReports = $user->can('view_reports'); + $canViewReports = $user->can('view_reports') || $user->can('view_all_reports'); $isClient = $user->isClient(); - $items = ttReportHelper::getItems($bean); - $group_by = $bean->getAttribute('group_by'); + $items = ttReportHelper::getItems($options); + $group_by = $options['group_by1']; if ($group_by && 'no_grouping' != $group_by) - $subtotals = ttReportHelper::getSubtotals($bean); - $totals = ttReportHelper::getTotals($bean); + $subtotals = ttReportHelper::getSubtotals($options); + $totals = ttReportHelper::getTotals($options); // Use custom fields plugin if it is enabled. if ($user->isPluginEnabled('cf')) @@ -1227,7 +717,7 @@ class ttReportHelper { // Output comment. if ($comment) $body .= '

'.htmlspecialchars($comment).'

'; - if ($bean->getAttribute('chtotalsonly')) { + if ($options['show_totals_only']) { // Totals only report. Output subtotals. // Determine group_by header. @@ -1241,27 +731,27 @@ class ttReportHelper { $body .= ''; $body .= ''; $body .= ''; - if ($bean->getAttribute('chduration')) + if ($options['show_duration']) $body .= ''; - if ($bean->getAttribute('chunits')) + if ($options['show_work_units']) $body .= ''; - if ($bean->getAttribute('chcost')) + if ($options['show_cost']) $body .= ''; $body .= ''; foreach($subtotals as $subtotal) { $body .= ''; $body .= ''; - if ($bean->getAttribute('chduration')) { + if ($options['show_duration']) { $body .= ''; } - if ($bean->getAttribute('chunits')) { + if ($options['show_work_units']) { $body .= ''; } - if ($bean->getAttribute('chcost')) { + if ($options['show_cost']) { $body .= ''; @@ -1273,17 +763,17 @@ class ttReportHelper { $body .= ''; $body .= ''; $body .= ''; - if ($bean->getAttribute('chduration')) { + if ($options['show_duration']) { $body .= ''; } - if ($bean->getAttribute('chunits')) { + if ($options['show_work_units']) { $body .= ''; } - if ($bean->getAttribute('chcost')) { + if ($options['show_cost']) { $body .= ''; @@ -1300,31 +790,31 @@ class ttReportHelper { $body .= ''; if ($canViewReports || $isClient) $body .= ''; - if ($bean->getAttribute('chclient')) + if ($options['show_client']) $body .= ''; - if ($bean->getAttribute('chproject')) + if ($options['show_project']) $body .= ''; - if ($bean->getAttribute('chtask')) + if ($options['show_task']) $body .= ''; - if ($bean->getAttribute('chcf_1')) + if ($options['show_custom_field_1']) $body .= ''; - if ($bean->getAttribute('chstart')) + if ($options['show_start']) $body .= ''; - if ($bean->getAttribute('chfinish')) + if ($options['show_end']) $body .= ''; - if ($bean->getAttribute('chduration')) + if ($options['show_duration']) $body .= ''; - if ($bean->getAttribute('chunits')) + if ($options['show_work_units']) $body .= ''; - if ($bean->getAttribute('chnote')) + if ($options['show_note']) $body .= ''; - if ($bean->getAttribute('chcost')) + if ($options['show_cost']) $body .= ''; - if ($bean->getAttribute('chpaid')) + if ($options['show_paid']) $body .= ''; - if ($bean->getAttribute('chip')) + if ($options['show_ip']) $body .= ''; - if ($bean->getAttribute('chinvoice')) + if ($options['show_invoice']) $body .= ''; $body .= ''; @@ -1352,23 +842,23 @@ class ttReportHelper { $body .= ''; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); if ($canViewReports || $isClient) $body .= ''; - if ($bean->getAttribute('chclient')) $body .= ''; - if ($bean->getAttribute('chproject')) $body .= ''; - if ($bean->getAttribute('chtask')) $body .= ''; - if ($bean->getAttribute('chcf_1')) $body .= ''; - if ($bean->getAttribute('chstart')) $body .= ''; - if ($bean->getAttribute('chfinish')) $body .= ''; - if ($bean->getAttribute('chduration')) $body .= ''; - if ($bean->getAttribute('chunits')) $body .= ''; - if ($bean->getAttribute('chnote')) $body .= ''; - if ($bean->getAttribute('chcost')) { + if ($options['show_client']) $body .= ''; + if ($options['show_project']) $body .= ''; + if ($options['show_task']) $body .= ''; + if ($options['show_custom_field_1']) $body .= ''; + if ($options['show_start']) $body .= ''; + if ($options['show_end']) $body .= ''; + if ($options['show_duration']) $body .= ''; + if ($options['show_work_units']) $body .= ''; + if ($options['show_note']) $body .= ''; + if ($options['show_cost']) { $body .= ''; } - if ($bean->getAttribute('chpaid')) $body .= ''; - if ($bean->getAttribute('chip')) $body .= ''; - if ($bean->getAttribute('chinvoice')) $body .= ''; + if ($options['show_paid']) $body .= ''; + if ($options['show_ip']) $body .= ''; + if ($options['show_invoice']) $body .= ''; $body .= ''; $body .= ''; } @@ -1382,37 +872,37 @@ class ttReportHelper { $body .= ''; if ($canViewReports || $isClient) $body .= ''; - if ($bean->getAttribute('chclient')) + if ($options['show_client']) $body .= ''; - if ($bean->getAttribute('chproject')) + if ($options['show_project']) $body .= ''; - if ($bean->getAttribute('chtask')) + if ($options['show_task']) $body .= ''; - if ($bean->getAttribute('chcf_1')) + if ($options['show_custom_field_1']) $body .= ''; - if ($bean->getAttribute('chstart')) + if ($options['show_start']) $body .= ''; - if ($bean->getAttribute('chfinish')) + if ($options['show_end']) $body .= ''; - if ($bean->getAttribute('chduration')) + if ($options['show_duration']) $body .= ''; - if ($bean->getAttribute('chunits')) + if ($options['show_work_units']) $body .= ''; - if ($bean->getAttribute('chnote')) + if ($options['show_note']) $body .= ''; - if ($bean->getAttribute('chcost')) + if ($options['show_cost']) $body .= ''; - if ($bean->getAttribute('chpaid')) { + if ($options['show_paid']) { $body .= ''; } - if ($bean->getAttribute('chip')) { + if ($options['show_ip']) { $body .= ''; } - if ($bean->getAttribute('chinvoice')) + if ($options['show_invoice']) $body .= ''; $body .= ''; @@ -1428,23 +918,23 @@ class ttReportHelper { $body .= ''; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); if ($canViewReports || $isClient) $body .= ''; - if ($bean->getAttribute('chclient')) $body .= ''; - if ($bean->getAttribute('chproject')) $body .= ''; - if ($bean->getAttribute('chtask')) $body .= ''; - if ($bean->getAttribute('chcf_1')) $body .= ''; - if ($bean->getAttribute('chstart')) $body .= ''; - if ($bean->getAttribute('chfinish')) $body .= ''; - if ($bean->getAttribute('chduration')) $body .= ''; - if ($bean->getAttribute('chunits')) $body .= ''; - if ($bean->getAttribute('chnote')) $body .= ''; - if ($bean->getAttribute('chcost')) { + if ($options['show_client']) $body .= ''; + if ($options['show_project']) $body .= ''; + if ($options['show_task']) $body .= ''; + if ($options['show_custom_field_1']) $body .= ''; + if ($options['show_start']) $body .= ''; + if ($options['show_end']) $body .= ''; + if ($options['show_duration']) $body .= ''; + if ($options['show_work_units']) $body .= ''; + if ($options['show_note']) $body .= ''; + if ($options['show_cost']) { $body .= ''; } - if ($bean->getAttribute('chpaid')) $body .= ''; - if ($bean->getAttribute('chip')) $body .= ''; - if ($bean->getAttribute('chinvoice')) $body .= ''; + if ($options['show_paid']) $body .= ''; + if ($options['show_ip']) $body .= ''; + if ($options['show_invoice']) $body .= ''; $body .= ''; } @@ -1453,23 +943,23 @@ class ttReportHelper { $body .= ''; $body .= ''; if ($canViewReports || $isClient) $body .= ''; - if ($bean->getAttribute('chclient')) $body .= ''; - if ($bean->getAttribute('chproject')) $body .= ''; - if ($bean->getAttribute('chtask')) $body .= ''; - if ($bean->getAttribute('chcf_1')) $body .= ''; - if ($bean->getAttribute('chstart')) $body .= ''; - if ($bean->getAttribute('chfinish')) $body .= ''; - if ($bean->getAttribute('chduration')) $body .= ''; - if ($bean->getAttribute('chunits')) $body .= ''; - if ($bean->getAttribute('chnote')) $body .= ''; - if ($bean->getAttribute('chcost')) { + if ($options['show_client']) $body .= ''; + if ($options['show_project']) $body .= ''; + if ($options['show_task']) $body .= ''; + if ($options['show_custom_field_1']) $body .= ''; + if ($options['show_start']) $body .= ''; + if ($options['show_end']) $body .= ''; + if ($options['show_duration']) $body .= ''; + if ($options['show_work_units']) $body .= ''; + if ($options['show_note']) $body .= ''; + if ($options['show_cost']) { $body .= ''; } - if ($bean->getAttribute('chpaid')) $body .= ''; - if ($bean->getAttribute('chip')) $body .= ''; - if ($bean->getAttribute('chinvoice')) $body .= ''; + if ($options['show_paid']) $body .= ''; + if ($options['show_ip']) $body .= ''; + if ($options['show_invoice']) $body .= ''; $body .= ''; $body .= '
'.$group_by_header.''.$i18n->get('label.duration').''.$i18n->get('label.work_units_short').''.$i18n->get('label.cost').'
'.($subtotal['name'] ? htmlspecialchars($subtotal['name']) : ' ').''; if ($subtotal['time'] <> '0:00') $body .= $subtotal['time']; $body .= ''; $body .= $subtotal['units']; $body .= ''; $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; $body .= '
 
'.$i18n->get('label.total').''; if ($totals['time'] <> '0:00') $body .= $totals['time']; $body .= ''; $body .= $totals['units']; $body .= ''.htmlspecialchars($user->currency).' '; $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= ''.$i18n->get('label.date').''.$i18n->get('label.user').''.$i18n->get('label.client').''.$i18n->get('label.project').''.$i18n->get('label.task').''.htmlspecialchars($custom_fields->fields[0]['label']).''.$i18n->get('label.start').''.$i18n->get('label.finish').''.$i18n->get('label.duration').''.$i18n->get('label.work_units_short').''.$i18n->get('label.note').''.$i18n->get('label.cost').''.$i18n->get('label.paid').''.$i18n->get('label.ip').''.$i18n->get('label.invoice').'
'.$i18n->get('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.($group_by == 'cf_1' ? $subtotal_name : '').''.$subtotals[$prev_grouped_by]['time'].''.$subtotals[$prev_grouped_by]['units'].''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.($group_by == 'cf_1' ? $subtotal_name : '').''.$subtotals[$prev_grouped_by]['time'].''.$subtotals[$prev_grouped_by]['units'].''; $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; $body .= '
 
'.$record['date'].''.htmlspecialchars($record['user']).''.htmlspecialchars($record['client']).''.htmlspecialchars($record['project']).''.htmlspecialchars($record['task']).''.htmlspecialchars($record['cf_1']).''.$record['start'].''.$record['finish'].''.$record['duration'].''.$record['units'].''.htmlspecialchars($record['note']).''.$record['cost'].''; $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no'); $body .= ''; $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created']; $body .= ''.htmlspecialchars($record['invoice']).'
'.$i18n->get('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.($group_by == 'cf_1' ? $subtotal_name : '').''.$subtotals[$cur_grouped_by]['time'].''.$subtotals[$cur_grouped_by]['units'].''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.($group_by == 'cf_1' ? $subtotal_name : '').''.$subtotals[$cur_grouped_by]['time'].''.$subtotals[$cur_grouped_by]['units'].''; $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; $body .= '
'.$i18n->get('label.total').''.$totals['time'].''.$totals['units'].''.$totals['time'].''.$totals['units'].''.htmlspecialchars($user->currency).' '; $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= '
'; @@ -1486,329 +976,51 @@ class ttReportHelper { } // checkFavReportCondition - checks whether it is okay to send fav report. - static function checkFavReportCondition($report, $condition) + static function checkFavReportCondition($options, $condition) { - $items = ttReportHelper::getFavItems($report); + $items = ttReportHelper::getItems($options); - $condition = str_replace('count', '', $condition); - $count_required = (int) trim(str_replace('>', '', $condition)); + $condition = trim(str_replace('count', '', $condition)); - if (count($items) > $count_required) - return true; // Condition ok. + $greater_or_equal = ttStartsWith($condition, '>='); + if ($greater_or_equal) $condition = trim(str_replace('>=', '', $condition)); - return false; - } + $less_or_equal = ttStartsWith($condition, '<='); + if ($less_or_equal) $condition = trim(str_replace('<=', '', $condition)); - // prepareFavReportBody - prepares an email body for a favorite report. - static function prepareFavReportBody($report) - { - global $user; - global $i18n; + $not_equal = ttStartsWith($condition, '<>'); + if ($not_equal) $condition = trim(str_replace('<>', '', $condition)); - // Determine these once as they are used in multiple places in this function. - $canViewReports = $user->can('view_reports'); - $isClient = $user->isClient(); + $greater = ttStartsWith($condition, '>'); + if ($greater) $condition = trim(str_replace('>', '', $condition)); - $items = ttReportHelper::getFavItems($report); - $group_by = $report['group_by']; - if ($group_by && 'no_grouping' != $group_by) - $subtotals = ttReportHelper::getFavSubtotals($report); - $totals = ttReportHelper::getFavTotals($report); + $less = ttStartsWith($condition, '<'); + if ($less) $condition = trim(str_replace('<', '', $condition)); - // Use custom fields plugin if it is enabled. - if ($user->isPluginEnabled('cf')) - $custom_fields = new CustomFields($user->group_id); + $equal = ttStartsWith($condition, '='); + if ($equal) $condition = trim(str_replace('=', '', $condition)); - // Define some styles to use in email. - $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: #ffffff;'; - $rowItemAlt = 'background-color: #f5f5f5;'; - $rowSubtotal = 'background-color: #e0e0e0;'; - $cellLeftAligned = 'text-align: left; vertical-align: top;'; - $cellRightAligned = 'text-align: right; vertical-align: top;'; - $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;'; - $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;'; + $count_required = (int) $condition; - // Start creating email body. - $body = ''; - $body .= ''; - $body .= ''; + if ($greater && count($items) > $count_required) return true; + if ($greater_or_equal && count($items) >= $count_required) return true; + if ($less && count($items) < $count_required) return true; + if ($less_or_equal && count($items) <= $count_required) return true; + if ($equal && count($items) == $count_required) return true; + if ($not_equal && count($items) <> $count_required) return true; - // Output title. - $body .= '

'.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'

'; - - // Output comment. - // if ($comment) $body .= '

'.htmlspecialchars($comment).'

'; // No comment for fav. reports. - - if ($report['show_totals_only']) { - // Totals only report. Output subtotals. - - // Determine group_by header. - if ('cf_1' == $group_by) - $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']); - else { - $key = 'label.'.$group_by; - $group_by_header = $i18n->get($key); - } - - $body .= ''; - $body .= ''; - $body .= ''; - if ($report['show_duration']) - $body .= ''; - if ($report['show_work_units']) - $body .= ''; - if ($report['show_cost']) - $body .= ''; - $body .= ''; - foreach($subtotals as $subtotal) { - $body .= ''; - $body .= ''; - if ($report['show_duration']) { - $body .= ''; - } - if ($report['show_work_units']) { - $body .= ''; - } - if ($report['show_cost']) { - $body .= ''; - } - $body .= ''; - } - - // Print totals. - $body .= ''; - $body .= ''; - $body .= ''; - if ($report['show_duration']) { - $body .= ''; - } - if ($report['show_work_units']) { - $body .= ''; - } - if ($report['show_cost']) { - $body .= ''; - } - $body .= ''; - - $body .= '
'.$group_by_header.''.$i18n->get('label.duration').''.$i18n->get('label.work_units_short').''.$i18n->get('label.cost').'
'.($subtotal['name'] ? htmlspecialchars($subtotal['name']) : ' ').''; - if ($subtotal['time'] <> '0:00') $body .= $subtotal['time']; - $body .= ''; - $body .= $subtotal['units']; - $body .= ''; - $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; - $body .= '
 
'.$i18n->get('label.total').''; - if ($totals['time'] <> '0:00') $body .= $totals['time']; - $body .= ''; - $body .= $totals['units']; - $body .= ''.htmlspecialchars($user->currency).' '; - $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; - $body .= '
'; - } else { - // Regular report. - - // Print table header. - $body .= ''; - $body .= ''; - $body .= ''; - if ($canViewReports || $isClient) - $body .= ''; - if ($report['show_client']) - $body .= ''; - if ($report['show_project']) - $body .= ''; - if ($report['show_task']) - $body .= ''; - if ($report['show_custom_field_1']) - $body .= ''; - if ($report['show_start']) - $body .= ''; - if ($report['show_end']) - $body .= ''; - if ($report['show_duration']) - $body .= ''; - if ($report['show_work_units']) - $body .= ''; - if ($report['show_note']) - $body .= ''; - if ($report['show_cost']) - $body .= ''; - if ($report['show_paid']) - $body .= ''; - if ($report['show_ip']) - $body .= ''; - if ($report['show_invoice']) - $body .= ''; - $body .= ''; - - // Initialize variables to print subtotals. - if ($items && 'no_grouping' != $group_by) { - $print_subtotals = true; - $first_pass = true; - $prev_grouped_by = ''; - $cur_grouped_by = ''; - } - // Initialize variables to alternate color of rows for different dates. - $prev_date = ''; - $cur_date = ''; - $row_style = $rowItem; - - // Print report items. - if (is_array($items)) { - foreach ($items as $record) { - $cur_date = $record['date']; - // Print a subtotal row after a block of grouped items. - if ($print_subtotals) { - $cur_grouped_by = $record['grouped_by']; - if ($cur_grouped_by != $prev_grouped_by && !$first_pass) { - $body .= ''; - $body .= ''; - $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($canViewReports || $isClient) $body .= ''; - if ($report['show_client']) $body .= ''; - if ($report['show_project']) $body .= ''; - if ($report['show_task']) $body .= ''; - if ($report['show_custom_field_1']) $body .= ''; - if ($report['show_start']) $body .= ''; - if ($report['show_end']) $body .= ''; - if ($report['show_duration']) $body .= ''; - if ($report['show_work_units']) $body .= ''; - if ($report['show_note']) $body .= ''; - if ($report['show_cost']) { - $body .= ''; - } - if ($report['show_paid']) $body .= ''; - if ($report['show_ip']) $body .= ''; - if ($report['show_invoice']) $body .= ''; - $body .= ''; - $body .= ''; - } - $first_pass = false; - } - - // Print a regular row. - if ($cur_date != $prev_date) - $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem; - $body .= ''; - $body .= ''; - if ($canViewReports || $isClient) - $body .= ''; - if ($report['show_client']) - $body .= ''; - if ($report['show_project']) - $body .= ''; - if ($report['show_task']) - $body .= ''; - if ($report['show_custom_field_1']) - $body .= ''; - if ($report['show_start']) - $body .= ''; - if ($report['show_end']) - $body .= ''; - if ($report['show_duration']) - $body .= ''; - if ($report['show_work_units']) - $body .= ''; - if ($report['show_note']) - $body .= ''; - if ($report['show_cost']) - $body .= ''; - if ($report['show_paid']) { - $body .= ''; - } - if ($report['show_ip']) { - $body .= ''; - } - if ($report['show_invoice']) - $body .= ''; - $body .= ''; - - $prev_date = $record['date']; - if ($print_subtotals) - $prev_grouped_by = $record['grouped_by']; - } - } - - // Print a terminating subtotal. - if ($print_subtotals) { - $body .= ''; - $body .= ''; - $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($canViewReports || $isClient) $body .= ''; - if ($report['show_client']) $body .= ''; - if ($report['show_project']) $body .= ''; - if ($report['show_task']) $body .= ''; - if ($report['show_custom_field_1']) $body .= ''; - if ($report['show_start']) $body .= ''; - if ($report['show_end']) $body .= ''; - if ($report['show_duration']) $body .= ''; - if ($report['show_work_units']) $body .= ''; - if ($report['show_note']) $body .= ''; - if ($report['show_cost']) { - $body .= ''; - } - if ($report['show_paid']) $body .= ''; - if ($report['show_ip']) $body .= ''; - if ($report['show_invoice']) $body .= ''; - $body .= ''; - } - - // Print totals. - $body .= ''; - $body .= ''; - $body .= ''; - if ($canViewReports || $isClient) $body .= ''; - if ($report['show_client']) $body .= ''; - if ($report['show_project']) $body .= ''; - if ($report['show_task']) $body .= ''; - if ($report['show_custom_field_1']) $body .= ''; - if ($report['show_start']) $body .= ''; - if ($report['show_end']) $body .= ''; - if ($report['show_duration']) $body .= ''; - if ($report['show_work_units']) $body .= ''; - if ($report['show_note']) $body .= ''; - if ($report['show_cost']) { - $body .= ''; - } - if ($report['show_paid']) $body .= ''; - if ($report['show_ip']) $body .= ''; - if ($report['show_invoice']) $body .= ''; - $body .= ''; - - $body .= '
'.$i18n->get('label.date').''.$i18n->get('label.user').''.$i18n->get('label.client').''.$i18n->get('label.project').''.$i18n->get('label.task').''.htmlspecialchars($custom_fields->fields[0]['label']).''.$i18n->get('label.start').''.$i18n->get('label.finish').''.$i18n->get('label.duration').''.$i18n->get('label.work_units_short').''.$i18n->get('label.note').''.$i18n->get('label.cost').''.$i18n->get('label.paid').''.$i18n->get('label.ip').''.$i18n->get('label.invoice').'
'.$i18n->get('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.($group_by == 'cf_1' ? $subtotal_name : '').''.$subtotals[$prev_grouped_by]['time'].''.$subtotals[$prev_grouped_by]['units'].''; - $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; - $body .= '
 
'.$record['date'].''.htmlspecialchars($record['user']).''.htmlspecialchars($record['client']).''.htmlspecialchars($record['project']).''.htmlspecialchars($record['task']).''.htmlspecialchars($record['cf_1']).''.$record['start'].''.$record['finish'].''.$record['duration'].''.$record['units'].''.htmlspecialchars($record['note']).''.$record['cost'].''; - $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no'); - $body .= ''; - $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created']; - $body .= ''.htmlspecialchars($record['invoice']).'
'.$i18n->get('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.($group_by == 'cf_1' ? $subtotal_name : '').''.$subtotals[$cur_grouped_by]['time'].''.$subtotals[$cur_grouped_by]['units'].''; - $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; - $body .= '
 
'.$i18n->get('label.total').''.$totals['time'].''.$totals['units'].''.htmlspecialchars($user->currency).' '; - $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; - $body .= '
'; - } - - // Output footer. - if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false)) - $body .= '

'.$i18n->get('form.mail.footer').'

'; - - // Finish creating email body. - $body .= ''; - - return $body; + return false; } // sendFavReport - sends a favorite report to a specified email, called from cron.php - static function sendFavReport($report, $subject, $email, $cc) { + static function sendFavReport($options, $subject, $email, $cc) { // We are called from cron.php, we have no $bean in session. // cron.php sets global $user and $i18n objects to match our favorite report user. global $user; global $i18n; // Prepare report body. - $body = ttReportHelper::prepareFavReportBody($report); + $body = ttReportHelper::prepareReportBody($options); import('mail.Mailer'); $mailer = new Mailer(); @@ -1821,10 +1033,78 @@ class ttReportHelper { $mailer->setReceiverBCC($user->bcc_email); $mailer->setReceiver($email); $mailer->setMailMode(MAIL_MODE); - if (empty($subject)) $subject = $report['name']; + if (empty($subject)) $subject = $options['name']; if (!$mailer->send($subject, $body)) return false; return true; } + + // getReportOptions - returns an array of report options constructed from session bean. + // + // Note: similarly to ttFavReportHelper::getReportOptions, this function is a part of + // refactoring to simplify maintenance of report generating functions, as we currently + // have 2 sets: normal reporting (from bean), and fav report emailing (from db fields). + // Using options obtained from either db or bean shall allow us to use only one set of functions. + static function getReportOptions($bean) { + global $user; + + // Prepare an array of report options. + $options = array(); + + // Construct one by one. + $options['name'] = null; // No name required. + $options['user_id'] = $user->id; // Not sure if we need user_id here. Fav reports use it to recycle $user object in cron.php. + $options['client_id'] = $bean->getAttribute('client'); + $options['cf_1_option_id'] = $bean->getAttribute('option'); + $options['project_id'] = $bean->getAttribute('project'); + $options['task_id'] = $bean->getAttribute('task'); + $options['billable'] = $bean->getAttribute('include_records'); + $options['invoice'] = $bean->getAttribute('invoice'); + $options['paid_status'] = $bean->getAttribute('paid_status'); + if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users')); + $options['period'] = $bean->getAttribute('period'); + $options['period_start'] = $bean->getAttribute('start_date'); + $options['period_end'] = $bean->getAttribute('end_date'); + $options['show_client'] = $bean->getAttribute('chclient'); + $options['show_invoice'] = $bean->getAttribute('chinvoice'); + $options['show_paid'] = $bean->getAttribute('chpaid'); + $options['show_ip'] = $bean->getAttribute('chip'); + $options['show_project'] = $bean->getAttribute('chproject'); + $options['show_start'] = $bean->getAttribute('chstart'); + $options['show_duration'] = $bean->getAttribute('chduration'); + $options['show_cost'] = $bean->getAttribute('chcost'); + $options['show_task'] = $bean->getAttribute('chtask'); + $options['show_end'] = $bean->getAttribute('chfinish'); + $options['show_note'] = $bean->getAttribute('chnote'); + $options['show_custom_field_1'] = $bean->getAttribute('chcf_1'); + $options['show_work_units'] = $bean->getAttribute('chunits'); + $options['show_totals_only'] = $bean->getAttribute('chtotalsonly'); + $options['group_by1'] = $bean->getAttribute('group_by1'); + $options['group_by2'] = $bean->getAttribute('group_by2'); + $options['group_by3'] = $bean->getAttribute('group_by3'); + return $options; + } + + // verifyBean is a security function to make sure data in bean makes sense for a group. + static function verifyBean($bean) { + global $user; + + // Check users. + $users_in_bean = $bean->getAttribute('users'); + if (is_array($users_in_bean)) { + $users_in_group = ttTeamHelper::getUsers(); + foreach ($users_in_group as $user_in_group) { + $valid_ids[] = $user_in_group['id']; + } + foreach ($users_in_bean as $user_in_bean) { + if (!in_array($user_in_bean, $valid_ids)) { + return false; + } + } + } + + // TODO: add additional checks here. Perhaps do it before saving the bean for consistency. + return true; + } }