X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=16277bd197bfd4707d5be4dfd7d541406b33dc6b;hb=38b85fc251ea53e5d5842e25c8fc9b066a474a54;hp=3940a51b73bf497d597ef56f08f9e9a77028e653;hpb=7562c5b6d68929eb4787749f8c10dc032ee9a1c7;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 3940a51b..16277bd1 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -62,7 +62,7 @@ class ttReportHelper { $user_list_part = " and l.user_id in ($userlist)"; else $user_list_part = " and l.user_id = ".$user->id; - $user_list_part .= " and l.group_id = ".$user->getActiveGroup(); + $user_list_part .= " and l.group_id = ".$user->getGroup(); // Prepare sql query part for where. if ($options['period']) @@ -100,7 +100,7 @@ class ttReportHelper { $user_list_part = " and ei.user_id in ($userlist)"; else $user_list_part = " and ei.user_id = ".$user->id; - $user_list_part .= " and ei.group_id = ".$user->getActiveGroup(); + $user_list_part .= " and ei.group_id = ".$user->getGroup(); // Prepare sql query part for where. if ($options['period']) @@ -127,17 +127,15 @@ class ttReportHelper { $canViewReports = $user->can('view_reports') || $user->can('view_all_reports'); $isClient = $user->isClient(); - $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') && - ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') && - ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping'); - $grouping_by_date = ($options['group_by1'] == 'date'|| $options['group_by2'] == 'date' || $options['group_by3'] == 'date'); - $grouping_by_client = ($options['group_by1'] == 'client'|| $options['group_by2'] == 'client' || $options['group_by3'] == 'client'); - $grouping_by_project = ($options['group_by1'] == 'project'|| $options['group_by2'] == 'project' || $options['group_by3'] == 'project'); - $grouping_by_task = ($options['group_by1'] == 'task'|| $options['group_by2'] == 'task' || $options['group_by3'] == 'task'); - $grouping_by_user = ($options['group_by1'] == 'user'|| $options['group_by2'] == 'user' || $options['group_by3'] == 'user'); - $grouping_by_cf_1 = ($options['group_by1'] == 'cf_1'|| $options['group_by2'] == 'cf_1' || $options['group_by3'] == 'cf_1'); - - $group_by_option = $options['group_by1']; + $grouping = ttReportHelper::grouping($options); + if ($grouping) { + $grouping_by_date = ttReportHelper::groupingBy('date', $options); + $grouping_by_client = ttReportHelper::groupingBy('client', $options); + $grouping_by_project = ttReportHelper::groupingBy('project', $options); + $grouping_by_task = ttReportHelper::groupingBy('task', $options); + $grouping_by_user = ttReportHelper::groupingBy('user', $options); + $grouping_by_cf_1 = ttReportHelper::groupingBy('cf_1', $options); + } $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']); // Prepare a query for time items in tt_log table. @@ -159,7 +157,7 @@ class ttReportHelper { // Add custom field. $include_cf_1 = $options['show_custom_field_1'] || $grouping_by_cf_1; if ($include_cf_1) { - $custom_fields = new CustomFields($user->group_id); + $custom_fields = new CustomFields($user->getGroup()); $cf_1_type = $custom_fields->fields[0]['type']; if ($cf_1_type == CustomFields::TYPE_TEXT) { array_push($fields, 'cfl.value as cf_1'); @@ -311,14 +309,14 @@ class ttReportHelper { // Determine sort part. $sort_part = ' order by '; - if ($no_grouping) - $sort_part .= 'date'; - else { + if ($grouping) { $sort_part2 .= ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') ? ', '.$options['group_by1'] : ''; $sort_part2 .= ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') ? ', '.$options['group_by2'] : ''; $sort_part2 .= ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') ? ', '.$options['group_by3'] : ''; if (!$grouping_by_date) $sort_part2 .= ', date'; $sort_part .= ltrim($sort_part2, ', '); // Remove leading comma and space. + } else { + $sort_part .= 'date'; } if (($canViewReports || $isClient) && $options['users'] && !$grouping_by_user) $sort_part .= ', user, type'; @@ -349,7 +347,7 @@ class ttReportHelper { $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']); } - if (!$no_grouping) $val['grouped_by'] = ttReportHelper::makeGroupByKey($options, $val); + if ($grouping) $val['grouped_by'] = ttReportHelper::makeGroupByKey($options, $val); $val['date'] = ttDateToUserFormat($val['date']); $report_items[] = $val; @@ -397,9 +395,6 @@ class ttReportHelper { static function getSubtotals($options) { global $user; - $group_fields = ttReportHelper::makeGroupByFieldsPart($options); - if (!$group_fields) return null; - $mdb2 = getConnection(); $concat_part = ttReportHelper::makeConcatPart($options); @@ -408,7 +403,7 @@ class ttReportHelper { $group_by_part = ttReportHelper::makeGroupByPart($options); if ($options['show_cost']) { if (MODE_TIME == $user->tracking_mode) { - if (!ttReportHelper::groupingByUser($options)) + if (!ttReportHelper::groupingBy('user', $options)) $left_join = 'left join tt_users u on (l.user_id = u.id)'; $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time"; if ($options['show_work_units']) { @@ -454,15 +449,16 @@ class ttReportHelper { $concat_part = ttReportHelper::makeConcatExpensesPart($options); $join_part = ttReportHelper::makeJoinExpensesPart($options); $where = ttReportHelper::getExpenseWhere($options); - $group_by_part = ttReportHelper::makeGroupByExpensesPart($options); + $group_by_expenses_part = ttReportHelper::makeGroupByExpensesPart($options); $sql_for_expenses = "select $concat_part, null as time"; if ($options['show_work_units']) $sql_for_expenses .= ", null as units"; - $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $join_part $where $group_by_part"; + $sql_for_expenses .= ", sum(ei.cost) as cost, sum(ei.cost) as expenses from tt_expense_items ei $join_part $where $group_by_expenses_part"; // Create a combined query. - $combined = "select group_field, sum(time) as time"; + $fields = ttReportHelper::makeCombinedSelectPart($options); + $combined = "select $fields, sum(time) as time"; if ($options['show_work_units']) $combined .= ", sum(units) as units"; - $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by group_field"; + $combined .= ", sum(cost) as cost, sum(expenses) as expenses from (($sql) union all ($sql_for_expenses)) t group by $fields"; $sql = $combined; } @@ -470,20 +466,16 @@ class ttReportHelper { $res = $mdb2->query($sql); if (is_a($res, 'PEAR_Error')) die($res->getMessage()); while ($val = $res->fetchRow()) { -// TODO: consider writing a function that properly formats a date part in a multi-part key. -// -// if ('date' == $group_by_option) { -// $val['group_field'] = ttDateToUserFormat($val['group_field']); -// } $time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null; + $rowLabel = ttReportHelper::makeGroupByLabel($val['group_field'], $options); if ($options['show_cost']) { if ('.' != $user->decimal_mark) { $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']); $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']); } - $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units'], 'cost'=>$val['cost'],'expenses'=>$val['expenses']); + $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'cf_1'=>$val['cf_1'],'time'=>$time,'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']); } else - $subtotals[$val['group_field']] = array('name'=>$val['group_field'],'time'=>$time, 'units'=> $val['units']); + $subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'cf_1'=>$val['cf_1'],'time'=>$time, 'units'=> $val['units']); } return $subtotals; @@ -617,14 +609,14 @@ class ttReportHelper { $isClient = $user->isClient(); $items = ttReportHelper::getItems($options); - $group_by = $options['group_by1']; - if ($group_by && 'no_grouping' != $group_by) + $grouping = ttReportHelper::grouping($options); + if ($grouping) $subtotals = ttReportHelper::getSubtotals($options); $totals = ttReportHelper::getTotals($options); // Use custom fields plugin if it is enabled. if ($user->isPluginEnabled('cf')) - $custom_fields = new CustomFields($user->group_id); + $custom_fields = new CustomFields($user->getGroup()); // Define some styles to use in email. $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;'; @@ -651,14 +643,7 @@ class ttReportHelper { if ($options['show_totals_only']) { // Totals only report. Output subtotals. - - // Determine group_by header. - if ('cf_1' == $group_by) - $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']); - else { - $key = 'label.'.$group_by; - $group_by_header = $i18n->get($key); - } + $group_by_header = ttReportHelper::makeGroupByHeader($options); $body .= '
'.$i18n->get('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; - if ($options['show_client']) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; - if ($options['show_project']) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; - if ($options['show_task']) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; - if ($options['show_custom_field_1']) $body .= ''.($group_by == 'cf_1' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.$subtotals[$prev_grouped_by]['user'].' | '; + if ($options['show_client']) $body .= ''.$subtotals[$prev_grouped_by]['client'].' | '; + if ($options['show_project']) $body .= ''.$subtotals[$prev_grouped_by]['project'].' | '; + if ($options['show_task']) $body .= ''.$subtotals[$prev_grouped_by]['task'].' | '; + if ($options['show_custom_field_1']) $body .= ''.$subtotals[$prev_grouped_by]['cf_1'].' | '; if ($options['show_start']) $body .= ''; if ($options['show_end']) $body .= ' | '; if ($options['show_duration']) $body .= ' | '.$subtotals[$prev_grouped_by]['time'].' | '; @@ -849,11 +834,11 @@ class ttReportHelper { $body .= '
'.$i18n->get('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; - if ($options['show_client']) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; - if ($options['show_project']) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; - if ($options['show_task']) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; - if ($options['show_custom_field_1']) $body .= ''.($group_by == 'cf_1' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.$subtotals[$prev_grouped_by]['user'].' | '; + if ($options['show_client']) $body .= ''.$subtotals[$prev_grouped_by]['client'].' | '; + if ($options['show_project']) $body .= ''.$subtotals[$prev_grouped_by]['project'].' | '; + if ($options['show_task']) $body .= ''.$subtotals[$prev_grouped_by]['task'].' | '; + if ($options['show_custom_field_1']) $body .= ''.$subtotals[$prev_grouped_by]['cf_1'].' | '; if ($options['show_start']) $body .= ''; if ($options['show_end']) $body .= ' | '; if ($options['show_duration']) $body .= ' | '.$subtotals[$cur_grouped_by]['time'].' | '; @@ -1074,10 +1059,7 @@ class ttReportHelper { // makeGroupByPart builds a combined group by part for sql query for time items using group_by1, // group_by2, and group_by3 values passed in $options. static function makeGroupByPart($options) { - $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') && - ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') && - ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping'); - if ($no_grouping) return null; + if (!ttReportHelper::grouping($options)) return null; $group_by1 = $options['group_by1']; $group_by2 = $options['group_by2']; @@ -1205,7 +1187,8 @@ class ttReportHelper { } // Remove garbage from the beginning. $group_by_parts = ltrim($group_by_parts, ', '); - $group_by_part = "group by $group_by_parts"; + if ($group_by_parts) + $group_by_part = "group by $group_by_parts"; return $group_by_part; } @@ -1221,18 +1204,23 @@ class ttReportHelper { break; case 'user': $what_to_concat .= ", ' - ', u.name"; + $fields_part .= ', u.name as user'; break; case 'client': $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')"; + $fields_part .= ', c.name as client'; break; case 'project': $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')"; + $fields_part .= ', p.name as project'; break; case 'task': $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')"; + $fields_part .= ', t.name as task'; break; case 'cf_1': $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')"; + $fields_part .= ', cfo.value as cf_1'; break; } switch ($group_by2) { @@ -1241,18 +1229,23 @@ class ttReportHelper { break; case 'user': $what_to_concat .= ", ' - ', u.name"; + $fields_part .= ', u.name as user'; break; case 'client': $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')"; + $fields_part .= ', c.name as client'; break; case 'project': $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')"; + $fields_part .= ', p.name as project'; break; case 'task': $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')"; + $fields_part .= ', t.name as task'; break; case 'cf_1': $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')"; + $fields_part .= ', cfo.value as cf_1'; break; } switch ($group_by3) { @@ -1261,25 +1254,30 @@ class ttReportHelper { break; case 'user': $what_to_concat .= ", ' - ', u.name"; + $fields_part .= ', u.name as user'; break; case 'client': $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')"; + $fields_part .= ', c.name as client'; break; case 'project': $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')"; + $fields_part .= ', p.name as project'; break; case 'task': $what_to_concat .= ", ' - ', coalesce(t.name, 'Null')"; + $fields_part .= ', t.name as task'; break; case 'cf_1': $what_to_concat .= ", ' - ', coalesce(cfo.value, 'Null')"; + $fields_part .= ', cfo.value as cf_1'; break; } // Remove garbage from both ends. $what_to_concat = trim($what_to_concat, "', -"); $concat_part = "concat($what_to_concat) as group_field"; $concat_part = trim($concat_part, ' -'); - return $concat_part; + return "$concat_part $fields_part"; } // makeConcatPart builds a concatenation part for getSubtotals query (for expense items). @@ -1294,12 +1292,25 @@ class ttReportHelper { break; case 'user': $what_to_concat .= ", ' - ', u.name"; + $fields_part .= ', u.name as user'; break; case 'client': $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')"; + $fields_part .= ', c.name as client'; break; case 'project': $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')"; + $fields_part .= ', p.name as project'; + break; + + case 'task': + $what_to_concat .= ", ' - ', 'Null'"; + $fields_part .= ', null as task'; + break; + + case 'cf_1': + $what_to_concat .= ", ' - ', 'Null'"; + $fields_part .= ', null as cf_1'; break; } switch ($group_by2) { @@ -1308,12 +1319,25 @@ class ttReportHelper { break; case 'user': $what_to_concat .= ", ' - ', u.name"; + $fields_part .= ', u.name as user'; break; case 'client': $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')"; + $fields_part .= ', c.name as client'; break; case 'project': $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')"; + $fields_part .= ', p.name as project'; + break; + + case 'task': + $what_to_concat .= ", ' - ', 'Null'"; + $fields_part .= ', null as task'; + break; + + case 'cf_1': + $what_to_concat .= ", ' - ', 'Null'"; + $fields_part .= ', null as cf_1'; break; } switch ($group_by3) { @@ -1322,45 +1346,121 @@ class ttReportHelper { break; case 'user': $what_to_concat .= ", ' - ', u.name"; + $fields_part .= ', u.name as user'; break; case 'client': $what_to_concat .= ", ' - ', coalesce(c.name, 'Null')"; + $fields_part .= ', c.name as client'; break; case 'project': $what_to_concat .= ", ' - ', coalesce(p.name, 'Null')"; + $fields_part .= ', p.name as project'; + break; + + case 'task': + $what_to_concat .= ", ' - ', 'Null'"; + $fields_part .= ', null as task'; + break; + + case 'cf_1': + $what_to_concat .= ", ' - ', 'Null'"; + $fields_part .= ', null as cf_1'; break; } - // Remove garbage from both ends. - $what_to_concat = trim($what_to_concat, "', -"); + // Remove garbage from the beginning. + if ($what_to_concat) + $what_to_concat = substr($what_to_concat, 8); $concat_part = "concat($what_to_concat) as group_field"; - $concat_part = trim($concat_part, ' -'); - return $concat_part; + return "$concat_part $fields_part"; + } + + // makeCombinedSelectPart builds a list of fields for a combined select on a union for getSubtotals. + // This is used when we include expenses. + static function makeCombinedSelectPart($options) { + $group_by1 = $options['group_by1']; + $group_by2 = $options['group_by2']; + $group_by3 = $options['group_by3']; + + $fields = "group_field"; + + switch ($group_by1) { + case 'user': + $fields .= ', user'; + break; + case 'client': + $fields_part .= ', client'; + break; + case 'project': + $fields .= ', project'; + break; + + case 'task': + $fields .= ', task'; + break; + + case 'cf_1': + $fields .= ', cf_1'; + break; + } + switch ($group_by2) { + case 'user': + $fields .= ', user'; + break; + case 'client': + $fields_part .= ', client'; + break; + case 'project': + $fields .= ', project'; + break; + + case 'task': + $fields .= ', task'; + break; + + case 'cf_1': + $fields .= ', cf_1'; + break; + } + switch ($group_by3) { + case 'user': + $fields .= ', user'; + break; + case 'client': + $fields_part .= ', client'; + break; + case 'project': + $fields .= ', project'; + break; + + case 'task': + $fields .= ', task'; + break; + + case 'cf_1': + $fields .= ', cf_1'; + break; + } + return $fields; } // makeJoinPart builds a left join part for getSubtotals query (for time items). static function makeJoinPart($options) { - global $custom_fields; // TODO: is it safe to assume the object is there when needed? + global $user; - $group_by_fields = ttReportHelper::makeGroupByFieldsPart($options); // TODO: refactor this, perhaps? - if (strpos($group_by_fields, 'user') !== false) { - // Grouping by user, add a join on tt_users table. + if (ttReportHelper::groupingBy('user', $options)) { $join .= ' left join tt_users u on (l.user_id = u.id)'; } - if (strpos($group_by_fields, 'client') !== false) { - // Grouping by client, add a join on tt_clients table. + if (ttReportHelper::groupingBy('client', $options)) { $join .= ' left join tt_clients c on (l.client_id = c.id)'; } - if (strpos($group_by_fields, 'project') !== false) { - // Grouping by project, add a join on tt_projects table. + if (ttReportHelper::groupingBy('project', $options)) { $join .= ' left join tt_projects p on (l.project_id = p.id)'; } - if (strpos($group_by_fields, 'task') !== false) { - // Grouping by task, add a join on tt_tasks table. + if (ttReportHelper::groupingBy('task', $options)) { $join .= ' left join tt_tasks t on (l.task_id = t.id)'; } - if (strpos($group_by_fields, 'cf_1') !== false) { - // Grouping by custom field 1, add a join for it. - // $custom_fields = new CustomFields($user->group_id); + if (ttReportHelper::groupingBy('cf_1', $options)) { + $custom_fields = new CustomFields($user->getGroup()); if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT) $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) @@ -1371,47 +1471,19 @@ class ttReportHelper { // makeJoinExpensesPart builds a left join part for getSubtotals query for expense items. static function makeJoinExpensesPart($options) { - $group_by_fields = ttReportHelper::makeGroupByFieldsPart($options); // TODO: refactor this, perhaps? - if (strpos($group_by_fields, 'user') !== false) { - // Grouping by user, add a join on tt_users table. + if (ttReportHelper::groupingBy('user', $options)) { $join .= ' left join tt_users u on (ei.user_id = u.id)'; } - if (strpos($group_by_fields, 'client') !== false) { - // Grouping by client, add a join on tt_clients table. + if (ttReportHelper::groupingBy('client', $options)) { $join .= ' left join tt_clients c on (ei.client_id = c.id)'; } - if (strpos($group_by_fields, 'project') !== false) { - // Grouping by project, add a join on tt_projects table. + if (ttReportHelper::groupingBy('project', $options)) { $join .= ' left join tt_projects p on (ei.project_id = p.id)'; } return $join; } - - // makeGroupByFieldsPart builds a commma-separated list of fields for sql query using group_by1, - // group_by2, and group_by3 values passed in $options. - static function makeGroupByFieldsPart($options) { - $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') && - ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') && - ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping'); - if ($no_grouping) return null; - if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') { - // We have group_by1. - $group_by_fields .= ', '.$options['group_by1']; - } - if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') { - // We have group_by2. - $group_by_fields .= ', '.$options['group_by2']; - } - if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') { - // We have group_by3. - $group_by_fields .= ', '.$options['group_by3']; - } - $group_by_fields = ltrim($group_by_fields, ', '); - return $group_by_fields; - } - - // grouping determines if we are grooping the project by either group_by1, + // grouping determines if we are grouping the report by either group_by1, // group_by2, or group_by3 values passed in $options. static function grouping($options) { $grouping = ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') || @@ -1420,11 +1492,12 @@ class ttReportHelper { return $grouping; } - // groupingByUser determines if we are grouping a report by user. - static function groupingByUser($options) { - if ($options['group_by1'] == 'user' || $options['group_by2'] == 'user' || $options['group_by3'] == 'user') return true; - - return false; + // groupingBy determines if we are grouping a report by a value of $what + // ('date', 'user', 'project', etc.) by checking group_by1, group_by2, + // and group_by3 values passed in $options. + static function groupingBy($what, $options) { + $grouping = ($options['group_by1'] == $what) || ($options['group_by2'] == $what) || ($options['group_by3'] == $what); + return $grouping; } // makeGroupByHeader builds a column header for a totals-only report using group_by1, @@ -1471,4 +1544,43 @@ class ttReportHelper { $group_by_header = ltrim($group_by_header, ' -'); return $group_by_header; } + + // makeGroupByXmlTag creates an xml tag for a totals only report using group_by1, + // group_by2, and group_by3 values passed in $options. + static function makeGroupByXmlTag($options) { + if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') { + // We have group_by1. + $tag .= '_'.$options['group_by1']; + } + if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') { + // We have group_by2. + $tag .= '_'.$options['group_by2']; + } + if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') { + // We have group_by3. + $tag .= '_'.$options['group_by3']; + } + $tag = ltrim($tag, '_'); + return $tag; + } + + // makeGroupByLabel builds a label for one row in a "Totals only" report of grouped by items. + // It does one thing: if we are grouping by date, the date format is converted for user. + static function makeGroupByLabel($key, $options) { + if (!ttReportHelper::groupingBy('date', $options)) + return $key; // No need to format. + + global $user; + if ($user->date_format == DB_DATEFORMAT) + return $key; // No need to format. + + $label = $key; + if (preg_match('/\d\d\d\d-\d\d-\d\d/', $key, $matches)) { + // Replace the first found match of a date in DB_DATEFORMAT. + // This is not entirely clean but better than nothing for a label in a row. + $userDate = ttDateToUserFormat($matches[0]); + $label = str_replace($matches[0], $userDate, $key); + } + return $label; + } }