X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=0900f7f9d0e440717d5bbcfc8886b689e3373503;hb=8ec1dac1bcf71ce282ab116413d335f582b5e8f3;hp=2e2113dfe2f27f2dfca8768eb796fb906b5c6e6a;hpb=0056678b5dda50f9664753a8134c558c7583dce9;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 2e2113df..0900f7f9 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -58,11 +58,11 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) + if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users'))) $userlist = join(',', $bean->getAttribute('users')); // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; @@ -103,7 +103,7 @@ class ttReportHelper { // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient())) { + if (($user->can('view_reports') || $user->isClient())) { if ($report['users']) $userlist = $report['users']; else { @@ -115,7 +115,7 @@ class ttReportHelper { } // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; @@ -147,14 +147,16 @@ class ttReportHelper { if ($bean->getAttribute('project')) $dropdown_parts .= ' and ei.project_id = '.$bean->getAttribute('project'); if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL'; if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and ei.invoice_id is NULL'; + if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and ei.paid = 1'; + if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and ei.paid = 0'; // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient()) && is_array($bean->getAttribute('users'))) + if (($user->can('view_reports') || $user->isClient()) && is_array($bean->getAttribute('users'))) $userlist = join(',', $bean->getAttribute('users')); // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; @@ -186,10 +188,12 @@ class ttReportHelper { if ($report['project_id']) $dropdown_parts .= ' and ei.project_id = '.$report['project_id']; if ($report['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL'; if ($report['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL'; + if ($report['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1'; + if ($report['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0'; // Prepare user list part. $userlist = -1; - if (($user->canManageTeam() || $user->isClient())) { + if (($user->can('view_reports') || $user->isClient())) { if ($report['users']) $userlist = $report['users']; else { @@ -201,7 +205,7 @@ class ttReportHelper { } // Prepare sql query part for user list. $user_list_part = null; - if ($user->canManageTeam() || $user->isClient()) + if ($user->can('view_reports') || $user->isClient()) $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; @@ -227,6 +231,10 @@ class ttReportHelper { global $user; $mdb2 = getConnection(); + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $group_by_option = $bean->getAttribute('group_by'); $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($bean->getAttribute('chstart') || $bean->getAttribute('chfinish')); @@ -235,7 +243,7 @@ class ttReportHelper { array_push($fields, 'l.id as id'); array_push($fields, '1 as type'); // Type 1 is for tt_log entries. array_push($fields, 'l.date as date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($bean->getAttribute('chclient') || 'client' == $group_by_option) @@ -249,7 +257,7 @@ class ttReportHelper { // Add custom field. $include_cf_1 = $bean->getAttribute('chcf_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'); @@ -268,6 +276,9 @@ 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')) + 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'); @@ -281,20 +292,27 @@ class ttReportHelper { array_push($fields, "null as expense"); } // Add paid status. - if ($user->canManageTeam() && $bean->getAttribute('chpaid')) + if ($canViewReports && $bean->getAttribute('chpaid')) array_push($fields, 'l.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'l.created as created'); + array_push($fields, 'l.created_ip as created_ip'); + array_push($fields, 'l.modified as modified'); + array_push($fields, 'l.modified_ip as modified_ip'); + } // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; if ($bean->getAttribute('chclient') || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; - if ($user->canManageTeam() || $user->isClient() || $user->isPluginEnabled('ex')) + if ($canViewReports || $isClient || $user->isPluginEnabled('ex')) $left_joins .= " left join tt_users u on (u.id = l.user_id)"; if ($bean->getAttribute('chproject') || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; @@ -325,7 +343,7 @@ class ttReportHelper { array_push($fields, 'ei.id'); array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries. array_push($fields, 'ei.date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($bean->getAttribute('chclient') || 'client' == $group_by_option) @@ -350,19 +368,34 @@ class ttReportHelper { array_push($fields, 'ei.name as note'); array_push($fields, 'ei.cost as cost'); array_push($fields, 'ei.cost as expense'); + // Add paid status. + if ($canViewReports && $bean->getAttribute('chpaid')) + array_push($fields, 'ei.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'ei.created as created'); + array_push($fields, 'ei.created_ip as created_ip'); + array_push($fields, 'ei.modified as modified'); + array_push($fields, 'ei.modified_ip as modified_ip'); + } + // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) + if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); + // 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 ($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); @@ -380,7 +413,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'; @@ -430,6 +463,39 @@ class ttReportHelper { return $report_items; } + // putInSession stores tt_log and tt_expense_items ids from a report in user session + // as 2 comma-separated lists. + static function putInSession($report_items) { + unset($_SESSION['report_item_ids']); + unset($_SESSION['report_item_expense_ids']); + + // Iterate through records and build 2 comma-separated lists. + foreach($report_items as $item) { + if ($item['type'] == 1) + $report_item_ids .= ','.$item['id']; + else if ($item['type'] == 2) + $report_item_expense_ids .= ','.$item['id']; + } + $report_item_ids = trim($report_item_ids, ','); + $report_item_expense_ids = trim($report_item_expense_ids, ','); + + // The lists are reqdy. Put them in session. + if ($report_item_ids) $_SESSION['report_item_ids'] = $report_item_ids; + if ($report_item_expense_ids) $_SESSION['report_item_expense_ids'] = $report_item_expense_ids; + } + + // getFromSession obtains tt_log and tt_expense_items ids stored in user session. + static function getFromSession() { + $items = array(); + $report_item_ids = $_SESSION['report_item_ids']; + if ($report_item_ids) + $items['report_item_ids'] = explode(',', $report_item_ids); + $report_item_expense_ids = $_SESSION['report_item_expense_ids']; + if ($report_item_expense_ids) + $items['report_item_expense_ids'] = explode(',', $report_item_expense_ids); + return $items; + } + // getFavItems retrieves all items associated with a favorite report. // It combines tt_log and tt_expense_items in one array for presentation in one table using mysql union all. // Expense items use the "note" field for item name. @@ -437,6 +503,10 @@ class ttReportHelper { global $user; $mdb2 = getConnection(); + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $group_by_option = $report['group_by']; $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($report['show_start'] || $report['show_end']); @@ -445,7 +515,7 @@ class ttReportHelper { array_push($fields, 'l.id as id'); array_push($fields, '1 as type'); // Type 1 is for tt_log entries. array_push($fields, 'l.date as date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($report['show_client'] || 'client' == $group_by_option) @@ -459,7 +529,7 @@ class ttReportHelper { // 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->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'); @@ -478,6 +548,10 @@ class ttReportHelper { // 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'); @@ -490,17 +564,27 @@ class ttReportHelper { array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user. array_push($fields, "null as expense"); } + // Add paid status. + if ($canViewReports && $report['show_paid']) + array_push($fields, 'l.paid as paid'); + // Add IP address. + if ($canViewReports && $report['show_ip']) { + array_push($fields, 'l.created as created'); + array_push($fields, 'l.created_ip as created_ip'); + array_push($fields, 'l.modified as modified'); + array_push($fields, 'l.modified_ip as modified_ip'); + } // Add invoice name if it is selected. - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; if ($report['show_client'] || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = l.invoice_id and i.status = 1)"; - if ($user->canManageTeam() || $user->isClient() || $user->isPluginEnabled('ex')) + if ($canViewReports || $isClient || $user->isPluginEnabled('ex')) $left_joins .= " left join tt_users u on (u.id = l.user_id)"; if ($report['show_project'] || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; @@ -531,7 +615,7 @@ class ttReportHelper { array_push($fields, 'ei.id'); array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries. array_push($fields, 'ei.date'); - if($user->canManageTeam() || $user->isClient()) + if($canViewReports || $isClient) array_push($fields, 'u.name as user'); // Add client name if it is selected. if ($report['show_client'] || 'client' == $group_by_option) @@ -551,24 +635,36 @@ class ttReportHelper { 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 (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) array_push($fields, 'i.name as invoice'); // Prepare sql query part for left joins. $left_joins = null; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $left_joins .= " left join tt_users u on (u.id = ei.user_id)"; if ($report['show_client'] || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = ei.client_id)"; if ($report['show_project'] || 'project' == $group_by_option) $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; - if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) + if (($canViewReports || $isClient) && $report['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)"; $where = ttReportHelper::getFavExpenseWhere($report); @@ -586,7 +682,7 @@ class ttReportHelper { $sort_part .= 'date'; else $sort_part .= $group_by_option.', date'; - if (($user->canManageTeam() || $user->isClient()) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option) + if (($canViewReports || $isClient) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option) $sort_part .= ', user, type'; if ($report['show_start']) $sort_part .= ', unformatted_start'; @@ -673,7 +769,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) @@ -686,21 +782,25 @@ class ttReportHelper { 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, + $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, + $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"; } } 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, + 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. @@ -730,13 +830,13 @@ class ttReportHelper { } $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 + $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(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field"; + $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. @@ -756,9 +856,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; @@ -801,7 +901,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) @@ -814,21 +914,25 @@ class ttReportHelper { 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, + $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, + $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"; } } 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, + 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. @@ -858,13 +962,13 @@ class ttReportHelper { } $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 + $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(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field"; + $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. @@ -884,9 +988,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; @@ -901,30 +1005,37 @@ class ttReportHelper { $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 (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, null as cost, null as expenses from tt_log l $where"; + $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, sum(cost) as cost, sum(cost) as expenses from tt_expense_items ei $where"; + $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(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t"; + $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. @@ -956,6 +1067,7 @@ class ttReportHelper { $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; @@ -975,26 +1087,30 @@ class ttReportHelper { 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, null as cost, null as expenses from tt_log l $where"; + $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 ($report['show_cost'] && $user->isPluginEnabled('ex')) { $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"; + $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(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t"; + $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. @@ -1026,6 +1142,7 @@ class ttReportHelper { $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; @@ -1050,12 +1167,33 @@ class ttReportHelper { } } + // The markPaid marks a set of records as either paid or unpaid. + static function markPaid($time_log_ids, $expense_item_ids, $paid = true) + { + $mdb2 = getConnection(); + $paid_val = (int) $paid; + if ($time_log_ids) { + $sql = "update tt_log set paid = $paid_val where id in(".join(', ', $time_log_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + if ($expense_item_ids) { + $sql = "update tt_expense_items set paid = $paid_val where id in(".join(', ', $expense_item_ids).")"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + } + // prepareReportBody - prepares an email body for report. static function prepareReportBody($bean, $comment) { global $user; global $i18n; + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $items = ttReportHelper::getItems($bean); $group_by = $bean->getAttribute('group_by'); if ($group_by && 'no_grouping' != $group_by) @@ -1064,7 +1202,7 @@ class ttReportHelper { // Use custom fields plugin if it is enabled. if ($user->isPluginEnabled('cf')) - $custom_fields = new CustomFields($user->team_id); + $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;'; @@ -1084,7 +1222,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).'

'; @@ -1097,16 +1235,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 .= ''; $body .= ''; $body .= ''; if ($bean->getAttribute('chduration')) - $body .= ''; + $body .= ''; + if ($bean->getAttribute('chunits')) + $body .= ''; if ($bean->getAttribute('chcost')) - $body .= ''; + $body .= ''; $body .= ''; foreach($subtotals as $subtotal) { $body .= ''; @@ -1116,9 +1256,14 @@ class ttReportHelper { if ($subtotal['time'] <> '0:00') $body .= $subtotal['time']; $body .= ''; } + if ($bean->getAttribute('chunits')) { + $body .= ''; + } if ($bean->getAttribute('chcost')) { $body .= ''; } $body .= ''; @@ -1127,15 +1272,20 @@ class ttReportHelper { // Print totals. $body .= ''; $body .= ''; - $body .= ''; + $body .= ''; if ($bean->getAttribute('chduration')) { $body .= ''; } + if ($bean->getAttribute('chunits')) { + $body .= ''; + } if ($bean->getAttribute('chcost')) { $body .= ''; } $body .= ''; @@ -1147,31 +1297,35 @@ class ttReportHelper { // Print table header. $body .= '
'.$group_by_header.''.$i18n->getKey('label.duration').''.$i18n->get('label.duration').''.$i18n->get('label.work_units_short').''.$i18n->getKey('label.cost').''.$i18n->get('label.cost').'
'; + $body .= $subtotal['units']; + $body .= ''; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; $body .= '
 
'.$i18n->getKey('label.total').''.$i18n->get('label.total').''; if ($totals['time'] <> '0:00') $body .= $totals['time']; $body .= ''; + $body .= $totals['units']; + $body .= ''.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= '
'; $body .= ''; - $body .= ''; - if ($user->canManageTeam() || $user->isClient()) - $body .= ''; + $body .= ''; + if ($canViewReports || $isClient) + $body .= ''; if ($bean->getAttribute('chclient')) - $body .= ''; + $body .= ''; if ($bean->getAttribute('chproject')) - $body .= ''; + $body .= ''; if ($bean->getAttribute('chtask')) - $body .= ''; + $body .= ''; if ($bean->getAttribute('chcf_1')) $body .= ''; if ($bean->getAttribute('chstart')) - $body .= ''; + $body .= ''; if ($bean->getAttribute('chfinish')) - $body .= ''; + $body .= ''; if ($bean->getAttribute('chduration')) - $body .= ''; + $body .= ''; + if ($bean->getAttribute('chunits')) + $body .= ''; if ($bean->getAttribute('chnote')) - $body .= ''; + $body .= ''; if ($bean->getAttribute('chcost')) - $body .= ''; + $body .= ''; if ($bean->getAttribute('chpaid')) - $body .= ''; + $body .= ''; + if ($bean->getAttribute('chip')) + $body .= ''; if ($bean->getAttribute('chinvoice')) - $body .= ''; + $body .= ''; $body .= ''; // Initialize variables to print subtotals. @@ -1195,9 +1349,9 @@ class ttReportHelper { $cur_grouped_by = $record['grouped_by']; if ($cur_grouped_by != $prev_grouped_by && !$first_pass) { $body .= ''; - $body .= ''; + $body .= ''; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ''; if ($bean->getAttribute('chclient')) $body .= ''; if ($bean->getAttribute('chproject')) $body .= ''; if ($bean->getAttribute('chtask')) $body .= ''; @@ -1205,13 +1359,15 @@ class ttReportHelper { 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')) { $body .= ''; } if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ''; if ($bean->getAttribute('chinvoice')) $body .= ''; $body .= ''; $body .= ''; @@ -1224,7 +1380,7 @@ class ttReportHelper { $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem; $body .= ''; $body .= ''; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''; if ($bean->getAttribute('chclient')) $body .= ''; @@ -1240,13 +1396,20 @@ class ttReportHelper { $body .= ''; if ($bean->getAttribute('chduration')) $body .= ''; + if ($bean->getAttribute('chunits')) + $body .= ''; if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) $body .= ''; if ($bean->getAttribute('chpaid')) { $body .= ''; + } + if ($bean->getAttribute('chip')) { + $body .= ''; } if ($bean->getAttribute('chinvoice')) @@ -1262,9 +1425,9 @@ class ttReportHelper { // Print a terminating subtotal. if ($print_subtotals) { $body .= ''; - $body .= ''; + $body .= ''; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ''; if ($bean->getAttribute('chclient')) $body .= ''; if ($bean->getAttribute('chproject')) $body .= ''; if ($bean->getAttribute('chtask')) $body .= ''; @@ -1272,13 +1435,15 @@ class ttReportHelper { 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')) { $body .= ''; } if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ''; if ($bean->getAttribute('chinvoice')) $body .= ''; $body .= ''; } @@ -1286,8 +1451,8 @@ class ttReportHelper { // Print totals. $body .= ''; $body .= ''; - $body .= ''; - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + $body .= ''; + if ($canViewReports || $isClient) $body .= ''; if ($bean->getAttribute('chclient')) $body .= ''; if ($bean->getAttribute('chproject')) $body .= ''; if ($bean->getAttribute('chtask')) $body .= ''; @@ -1295,13 +1460,15 @@ class ttReportHelper { 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')) { $body .= ''; } if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ''; if ($bean->getAttribute('chinvoice')) $body .= ''; $body .= ''; @@ -1310,7 +1477,7 @@ class ttReportHelper { // Output footer. if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false)) - $body .= '

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

'; + $body .= '

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

'; // Finish creating email body. $body .= ''; @@ -1324,7 +1491,7 @@ class ttReportHelper { $items = ttReportHelper::getFavItems($report); $condition = str_replace('count', '', $condition); - $count_required = intval(trim(str_replace('>', '', $condition))); + $count_required = (int) trim(str_replace('>', '', $condition)); if (count($items) > $count_required) return true; // Condition ok. @@ -1338,6 +1505,10 @@ class ttReportHelper { global $user; global $i18n; + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $items = ttReportHelper::getFavItems($report); $group_by = $report['group_by']; if ($group_by && 'no_grouping' != $group_by) @@ -1346,7 +1517,7 @@ class ttReportHelper { // Use custom fields plugin if it is enabled. if ($user->isPluginEnabled('cf')) - $custom_fields = new CustomFields($user->team_id); + $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;'; @@ -1366,7 +1537,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).'

'; // No comment for fav. reports. @@ -1379,16 +1550,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 .= '
'.$i18n->getKey('label.date').''.$i18n->getKey('label.user').''.$i18n->get('label.date').''.$i18n->get('label.user').''.$i18n->getKey('label.client').''.$i18n->get('label.client').''.$i18n->getKey('label.project').''.$i18n->get('label.project').''.$i18n->getKey('label.task').''.$i18n->get('label.task').''.htmlspecialchars($custom_fields->fields[0]['label']).''.$i18n->getKey('label.start').''.$i18n->get('label.start').''.$i18n->getKey('label.finish').''.$i18n->get('label.finish').''.$i18n->getKey('label.duration').''.$i18n->get('label.duration').''.$i18n->get('label.work_units_short').''.$i18n->getKey('label.note').''.$i18n->get('label.note').''.$i18n->getKey('label.cost').''.$i18n->get('label.cost').''.$i18n->getKey('label.paid').''.$i18n->get('label.paid').''.$i18n->get('label.ip').''.$i18n->getKey('label.invoice').''.$i18n->get('label.invoice').'
'.$i18n->getKey('label.subtotal').''.$i18n->get('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.$subtotals[$prev_grouped_by]['time'].''.$subtotals[$prev_grouped_by]['units'].''; - $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 .= '
 
'.$record['date'].''.htmlspecialchars($record['user']).''.htmlspecialchars($record['client']).''.$record['finish'].''.$record['duration'].''.$record['units'].''.htmlspecialchars($record['note']).''.$record['cost'].''; - $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no'); + $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 .= '
'.$i18n->getKey('label.subtotal').''.$i18n->get('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.$subtotals[$cur_grouped_by]['time'].''.$subtotals[$cur_grouped_by]['units'].''; - $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 .= '
 
'.$i18n->getKey('label.total').''.$i18n->get('label.total').''.$totals['time'].''.$totals['units'].''.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= '
'; $body .= ''; $body .= ''; if ($report['show_duration']) - $body .= ''; + $body .= ''; + if ($report['show_work_units']) + $body .= ''; if ($report['show_cost']) - $body .= ''; + $body .= ''; $body .= ''; foreach($subtotals as $subtotal) { $body .= ''; @@ -1398,9 +1571,14 @@ class ttReportHelper { if ($subtotal['time'] <> '0:00') $body .= $subtotal['time']; $body .= ''; } + if ($report['show_work_units']) { + $body .= ''; + } if ($report['show_cost']) { $body .= ''; } $body .= ''; @@ -1409,15 +1587,20 @@ class ttReportHelper { // Print totals. $body .= ''; $body .= ''; - $body .= ''; + $body .= ''; if ($report['show_duration']) { $body .= ''; } + if ($report['show_work_units']) { + $body .= ''; + } if ($report['show_cost']) { $body .= ''; } $body .= ''; @@ -1429,31 +1612,35 @@ class ttReportHelper { // Print table header. $body .= '
'.$group_by_header.''.$i18n->getKey('label.duration').''.$i18n->get('label.duration').''.$i18n->get('label.work_units_short').''.$i18n->getKey('label.cost').''.$i18n->get('label.cost').'
'; + $body .= $subtotal['units']; + $body .= ''; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; $body .= '
 
'.$i18n->getKey('label.total').''.$i18n->get('label.total').''; if ($totals['time'] <> '0:00') $body .= $totals['time']; $body .= ''; + $body .= $totals['units']; + $body .= ''.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= '
'; $body .= ''; - $body .= ''; - if ($user->canManageTeam() || $user->isClient()) - $body .= ''; + $body .= ''; + if ($canViewReports || $isClient) + $body .= ''; if ($report['show_client']) - $body .= ''; + $body .= ''; if ($report['show_project']) - $body .= ''; + $body .= ''; if ($report['show_task']) - $body .= ''; + $body .= ''; if ($report['show_custom_field_1']) $body .= ''; if ($report['show_start']) - $body .= ''; + $body .= ''; if ($report['show_end']) - $body .= ''; + $body .= ''; if ($report['show_duration']) - $body .= ''; + $body .= ''; + if ($report['show_work_units']) + $body .= ''; if ($report['show_note']) - $body .= ''; + $body .= ''; if ($report['show_cost']) - $body .= ''; + $body .= ''; if ($report['show_paid']) - $body .= ''; + $body .= ''; + if ($report['show_ip']) + $body .= ''; if ($report['show_invoice']) - $body .= ''; + $body .= ''; $body .= ''; // Initialize variables to print subtotals. @@ -1477,9 +1664,9 @@ class ttReportHelper { $cur_grouped_by = $record['grouped_by']; if ($cur_grouped_by != $prev_grouped_by && !$first_pass) { $body .= ''; - $body .= ''; + $body .= ''; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ''; if ($report['show_client']) $body .= ''; if ($report['show_project']) $body .= ''; if ($report['show_task']) $body .= ''; @@ -1487,13 +1674,15 @@ class ttReportHelper { 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 .= ''; @@ -1506,7 +1695,7 @@ class ttReportHelper { $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem; $body .= ''; $body .= ''; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''; if ($report['show_client']) $body .= ''; @@ -1522,13 +1711,20 @@ class ttReportHelper { $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']) @@ -1544,9 +1740,9 @@ class ttReportHelper { // Print a terminating subtotal. if ($print_subtotals) { $body .= ''; - $body .= ''; + $body .= ''; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ''; if ($report['show_client']) $body .= ''; if ($report['show_project']) $body .= ''; if ($report['show_task']) $body .= ''; @@ -1554,13 +1750,15 @@ class ttReportHelper { 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 .= ''; } @@ -1568,8 +1766,8 @@ class ttReportHelper { // Print totals. $body .= ''; $body .= ''; - $body .= ''; - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + $body .= ''; + if ($canViewReports || $isClient) $body .= ''; if ($report['show_client']) $body .= ''; if ($report['show_project']) $body .= ''; if ($report['show_task']) $body .= ''; @@ -1577,13 +1775,15 @@ class ttReportHelper { 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 .= ''; @@ -1592,7 +1792,7 @@ class ttReportHelper { // Output footer. if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false)) - $body .= '

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

'; + $body .= '

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

'; // Finish creating email body. $body .= '';
'.$i18n->getKey('label.date').''.$i18n->getKey('label.user').''.$i18n->get('label.date').''.$i18n->get('label.user').''.$i18n->getKey('label.client').''.$i18n->get('label.client').''.$i18n->getKey('label.project').''.$i18n->get('label.project').''.$i18n->getKey('label.task').''.$i18n->get('label.task').''.htmlspecialchars($custom_fields->fields[0]['label']).''.$i18n->getKey('label.start').''.$i18n->get('label.start').''.$i18n->getKey('label.finish').''.$i18n->get('label.finish').''.$i18n->getKey('label.duration').''.$i18n->get('label.duration').''.$i18n->get('label.work_units_short').''.$i18n->getKey('label.note').''.$i18n->get('label.note').''.$i18n->getKey('label.cost').''.$i18n->get('label.cost').''.$i18n->getKey('label.paid').''.$i18n->get('label.paid').''.$i18n->get('label.ip').''.$i18n->getKey('label.invoice').''.$i18n->get('label.invoice').'
'.$i18n->getKey('label.subtotal').''.$i18n->get('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.$subtotals[$prev_grouped_by]['time'].''.$subtotals[$prev_grouped_by]['units'].''; - $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 .= '
 
'.$record['date'].''.htmlspecialchars($record['user']).''.htmlspecialchars($record['client']).''.$record['finish'].''.$record['duration'].''.$record['units'].''.htmlspecialchars($record['note']).''.$record['cost'].''; - $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no'); + $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 .= '
'.$i18n->getKey('label.subtotal').''.$i18n->get('label.subtotal').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'user' ? $subtotal_name : '').''.($group_by == 'client' ? $subtotal_name : '').''.($group_by == 'project' ? $subtotal_name : '').''.($group_by == 'task' ? $subtotal_name : '').''.$subtotals[$cur_grouped_by]['time'].''.$subtotals[$cur_grouped_by]['units'].''; - $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 .= '
 
'.$i18n->getKey('label.total').''.$i18n->get('label.total').''.$totals['time'].''.$totals['units'].''.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= '