X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=topdf.php;h=7d7a7f9d0cb82226ca9e7d818dd4e81577e5ad1e;hb=bc4fe9902b43859db0c8f78f4fd4a5ceda6f2b00;hp=8e0738d4ca59c61abfa979d1b911cdc766f2489f;hpb=72c8ed85c06c6808aff2e967f35f5db45f9ba750;p=timetracker.git
diff --git a/topdf.php b/topdf.php
index 8e0738d4..7d7a7f9d 100644
--- a/topdf.php
+++ b/topdf.php
@@ -154,7 +154,6 @@ 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').' | '; }
@@ -201,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())
@@ -217,8 +215,17 @@ if ($totals_only) {
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.
@@ -233,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())
@@ -261,6 +267,14 @@ if ($totals_only) {
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'];
}
@@ -298,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())
@@ -328,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())
|