X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=topdf.php;h=8e0738d4ca59c61abfa979d1b911cdc766f2489f;hb=dac7b3b59c56d265e7ee630c10d8d5fe3614d399;hp=0040c7be926bb504c9d9a1d9393f9e14eacb55a3;hpb=405a3dc75eaf770313b2da57bc25088e5c6e76bd;p=timetracker.git
diff --git a/topdf.php b/topdf.php
index 0040c7be..8e0738d4 100644
--- a/topdf.php
+++ b/topdf.php
@@ -36,7 +36,7 @@ import('form.ActionForm');
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();
}
@@ -52,7 +52,7 @@ require_once('WEB-INF/lib/tcpdf/tcpdf.php');
// 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.
@@ -64,14 +64,15 @@ $totals_only = ($bean->getAttribute('chtotalsonly') == '1');
// 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_by1)
+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_by1) {
+if ($items && $grouping) {
$print_subtotals = true;
$first_pass = true;
$prev_grouped_by = '';
@@ -155,9 +156,11 @@ if ($totals_only) {
if ($bean->getAttribute('chunits')) { $colspan++; $html .= "
".$i18n->get('label.work_units_short').' | '; }
if ($bean->getAttribute('chnote')) { $colspan++; $html .= ''.$i18n->get('label.note').' | '; }
if ($bean->getAttribute('chcost')) { $colspan++; $html .= "".$i18n->get('label.cost').' | '; }
+ if ($bean->getAttribute('chapproved')) { $colspan++; $html .= "".$i18n->get('label.approved').' | '; }
if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "".$i18n->get('label.paid').' | '; }
if ($bean->getAttribute('chip')) { $colspan++; $html .= "".$i18n->get('label.ip').' | '; }
if ($bean->getAttribute('chinvoice')) { $colspan++; $html .= ''.$i18n->get('label.invoice').' | '; }
+ if ($bean->getAttribute('chtimesheet')) { $colspan++; $html .= ''.$i18n->get('label.timesheet').' | '; }
$html .= '';
$html .= '';
@@ -171,27 +174,27 @@ if ($totals_only) {
$html .= ''.$i18n->get('label.subtotal').' | ';
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
$html .= '';
- if ($group_by1 == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['user']);
$html .= ' | ';
}
if ($bean->getAttribute('chclient')) {
$html .= '';
- if ($group_by1 == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['client']);
$html .= ' | ';
}
if ($bean->getAttribute('chproject')) {
$html .= '';
- if ($group_by1 == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
$html .= ' | ';
}
if ($bean->getAttribute('chtask')) {
$html .= '';
- if ($group_by1 == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
$html .= ' | ';
}
if ($bean->getAttribute('chcf_1')) {
$html .= '';
- if ($group_by1 == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['cf_1']);
$html .= ' | ';
}
if ($bean->getAttribute('chstart')) $html .= ' | ';
@@ -207,9 +210,11 @@ if ($totals_only) {
$html .= $subtotals[$prev_grouped_by]['expenses'];
$html .= '';
}
+ if ($bean->getAttribute('chapproved')) $html .= ' | ';
if ($bean->getAttribute('chpaid')) $html .= ' | ';
if ($bean->getAttribute('chip')) $html .= ' | ';
if ($bean->getAttribute('chinvoice')) $html .= ' | ';
+ if ($bean->getAttribute('chtimesheet')) $html .= ' | ';
$html .= '';
$html .= ' |
';
}
@@ -237,6 +242,11 @@ if ($totals_only) {
$html .= $item['expense'];
$html .= '';
}
+ if ($bean->getAttribute('chapproved')) {
+ $html .= '';
+ $html .= $item['approved'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+ $html .= ' | ';
+ }
if ($bean->getAttribute('chpaid')) {
$html .= '';
$html .= $item['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
@@ -248,6 +258,7 @@ if ($totals_only) {
$html .= ' | ';
}
if ($bean->getAttribute('chinvoice')) $html .= ''.htmlspecialchars($item['invoice']).' | ';
+ if ($bean->getAttribute('chtimesheet')) $html .= ''.htmlspecialchars($item['timesheet_name']).' | ';
$html .= '';
$prev_date = $item['date'];
@@ -260,27 +271,27 @@ if ($totals_only) {
$html .= ''.$i18n->get('label.subtotal').' | ';
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
$html .= '';
- if ($group_by1 == 'user') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['user']);
$html .= ' | ';
}
if ($bean->getAttribute('chclient')) {
$html .= '';
- if ($group_by1 == 'client') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['client']);
$html .= ' | ';
}
if ($bean->getAttribute('chproject')) {
$html .= '';
- if ($group_by1 == 'project') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['project']);
$html .= ' | ';
}
if ($bean->getAttribute('chtask')) {
$html .= '';
- if ($group_by1 == 'task') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['task']);
$html .= ' | ';
}
if ($bean->getAttribute('chcf_1')) {
$html .= '';
- if ($group_by1 == 'cf_1') $html .= htmlspecialchars($subtotals[$prev_grouped_by]['name']);
+ $html .= htmlspecialchars($subtotals[$prev_grouped_by]['cf_1']);
$html .= ' | ';
}
if ($bean->getAttribute('chstart')) $html .= ' | ';
@@ -296,9 +307,11 @@ if ($totals_only) {
$html .= $subtotals[$prev_grouped_by]['expenses'];
$html .= '';
}
+ if ($bean->getAttribute('chapproved')) $html .= ' | ';
if ($bean->getAttribute('chpaid')) $html .= ' | ';
if ($bean->getAttribute('chip')) $html .= ' | ';
if ($bean->getAttribute('chinvoice')) $html .= ' | ';
+ if ($bean->getAttribute('chtimesheet')) $html .= ' | ';
$html .= '';
}
@@ -324,9 +337,11 @@ if ($totals_only) {
$html .= $totals['expenses'];
$html .= '';
}
+ if ($bean->getAttribute('chapproved')) $html .= ' | ';
if ($bean->getAttribute('chpaid')) $html .= ' | ';
if ($bean->getAttribute('chip')) $html .= ' | ';
if ($bean->getAttribute('chinvoice')) $html .= ' | ';
+ if ($bean->getAttribute('chtimesheet')) $html .= ' | ';
$html .= '';
$html .= '';
}