X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=088280ca0ec9cb2290059bfd86f5f11fbe597ab2;hb=817c14c6c2098d85ef912fb95898c857bf533b4f;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..088280ca 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -30,6 +30,7 @@ import('ttClientHelper'); import('DateAndTime'); import('Period'); import('ttTimeHelper'); +import('ttConfigHelper'); require_once(dirname(__FILE__).'/../../plugins/CustomFields.class.php'); @@ -154,6 +155,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 +255,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 +281,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 +361,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 +375,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); @@ -716,6 +736,10 @@ class ttReportHelper { $canViewReports = $user->can('view_reports') || $user->can('view_all_reports'); $isClient = $user->isClient(); + $config = new ttConfigHelper($user->getConfig()); + $show_note_column = $options['show_note'] && !$config->getDefinedValue('report_note_on_separate_row'); + $show_note_row = $options['show_note'] && $config->getDefinedValue('report_note_on_separate_row'); + $items = ttReportHelper::getItems($options); $grouping = ttReportHelper::grouping($options); if ($grouping) @@ -849,7 +873,7 @@ class ttReportHelper { $body .= '