X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=2e2113dfe2f27f2dfca8768eb796fb906b5c6e6a;hb=0056678b5dda50f9664753a8134c558c7583dce9;hp=cfa10794a12dd1a43d3ce7a2e0a9557ab4fe3ee7;hpb=988dcb3947c5e0d347f1002dbee2ff5c5c56e1db;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index cfa10794..2e2113df 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -53,6 +53,8 @@ class ttReportHelper {
if ($bean->getAttribute('include_records')=='2') $dropdown_parts .= ' and l.billable = 0';
if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+ if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and l.paid = 1';
+ if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and l.paid = 0';
// Prepare user list part.
$userlist = -1;
@@ -96,6 +98,8 @@ class ttReportHelper {
if ($report['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
if ($report['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
if ($report['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+ if ($report['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
+ if ($report['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
// Prepare user list part.
$userlist = -1;
@@ -276,6 +280,10 @@ class ttReportHelper {
array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
array_push($fields, "null as expense");
}
+ // Add paid status.
+ if ($user->canManageTeam() && $bean->getAttribute('chpaid'))
+ array_push($fields, 'l.paid as paid');
+
// Add invoice name if it is selected.
if (($user->canManageTeam() || $user->isClient()) && $bean->getAttribute('chinvoice'))
array_push($fields, 'i.name as invoice');
@@ -1062,7 +1070,7 @@ class ttReportHelper {
$style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
$tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
$tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
- $rowItem = 'background-color: #ccccce;';
+ $rowItem = 'background-color: #ffffff;';
$rowItemAlt = 'background-color: #f5f5f5;';
$rowSubtotal = 'background-color: #e0e0e0;';
$cellLeftAligned = 'text-align: left; vertical-align: top;';
@@ -1160,6 +1168,8 @@ class ttReportHelper {
$body .= '
'.$i18n->getKey('label.note').' | ';
if ($bean->getAttribute('chcost'))
$body .= ''.$i18n->getKey('label.cost').' | ';
+ if ($bean->getAttribute('chpaid'))
+ $body .= ''.$i18n->getKey('label.paid').' | ';
if ($bean->getAttribute('chinvoice'))
$body .= ''.$i18n->getKey('label.invoice').' | ';
$body .= '';
@@ -1201,6 +1211,7 @@ class ttReportHelper {
$body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
$body .= '';
}
+ if ($bean->getAttribute('chpaid')) $body .= ' | ';
if ($bean->getAttribute('chinvoice')) $body .= ' | ';
$body .= '';
$body .= ' |
';
@@ -1233,6 +1244,11 @@ class ttReportHelper {
$body .= ''.htmlspecialchars($record['note']).' | ';
if ($bean->getAttribute('chcost'))
$body .= ''.$record['cost'].' | ';
+ if ($bean->getAttribute('chpaid')) {
+ $body .= '';
+ $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
+ $body .= ' | ';
+ }
if ($bean->getAttribute('chinvoice'))
$body .= ''.htmlspecialchars($record['invoice']).' | ';
$body .= '';
@@ -1262,6 +1278,7 @@ class ttReportHelper {
$body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
$body .= '';
}
+ if ($bean->getAttribute('chpaid')) $body .= ' | ';
if ($bean->getAttribute('chinvoice')) $body .= ' | ';
$body .= '';
}
@@ -1284,6 +1301,7 @@ class ttReportHelper {
$body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
$body .= '';
}
+ if ($bean->getAttribute('chpaid')) $body .= ' | ';
if ($bean->getAttribute('chinvoice')) $body .= ' | ';
$body .= '';
@@ -1334,7 +1352,7 @@ class ttReportHelper {
$style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
$tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;';
$tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;';
- $rowItem = 'background-color: #ccccce;';
+ $rowItem = 'background-color: #ffffff;';
$rowItemAlt = 'background-color: #f5f5f5;';
$rowSubtotal = 'background-color: #e0e0e0;';
$cellLeftAligned = 'text-align: left; vertical-align: top;';
@@ -1432,6 +1450,8 @@ class ttReportHelper {
$body .= ''.$i18n->getKey('label.note').' | ';
if ($report['show_cost'])
$body .= ''.$i18n->getKey('label.cost').' | ';
+ if ($report['show_paid'])
+ $body .= ''.$i18n->getKey('label.paid').' | ';
if ($report['show_invoice'])
$body .= ''.$i18n->getKey('label.invoice').' | ';
$body .= '';
@@ -1473,6 +1493,7 @@ class ttReportHelper {
$body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
$body .= '';
}
+ if ($report['show_paid']) $body .= ' | ';
if ($report['show_invoice']) $body .= ' | ';
$body .= '';
$body .= ' |
';
@@ -1505,6 +1526,11 @@ class ttReportHelper {
$body .= ''.htmlspecialchars($record['note']).' | ';
if ($report['show_cost'])
$body .= ''.$record['cost'].' | ';
+ if ($report['show_paid']) {
+ $body .= '';
+ $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
+ $body .= ' | ';
+ }
if ($report['show_invoice'])
$body .= ''.htmlspecialchars($record['invoice']).' | ';
$body .= '';
@@ -1534,6 +1560,7 @@ class ttReportHelper {
$body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
$body .= '';
}
+ if ($report['show_paid']) $body .= ' | ';
if ($report['show_invoice']) $body .= ' | ';
$body .= '';
}
@@ -1556,6 +1583,7 @@ class ttReportHelper {
$body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
$body .= '';
}
+ if ($report['show_paid']) $body .= ' | ';
if ($report['show_invoice']) $body .= ' | ';
$body .= '';