X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=1b1adf90efabe96ae28c4c9b27c507e716954ed4;hb=9e5dbe1bb51fef6af2a8e3a1dc0160086d723cfb;hp=3520dfd9f0b1debd860c0e1bdacd427a71b8d3e6;hpb=c9ab2e84d7c459e4d5e8e946be78c2e49533796e;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 3520dfd9..1b1adf90 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -37,181 +37,81 @@ 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'; - - // Prepare user list part. - $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) - $userlist = join(',', $bean->getAttribute('users')); - // Prepare sql query part for user list. - $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) - $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->getBeginDate(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'; - - // Prepare user list part. - $userlist = -1; - if (($user->canManageTeam() || $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->canManageTeam() || $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->getBeginDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } // 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'; - - // Prepare user list part. - $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) - $userlist = join(',', $bean->getAttribute('users')); - // Prepare sql query part for user list. - $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) - $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->getBeginDate(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'; - - // Prepare user list part. - $userlist = -1; - if (($user->canManageTeam() || $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->canManageTeam() || $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->getBeginDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } @@ -219,33 +119,37 @@ 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($bean, $options) { global $user; $mdb2 = getConnection(); - $group_by_option = $bean->getAttribute('group_by'); - $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish')); + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + + $group_by_option = $options['group_by']; + $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. array_push($fields, 'l.id as id'); array_push($fields, '1 as type'); // Type 1 is for tt_log entries. array_push($fields, 'l.date as date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. - if ($bean->getAttribute('chclient') || 'client' == $group_by_option) + if ($options['show_client'] || 'client' == $group_by_option) 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'] || 'project' == $group_by_option) 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'] || 'task' == $group_by_option) 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'] || 'cf_1' == $group_by_option; if ($include_cf_1) { - $custom_fields = new CustomFields($user->team_id); + $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'); @@ -253,6 +157,8 @@ class ttReportHelper { array_push($fields, 'cfo.value as cf_1'); } } + +// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge. // Add start time. if ($bean->getAttribute('chstart')) { array_push($fields, "l.start as unformatted_start"); @@ -264,6 +170,13 @@ class ttReportHelper { // Add duration. if ($bean->getAttribute('chduration')) array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration"); + // Add work units. + if ($bean->getAttribute('chunits')) { + 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')) array_push($fields, 'l.comment as note'); @@ -276,17 +189,28 @@ class ttReportHelper { array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user. array_push($fields, "null as expense"); } + // Add paid status. + if ($canViewReports && $bean->getAttribute('chpaid')) + array_push($fields, 'l.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'l.created as created'); + array_push($fields, 'l.created_ip as created_ip'); + array_push($fields, 'l.modified as modified'); + array_push($fields, 'l.modified_ip as modified_ip'); + } + // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; if ($bean->getAttribute('chclient') || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; - if ($user->canManageTeam() || $user->isClient() || ttPluginEnabled('ex')) + if ($canViewReports || $isClient || $user->isPluginEnabled('ex')) $left_joins .= " left join tt_users u on (u.id = l.user_id)"; if ($bean->getAttribute('chproject') || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; @@ -303,7 +227,7 @@ 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"; @@ -311,13 +235,13 @@ class ttReportHelper { // 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') && ttPluginEnabled('ex')) { // if ex(penses) plugin is enabled + if ($bean->getAttribute('chcost') && $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($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($bean->getAttribute('chclient') || 'client' == $group_by_option) @@ -337,27 +261,41 @@ class ttReportHelper { array_push($fields, 'null'); // null for finish. if ($bean->getAttribute('chduration')) array_push($fields, 'null'); // null for duration. + // Add work units. + if ($bean->getAttribute('chunits')) + array_push($fields, 'null as units'); // null for work units. // Use the note field to print item name. if ($bean->getAttribute('chnote')) array_push($fields, 'ei.name as note'); array_push($fields, 'ei.cost as cost'); array_push($fields, 'ei.cost as expense'); + // Add paid status. + if ($canViewReports && $bean->getAttribute('chpaid')) + array_push($fields, 'ei.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'ei.created as created'); + array_push($fields, 'ei.created_ip as created_ip'); + array_push($fields, 'ei.modified as modified'); + array_push($fields, 'ei.modified_ip as modified_ip'); + } + // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $left_joins .= " left join tt_users u on (u.id = ei.user_id)"; if ($bean->getAttribute('chclient') || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = ei.client_id)"; if ($bean->getAttribute('chproject') || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)"; - $where = ttReportHelper::getExpenseWhere($bean); + $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"; @@ -372,7 +310,7 @@ class ttReportHelper { $sort_part .= 'date'; else $sort_part .= $group_by_option.', date'; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option) + if (($canViewReports || $isClient) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option) $sort_part .= ', user, type'; if ($bean->getAttribute('chstart')) $sort_part .= ', unformatted_start'; @@ -422,36 +360,73 @@ class ttReportHelper { return $report_items; } + // putInSession stores tt_log and tt_expense_items ids from a report in user session + // as 2 comma-separated lists. + static function putInSession($report_items) { + unset($_SESSION['report_item_ids']); + unset($_SESSION['report_item_expense_ids']); + + // Iterate through records and build 2 comma-separated lists. + foreach($report_items as $item) { + if ($item['type'] == 1) + $report_item_ids .= ','.$item['id']; + else if ($item['type'] == 2) + $report_item_expense_ids .= ','.$item['id']; + } + $report_item_ids = trim($report_item_ids, ','); + $report_item_expense_ids = trim($report_item_expense_ids, ','); + + // The lists are reqdy. Put them in session. + if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids; + if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids; + } + + // getFromSession obtains tt_log and tt_expense_items ids stored in user session. + static function getFromSession() { + $items = array(); + $report_item_ids = $_SESSION['report_item_ids']; + if ($report_item_ids) + $items['report_item_ids'] = explode(',', $report_item_ids); + $report_item_expense_ids = $_SESSION['report_item_expense_ids']; + if ($report_item_expense_ids) + $items['report_item_expense_ids'] = explode(',', $report_item_expense_ids); + return $items; + } + // getFavItems retrieves all items associated with a favorite report. // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all. // Expense items use the "note" field for item name. - static function getFavItems($report) { + static function getFavItems($options) { global $user; $mdb2 = getConnection(); - $group_by_option = $report['group_by']; - $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($report['show_start'] || $report['show_end']); + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + + $group_by_option = $options['group_by']; + $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. array_push($fields, 'l.id as id'); array_push($fields, '1 as type'); // Type 1 is for tt_log entries. array_push($fields, 'l.date as date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. - if ($report['show_client'] || 'client' == $group_by_option) + if ($options['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) + if ($options['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) + if ($options['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; + $include_cf_1 = $options['show_custom_field_1'] || 'cf_1' == $group_by_option; if ($include_cf_1) { - $custom_fields = new CustomFields($user->team_id); + $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'); @@ -460,21 +435,29 @@ class ttReportHelper { } } // Add start time. - if ($report['show_start']) { + 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 ($report['show_end']) + 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 ($report['show_duration']) + if ($options['show_duration']) array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration"); + // Add work 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 ($report['show_note']) + if ($options['show_note']) array_push($fields, 'l.comment as note'); // Handle cost. - $includeCost = $report['show_cost']; + $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. @@ -482,21 +465,31 @@ class ttReportHelper { array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user. array_push($fields, "null as expense"); } + // Add paid status. + if ($canViewReports && $options['show_paid']) + array_push($fields, 'l.paid as paid'); + // Add IP address. + 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 (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $options['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) + if ($options['show_client'] || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $options['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; - if ($user->canManageTeam() || $user->isClient() || ttPluginEnabled('ex')) + if ($canViewReports || $isClient || $user->isPluginEnabled('ex')) $left_joins .= " left join tt_users u on (u.id = l.user_id)"; - if ($report['show_project'] || 'project' == $group_by_option) + if ($options['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) + if ($options['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) @@ -509,7 +502,7 @@ 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::getFavWhere($report); + $where = ttReportHelper::getWhere($options); // Construct sql query for tt_log items. $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where"; @@ -517,53 +510,65 @@ class ttReportHelper { // 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 + 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'); array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries. array_push($fields, 'ei.date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. - if ($report['show_client'] || 'client' == $group_by_option) + if ($options['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) + if ($options['show_project'] || 'project' == $group_by_option) array_push($fields, 'p.name as project'); - if ($report['show_task'] || 'task' == $group_by_option) + if ($options['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) + if ($options['show_custom_field_1'] || 'cf_1' == $group_by_option) array_push($fields, 'null'); // null for cf_1. - if ($report['show_start']) { + if ($options['show_start']) { array_push($fields, 'null'); // null for unformatted_start. array_push($fields, 'null'); // null for start. } - if ($report['show_end']) + if ($options['show_end']) array_push($fields, 'null'); // null for finish. - if ($report['show_duration']) + 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 ($report['show_note']) + 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 && $options['show_paid']) + array_push($fields, 'ei.paid as paid'); + // Add IP address. + 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 (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $options['show_invoice']) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $left_joins .= " left join tt_users u on (u.id = ei.user_id)"; - if ($report['show_client'] || 'client' == $group_by_option) + if ($options['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) + if ($options['show_project'] || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $options['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)"; - $where = ttReportHelper::getFavExpenseWhere($report); + $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"; @@ -578,9 +583,9 @@ class ttReportHelper { $sort_part .= 'date'; else $sort_part .= $group_by_option.', date'; - if (($user->canManageTeam() || $user->isClient()) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option) + if (($canViewReports || $isClient) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option) $sort_part .= ', user, type'; - if ($report['show_start']) + if ($options['show_start']) $sort_part .= ', unformatted_start'; $sort_part .= ', id'; @@ -631,7 +636,7 @@ class ttReportHelper { // 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($bean, $options) { global $user; $group_by_option = $bean->getAttribute('group_by'); @@ -665,7 +670,7 @@ class ttReportHelper { break; case 'cf_1': $group_field = 'cfo.value'; - $custom_fields = new CustomFields($user->team_id); + $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) @@ -673,31 +678,50 @@ class ttReportHelper { break; } - $where = ttReportHelper::getWhere($bean); + $where = ttReportHelper::getWhere($options); 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)'; - $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, + $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time"; + if ($bean->getAttribute('chunits')) { + 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(cast(l.billable * coalesce(upb.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 ($bean->getAttribute('chunits')) { + 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, null as expenses from tt_log l - $group_join $where group by $group_field"; + $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time"; + if ($bean->getAttribute('chunits')) { + 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') && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled + if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled // Determine group by field and a required join. $group_join = null; @@ -721,14 +745,18 @@ class ttReportHelper { break; } - $where = ttReportHelper::getExpenseWhere($bean); - $sql_for_expenses = "select $group_field as group_field, null as time, 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 ($bean->getAttribute('chunits')) $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(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 ($bean->getAttribute('chunits')) $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. @@ -748,9 +776,9 @@ class ttReportHelper { $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']); + $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); + $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']); } return $subtotals; @@ -759,10 +787,10 @@ class ttReportHelper { // 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) { + static function getFavSubtotals($options) { global $user; - $group_by_option = $report['group_by']; + $group_by_option = $options['group_by']; if ('no_grouping' == $group_by_option) return null; $mdb2 = getConnection(); @@ -793,7 +821,7 @@ class ttReportHelper { break; case 'cf_1': $group_field = 'cfo.value'; - $custom_fields = new CustomFields($user->team_id); + $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) @@ -801,31 +829,51 @@ class ttReportHelper { break; } - $where = ttReportHelper::getFavWhere($report); - if ($report['show_cost']) { + $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(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(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(cast(l.billable * coalesce(upb.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(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, null as expenses from tt_log l - $group_join $where group by $group_field"; + $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 ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) { // 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; @@ -849,14 +897,18 @@ class ttReportHelper { break; } - $where = ttReportHelper::getFavExpenseWhere($report); - $sql_for_expenses = "select $group_field as group_field, null as time, 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(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. @@ -871,52 +923,63 @@ class ttReportHelper { unset($o_date); } $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; - if ($report['show_cost']) { + 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,'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); + $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']); } return $subtotals; } // getTotals calculates total hours and cost for all report items. - static function getTotals($bean) + static function getTotals($bean, $options) { global $user; $mdb2 = getConnection(); - $where = ttReportHelper::getWhere($bean); + $where = ttReportHelper::getWhere($options); - // Start with a query for time items. + // Prepare parts. + $time_part = "sum(time_to_sec(l.duration)) as time"; + if ($bean->getAttribute('chunits')) { + $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"; + } + if ($bean->getAttribute('chcost')) { + 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 { + $cost_part = ", null as cost, null as expenses"; + } if ($bean->getAttribute('chcost')) { if (MODE_TIME == $user->tracking_mode) { - $sql = "select 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 - 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(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, 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 ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) { - $where = ttReportHelper::getExpenseWhere($bean); - $sql_for_expenses = "select null as time, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where"; + if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { + $where = ttReportHelper::getExpenseWhere($options); + $sql_for_expenses = "select null as time"; + if ($bean->getAttribute('chunits')) $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(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t"; + $combined = "select sum(time) as time"; + if ($bean->getAttribute('chunits')) $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. @@ -945,9 +1008,10 @@ class ttReportHelper { new DateAndTime($user->date_format, $bean->getAttribute('end_date'))); } - $totals['start_date'] = $period->getBeginDate(); + $totals['start_date'] = $period->getStartDate(); $totals['end_date'] = $period->getEndDate(); $totals['time'] = $total_time; + $totals['units'] = $val['units']; $totals['cost'] = $total_cost; $totals['expenses'] = $total_expenses; @@ -955,38 +1019,49 @@ class ttReportHelper { } // getFavTotals calculates total hours and cost for all favorite report items. - static function getFavTotals($report) + static function getFavTotals($options) { global $user; $mdb2 = getConnection(); - $where = ttReportHelper::getFavWhere($report); + $where = ttReportHelper::getWhere($options); - // Start with a query for time items. - if ($report['show_cost']) { + // 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"; + } + 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 { + $cost_part = ", null as cost, null as expenses"; + } + if ($options['show_cost']) { if (MODE_TIME == $user->tracking_mode) { - $sql = "select 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 - 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(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, 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'] && in_array('ex', explode(',', $user->plugins))) { - $where = ttReportHelper::getFavExpenseWhere($report); - $sql_for_expenses = "select null as time, 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(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. @@ -995,7 +1070,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) @@ -1006,18 +1081,19 @@ 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->getBeginDate(); + $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; @@ -1042,27 +1118,49 @@ class ttReportHelper { } } + // The markPaid marks a set of records as either paid or unpaid. + static function markPaid($time_log_ids, $expense_item_ids, $paid = true) + { + $mdb2 = getConnection(); + $paid_val = (int) $paid; + if ($time_log_ids) { + $sql = "update tt_log set paid = $paid_val where id in(".join(', ', $time_log_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + if ($expense_item_ids) { + $sql = "update tt_expense_items set paid = $paid_val where id in(".join(', ', $expense_item_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + } + // prepareReportBody - prepares an email body for report. static function prepareReportBody($bean, $comment) { global $user; global $i18n; - $items = ttReportHelper::getItems($bean); + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $options = ttReportHelper::getReportOptions($bean); + + $items = ttReportHelper::getItems($bean, $options); $group_by = $bean->getAttribute('group_by'); if ($group_by && 'no_grouping' != $group_by) - $subtotals = ttReportHelper::getSubtotals($bean); - $totals = ttReportHelper::getTotals($bean); + $subtotals = ttReportHelper::getSubtotals($bean, $options); + $totals = ttReportHelper::getTotals($bean, $options); // Use custom fields plugin if it is enabled. - if (in_array('cf', explode(',', $user->plugins))) - $custom_fields = new CustomFields($user->team_id); + if ($user->isPluginEnabled('cf')) + $custom_fields = new CustomFields($user->group_id); // 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: #ccccce;'; + $rowItem = 'background-color: #ffffff;'; $rowItemAlt = 'background-color: #f5f5f5;'; $rowSubtotal = 'background-color: #e0e0e0;'; $cellLeftAligned = 'text-align: left; vertical-align: top;'; @@ -1076,7 +1174,7 @@ class ttReportHelper { $body .= '
'; // Output title. - $body .= ''.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; + $body .= ''.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; // Output comment. if ($comment) $body .= ''.htmlspecialchars($comment).'
'; @@ -1089,16 +1187,18 @@ class ttReportHelper { $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']); else { $key = 'label.'.$group_by; - $group_by_header = $i18n->getKey($key); + $group_by_header = $i18n->get($key); } $body .= ''.$group_by_header.' | '; if ($bean->getAttribute('chduration')) - $body .= ''.$i18n->getKey('label.duration').' | '; + $body .= ''.$i18n->get('label.duration').' | '; + if ($bean->getAttribute('chunits')) + $body .= ''.$i18n->get('label.work_units_short').' | '; if ($bean->getAttribute('chcost')) - $body .= ''.$i18n->getKey('label.cost').' | '; + $body .= ''.$i18n->get('label.cost').' | '; $body .= '||||||||||||||||||||
'; + $body .= $subtotal['units']; + $body .= ' | '; + } if ($bean->getAttribute('chcost')) { $body .= ''; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; $body .= ' | '; } $body .= '||||||||||||||||||||||||
'.$i18n->getKey('label.total').' | '; + $body .= ''.$i18n->get('label.total').' | '; if ($bean->getAttribute('chduration')) { $body .= ''; if ($totals['time'] <> '0:00') $body .= $totals['time']; $body .= ' | '; } + if ($bean->getAttribute('chunits')) { + $body .= ''; + $body .= $totals['units']; + $body .= ' | '; + } if ($bean->getAttribute('chcost')) { $body .= ''.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= ' | '; } $body .= '
'.$i18n->getKey('label.date').' | '; - if ($user->canManageTeam() || $user->isClient()) - $body .= ''.$i18n->getKey('label.user').' | '; + $body .= ''.$i18n->get('label.date').' | '; + if ($canViewReports || $isClient) + $body .= ''.$i18n->get('label.user').' | '; if ($bean->getAttribute('chclient')) - $body .= ''.$i18n->getKey('label.client').' | '; + $body .= ''.$i18n->get('label.client').' | '; if ($bean->getAttribute('chproject')) - $body .= ''.$i18n->getKey('label.project').' | '; + $body .= ''.$i18n->get('label.project').' | '; if ($bean->getAttribute('chtask')) - $body .= ''.$i18n->getKey('label.task').' | '; + $body .= ''.$i18n->get('label.task').' | '; if ($bean->getAttribute('chcf_1')) $body .= ''.htmlspecialchars($custom_fields->fields[0]['label']).' | '; if ($bean->getAttribute('chstart')) - $body .= ''.$i18n->getKey('label.start').' | '; + $body .= ''.$i18n->get('label.start').' | '; if ($bean->getAttribute('chfinish')) - $body .= ''.$i18n->getKey('label.finish').' | '; + $body .= ''.$i18n->get('label.finish').' | '; if ($bean->getAttribute('chduration')) - $body .= ''.$i18n->getKey('label.duration').' | '; + $body .= ''.$i18n->get('label.duration').' | '; + if ($bean->getAttribute('chunits')) + $body .= ''.$i18n->get('label.work_units_short').' | '; if ($bean->getAttribute('chnote')) - $body .= ''.$i18n->getKey('label.note').' | '; + $body .= ''.$i18n->get('label.note').' | '; if ($bean->getAttribute('chcost')) - $body .= ''.$i18n->getKey('label.cost').' | '; + $body .= ''.$i18n->get('label.cost').' | '; + if ($bean->getAttribute('chpaid')) + $body .= ''.$i18n->get('label.paid').' | '; + if ($bean->getAttribute('chip')) + $body .= ''.$i18n->get('label.ip').' | '; if ($bean->getAttribute('chinvoice')) - $body .= ''.$i18n->getKey('label.invoice').' | '; + $body .= ''.$i18n->get('label.invoice').' | '; $body .= '
'.$i18n->getKey('label.subtotal').' | '; + $body .= ''.$i18n->get('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1195,12 +1311,15 @@ class ttReportHelper { if ($bean->getAttribute('chstart')) $body .= ''; if ($bean->getAttribute('chfinish')) $body .= ' | '; if ($bean->getAttribute('chduration')) $body .= ' | '.$subtotals[$prev_grouped_by]['time'].' | '; + if ($bean->getAttribute('chunits')) $body .= ''.$subtotals[$prev_grouped_by]['units'].' | '; if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; $body .= ' | '; } + if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' | ||||||||||
'.$record['date'].' | '; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''.htmlspecialchars($record['user']).' | '; if ($bean->getAttribute('chclient')) $body .= ''.htmlspecialchars($record['client']).' | '; @@ -1229,10 +1348,22 @@ class ttReportHelper { $body .= ''.$record['finish'].' | '; if ($bean->getAttribute('chduration')) $body .= ''.$record['duration'].' | '; + if ($bean->getAttribute('chunits')) + $body .= ''.$record['units'].' | '; if ($bean->getAttribute('chnote')) $body .= ''.htmlspecialchars($record['note']).' | '; if ($bean->getAttribute('chcost')) $body .= ''.$record['cost'].' | '; + if ($bean->getAttribute('chpaid')) { + $body .= ''; + $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no'); + $body .= ' | '; + } + if ($bean->getAttribute('chip')) { + $body .= ''; + $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created']; + $body .= ' | '; + } if ($bean->getAttribute('chinvoice')) $body .= ''.htmlspecialchars($record['invoice']).' | '; $body .= '|||||||||||||||
'.$i18n->getKey('label.subtotal').' | '; + $body .= ''.$i18n->get('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1256,12 +1387,15 @@ class ttReportHelper { if ($bean->getAttribute('chstart')) $body .= ''; if ($bean->getAttribute('chfinish')) $body .= ' | '; if ($bean->getAttribute('chduration')) $body .= ' | '.$subtotals[$cur_grouped_by]['time'].' | '; + if ($bean->getAttribute('chunits')) $body .= ''.$subtotals[$cur_grouped_by]['units'].' | '; if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; $body .= ' | '; } + if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' | ||||||||||
'.$i18n->getKey('label.total').' | '; - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + $body .= ' | '.$i18n->get('label.total').' | '; + if ($canViewReports || $isClient) $body .= ''; if ($bean->getAttribute('chclient')) $body .= ' | '; if ($bean->getAttribute('chproject')) $body .= ' | '; if ($bean->getAttribute('chtask')) $body .= ' | '; @@ -1278,12 +1412,15 @@ class ttReportHelper { if ($bean->getAttribute('chstart')) $body .= ' | '; if ($bean->getAttribute('chfinish')) $body .= ' | '; if ($bean->getAttribute('chduration')) $body .= ' | '.$totals['time'].' | '; + if ($bean->getAttribute('chunits')) $body .= ''.$totals['units'].' | '; if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= ' | '; } + if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' |