X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=b894b037d8978f59aba61667fb40cee861582a23;hb=a8334a66f49ce583f575ec1b4a71c7d746a1bcdc;hp=927892e7963083e4894329ecc4122676a5ac6df3;hpb=5a989e29aed5ad95f7b4a4082a2d88b924523968;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 927892e7..b894b037 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -291,6 +291,13 @@ class ttReportHelper { // Add paid status. if ($canViewReports && $bean->getAttribute('chpaid')) array_push($fields, 'l.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'l.created as created'); + array_push($fields, 'l.created_ip as created_ip'); + array_push($fields, 'l.modified as modified'); + array_push($fields, 'l.modified_ip as modified_ip'); + } // Add invoice name if it is selected. if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) @@ -361,6 +368,14 @@ class ttReportHelper { // Add paid status. if ($canViewReports && $bean->getAttribute('chpaid')) array_push($fields, 'ei.paid as paid'); + // Add IP address. + if ($canViewReports && $bean->getAttribute('chip')) { + array_push($fields, 'ei.created as created'); + array_push($fields, 'ei.created_ip as created_ip'); + array_push($fields, 'ei.modified as modified'); + array_push($fields, 'ei.modified_ip as modified_ip'); + } + // Add invoice name if it is selected. if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice')) array_push($fields, 'i.name as invoice'); @@ -538,6 +553,16 @@ 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 ($canViewReports && $report['show_paid']) + array_push($fields, 'l.paid as paid'); + // Add IP address. + if ($canViewReports && $report['show_ip']) { + array_push($fields, 'l.created as created'); + array_push($fields, 'l.created_ip as created_ip'); + array_push($fields, 'l.modified as modified'); + array_push($fields, 'l.modified_ip as modified_ip'); + } // Add invoice name if it is selected. if (($canViewReports || $isClient) && $report['show_invoice']) array_push($fields, 'i.name as invoice'); @@ -604,6 +629,16 @@ class ttReportHelper { array_push($fields, 'ei.name as note'); array_push($fields, 'ei.cost as cost'); array_push($fields, 'ei.cost as expense'); + // Add paid status. + if ($canViewReports && $report['show_paid']) + array_push($fields, 'ei.paid as paid'); + // Add IP address. + if ($canViewReports && $report['show_ip']) { + array_push($fields, 'ei.created as created'); + array_push($fields, 'ei.created_ip as created_ip'); + array_push($fields, 'ei.modified as modified'); + array_push($fields, 'ei.modified_ip as modified_ip'); + } // Add invoice name if it is selected. if (($canViewReports || $isClient) && $report['show_invoice']) array_push($fields, 'i.name as invoice'); @@ -1121,6 +1156,10 @@ class ttReportHelper { global $user; global $i18n; + // Determine these once as they are used in multiple places in this function. + $canViewReports = $user->can('view_reports'); + $isClient = $user->isClient(); + $items = ttReportHelper::getItems($bean); $group_by = $bean->getAttribute('group_by'); if ($group_by && 'no_grouping' != $group_by) @@ -1149,7 +1188,7 @@ class ttReportHelper { $body .= '
'; // Output title. - $body .= ''.$i18n->getKey('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; + $body .= ''.$i18n->get('form.mail.report_subject').': '.$totals['start_date'].' - '.$totals['end_date'].'
'; // Output comment. if ($comment) $body .= ''.htmlspecialchars($comment).'
'; @@ -1162,16 +1201,16 @@ class ttReportHelper { $group_by_header = htmlspecialchars($custom_fields->fields[0]['label']); else { $key = 'label.'.$group_by; - $group_by_header = $i18n->getKey($key); + $group_by_header = $i18n->get($key); } $body .= ''.$group_by_header.' | '; if ($bean->getAttribute('chduration')) - $body .= ''.$i18n->getKey('label.duration').' | '; + $body .= ''.$i18n->get('label.duration').' | '; if ($bean->getAttribute('chcost')) - $body .= ''.$i18n->getKey('label.cost').' | '; + $body .= ''.$i18n->get('label.cost').' | '; $body .= '|||||||||||||||||||||
'; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses']; $body .= ' | '; } $body .= '|||||||||||||||||||||||||
'.$i18n->getKey('label.total').' | '; + $body .= ''.$i18n->get('label.total').' | '; if ($bean->getAttribute('chduration')) { $body .= ''; if ($totals['time'] <> '0:00') $body .= $totals['time']; @@ -1200,7 +1239,7 @@ class ttReportHelper { } if ($bean->getAttribute('chcost')) { $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= ' | '; } $body .= '
'.$i18n->getKey('label.date').' | '; - if ($user->canManageTeam() || $user->isClient()) - $body .= ''.$i18n->getKey('label.user').' | '; + $body .= ''.$i18n->get('label.date').' | '; + if ($canViewReports || $isClient) + $body .= ''.$i18n->get('label.user').' | '; if ($bean->getAttribute('chclient')) - $body .= ''.$i18n->getKey('label.client').' | '; + $body .= ''.$i18n->get('label.client').' | '; if ($bean->getAttribute('chproject')) - $body .= ''.$i18n->getKey('label.project').' | '; + $body .= ''.$i18n->get('label.project').' | '; if ($bean->getAttribute('chtask')) - $body .= ''.$i18n->getKey('label.task').' | '; + $body .= ''.$i18n->get('label.task').' | '; if ($bean->getAttribute('chcf_1')) $body .= ''.htmlspecialchars($custom_fields->fields[0]['label']).' | '; if ($bean->getAttribute('chstart')) - $body .= ''.$i18n->getKey('label.start').' | '; + $body .= ''.$i18n->get('label.start').' | '; if ($bean->getAttribute('chfinish')) - $body .= ''.$i18n->getKey('label.finish').' | '; + $body .= ''.$i18n->get('label.finish').' | '; if ($bean->getAttribute('chduration')) - $body .= ''.$i18n->getKey('label.duration').' | '; + $body .= ''.$i18n->get('label.duration').' | '; if ($bean->getAttribute('chnote')) - $body .= ''.$i18n->getKey('label.note').' | '; + $body .= ''.$i18n->get('label.note').' | '; if ($bean->getAttribute('chcost')) - $body .= ''.$i18n->getKey('label.cost').' | '; + $body .= ''.$i18n->get('label.cost').' | '; if ($bean->getAttribute('chpaid')) - $body .= ''.$i18n->getKey('label.paid').' | '; + $body .= ''.$i18n->get('label.paid').' | '; + if ($bean->getAttribute('chip')) + $body .= ''.$i18n->get('label.ip').' | '; if ($bean->getAttribute('chinvoice')) - $body .= ''.$i18n->getKey('label.invoice').' | '; + $body .= ''.$i18n->get('label.invoice').' | '; $body .= '
'.$i18n->getKey('label.subtotal').' | '; + $body .= ''.$i18n->get('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1273,10 +1314,11 @@ class ttReportHelper { if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses']; $body .= ' | '; } if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' | ||||||||||||||
'.$record['date'].' | '; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''.htmlspecialchars($record['user']).' | '; if ($bean->getAttribute('chclient')) $body .= ''.htmlspecialchars($record['client']).' | '; @@ -1311,7 +1353,12 @@ class ttReportHelper { $body .= ''.$record['cost'].' | '; if ($bean->getAttribute('chpaid')) { $body .= ''; - $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no'); + $body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no'); + $body .= ' | '; + } + if ($bean->getAttribute('chip')) { + $body .= ''; + $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created']; $body .= ' | '; } if ($bean->getAttribute('chinvoice')) @@ -1327,9 +1374,9 @@ class ttReportHelper { // Print a terminating subtotal. if ($print_subtotals) { $body .= '||||||||||||||||||||
'.$i18n->getKey('label.subtotal').' | '; + $body .= ''.$i18n->get('label.subtotal').' | '; $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']); - if ($user->canManageTeam() || $user->isClient()) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; + if ($canViewReports || $isClient) $body .= ''.($group_by == 'user' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chclient')) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chproject')) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($bean->getAttribute('chtask')) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1340,10 +1387,11 @@ class ttReportHelper { if ($bean->getAttribute('chnote')) $body .= ''; if ($bean->getAttribute('chcost')) { $body .= ' | '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; + $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses']; $body .= ' | '; } if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' | ||||||||||||||
'.$i18n->getKey('label.total').' | '; - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + $body .= ' | '.$i18n->get('label.total').' | '; + if ($canViewReports || $isClient) $body .= ''; if ($bean->getAttribute('chclient')) $body .= ' | '; if ($bean->getAttribute('chproject')) $body .= ' | '; if ($bean->getAttribute('chtask')) $body .= ' | '; @@ -1363,10 +1411,11 @@ class ttReportHelper { if ($bean->getAttribute('chnote')) $body .= ' | '; if ($bean->getAttribute('chcost')) { $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= ' | '; } if ($bean->getAttribute('chpaid')) $body .= ''; + if ($bean->getAttribute('chip')) $body .= ' | '; if ($bean->getAttribute('chinvoice')) $body .= ' | '; $body .= ' |