import('DateAndTime');
import('Period');
import('ttTimeHelper');
+import('ttConfigHelper');
require_once(dirname(__FILE__).'/../../plugins/CustomFields.class.php');
+// Definitions of types for timesheet dropdown.
+define('TIMESHEET_ALL', 0); // Include all records.
+define('TIMESHEET_NOT_ASSIGNED', 1); // Include records not assigned to timesheets.
+define('TIMESHEET_ASSIGNED', 2); // Include records assigned to timesheets.
+define('TIMESHEET_PENDING', 3); // Include records in submitted timesheets that are pending manager approval.
+define('TIMESHEET_APPROVED', 4); // Include records in approved timesheets.
+define('TIMESHEET_NOT_APPROVED', 5); // Include records in disapproved timesheets.
+
// Class ttReportHelper is used for help with reports.
class ttReportHelper {
$group_id = $user->getGroup();
$org_id = $user->org_id;
+ // A shortcut for timesheets.
+ if ($options['timesheet_id']) {
+ $where = " where l.timesheet_id = ".$options['timesheet_id']." and l.group_id = $group_id and l.org_id = $org_id";
+ return $where;
+ }
+
// Prepare dropdown parts.
$dropdown_parts = '';
if ($options['client_id'])
if ($options['task_id']) $dropdown_parts .= ' and l.task_id = '.$options['task_id'];
if ($options['billable']=='1') $dropdown_parts .= ' and l.billable = 1';
if ($options['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
- if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
- if ($options['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+ if ($options['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not null';
+ 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';
elseif ($user->isClient() && $user->client_id)
$dropdown_parts .= ' and ei.client_id = '.$user->client_id;
if ($options['project_id']) $dropdown_parts .= ' and ei.project_id = '.$options['project_id'];
- if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not NULL';
- if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is NULL';
+ if ($options['invoice']=='1') $dropdown_parts .= ' and ei.invoice_id is not null';
+ if ($options['invoice']=='2') $dropdown_parts .= ' and ei.invoice_id is null';
+ if (isset($options['timesheet']) && ($options['timesheet']!=TIMESHEET_ALL && $options['timesheet']!=TIMESHEET_NOT_ASSIGNED)) {
+ $dropdown_parts .= ' and 0 = 1'; // Expense items do not have a timesheet_id.
+ }
+ 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';
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();
// Prepare a query for time items in tt_log table.
$fields = array(); // An array of fields for database query.
- array_push($fields, 'l.id as id');
+ array_push($fields, 'l.id');
+ array_push($fields, 'l.user_id');
array_push($fields, '1 as type'); // Type 1 is for tt_log entries.
- array_push($fields, 'l.date as date');
+ array_push($fields, 'l.date');
if($canViewReports || $isClient)
array_push($fields, 'u.name as user');
// Add client name if it is selected.
if ($user->getConfigOption('unit_totals_only'))
array_push($fields, "null as units");
else {
- $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
- $minutesInUnit = $user->getConfigInt('minutes_in_unit');
+ $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold', 0);
+ $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
array_push($fields, "if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit)) as units");
}
}
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 as paid');
+ array_push($fields, 'l.paid');
// Add IP address.
if ($canViewReports && $options['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');
+ array_push($fields, 'l.created');
+ array_push($fields, 'l.created_ip');
+ array_push($fields, 'l.modified');
+ array_push($fields, 'l.modified_ip');
}
// Add invoice name if it is selected.
if (($canViewReports || $isClient) && $options['show_invoice'])
array_push($fields, 'i.name as invoice');
+ // 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;
}
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;
+ if ($user->isPluginEnabled('ts')) {
+ $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.approve_status is null)";
+ else if ($timesheet_option == TIMESHEET_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 1)";
+ else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 0)";
+ else if ($options['show_timesheet'])
+ $inner_joins .= " left join tt_timesheets ts on (l.timesheet_id = ts.id)"; // Left join for timesheet nme.
+ }
$where = ttReportHelper::getWhere($options);
// Construct sql query for tt_log items.
- $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $where";
+ $sql = "select ".join(', ', $fields)." from tt_log l $left_joins $inner_joins $where";
// If we don't have expense items (such as when the Expenses plugin is disabled), the above is all sql we need,
// with an exception of sorting part, that is added in the end.
$fields = array(); // An array of fields for database query.
array_push($fields, 'ei.id');
+ array_push($fields, 'ei.user_id');
array_push($fields, '2 as type'); // Type 2 is for tt_expense_items entries.
array_push($fields, 'ei.date');
if($canViewReports || $isClient)
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 as paid');
+ array_push($fields, 'ei.paid');
// Add IP address.
if ($canViewReports && $options['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');
+ array_push($fields, 'ei.created');
+ array_push($fields, 'ei.created_ip');
+ array_push($fields, 'ei.modified');
+ array_push($fields, 'ei.modified_ip');
}
// Add invoice name if it is selected.
if (($canViewReports || $isClient) && $options['show_invoice'])
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;
$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);
static function getTotals($options)
{
global $user;
-
$mdb2 = getConnection();
+ $trackingMode = $user->getTrackingMode();
+ $decimalMark = $user->getDecimalMark();
$where = ttReportHelper::getWhere($options);
// Prepare parts.
$time_part = "sum(time_to_sec(l.duration)) as time";
if ($options['show_work_units']) {
- $units_part = $user->unit_totals_only ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $user->first_unit_threshold, 0, ceil(time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
+ $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
+ $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold', 0);
+ $minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
+ $units_part = $unitTotalsOnly ? ", null as units" : ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
}
if ($options['show_cost']) {
- if (MODE_TIME == $user->tracking_mode)
+ if (MODE_TIME == $trackingMode)
$cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
else
$cost_part = ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost, null as expenses";
$cost_part = ", null as cost, null as expenses";
}
if ($options['show_cost']) {
- if (MODE_TIME == $user->tracking_mode) {
+ if (MODE_TIME == $trackingMode) {
$left_joins = "left join tt_users u on (l.user_id = u.id)";
} else {
$left_joins = "left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id)";
}
}
+ // Prepare sql query part for 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.approve_status is null)";
+ else if ($timesheet_option == TIMESHEET_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 1)";
+ else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 0)";
+ }
// Prepare a query for time items.
- $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $where";
+ $sql = "select $time_part $units_part $cost_part from tt_log l $left_joins $inner_joins $where";
// If we have expenses, query becomes a bit more complex.
if ($options['show_cost'] && $user->isPluginEnabled('ex')) {
if ($options['show_cost']) {
$total_cost = $val['cost'];
if (!$total_cost) $total_cost = '0.00';
- if ('.' != $user->decimal_mark)
- $total_cost = str_replace('.', $user->decimal_mark, $total_cost);
+ if ('.' != $decimalMark)
+ $total_cost = str_replace('.', $decimalMark, $total_cost);
$total_expenses = $val['expenses'];
if (!$total_expenses) $total_expenses = '0.00';
- if ('.' != $user->decimal_mark)
- $total_expenses = str_replace('.', $user->decimal_mark, $total_expenses);
+ if ('.' != $decimalMark)
+ $total_expenses = str_replace('.', $decimalMark, $total_expenses);
}
+ $dateFormat = $user->getDateFormat();
if ($options['period'])
- $period = new Period($options['period'], new DateAndTime($user->date_format));
+ $period = new Period($options['period'], new DateAndTime($dateFormat));
else {
$period = new Period();
$period->setPeriod(
- new DateAndTime($user->date_format, $options['period_start']),
- new DateAndTime($user->date_format, $options['period_end']));
+ new DateAndTime($dateFormat, $options['period_start']),
+ new DateAndTime($dateFormat, $options['period_end']));
}
$totals['start_date'] = $period->getStartDate();
}
}
+ // The assignToTimesheet assigns a set of tt_log records to a specific timesheet.
+ static function assignToTimesheet($timesheet_id, $time_log_ids) {
+ global $user;
+ $mdb2 = getConnection();
+
+ $user_id = $user->getUser();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
+ if ($time_log_ids) {
+ // Use inner join as a protection mechanism not to do anything with "acted upon" timesheets.
+ // Allow oprations only with pending timesheets.
+ if ($timesheet_id) {
+ // Assigning a timesheet to records.
+ $inner_join = " inner join tt_timesheets ts on (ts.id = $timesheet_id".
+ " and ts.user_id = $user_id and ts.approve_status is null". // Timesheet to assign to is pending.
+ // Part below: existing timesheet either not exists or is also pending.
+ " and (l.timesheet_id is null or (l.timesheet_id = ts.id and ts.approve_status is null)))";
+ } else {
+ $inner_join = " inner join tt_timesheets ts on (ts.id = l.timesheet_id".
+ " and ts.user_id = $user_id and ts.approve_status is null)"; // Do not deassign from acted-upon timesheets.
+ }
+
+ $sql = "update tt_log l $inner_join".
+ " set l.timesheet_id = ".$mdb2->quote($timesheet_id).
+ " where l.id in(".join(', ', $time_log_ids).") and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) die($affected->getMessage());
+ }
+ }
+
+ // 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;
$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)
$cellLeftAlignedSubtotal = 'font-weight: bold; text-align: left; vertical-align: top;';
$cellRightAlignedSubtotal = 'font-weight: bold; text-align: right; vertical-align: top;';
+ // Determine column span for note field.
+ $colspan = 1;
+ if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) $colspan++;
+ if ($options['show_client']) $colspan++;
+ if ($options['show_project']) $colspan++;
+ if ($options['show_task']) $colspan++;
+ if ($options['show_custom_field_1']) $colspan++;
+ if ($options['show_start']) $colspan++;
+ if ($options['show_end']) $colspan++;
+ if ($options['show_duration']) $colspan++;
+ if ($options['show_work_units']) $colspan++;
+ if ($options['show_cost']) $colspan++;
+ if ($options['show_approved']) $colspan++;
+ if ($options['show_paid']) $colspan++;
+ if ($options['show_ip']) $colspan++;
+ if ($options['show_invoice']) $colspan++;
+ if ($options['show_timesheet']) $colspan++;
+
// Start creating email body.
$body = '<html>';
$body .= '<head><meta http-equiv="content-type" content="text/html; charset='.CHARSET.'"></head>';
$body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.duration').'</td>';
if ($options['show_work_units'])
$body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.work_units_short').'</td>';
- if ($options['show_note'])
+ if ($show_note_column)
$body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.note').'</td>';
if ($options['show_cost'])
$body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.cost').'</td>';
+ if ($options['show_approved'])
+ $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.approved').'</td>';
if ($options['show_paid'])
$body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.paid').'</td>';
if ($options['show_ip'])
$body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->get('label.ip').'</td>';
if ($options['show_invoice'])
$body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.invoice').'</td>';
+ if ($options['show_timesheet'])
+ $body .= '<td style="'.$tableHeader.'">'.$i18n->get('label.timesheet').'</td>';
$body .= '</tr>';
// Initialize variables to print subtotals.
if ($options['show_end']) $body .= '<td></td>';
if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['time'].'</td>';
if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$prev_grouped_by]['units'].'</td>';
- if ($options['show_note']) $body .= '<td></td>';
+ if ($show_note_column) $body .= '<td></td>';
if ($options['show_cost']) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
$body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
$body .= '</td>';
}
+ if ($options['show_approved']) $body .= '<td></td>';
if ($options['show_paid']) $body .= '<td></td>';
if ($options['show_ip']) $body .= '<td></td>';
if ($options['show_invoice']) $body .= '<td></td>';
+ if ($options['show_timesheet']) $body .= '<td></td>';
$body .= '</tr>';
$body .= '<tr><td> </td></tr>';
}
$body .= '<td style="'.$cellRightAligned.'">'.$record['duration'].'</td>';
if ($options['show_work_units'])
$body .= '<td style="'.$cellRightAligned.'">'.$record['units'].'</td>';
- if ($options['show_note'])
+ if ($show_note_column)
$body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['note']).'</td>';
if ($options['show_cost'])
$body .= '<td style="'.$cellRightAligned.'">'.$record['cost'].'</td>';
+ if ($options['show_approved']) {
+ $body .= '<td style="'.$cellRightAligned.'">';
+ $body .= $record['approved'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
+ $body .= '</td>';
+ }
if ($options['show_paid']) {
$body .= '<td style="'.$cellRightAligned.'">';
$body .= $record['paid'] == 1 ? $i18n->get('label.yes') : $i18n->get('label.no');
}
if ($options['show_invoice'])
$body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
+ if ($options['show_timesheet'])
+ $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['timesheet']).'</td>';
$body .= '</tr>';
-
+ if ($show_note_row && $record['note']) {
+ $body .= '<tr style="'.$row_style.'">';
+ $body .= '<td style="'.$cellRightAligned.'">'.$i18n->get('label.note').':</td>';
+ $body .= '<td colspan="'.$colspan.'">'.$record['note'].'</td>';
+ $body .= '</tr>';
+ }
$prev_date = $record['date'];
if ($print_subtotals)
$prev_grouped_by = $record['grouped_by'];
if ($options['show_end']) $body .= '<td></td>';
if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['time'].'</td>';
if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$subtotals[$cur_grouped_by]['units'].'</td>';
- if ($options['show_note']) $body .= '<td></td>';
+ if ($show_note_column) $body .= '<td></td>';
if ($options['show_cost']) {
$body .= '<td style="'.$cellRightAlignedSubtotal.'">';
$body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
$body .= '</td>';
}
+ if ($options['show_approved']) $body .= '<td></td>';
if ($options['show_paid']) $body .= '<td></td>';
if ($options['show_ip']) $body .= '<td></td>';
if ($options['show_invoice']) $body .= '<td></td>';
+ if ($options['show_timesheet']) $body .= '<td></td>';
$body .= '</tr>';
}
if ($options['show_end']) $body .= '<td></td>';
if ($options['show_duration']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['time'].'</td>';
if ($options['show_work_units']) $body .= '<td style="'.$cellRightAlignedSubtotal.'">'.$totals['units'].'</td>';
- if ($options['show_note']) $body .= '<td></td>';
+ if ($show_note_column) $body .= '<td></td>';
if ($options['show_cost']) {
$body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
$body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
$body .= '</td>';
}
+ if ($options['show_approved']) $body .= '<td></td>';
if ($options['show_paid']) $body .= '<td></td>';
if ($options['show_ip']) $body .= '<td></td>';
if ($options['show_invoice']) $body .= '<td></td>';
+ if ($options['show_timesheet']) $body .= '<td></td>';
$body .= '</tr>';
$body .= '</table>';
$options['billable'] = $bean->getAttribute('include_records');
$options['invoice'] = $bean->getAttribute('invoice');
$options['paid_status'] = $bean->getAttribute('paid_status');
- if (is_array($bean->getAttribute('users'))) $options['users'] = join(',', $bean->getAttribute('users'));
+ $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');
+
+ $active_users_in_bean = $bean->getAttribute('users_active');
+ if ($active_users_in_bean && is_array($active_users_in_bean)) {
+ $users = join(',', $active_users_in_bean);
+ }
+ $inactive_users_in_bean = $bean->getAttribute('users_inactive');
+ if ($inactive_users_in_bean && is_array($inactive_users_in_bean)) {
+ if ($users) $users .= ',';
+ $users .= join(',', $inactive_users_in_bean);
+ }
+ if ($users) $options['users'] = $users;
+
$options['period'] = $bean->getAttribute('period');
$options['period_start'] = $bean->getAttribute('start_date');
$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');
$options['show_note'] = $bean->getAttribute('chnote');
$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');
global $user;
// Check users.
- $users_in_bean = $bean->getAttribute('users');
- if (is_array($users_in_bean)) {
+ $active_users_in_bean = $bean->getAttribute('users_active');
+ $inactive_users_in_bean = $bean->getAttribute('users_inactive');
+ if (is_array($active_users_in_bean) || is_array($inactive_users_in_bean)) {
$users_in_group = ttGroupHelper::getUsers();
foreach ($users_in_group as $user_in_group) {
$valid_ids[] = $user_in_group['id'];
}
- foreach ($users_in_bean as $user_in_bean) {
+ foreach ($active_users_in_bean as $user_in_bean) {
+ if (!in_array($user_in_bean, $valid_ids)) {
+ return false;
+ }
+ }
+ foreach ($inactive_users_in_bean as $user_in_bean) {
if (!in_array($user_in_bean, $valid_ids)) {
return false;
}
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.approve_status is null)";
+ else if ($timesheet_option == TIMESHEET_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 1)";
+ else if ($timesheet_option == TIMESHEET_NOT_APPROVED)
+ $inner_joins .= " inner join tt_timesheets ts on (l.timesheet_id = ts.id and ts.approve_status = 0)";
+ }
+ $join .= $inner_joins;
return $join;
}
$workUnits = $options['show_work_units'];
if ($workUnits) {
$unitTotalsOnly = $user->getConfigOption('unit_totals_only');
- $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
+ $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold', 0);
$minutesInUnit = $user->getConfigInt('minutes_in_unit', 15);
if ($unitTotalsOnly)
$work_unit_part = ", if (sum(l.billable * time_to_sec(l.duration)/60) < $firstUnitThreshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$minutesInUnit))) as units";
// 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)';
}
return $key; // No need to format.
global $user;
- if ($user->date_format == DB_DATEFORMAT)
+ if ($user->getDateFormat() == DB_DATEFORMAT)
return $key; // No need to format.
$label = $key;
projects / timetracker.git / blobdiff