X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=313951849b19409c642a47e2ade084ba2e86d059;hb=a5004f7ad3f11be39db2694bda00d0bee41d837b;hp=2aac46847b7313fe6de59e385d5a6834f602a89b;hpb=70272dc970919c348288bd09ff835f05e7538949;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 2aac4684..31395184 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -53,6 +53,8 @@ class ttReportHelper { if ($bean->getAttribute('include_records')=='2') $dropdown_parts .= ' and l.billable = 0'; if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and l.invoice_id is not NULL'; if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and l.invoice_id is NULL'; + if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and l.paid = 1'; + if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and l.paid = 0'; // Prepare user list part. $userlist = -1; @@ -74,7 +76,7 @@ class ttReportHelper { new DateAndTime($user->date_format, $bean->getAttribute('start_date')), new DateAndTime($user->date_format, $bean->getAttribute('end_date'))); } - $where = " where l.status = 1 and l.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } @@ -96,6 +98,8 @@ class ttReportHelper { if ($report['billable']=='2') $dropdown_parts .= ' and l.billable = 0'; if ($report['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL'; if ($report['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL'; + if ($report['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1'; + if ($report['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0'; // Prepare user list part. $userlist = -1; @@ -125,7 +129,7 @@ class ttReportHelper { new DateAndTime($user->date_format, $report['period_start']), new DateAndTime($user->date_format, $report['period_end'])); } - $where = " where l.status = 1 and l.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } @@ -143,6 +147,8 @@ 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; @@ -164,7 +170,7 @@ class ttReportHelper { new DateAndTime($user->date_format, $bean->getAttribute('start_date')), new DateAndTime($user->date_format, $bean->getAttribute('end_date'))); } - $where = " where ei.status = 1 and ei.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } @@ -182,6 +188,8 @@ 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; @@ -211,7 +219,7 @@ class ttReportHelper { new DateAndTime($user->date_format, $report['period_start']), new DateAndTime($user->date_format, $report['period_end'])); } - $where = " where ei.status = 1 and ei.date >= '".$period->getBeginDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". + $where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'". " $user_list_part $dropdown_parts"; return $where; } @@ -276,6 +284,10 @@ 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 ($user->canManageTeam() && $bean->getAttribute('chpaid')) + array_push($fields, 'l.paid as paid'); + // Add invoice name if it is selected. if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); @@ -286,7 +298,7 @@ class ttReportHelper { $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; if (($user->canManageTeam() || $user->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() || in_array('ex', explode(',', $user->plugins))) + if ($user->canManageTeam() || $user->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)"; @@ -311,7 +323,7 @@ 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') && 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 $fields = array(); // An array of fields for database query. array_push($fields, 'ei.id'); @@ -342,6 +354,9 @@ 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 ($user->canManageTeam() && $bean->getAttribute('chpaid')) + array_push($fields, 'ei.paid as paid'); // Add invoice name if it is selected. if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); @@ -383,56 +398,88 @@ class ttReportHelper { // Obtain items for report. $res = $mdb2->query($sql); - if (!is_a($res, 'PEAR_Error')) { - while ($val = $res->fetchRow()) { - if ($convertTo12Hour) { - if($val['start'] != '') - $val['start'] = ttTimeHelper::to12HourFormat($val['start']); - if($val['finish'] != '') - $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']); - } - if (isset($val['cost'])) { - if ('.' != $user->decimal_mark) - $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); - } - if (isset($val['expense'])) { - if ('.' != $user->decimal_mark) - $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']); - } - if ('no_grouping' != $group_by_option) { - $val['grouped_by'] = $val[$group_by_option]; - if ('date' == $group_by_option) { - // This is needed to get the date in user date format. - $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']); - $val['grouped_by'] = $o_date->toString($user->date_format); - unset($o_date); - } - } - + if (is_a($res, 'PEAR_Error')) die($res->getMessage()); + + while ($val = $res->fetchRow()) { + if ($convertTo12Hour) { + if($val['start'] != '') + $val['start'] = ttTimeHelper::to12HourFormat($val['start']); + if($val['finish'] != '') + $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']); + } + if (isset($val['cost'])) { + if ('.' != $user->decimal_mark) + $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); + } + if (isset($val['expense'])) { + if ('.' != $user->decimal_mark) + $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']); + } + if ('no_grouping' != $group_by_option) { + $val['grouped_by'] = $val[$group_by_option]; + if ('date' == $group_by_option) { // This is needed to get the date in user date format. - $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']); - $val['date'] = $o_date->toString($user->date_format); + $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']); + $val['grouped_by'] = $o_date->toString($user->date_format); unset($o_date); - - $row = $val; - $report_items[] = $row; } - } else - die($res->getMessage()); + } + + // This is needed to get the date in user date format. + $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']); + $val['date'] = $o_date->toString($user->date_format); + unset($o_date); + + $row = $val; + $report_items[] = $row; + } return $report_items; } - + + // 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) { global $user; $mdb2 = getConnection(); - + $group_by_option = $report['group_by']; $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($report['show_start'] || $report['show_end']); - + // Prepare a query for time items in tt_log table. $fields = array(); // An array of fields for database query. array_push($fields, 'l.id as id'); @@ -493,12 +540,12 @@ class ttReportHelper { $left_joins .= " left join tt_clients c on (c.id = l.client_id)"; if (($user->canManageTeam() || $user->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() || in_array('ex', explode(',', $user->plugins))) + if ($user->canManageTeam() || $user->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)"; + $left_joins .= " left join tt_projects p on (p.id = l.project_id)"; if ($report['show_task'] || 'task' == $group_by_option) - $left_joins .= " left join tt_tasks t on (t.id = l.task_id)"; + $left_joins .= " left join tt_tasks t on (t.id = l.task_id)"; if ($include_cf_1) { if ($cf_1_type == CustomFields::TYPE_TEXT) $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)"; @@ -509,17 +556,17 @@ 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); - - // Construct sql query for tt_log items. + + // Construct sql query for tt_log items. $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where"; // If we don't have expense items (such as when the Expenses plugin is desabled), the above is all sql we need, // with an exception of sorting part, that is added in the end. // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table. - if ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled - + if ($report['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled + $fields = array(); // An array of fields for database query. array_push($fields, 'ei.id'); array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries. @@ -552,7 +599,7 @@ class ttReportHelper { // Add invoice name if it is selected. if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) array_push($fields, 'i.name as invoice'); - + // Prepare sql query part for left joins. $left_joins = null; if ($user->canManageTeam() || $user->isClient()) @@ -560,19 +607,19 @@ class ttReportHelper { if ($report['show_client'] || 'client' == $group_by_option) $left_joins .= " left join tt_clients c on (c.id = ei.client_id)"; if ($report['show_project'] || 'project' == $group_by_option) - $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; + $left_joins .= " left join tt_projects p on (p.id = ei.project_id)"; if (($user->canManageTeam() || $user->isClient()) && $report['show_invoice']) $left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)"; $where = ttReportHelper::getFavExpenseWhere($report); - + // Construct sql query for expense items. $sql_for_expense_items = "select ".join(', ', $fields)." from tt_expense_items ei $left_joins $where"; - + // Construct a union. $sql = "($sql) union all ($sql_for_expense_items)"; } - + // Determine sort part. $sort_part = ' order by '; if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option) // TODO: fix DB for NULL values in group_by field. @@ -584,68 +631,67 @@ class ttReportHelper { if ($report['show_start']) $sort_part .= ', unformatted_start'; $sort_part .= ', id'; - + $sql .= $sort_part; // By now we are ready with sql. // Obtain items for report. $res = $mdb2->query($sql); - if (!is_a($res, 'PEAR_Error')) { - while ($val = $res->fetchRow()) { - if ($convertTo12Hour) { - if($val['start'] != '') - $val['start'] = ttTimeHelper::to12HourFormat($val['start']); - if($val['finish'] != '') - $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']); - } - if (isset($val['cost'])) { - if ('.' != $user->decimal_mark) - $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); - } - if (isset($val['expense'])) { - if ('.' != $user->decimal_mark) - $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']); - } - if ('no_grouping' != $group_by_option) { - $val['grouped_by'] = $val[$group_by_option]; - if ('date' == $group_by_option) { - // This is needed to get the date in user date format. - $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']); - $val['grouped_by'] = $o_date->toString($user->date_format); - unset($o_date); - } - } - + if (is_a($res, 'PEAR_Error')) die($res->getMessage()); + + while ($val = $res->fetchRow()) { + if ($convertTo12Hour) { + if($val['start'] != '') + $val['start'] = ttTimeHelper::to12HourFormat($val['start']); + if($val['finish'] != '') + $val['finish'] = ttTimeHelper::to12HourFormat($val['finish']); + } + if (isset($val['cost'])) { + if ('.' != $user->decimal_mark) + $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); + } + if (isset($val['expense'])) { + if ('.' != $user->decimal_mark) + $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']); + } + if ('no_grouping' != $group_by_option) { + $val['grouped_by'] = $val[$group_by_option]; + if ('date' == $group_by_option) { // This is needed to get the date in user date format. - $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']); - $val['date'] = $o_date->toString($user->date_format); + $o_date = new DateAndTime(DB_DATEFORMAT, $val['grouped_by']); + $val['grouped_by'] = $o_date->toString($user->date_format); unset($o_date); - - $row = $val; - $report_items[] = $row; } - } else - die($res->getMessage()); + } + + // This is needed to get the date in user date format. + $o_date = new DateAndTime(DB_DATEFORMAT, $val['date']); + $val['date'] = $o_date->toString($user->date_format); + unset($o_date); + + $row = $val; + $report_items[] = $row; + } return $report_items; } - + // getSubtotals calculates report items subtotals when a report is grouped by. // Without expenses, it's a simple select with group by. // With expenses, it becomes a select with group by from a combined set of records obtained with "union all". static function getSubtotals($bean) { - global $user; - + global $user; + $group_by_option = $bean->getAttribute('group_by'); if ('no_grouping' == $group_by_option) return null; - + $mdb2 = getConnection(); - + // Start with sql to obtain subtotals for time items. This simple sql will be used when we have no expenses. - + // Determine group by field and a required join. switch ($group_by_option) { - case 'date': + case 'date': $group_field = 'l.date'; $group_join = ''; break; @@ -658,54 +704,54 @@ class ttReportHelper { $group_join = 'left join tt_clients c on (l.client_id = c.id) '; break; case 'project': - $group_field = 'p.name'; + $group_field = 'p.name'; $group_join = 'left join tt_projects p on (l.project_id = p.id) '; - break; + break; case 'task': - $group_field = 't.name'; + $group_field = 't.name'; $group_join = 'left join tt_tasks t on (l.task_id = t.id) '; - break; + break; case 'cf_1': - $group_field = 'cfo.value'; - $custom_fields = new CustomFields($user->team_id); - if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) + $group_field = 'cfo.value'; + $custom_fields = new CustomFields($user->team_id); + if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) '; elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) '; - break; + break; } $where = ttReportHelper::getWhere($bean); if ($bean->getAttribute('chcost')) { if (MODE_TIME == $user->tracking_mode) { - if ($group_by_option != 'user') - $left_join = 'left join tt_users u on (l.user_id = u.id)'; + if ($group_by_option != 'user') + $left_join = 'left join tt_users u on (l.user_id = u.id)'; $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost, null as expenses from tt_log l - $group_join $left_join $where group by $group_field"; + $group_join $left_join $where group by $group_field"; } else { // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table. $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, - null as expenses from tt_log l + null as expenses from tt_log l $group_join left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field"; } } else { - $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l + $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l $group_join $where group by $group_field"; } // By now we have sql for time items. - + // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table. - if ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled - + if ($bean->getAttribute('chcost') && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled + // Determine group by field and a required join. $group_join = null; $group_field = 'null'; switch ($group_by_option) { - case 'date': + case 'date': $group_field = 'ei.date'; $group_join = ''; break; @@ -718,9 +764,9 @@ class ttReportHelper { $group_join = 'left join tt_clients c on (ei.client_id = c.id) '; break; case 'project': - $group_field = 'p.name'; + $group_field = 'p.name'; $group_join = 'left join tt_projects p on (ei.project_id = p.id) '; - break; + break; } $where = ttReportHelper::getExpenseWhere($bean); @@ -728,53 +774,52 @@ class ttReportHelper { $group_join $where"; // Add a "group by" clause if we are grouping. if ('null' != $group_field) $sql_for_expenses .= " group by $group_field"; - + // Create a combined query. $sql = "select group_field, sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field"; } - + // Execute query. $res = $mdb2->query($sql); - if (!is_a($res, 'PEAR_Error')) { - while ($val = $res->fetchRow()) { - if ('date' == $group_by_option) { - // This is needed to get the date in user date format. - $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']); - $val['group_field'] = $o_date->toString($user->date_format); - unset($o_date); - } - $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; - if ($bean->getAttribute('chcost')) { - if ('.' != $user->decimal_mark) { - $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); - $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']); - } - $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']); - } else - $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time); + if (is_a($res, 'PEAR_Error')) die($res->getMessage()); + + while ($val = $res->fetchRow()) { + if ('date' == $group_by_option) { + // This is needed to get the date in user date format. + $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']); + $val['group_field'] = $o_date->toString($user->date_format); + unset($o_date); } - } else - die($res->getMessage()); + $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; + if ($bean->getAttribute('chcost')) { + if ('.' != $user->decimal_mark) { + $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); + $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']); + } + $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']); + } else + $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time); + } return $subtotals; } - + // getFavSubtotals calculates report items subtotals when a favorite report is grouped by. // Without expenses, it's a simple select with group by. // With expenses, it becomes a select with group by from a combined set of records obtained with "union all". static function getFavSubtotals($report) { - global $user; - + global $user; + $group_by_option = $report['group_by']; if ('no_grouping' == $group_by_option) return null; - + $mdb2 = getConnection(); - + // Start with sql to obtain subtotals for time items. This simple sql will be used when we have no expenses. - + // Determine group by field and a required join. switch ($group_by_option) { - case 'date': + case 'date': $group_field = 'l.date'; $group_join = ''; break; @@ -787,32 +832,32 @@ class ttReportHelper { $group_join = 'left join tt_clients c on (l.client_id = c.id) '; break; case 'project': - $group_field = 'p.name'; + $group_field = 'p.name'; $group_join = 'left join tt_projects p on (l.project_id = p.id) '; - break; + break; case 'task': - $group_field = 't.name'; + $group_field = 't.name'; $group_join = 'left join tt_tasks t on (l.task_id = t.id) '; - break; + break; case 'cf_1': - $group_field = 'cfo.value'; - $custom_fields = new CustomFields($user->team_id); - if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) + $group_field = 'cfo.value'; + $custom_fields = new CustomFields($user->team_id); + if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id) '; elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) $group_join = 'left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.option_id = cfo.id) '; - break; + break; } $where = ttReportHelper::getFavWhere($report); if ($report['show_cost']) { if (MODE_TIME == $user->tracking_mode) { - if ($group_by_option != 'user') - $left_join = 'left join tt_users u on (l.user_id = u.id)'; + if ($group_by_option != 'user') + $left_join = 'left join tt_users u on (l.user_id = u.id)'; $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost, null as expenses from tt_log l - $group_join $left_join $where group by $group_field"; + $group_join $left_join $where group by $group_field"; } else { // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table. $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, @@ -822,19 +867,19 @@ class ttReportHelper { left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where group by $group_field"; } } else { - $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l + $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time, null as expenses from tt_log l $group_join $where group by $group_field"; } // By now we have sql for time items. - + // However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table. - if ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) { // if ex(penses) plugin is enabled - + if ($report['show_cost'] && $user->isPluginEnabled('ex')) { // if ex(penses) plugin is enabled + // Determine group by field and a required join. $group_join = null; $group_field = 'null'; switch ($group_by_option) { - case 'date': + case 'date': $group_field = 'ei.date'; $group_join = ''; break; @@ -847,9 +892,9 @@ class ttReportHelper { $group_join = 'left join tt_clients c on (ei.client_id = c.id) '; break; case 'project': - $group_field = 'p.name'; + $group_field = 'p.name'; $group_join = 'left join tt_projects p on (ei.project_id = p.id) '; - break; + break; } $where = ttReportHelper::getFavExpenseWhere($report); @@ -857,46 +902,45 @@ class ttReportHelper { $group_join $where"; // Add a "group by" clause if we are grouping. if ('null' != $group_field) $sql_for_expenses .= " group by $group_field"; - + // Create a combined query. $sql = "select group_field, sum(time) as time, sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field"; } - + // Execute query. $res = $mdb2->query($sql); - if (!is_a($res, 'PEAR_Error')) { - while ($val = $res->fetchRow()) { - if ('date' == $group_by_option) { - // This is needed to get the date in user date format. - $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']); - $val['group_field'] = $o_date->toString($user->date_format); - unset($o_date); - } - $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; - if ($report['show_cost']) { - if ('.' != $user->decimal_mark) { - $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); - $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']); - } - $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']); - } else - $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time); + if (is_a($res, 'PEAR_Error')) die($res->getMessage()); + + while ($val = $res->fetchRow()) { + if ('date' == $group_by_option) { + // This is needed to get the date in user date format. + $o_date = new DateAndTime(DB_DATEFORMAT, $val['group_field']); + $val['group_field'] = $o_date->toString($user->date_format); + unset($o_date); } - } else - die($res->getMessage()); + $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; + if ($report['show_cost']) { + if ('.' != $user->decimal_mark) { + $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); + $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']); + } + $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time,'cost'=>$val['cost'],'expenses'=>$val['expenses']); + } else + $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time); + } return $subtotals; } - + // getTotals calculates total hours and cost for all report items. static function getTotals($bean) { global $user; - + $mdb2 = getConnection(); - + $where = ttReportHelper::getWhere($bean); - + // Start with a query for time items. if ($bean->getAttribute('chcost')) { if (MODE_TIME == $user->tracking_mode) { @@ -910,38 +954,36 @@ class ttReportHelper { 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 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"; - + // If we have expenses, query becomes a bit more complex. - if ($bean->getAttribute('chcost') && in_array('ex', explode(',', $user->plugins))) { + 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"; // 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"; - } + } - // Execute query. + // Execute query. $res = $mdb2->query($sql); - if (!is_a($res, 'PEAR_Error')) { - $val = $res->fetchRow(); - $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; - if ($bean->getAttribute('chcost')) { - $total_cost = $val['cost']; - if (!$total_cost) $total_cost = '0.00'; - if ('.' != $user->decimal_mark) - $total_cost = str_replace('.', $user->decimal_mark, $total_cost); - - $total_expenses = $val['expenses']; - if (!$total_expenses) $total_expenses = '0.00'; - if ('.' != $user->decimal_mark) - $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses); - } - } else - die($res->getMessage()); - + if (is_a($res, 'PEAR_Error')) die($res->getMessage()); + + $val = $res->fetchRow(); + $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; + if ($bean->getAttribute('chcost')) { + $total_cost = $val['cost']; + if (!$total_cost) $total_cost = '0.00'; + if ('.' != $user->decimal_mark) + $total_cost = str_replace('.', $user->decimal_mark, $total_cost); + $total_expenses = $val['expenses']; + if (!$total_expenses) $total_expenses = '0.00'; + if ('.' != $user->decimal_mark) + $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses); + } + if ($bean->getAttribute('period')) $period = new Period($bean->getAttribute('period'), new DateAndTime($user->date_format)); else { @@ -951,24 +993,24 @@ class ttReportHelper { new DateAndTime($user->date_format, $bean->getAttribute('end_date'))); } - $totals['start_date'] = $period->getBeginDate(); - $totals['end_date'] = $period->getEndDate(); - $totals['time'] = $total_time; - $totals['cost'] = $total_cost; - $totals['expenses'] = $total_expenses; + $totals['start_date'] = $period->getStartDate(); + $totals['end_date'] = $period->getEndDate(); + $totals['time'] = $total_time; + $totals['cost'] = $total_cost; + $totals['expenses'] = $total_expenses; return $totals; } - + // getFavTotals calculates total hours and cost for all favorite report items. static function getFavTotals($report) { global $user; - + $mdb2 = getConnection(); - + $where = ttReportHelper::getFavWhere($report); - + // Start with a query for time items. if ($report['show_cost']) { if (MODE_TIME == $user->tracking_mode) { @@ -982,38 +1024,36 @@ class ttReportHelper { 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 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"; - + // If we have expenses, query becomes a bit more complex. - if ($report['show_cost'] && in_array('ex', explode(',', $user->plugins))) { + 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"; // 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"; - } + } - // Execute query. + // Execute query. $res = $mdb2->query($sql); - if (!is_a($res, 'PEAR_Error')) { - $val = $res->fetchRow(); - $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; - if ($report['show_cost']) { - $total_cost = $val['cost']; - if (!$total_cost) $total_cost = '0.00'; - if ('.' != $user->decimal_mark) - $total_cost = str_replace('.', $user->decimal_mark, $total_cost); - - $total_expenses = $val['expenses']; - if (!$total_expenses) $total_expenses = '0.00'; - if ('.' != $user->decimal_mark) - $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses); - } - } else - die($res->getMessage()); - + if (is_a($res, 'PEAR_Error')) die($res->getMessage()); + + $val = $res->fetchRow(); + $total_time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; + if ($report['show_cost']) { + $total_cost = $val['cost']; + if (!$total_cost) $total_cost = '0.00'; + if ('.' != $user->decimal_mark) + $total_cost = str_replace('.', $user->decimal_mark, $total_cost); + $total_expenses = $val['expenses']; + if (!$total_expenses) $total_expenses = '0.00'; + if ('.' != $user->decimal_mark) + $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses); + } + if ($report['period']) $period = new Period($report['period'], new DateAndTime($user->date_format)); else { @@ -1023,33 +1063,48 @@ class ttReportHelper { new DateAndTime($user->date_format, $report['period_end'])); } - $totals['start_date'] = $period->getBeginDate(); - $totals['end_date'] = $period->getEndDate(); - $totals['time'] = $total_time; - $totals['cost'] = $total_cost; - $totals['expenses'] = $total_expenses; + $totals['start_date'] = $period->getStartDate(); + $totals['end_date'] = $period->getEndDate(); + $totals['time'] = $total_time; + $totals['cost'] = $total_cost; + $totals['expenses'] = $total_expenses; return $totals; } - + // The assignToInvoice assigns a set of records to a specific invoice. static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids) { - $mdb2 = getConnection(); - if ($time_log_ids) { + $mdb2 = getConnection(); + if ($time_log_ids) { $sql = "update tt_log set invoice_id = ".$mdb2->quote($invoice_id). " where id in(".join(', ', $time_log_ids).")"; $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - die($affected->getMessage()); - } + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } if ($expense_item_ids) { $sql = "update tt_expense_items set invoice_id = ".$mdb2->quote($invoice_id). " where id in(".join(', ', $expense_item_ids).")"; $affected = $mdb2->exec($sql); - if (is_a($affected, 'PEAR_Error')) - die($affected->getMessage()); - } + if (is_a($affected, 'PEAR_Error')) die($affected->getMessage()); + } + } + + // 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. @@ -1063,37 +1118,37 @@ class ttReportHelper { if ($group_by && 'no_grouping' != $group_by) $subtotals = ttReportHelper::getSubtotals($bean); $totals = ttReportHelper::getTotals($bean); - + // Use custom fields plugin if it is enabled. - if (in_array('cf', explode(',', $user->plugins))) + if ($user->isPluginEnabled('cf')) $custom_fields = new CustomFields($user->team_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;'; $cellRightAligned = 'text-align: right; vertical-align: top;'; $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;'; $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;'; - + // Start creating email body. $body = ''; $body .= '
'; $body .= ''; - + // Output title. $body .= ''.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; - + // Output comment. if ($comment) $body .= ''.htmlspecialchars($comment).'
'; if ($bean->getAttribute('chtotalsonly')) { // Totals only report. Output subtotals. - + // Determine group_by header. if ('cf_1' == $group_by) $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']); @@ -1101,7 +1156,7 @@ class ttReportHelper { $key = 'label.'.$group_by; $group_by_header = $i18n->getKey($key); } - + $body .= ''.$group_by_header.' | '; @@ -1125,27 +1180,27 @@ class ttReportHelper { } $body .= '||||
'.$i18n->getKey('label.total').' | '; if ($bean->getAttribute('chduration')) { - $body .= ''; - if ($totals['time'] <> '0:00') $body .= $totals['time']; - $body .= ' | '; + $body .= ''; + if ($totals['time'] <> '0:00') $body .= $totals['time']; + $body .= ' | '; } if ($bean->getAttribute('chcost')) { - $body .= ''.htmlspecialchars($user->currency).' '; + $body .= ' | '.htmlspecialchars($user->currency).' '; $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''; } $body .= '
'.$i18n->getKey('label.note').' | '; if ($bean->getAttribute('chcost')) $body .= ''.$i18n->getKey('label.cost').' | '; + if ($bean->getAttribute('chpaid')) + $body .= ''.$i18n->getKey('label.paid').' | '; if ($bean->getAttribute('chinvoice')) $body .= ''.$i18n->getKey('label.invoice').' | '; $body .= ''.$subtotals[$prev_grouped_by]['time'].' | '; 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 .= ' | '; + $body .= ''; + $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; + $body .= ' | '; } + if ($bean->getAttribute('chpaid')) $body .= ''; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ''; $body .= ' |
'.htmlspecialchars($record['note']).' | '; if ($bean->getAttribute('chcost')) $body .= ''.$record['cost'].' | '; + if ($bean->getAttribute('chpaid')) { + $body .= ''; + $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no'); + $body .= ' | '; + } if ($bean->getAttribute('chinvoice')) $body .= ''.htmlspecialchars($record['invoice']).' | '; $body .= ''; - + $prev_date = $record['date']; if ($print_subtotals) $prev_grouped_by = $record['grouped_by']; } } - + // Print a terminating subtotal. if ($print_subtotals) { $body .= '||
'; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' | ||||
'.$totals['time'].' | '; if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { - $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''.htmlspecialchars($user->currency).' '; + $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ' | '; } + if ($bean->getAttribute('chpaid')) $body .= ''; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' |
'.$i18n->getKey('form.mail.footer').'
'; @@ -1309,40 +1374,54 @@ class ttReportHelper { return $body; } - -// prepareFavReportBody - prepares an email body for a favorite report. + + // checkFavReportCondition - checks whether it is okay to send fav report. + static function checkFavReportCondition($report, $condition) + { + $items = ttReportHelper::getFavItems($report); + + $condition = str_replace('count', '', $condition); + $count_required = intval(trim(str_replace('>', '', $condition))); + + if (count($items) > $count_required) + return true; // Condition ok. + + return false; + } + + // prepareFavReportBody - prepares an email body for a favorite report. static function prepareFavReportBody($report) { - global $user; - global $i18n; - - $items = ttReportHelper::getFavItems($report); + global $user; + global $i18n; + + $items = ttReportHelper::getFavItems($report); $group_by = $report['group_by']; - if ($group_by && 'no_grouping' != $group_by) - $subtotals = ttReportHelper::getFavSubtotals($report); - $totals = ttReportHelper::getFavTotals($report); - + if ($group_by && 'no_grouping' != $group_by) + $subtotals = ttReportHelper::getFavSubtotals($report); + $totals = ttReportHelper::getFavTotals($report); + // Use custom fields plugin if it is enabled. - if (in_array('cf', explode(',', $user->plugins))) + if ($user->isPluginEnabled('cf')) $custom_fields = new CustomFields($user->team_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;'; $cellRightAligned = 'text-align: right; vertical-align: top;'; $cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;'; $cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;'; - + // Start creating email body. $body = ''; $body .= ''; $body .= ''; - + // Output title. $body .= ''.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; @@ -1351,7 +1430,7 @@ class ttReportHelper { if ($report['show_totals_only']) { // Totals only report. Output subtotals. - + // Determine group_by header. if ('cf_1' == $group_by) $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']); @@ -1359,7 +1438,7 @@ class ttReportHelper { $key = 'label.'.$group_by; $group_by_header = $i18n->getKey($key); } - + $body .= ''.$group_by_header.' | '; @@ -1383,27 +1462,27 @@ class ttReportHelper { } $body .= '||||
'.$i18n->getKey('label.total').' | '; if ($report['show_duration']) { - $body .= ''; - if ($totals['time'] <> '0:00') $body .= $totals['time']; - $body .= ' | '; + $body .= ''; + if ($totals['time'] <> '0:00') $body .= $totals['time']; + $body .= ' | '; } if ($report['show_cost']) { - $body .= ''.htmlspecialchars($user->currency).' '; + $body .= ' | '.htmlspecialchars($user->currency).' '; $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''; } $body .= '
'.$i18n->getKey('label.note').' | '; if ($report['show_cost']) $body .= ''.$i18n->getKey('label.cost').' | '; + if ($report['show_paid']) + $body .= ''.$i18n->getKey('label.paid').' | '; if ($report['show_invoice']) $body .= ''.$i18n->getKey('label.invoice').' | '; $body .= ''; if ($report['show_invoice']) $body .= ' | '; $body .= ''; - $body .= ' |
'.htmlspecialchars($record['note']).' | '; if ($report['show_cost']) $body .= ''.$record['cost'].' | '; + if ($report['show_paid']) { + $body .= ''; + $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no'); + $body .= ' | '; + } if ($report['show_invoice']) $body .= ''.htmlspecialchars($record['invoice']).' | '; $body .= ''; - + $prev_date = $record['date']; if ($print_subtotals) $prev_grouped_by = $record['grouped_by']; } } - + // Print a terminating subtotal. if ($print_subtotals) { $body .= '||
'; if ($report['show_invoice']) $body .= ' | '; $body .= ' | ||||
'.$totals['time'].' | '; if ($report['show_note']) $body .= ''; if ($report['show_cost']) { - $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; - $body .= ' | '; + $body .= ''.htmlspecialchars($user->currency).' '; + $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ' | '; } + if ($report['show_paid']) $body .= ''; if ($report['show_invoice']) $body .= ' | '; $body .= ' |
'.$i18n->getKey('form.mail.footer').'
'; @@ -1567,27 +1656,32 @@ class ttReportHelper { return $body; } - + // sendFavReport - sends a favorite report to a specified email, called from cron.php - static function sendFavReport($report, $email) { + static function sendFavReport($report, $subject, $email, $cc) { // We are called from cron.php, we have no $bean in session. - // cron.php set global $user and $i18n objects to match our favorite report user. + // cron.php sets global $user and $i18n objects to match our favorite report user. global $user; global $i18n; - + // Prepare report body. $body = ttReportHelper::prepareFavReportBody($report); - + import('mail.Mailer'); $mailer = new Mailer(); $mailer->setCharSet(CHARSET); $mailer->setContentType('text/html'); $mailer->setSender(SENDER); + if (!empty($cc)) + $mailer->setReceiverCC($cc); + if (!empty($user->bcc_email)) + $mailer->setReceiverBCC($user->bcc_email); $mailer->setReceiver($email); - $mailer->setSendType(MAIL_MODE); - if (!$mailer->send($report['name'], $body)) + $mailer->setMailMode(MAIL_MODE); + if (empty($subject)) $subject = $report['name']; + if (!$mailer->send($subject, $body)) return false; - + return true; } }