X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=topdf.php;h=7d7a7f9d0cb82226ca9e7d818dd4e81577e5ad1e;hb=bc4fe9902b43859db0c8f78f4fd4a5ceda6f2b00;hp=e3801d273ef3cb3cf5424399c16f4e88a3dffd11;hpb=2fb29ce0672acc8828496861db80f3cac32a49a1;p=timetracker.git
diff --git a/topdf.php b/topdf.php
index e3801d27..7d7a7f9d 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.
@@ -154,11 +154,12 @@ if ($totals_only) {
if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "
".$i18n->get('label.finish').' | '; }
if ($bean->getAttribute('chduration')) { $colspan++; $html .= "".$i18n->get('label.duration').' | '; }
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 .= '';
@@ -199,7 +200,6 @@ if ($totals_only) {
if ($bean->getAttribute('chfinish')) $html .= ' | ';
if ($bean->getAttribute('chduration')) $html .= "".$subtotals[$prev_grouped_by]['time'].' | ';
if ($bean->getAttribute('chunits')) $html .= "".$subtotals[$prev_grouped_by]['units'].' | ';
- if ($bean->getAttribute('chnote')) $html .= ' | ';
if ($bean->getAttribute('chcost')) {
$html .= "";
if ($user->can('manage_invoices') || $user->isClient())
@@ -208,13 +208,24 @@ 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 .= ' |
';
+ // TODO: page breaks on PDF reports is a rarely used feature.
+ // Currently without configuration capability.
+ // Consider adding an option to user profile instead.
+ if (isTrue('PDF_REPORT_PAGE_BREAKS')) {
+ import('ttUserConfig');
+ $uc = new ttUserConfig();
+ $use_breaks = $uc->getValue(SYSC_PDF_REPORT_PAGE_BREAKS);
+ if ($use_breaks) $html .= '
';
+ }
}
- $first_pass = false;
+ $first_pass = false;
}
// Print a regular row.
@@ -229,7 +240,6 @@ if ($totals_only) {
if ($bean->getAttribute('chfinish')) $html .= "".$item['finish'].' | ';
if ($bean->getAttribute('chduration')) $html .= "".$item['duration'].' | ';
if ($bean->getAttribute('chunits')) $html .= "".$item['units'].' | ';
- if ($bean->getAttribute('chnote')) $html .= ''.htmlspecialchars($item['note']).' | ';
if ($bean->getAttribute('chcost')) {
$html .= "";
if ($user->can('manage_invoices') || $user->isClient())
@@ -238,6 +248,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');
@@ -249,8 +264,17 @@ if ($totals_only) {
$html .= ' | ';
}
if ($bean->getAttribute('chinvoice')) $html .= ''.htmlspecialchars($item['invoice']).' | ';
+ if ($bean->getAttribute('chtimesheet')) $html .= ''.htmlspecialchars($item['timesheet_name']).' | ';
$html .= '';
+ if ($bean->getAttribute('chnote') && $item['note']) {
+ $html .= '';
+ $html .= "".$i18n->get('label.note').' | ';
+ $noteSpan = $colspan-1;
+ $html .= ''.htmlspecialchars($item['note']).' | ';
+ $html .= '
';
+ }
+
$prev_date = $item['date'];
if ($print_subtotals) $prev_grouped_by = $item['grouped_by'];
}
@@ -288,7 +312,6 @@ if ($totals_only) {
if ($bean->getAttribute('chfinish')) $html .= ' | ';
if ($bean->getAttribute('chduration')) $html .= "".$subtotals[$prev_grouped_by]['time'].' | ';
if ($bean->getAttribute('chunits')) $html .= "".$subtotals[$prev_grouped_by]['units'].' | ';
- if ($bean->getAttribute('chnote')) $html .= ' | ';
if ($bean->getAttribute('chcost')) {
$html .= "";
if ($user->can('manage_invoices') || $user->isClient())
@@ -297,9 +320,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 .= '';
}
@@ -316,7 +341,6 @@ if ($totals_only) {
if ($bean->getAttribute('chfinish')) $html .= ' | ';
if ($bean->getAttribute('chduration')) $html .= "".$totals['time'].' | ';
if ($bean->getAttribute('chunits')) $html .= "".$totals['units'].' | ';
- if ($bean->getAttribute('chnote')) $html .= ' | ';
if ($bean->getAttribute('chcost')) {
$html .= "".htmlspecialchars($user->currency).' ';
if ($user->can('manage_invoices') || $user->isClient())
@@ -325,9 +349,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 .= '';
}