X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=c455486104d63537e73a6a9b489966d3dae6a188;hb=179facbe37379829ddffc9ee2e29ca6c3d969ce8;hp=57d0047288c39b4f2ef082e7d22f6c865e876053;hpb=cb0478b58a3e34cfffcf41e4e89de5a75685460d;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 57d00472..c4554861 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -834,12 +834,16 @@ class ttReportHelper {
$body .= '
'.$i18n->get('label.note').' | ';
if ($options['show_cost'])
$body .= ''.$i18n->get('label.cost').' | ';
+ if ($options['show_approved'])
+ $body .= ''.$i18n->get('label.approved').' | ';
if ($options['show_paid'])
$body .= ''.$i18n->get('label.paid').' | ';
if ($options['show_ip'])
$body .= ''.$i18n->get('label.ip').' | ';
if ($options['show_invoice'])
$body .= ''.$i18n->get('label.invoice').' | ';
+ if ($options['show_timesheet'])
+ $body .= ''.$i18n->get('label.timesheet').' | ';
$body .= '';
// Initialize variables to print subtotals.
@@ -880,9 +884,11 @@ class ttReportHelper {
$body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
$body .= '';
}
+ if ($options['show_approved']) $body .= ' | ';
if ($options['show_paid']) $body .= ' | ';
if ($options['show_ip']) $body .= ' | ';
if ($options['show_invoice']) $body .= ' | ';
+ if ($options['show_timesheet']) $body .= ' | ';
$body .= '';
$body .= ' |
';
}
@@ -916,6 +922,11 @@ class ttReportHelper {
$body .= ''.htmlspecialchars($record['note']).' | ';
if ($options['show_cost'])
$body .= ''.$record['cost'].' | ';
+ if ($options['show_approved']) {
+ $body .= '';
+ $body .= $record['approved'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+ $body .= ' | ';
+ }
if ($options['show_paid']) {
$body .= '';
$body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
@@ -928,6 +939,8 @@ class ttReportHelper {
}
if ($options['show_invoice'])
$body .= ' | '.htmlspecialchars($record['invoice']).' | ';
+ if ($options['show_timesheet'])
+ $body .= ''.htmlspecialchars($record['timesheet']).' | ';
$body .= '';
$prev_date = $record['date'];
@@ -956,9 +969,11 @@ class ttReportHelper {
$body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
$body .= '';
}
+ if ($options['show_approved']) $body .= ' | ';
if ($options['show_paid']) $body .= ' | ';
if ($options['show_ip']) $body .= ' | ';
if ($options['show_invoice']) $body .= ' | ';
+ if ($options['show_timesheet']) $body .= ' | ';
$body .= '';
}
@@ -981,9 +996,11 @@ class ttReportHelper {
$body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= '';
}
+ if ($options['show_approved']) $body .= ' | ';
if ($options['show_paid']) $body .= ' | ';
if ($options['show_ip']) $body .= ' | ';
if ($options['show_invoice']) $body .= ' | ';
+ if ($options['show_timesheet']) $body .= ' | ';
$body .= '';
$body .= '';
@@ -1087,9 +1104,9 @@ class ttReportHelper {
$options['invoice'] = $bean->getAttribute('invoice');
$options['paid_status'] = $bean->getAttribute('paid_status');
$options['approved'] = $bean->getAttribute('approved');
+ if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
+ $options['approved'] = 1; // Restrict clients to approved records only.
$options['timesheet'] = $bean->getAttribute('timesheet');
- if ($user->isPluginEnabled('ts') && $user->isClient() && !$user->can('view_client_unapproved'))
- $options['timesheet'] = TIMESHEET_APPROVED; // Restrict clients to approved timesheet records only.
if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
$options['period'] = $bean->getAttribute('period');
$options['period_start'] = $bean->getAttribute('start_date');