import('ttReportHelper');
// Access checks.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports') || ttAccessAllowed('view_client_reports'))) {
header('Location: access_denied.php');
exit();
}
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf')) {
require_once('plugins/CustomFields.class.php');
- $custom_fields = new CustomFields($user->group_id);
+ $custom_fields = new CustomFields();
}
// Report settings are stored in session bean before we get here.
// is grouped by either date, user, client, project, task or cf_1 and user only needs to see subtotals by group.
$totals_only = ($bean->getAttribute('chtotalsonly') == '1');
-// Determine group by header.
-$group_by = $bean->getAttribute('group_by');
-if ('no_grouping' != $group_by) {
- if ('cf_1' == $group_by)
- $group_by_header = $custom_fields->fields[0]['label'];
- else {
- $key = 'label.'.$group_by;
- $group_by_header = $i18n->get($key);
- }
-}
-
// Obtain items for report.
$options = ttReportHelper::getReportOptions($bean);
+$grouping = ttReportHelper::grouping($options);
if (!$totals_only)
$items = ttReportHelper::getItems($options); // Individual entries.
-if ($totals_only || 'no_grouping' != $group_by)
+if ($totals_only || $grouping)
$subtotals = ttReportHelper::getSubtotals($options); // Subtotals for groups of items.
$totals = ttReportHelper::getTotals($options); // Totals for the entire report.
// Assign variables that are used to print subtotals.
-if ($items && 'no_grouping' != $group_by) {
+if ($items && $grouping) {
$print_subtotals = true;
$first_pass = true;
$prev_grouped_by = '';
if ($totals_only) {
// We are building a "totals only" report with only subtotals and total.
+ $group_by_header = ttReportHelper::makeGroupByHeader($options);
$colspan = 1; // Column span for an empty row.
// Table header.
$html .= '<thead>';
if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
if ($bean->getAttribute('chnote')) { $colspan++; $html .= '<td>'.$i18n->get('label.note').'</td>'; }
if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
+ if ($bean->getAttribute('chapproved')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.approved').'</td>'; }
if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
if ($bean->getAttribute('chip')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.ip').'</td>'; }
if ($bean->getAttribute('chinvoice')) { $colspan++; $html .= '<td>'.$i18n->get('label.invoice').'</td>'; }
+ if ($bean->getAttribute('chtimesheet')) { $colspan++; $html .= '<td>'.$i18n->get('label.timesheet').'</td>'; }
$html .= '</tr>';
$html .= '</thead>';
$html .= '<td>'.$i18n->get('label.subtotal').'</td>';
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
$html .= '<td>';
- if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['user']);
$html .= '</td>';
}
if ($bean->getAttribute('chclient')) {
$html .= '<td>';
- if ($group_by == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['client']);
$html .= '</td>';
}
if ($bean->getAttribute('chproject')) {
$html .= '<td>';
- if ($group_by == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
$html .= '</td>';
}
if ($bean->getAttribute('chtask')) {
$html .= '<td>';
- if ($group_by == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
$html .= '</td>';
}
if ($bean->getAttribute('chcf_1')) {
$html .= '<td>';
- if ($group_by == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['cf_1']);
$html .= '</td>';
}
if ($bean->getAttribute('chstart')) $html .= '<td></td>';
$html .= $subtotals[$prev_grouped_by]['expenses'];
$html .= '</td>';
}
+ if ($bean->getAttribute('chapproved')) $html .= '<td></td>';
if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
if ($bean->getAttribute('chip')) $html .= '<td></td>';
if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
+ if ($bean->getAttribute('chtimesheet')) $html .= '<td></td>';
$html .= '</tr>';
$html .= '<tr><td colspan="'.$colspan.'"> </td></tr>';
}
$html .= $item['expense'];
$html .= '</td>';
}
+ if ($bean->getAttribute('chapproved')) {
+ $html .= '<td>';
+ $html .= $item['approved'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+ $html .= '</td>';
+ }
if ($bean->getAttribute('chpaid')) {
$html .= '<td>';
$html .= $item['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
$html .= '</td>';
}
if ($bean->getAttribute('chinvoice')) $html .= '<td>'.htmlspecialchars($item['invoice']).'</td>';
+ if ($bean->getAttribute('chtimesheet')) $html .= '<td>'.htmlspecialchars($item['timesheet_name']).'</td>';
$html .= '</tr>';
$prev_date = $item['date'];
$html .= '<td>'.$i18n->get('label.subtotal').'</td>';
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
$html .= '<td>';
- if ($group_by == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['user']);
$html .= '</td>';
}
if ($bean->getAttribute('chclient')) {
$html .= '<td>';
- if ($group_by == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['client']);
$html .= '</td>';
}
if ($bean->getAttribute('chproject')) {
$html .= '<td>';
- if ($group_by == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
$html .= '</td>';
}
if ($bean->getAttribute('chtask')) {
$html .= '<td>';
- if ($group_by == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
$html .= '</td>';
}
if ($bean->getAttribute('chcf_1')) {
$html .= '<td>';
- if ($group_by == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['cf_1']);
$html .= '</td>';
}
if ($bean->getAttribute('chstart')) $html .= '<td></td>';
$html .= $subtotals[$prev_grouped_by]['expenses'];
$html .= '</td>';
}
+ if ($bean->getAttribute('chapproved')) $html .= '<td></td>';
if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
if ($bean->getAttribute('chip')) $html .= '<td></td>';
if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
+ if ($bean->getAttribute('chtimesheet')) $html .= '<td></td>';
$html .= '</tr>';
}
$html .= $totals['expenses'];
$html .= '</td>';
}
+ if ($bean->getAttribute('chapproved')) $html .= '<td></td>';
if ($bean->getAttribute('chpaid')) $html .= '<td></td>';
if ($bean->getAttribute('chip')) $html .= '<td></td>';
if ($bean->getAttribute('chinvoice')) $html .= '<td></td>';
+ if ($bean->getAttribute('chtimesheet')) $html .= '<td></td>';
$html .= '</tr>';
$html .= '</table>';
}