X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=40b6a0476214c73e31d6610eba96fd7e35776fd0;hb=70e77a95ac584db9d220b8f6d791baa0de084734;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..40b6a047 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -154,6 +154,9 @@ class ttReportHelper {
global $user;
$mdb2 = getConnection();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
// Determine these once as they are used in multiple places in this function.
$canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
$isClient = $user->isClient();
@@ -251,6 +254,9 @@ class ttReportHelper {
// Add timesheet name if it is selected.
if ($options['show_timesheet'])
array_push($fields, 'ts.name as timesheet_name');
+ // Add has_files.
+ if ($options['show_files'])
+ array_push($fields, 'if(Sub1.entity_id is null, 0, 1) as has_files');
// Prepare sql query part for left joins.
$left_joins = null;
@@ -274,6 +280,11 @@ class ttReportHelper {
}
if ($includeCost && MODE_TIME != $trackingMode)
$left_joins .= " left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
+ if ($options['show_files']) {
+ $left_joins .= " left join (select distinct entity_id from tt_files".
+ " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+ " on (l.id = Sub1.entity_id)";
+ }
// Prepare sql query part for inner joins.
$inner_joins = null;
@@ -349,6 +360,9 @@ class ttReportHelper {
array_push($fields, 'i.name as invoice');
if ($options['show_timesheet'])
array_push($fields, 'null as timesheet_name');
+ // Add has_files.
+ if ($options['show_files'])
+ array_push($fields, 'if(Sub1.entity_id is null, 0, 1) as has_files');
// Prepare sql query part for left joins.
$left_joins = null;
@@ -360,6 +374,11 @@ class ttReportHelper {
$left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
if (($canViewReports || $isClient) && $options['show_invoice'])
$left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
+ if ($options['show_files']) {
+ $left_joins .= " left join (select distinct entity_id from tt_files".
+ " where entity_type = 'expense' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+ " on (ei.id = Sub1.entity_id)";
+ }
$where = ttReportHelper::getExpenseWhere($options);
@@ -849,8 +868,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 +914,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 +953,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 +975,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 +1001,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 +1027,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'];
@@ -1145,6 +1162,7 @@ class ttReportHelper {
$options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
$options['show_work_units'] = $bean->getAttribute('chunits');
$options['show_timesheet'] = $bean->getAttribute('chtimesheet');
+ $options['show_files'] = $bean->getAttribute('chfiles');
$options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
$options['group_by1'] = $bean->getAttribute('group_by1');
$options['group_by2'] = $bean->getAttribute('group_by2');
|