X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=1f797ace4580068bd21bbaede3dd291f12c64650;hb=bcff87ad905e60d848029cf5643c8c02191ca346;hp=223d8e4b1bcdd7a163d02bb8b8ffadf003a4bdfc;hpb=2cb68f81bd4dd4f4a83afc87bbc292df6b7d7039;p=timetracker.git diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 223d8e4b..1f797ace 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'); @@ -1239,6 +1274,8 @@ class ttReportHelper { $body .= '
'.$i18n->getKey('label.date').' | '; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''.$i18n->getKey('label.user').' | '; if ($report['show_client']) $body .= ''.$i18n->getKey('label.client').' | '; @@ -1521,6 +1570,8 @@ class ttReportHelper { $body .= ''.$i18n->getKey('label.cost').' | '; if ($report['show_paid']) $body .= ''.$i18n->getKey('label.paid').' | '; + if ($report['show_ip']) + $body .= ''.$i18n->getKey('label.ip').' | '; if ($report['show_invoice']) $body .= ''.$i18n->getKey('label.invoice').' | '; $body .= '||||
'.$i18n->getKey('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 ($report['show_client']) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($report['show_project']) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($report['show_task']) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1559,10 +1610,11 @@ class ttReportHelper { if ($report['show_note']) $body .= ''; if ($report['show_cost']) { $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 ($report['show_paid']) $body .= ''; + if ($report['show_ip']) $body .= ' | '; if ($report['show_invoice']) $body .= ' | '; $body .= ' |
'.$record['date'].' | '; - if ($user->canManageTeam() || $user->isClient()) + if ($canViewReports || $isClient) $body .= ''.htmlspecialchars($record['user']).' | '; if ($report['show_client']) $body .= ''.htmlspecialchars($record['client']).' | '; @@ -1600,6 +1652,11 @@ class ttReportHelper { $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no'); $body .= ''; } + if ($report['show_ip']) { + $body .= ''; + $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created']; + $body .= ' | '; + } if ($report['show_invoice']) $body .= ''.htmlspecialchars($record['invoice']).' | '; $body .= '||||||
'.$i18n->getKey('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 ($report['show_client']) $body .= ''.($group_by == 'client' ? $subtotal_name : '').' | '; if ($report['show_project']) $body .= ''.($group_by == 'project' ? $subtotal_name : '').' | '; if ($report['show_task']) $body .= ''.($group_by == 'task' ? $subtotal_name : '').' | '; @@ -1626,10 +1683,11 @@ class ttReportHelper { if ($report['show_note']) $body .= ''; if ($report['show_cost']) { $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 ($report['show_paid']) $body .= ''; + if ($report['show_ip']) $body .= ' | '; if ($report['show_invoice']) $body .= ' | '; $body .= ' |
'.$i18n->getKey('label.total').' | '; - if ($user->canManageTeam() || $user->isClient()) $body .= ''; + if ($canViewReports || $isClient) $body .= ' | '; if ($report['show_client']) $body .= ' | '; if ($report['show_project']) $body .= ' | '; if ($report['show_task']) $body .= ' | '; @@ -1649,10 +1707,11 @@ class ttReportHelper { if ($report['show_note']) $body .= ' | '; if ($report['show_cost']) { $body .= ' | '.htmlspecialchars($user->currency).' '; - $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses']; + $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses']; $body .= ' | '; } if ($report['show_paid']) $body .= ''; + if ($report['show_ip']) $body .= ' | '; if ($report['show_invoice']) $body .= ' | '; $body .= ' |