X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=5e8f799f0cdd034fd4239b270ff0187e7c35fb87;hb=c5461f26c2b9b04044747c9f78fd710627067c83;hp=4de5a48399b3d10c2a967eb4594090c6ff1da8a4;hpb=1e825770a4defc5eb8d2032c35dc90e8bc8684da;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 4de5a483..5e8f799f 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -849,8 +849,6 @@ class ttReportHelper {
$body .= '
'.$i18n->get('label.duration').' | ';
if ($options['show_work_units'])
$body .= ''.$i18n->get('label.work_units_short').' | ';
- if ($options['show_note'])
- $body .= ''.$i18n->get('label.note').' | ';
if ($options['show_cost'])
$body .= ''.$i18n->get('label.cost').' | ';
if ($options['show_approved'])
@@ -897,7 +895,6 @@ class ttReportHelper {
if ($options['show_end']) $body .= ' | ';
if ($options['show_duration']) $body .= ''.$subtotals[$prev_grouped_by]['time'].' | ';
if ($options['show_work_units']) $body .= ''.$subtotals[$prev_grouped_by]['units'].' | ';
- if ($options['show_note']) $body .= ' | ';
if ($options['show_cost']) {
$body .= '';
$body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
@@ -937,8 +934,6 @@ class ttReportHelper {
$body .= ' | '.$record['duration'].' | ';
if ($options['show_work_units'])
$body .= ''.$record['units'].' | ';
- if ($options['show_note'])
- $body .= ''.htmlspecialchars($record['note']).' | ';
if ($options['show_cost'])
$body .= ''.$record['cost'].' | ';
if ($options['show_approved']) {
@@ -961,7 +956,12 @@ class ttReportHelper {
if ($options['show_timesheet'])
$body .= ''.htmlspecialchars($record['timesheet']).' | ';
$body .= '';
-
+ if ($options['show_note'] && $record['note']) {
+ $body .= '';
+ $body .= ''.$i18n->get('label.note').': | ';
+ $body .= ''.$record['note'].' | ';
+ $body .= '
';
+ }
$prev_date = $record['date'];
if ($print_subtotals)
$prev_grouped_by = $record['grouped_by'];
@@ -982,7 +982,6 @@ class ttReportHelper {
if ($options['show_end']) $body .= ' | ';
if ($options['show_duration']) $body .= ''.$subtotals[$cur_grouped_by]['time'].' | ';
if ($options['show_work_units']) $body .= ''.$subtotals[$cur_grouped_by]['units'].' | ';
- if ($options['show_note']) $body .= ' | ';
if ($options['show_cost']) {
$body .= '';
$body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
@@ -1009,7 +1008,6 @@ class ttReportHelper {
if ($options['show_end']) $body .= ' | | ';
if ($options['show_duration']) $body .= ''.$totals['time'].' | ';
if ($options['show_work_units']) $body .= ''.$totals['units'].' | ';
- if ($options['show_note']) $body .= ' | ';
if ($options['show_cost']) {
$body .= ''.htmlspecialchars($user->currency).' ';
$body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
|