X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=c455486104d63537e73a6a9b489966d3dae6a188;hb=f42e768a0b39f5c375814bf9e3f36fb53563ecfd;hp=a14313b35c9bf9a03eafe97544488b3faa7bd47e;hpb=a4a45a19de0987b40ea0452fea3cd50647756a22;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index a14313b3..c4554861 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -72,6 +72,8 @@ class ttReportHelper {
if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is null';
if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is null';
if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and l.timesheet_id is not null';
+ if ($options['approved']=='1') $dropdown_parts .= ' and l.approved = 1';
+ if ($options['approved']=='2') $dropdown_parts .= ' and l.approved = 0';
if ($options['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
if ($options['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
@@ -122,6 +124,8 @@ class ttReportHelper {
if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is null';
if ($options['timesheet']==TIMESHEET_NOT_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is null';
if ($options['timesheet']==TIMESHEET_ASSIGNED) $dropdown_parts .= ' and ei.timesheet_id is not null';
+ if ($options['approved']=='1') $dropdown_parts .= ' and ei.approved = 1';
+ if ($options['approved']=='2') $dropdown_parts .= ' and ei.approved = 0';
if ($options['paid_status']=='1') $dropdown_parts .= ' and ei.paid = 1';
if ($options['paid_status']=='2') $dropdown_parts .= ' and ei.paid = 0';
@@ -233,6 +237,9 @@ 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 approved.
+ if ($options['show_approved'])
+ array_push($fields, 'l.approved');
// Add paid status.
if ($canViewReports && $options['show_paid'])
array_push($fields, 'l.paid');
@@ -329,6 +336,9 @@ class ttReportHelper {
array_push($fields, 'ei.name as note');
array_push($fields, 'ei.cost as cost');
array_push($fields, 'ei.cost as expense');
+ // Add approved.
+ if ($options['show_approved'])
+ array_push($fields, 'ei.approved');
// Add paid status.
if ($canViewReports && $options['show_paid'])
array_push($fields, 'ei.paid');
@@ -649,6 +659,29 @@ class ttReportHelper {
}
}
+ // The markApproved marks a set of records as either approved or unapproved.
+ static function markApproved($time_log_ids, $expense_item_ids, $approved = true) {
+ global $user;
+ $mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
+ $approved_val = (int) $approved;
+ if ($time_log_ids) {
+ $sql = "update tt_log set approved = $approved_val".
+ " where id in(".join(', ', $time_log_ids).") and group_id = $group_id and org_id = $org_id";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+ }
+ if ($expense_item_ids) {
+ $sql = "update tt_expense_items set approved = $approved_val".
+ " where id in(".join(', ', $expense_item_ids).") and group_id = $group_id and org_id = $org_id";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+ }
+ }
+
// The markPaid marks a set of records as either paid or unpaid.
static function markPaid($time_log_ids, $expense_item_ids, $paid = true) {
global $user;
@@ -801,12 +834,16 @@ class ttReportHelper {
$body .= '
'.$i18n->get('label.note').' | ';
if ($options['show_cost'])
$body .= ''.$i18n->get('label.cost').' | ';
+ if ($options['show_approved'])
+ $body .= ''.$i18n->get('label.approved').' | ';
if ($options['show_paid'])
$body .= ''.$i18n->get('label.paid').' | ';
if ($options['show_ip'])
$body .= ''.$i18n->get('label.ip').' | ';
if ($options['show_invoice'])
$body .= ''.$i18n->get('label.invoice').' | ';
+ if ($options['show_timesheet'])
+ $body .= ''.$i18n->get('label.timesheet').' | ';
$body .= '';
// Initialize variables to print subtotals.
@@ -847,9 +884,11 @@ class ttReportHelper {
$body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
$body .= '';
}
+ if ($options['show_approved']) $body .= ' | ';
if ($options['show_paid']) $body .= ' | ';
if ($options['show_ip']) $body .= ' | ';
if ($options['show_invoice']) $body .= ' | ';
+ if ($options['show_timesheet']) $body .= ' | ';
$body .= '';
$body .= ' |
';
}
@@ -883,6 +922,11 @@ class ttReportHelper {
$body .= ''.htmlspecialchars($record['note']).' | ';
if ($options['show_cost'])
$body .= ''.$record['cost'].' | ';
+ if ($options['show_approved']) {
+ $body .= '';
+ $body .= $record['approved'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+ $body .= ' | ';
+ }
if ($options['show_paid']) {
$body .= '';
$body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
@@ -895,6 +939,8 @@ class ttReportHelper {
}
if ($options['show_invoice'])
$body .= ' | '.htmlspecialchars($record['invoice']).' | ';
+ if ($options['show_timesheet'])
+ $body .= ''.htmlspecialchars($record['timesheet']).' | ';
$body .= '';
$prev_date = $record['date'];
@@ -923,9 +969,11 @@ class ttReportHelper {
$body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
$body .= '';
}
+ if ($options['show_approved']) $body .= ' | ';
if ($options['show_paid']) $body .= ' | ';
if ($options['show_ip']) $body .= ' | ';
if ($options['show_invoice']) $body .= ' | ';
+ if ($options['show_timesheet']) $body .= ' | ';
$body .= '';
}
@@ -948,9 +996,11 @@ class ttReportHelper {
$body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= '';
}
+ if ($options['show_approved']) $body .= ' | ';
if ($options['show_paid']) $body .= ' | ';
if ($options['show_ip']) $body .= ' | ';
if ($options['show_invoice']) $body .= ' | ';
+ if ($options['show_timesheet']) $body .= ' | ';
$body .= '';
$body .= '';
@@ -1053,6 +1103,9 @@ class ttReportHelper {
$options['billable'] = $bean->getAttribute('include_records');
$options['invoice'] = $bean->getAttribute('invoice');
$options['paid_status'] = $bean->getAttribute('paid_status');
+ $options['approved'] = $bean->getAttribute('approved');
+ if ($user->isPluginEnabled('ap') && $user->isClient() && !$user->can('view_client_unapproved'))
+ $options['approved'] = 1; // Restrict clients to approved records only.
$options['timesheet'] = $bean->getAttribute('timesheet');
if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
$options['period'] = $bean->getAttribute('period');
@@ -1060,6 +1113,7 @@ class ttReportHelper {
$options['period_end'] = $bean->getAttribute('end_date');
$options['show_client'] = $bean->getAttribute('chclient');
$options['show_invoice'] = $bean->getAttribute('chinvoice');
+ $options['show_approved'] = $bean->getAttribute('chapproved');
$options['show_paid'] = $bean->getAttribute('chpaid');
$options['show_ip'] = $bean->getAttribute('chip');
$options['show_project'] = $bean->getAttribute('chproject');
@@ -1546,6 +1600,18 @@ class ttReportHelper {
if ($options['show_cost'] && $trackingMode != MODE_TIME) {
$join .= ' left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)';
}
+ // Prepare inner joins.
+ $inner_joins = null;
+ if ($user->isPluginEnabled('ts') && $options['timesheet']) {
+ $timesheet_option = $options['timesheet'];
+ if ($timesheet_option == TIMESHEET_PENDING)
+ $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+ else if ($timesheet_option == TIMESHEET_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 1)";
+ else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approval_status = 0)";
+ }
+ $join .= $inner_joins;
return $join;
}
@@ -1581,6 +1647,8 @@ class ttReportHelper {
// makeJoinExpensesPart builds a left join part for getSubtotals query for expense items.
static function makeJoinExpensesPart($options) {
+ global $user;
+
if (ttReportHelper::groupingBy('user', $options)) {
$join .= ' left join tt_users u on (ei.user_id = u.id)';
}
@@ -1590,6 +1658,18 @@ class ttReportHelper {
if (ttReportHelper::groupingBy('project', $options)) {
$join .= ' left join tt_projects p on (ei.project_id = p.id)';
}
+ // Prepare inner joins.
+ $inner_joins = null;
+ if ($user->isPluginEnabled('ts') && $options['timesheet']) {
+ $timesheet_option = $options['timesheet'];
+ if ($timesheet_option == TIMESHEET_PENDING)
+ $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.submit_status = 1 and ts.approval_status is null)";
+ else if ($timesheet_option == TIMESHEET_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 1)";
+ else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (ei.timesheet_id = ts.id and ts.approval_status = 0)";
+ }
+ $join .= $inner_joins;
return $join;
}