static function getWhere($options) {
global $user;
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
// Prepare dropdown parts.
$dropdown_parts = '';
if ($options['client_id'])
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
$user_list_part = " and l.user_id in ($userlist)";
else
- $user_list_part = " and l.user_id = ".$user->id;
- $user_list_part .= " and l.group_id = ".$user->getActiveGroup();
+ $user_list_part = " and l.user_id = ".$user->getUser();
+ $user_list_part .= " and l.group_id = $group_id and l.org_id = $org_id";
// Prepare sql query part for where.
+ $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']));
}
$where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
" $user_list_part $dropdown_parts";
static function getExpenseWhere($options) {
global $user;
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
// Prepare dropdown parts.
$dropdown_parts = '';
if ($options['client_id'])
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
$user_list_part = " and ei.user_id in ($userlist)";
else
- $user_list_part = " and ei.user_id = ".$user->id;
- $user_list_part .= " and ei.group_id = ".$user->getActiveGroup();
+ $user_list_part = " and ei.user_id = ".$user->getUser();
+ $user_list_part .= " and ei.group_id = $group_id and ei.org_id = $org_id";
// Prepare sql query part for where.
+ $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']));
}
$where = " where ei.status = 1 and ei.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and ei.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
" $user_list_part $dropdown_parts";
$isClient = $user->isClient();
$grouping = ttReportHelper::grouping($options);
- $grouping_by_date = ($options['group_by1'] == 'date'|| $options['group_by2'] == 'date' || $options['group_by3'] == 'date');
- $grouping_by_client = ($options['group_by1'] == 'client'|| $options['group_by2'] == 'client' || $options['group_by3'] == 'client');
- $grouping_by_project = ($options['group_by1'] == 'project'|| $options['group_by2'] == 'project' || $options['group_by3'] == 'project');
- $grouping_by_task = ($options['group_by1'] == 'task'|| $options['group_by2'] == 'task' || $options['group_by3'] == 'task');
- $grouping_by_user = ($options['group_by1'] == 'user'|| $options['group_by2'] == 'user' || $options['group_by3'] == 'user');
- $grouping_by_cf_1 = ($options['group_by1'] == 'cf_1'|| $options['group_by2'] == 'cf_1' || $options['group_by3'] == 'cf_1');
-
- $group_by_option = $options['group_by1'];
- $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
+ if ($grouping) {
+ $grouping_by_date = ttReportHelper::groupingBy('date', $options);
+ $grouping_by_client = ttReportHelper::groupingBy('client', $options);
+ $grouping_by_project = ttReportHelper::groupingBy('project', $options);
+ $grouping_by_task = ttReportHelper::groupingBy('task', $options);
+ $grouping_by_user = ttReportHelper::groupingBy('user', $options);
+ $grouping_by_cf_1 = ttReportHelper::groupingBy('cf_1', $options);
+ }
+ $convertTo12Hour = ('%I:%M %p' == $user->getTimeFormat()) && ($options['show_start'] || $options['show_end']);
+ $trackingMode = $user->getTrackingMode();
+ $decimalMark = $user->getDecimalMark();
// Prepare a query for time items in tt_log table.
$fields = array(); // An array of fields for database query.
// Add custom field.
$include_cf_1 = $options['show_custom_field_1'] || $grouping_by_cf_1;
if ($include_cf_1) {
- $custom_fields = new CustomFields($user->group_id);
+ $custom_fields = new CustomFields();
$cf_1_type = $custom_fields->fields[0]['type'];
if ($cf_1_type == CustomFields::TYPE_TEXT) {
array_push($fields, 'cfl.value as cf_1');
array_push($fields, "TIME_FORMAT(l.duration, '%k:%i') as duration");
// Add work units.
if ($options['show_work_units']) {
- if ($user->unit_totals_only)
+ if ($user->getConfigOption('unit_totals_only'))
array_push($fields, "null as units");
- else
- array_push($fields, "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");
+ else {
+ $firstUnitThreshold = $user->getConfigInt('1st_unit_threshold');
+ $minutesInUnit = $user->getConfigInt('minutes_in_unit');
+ 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");
+ }
}
// Add note.
if ($options['show_note'])
// Handle cost.
$includeCost = $options['show_cost'];
if ($includeCost) {
- if (MODE_TIME == $user->tracking_mode)
+ if (MODE_TIME == $trackingMode)
array_push($fields, "cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use default user rate.
else
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.
" left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)";
}
}
- if ($includeCost && MODE_TIME != $user->tracking_mode)
+ 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)";
$where = ttReportHelper::getWhere($options);
$val['finish'] = ttTimeHelper::to12HourFormat($val['finish']);
}
if (isset($val['cost'])) {
- if ('.' != $user->decimal_mark)
- $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
+ if ('.' != $decimalMark)
+ $val['cost'] = str_replace('.', $decimalMark, $val['cost']);
}
if (isset($val['expense'])) {
- if ('.' != $user->decimal_mark)
- $val['expense'] = str_replace('.', $user->decimal_mark, $val['expense']);
+ if ('.' != $decimalMark)
+ $val['expense'] = str_replace('.', $decimalMark, $val['expense']);
}
if ($grouping) $val['grouped_by'] = ttReportHelper::makeGroupByKey($options, $val);
$group_by_part = ttReportHelper::makeGroupByPart($options);
if ($options['show_cost']) {
if (MODE_TIME == $user->tracking_mode) {
- if (!ttReportHelper::groupingByUser($options))
+ if (!ttReportHelper::groupingBy('user', $options))
$left_join = 'left join tt_users u on (l.user_id = u.id)';
$sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
if ($options['show_work_units']) {
}
// The assignToInvoice assigns a set of records to a specific invoice.
- static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids)
- {
+ static function assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids) {
+ global $user;
$mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
if ($time_log_ids) {
$sql = "update tt_log set invoice_id = ".$mdb2->quote($invoice_id).
- " where id in(".join(', ', $time_log_ids).")";
+ " 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 invoice_id = ".$mdb2->quote($invoice_id).
- " where id in(".join(', ', $expense_item_ids).")";
+ " 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)
- {
+ static function markPaid($time_log_ids, $expense_item_ids, $paid = true) {
+ global $user;
$mdb2 = getConnection();
+
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
$paid_val = (int) $paid;
if ($time_log_ids) {
- $sql = "update tt_log set paid = $paid_val where id in(".join(', ', $time_log_ids).")";
+ $sql = "update tt_log set paid = $paid_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 paid = $paid_val where id in(".join(', ', $expense_item_ids).")";
+ $sql = "update tt_expense_items set paid = $paid_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());
}
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf'))
- $custom_fields = new CustomFields($user->group_id);
+ $custom_fields = new CustomFields();
// Define some styles to use in email.
$style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;';
// Check users.
$users_in_bean = $bean->getAttribute('users');
if (is_array($users_in_bean)) {
- $users_in_group = ttTeamHelper::getUsers();
+ $users_in_group = ttGroupHelper::getUsers();
foreach ($users_in_group as $user_in_group) {
$valid_ids[] = $user_in_group['id'];
}
// makeJoinPart builds a left join part for getSubtotals query (for time items).
static function makeJoinPart($options) {
global $user;
- if (ttReportHelper::groupingBy('cf_1', $options)) {
- $custom_fields = new CustomFields($user->group_id);
- }
- $group_by_fields = ttReportHelper::makeGroupByFieldsPart($options); // TODO: refactor this, perhaps?
- if (strpos($group_by_fields, 'user') !== false) {
- // Grouping by user, add a join on tt_users table.
+ if (ttReportHelper::groupingBy('user', $options)) {
$join .= ' left join tt_users u on (l.user_id = u.id)';
}
- if (strpos($group_by_fields, 'client') !== false) {
- // Grouping by client, add a join on tt_clients table.
+ if (ttReportHelper::groupingBy('client', $options)) {
$join .= ' left join tt_clients c on (l.client_id = c.id)';
}
- if (strpos($group_by_fields, 'project') !== false) {
- // Grouping by project, add a join on tt_projects table.
+ if (ttReportHelper::groupingBy('project', $options)) {
$join .= ' left join tt_projects p on (l.project_id = p.id)';
}
- if (strpos($group_by_fields, 'task') !== false) {
- // Grouping by task, add a join on tt_tasks table.
+ if (ttReportHelper::groupingBy('task', $options)) {
$join .= ' left join tt_tasks t on (l.task_id = t.id)';
}
- if (strpos($group_by_fields, 'cf_1') !== false) {
- // Grouping by custom field 1, add a join for it.
- // $custom_fields = new CustomFields($user->group_id);
+ if (ttReportHelper::groupingBy('cf_1', $options)) {
+ $custom_fields = new CustomFields();
if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
$join .= ' left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1) left join tt_custom_field_options cfo on (cfl.value = cfo.id)';
elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
// makeJoinExpensesPart builds a left join part for getSubtotals query for expense items.
static function makeJoinExpensesPart($options) {
- $group_by_fields = ttReportHelper::makeGroupByFieldsPart($options); // TODO: refactor this, perhaps?
- if (strpos($group_by_fields, 'user') !== false) {
- // Grouping by user, add a join on tt_users table.
+ if (ttReportHelper::groupingBy('user', $options)) {
$join .= ' left join tt_users u on (ei.user_id = u.id)';
}
- if (strpos($group_by_fields, 'client') !== false) {
- // Grouping by client, add a join on tt_clients table.
+ if (ttReportHelper::groupingBy('client', $options)) {
$join .= ' left join tt_clients c on (ei.client_id = c.id)';
}
- if (strpos($group_by_fields, 'project') !== false) {
- // Grouping by project, add a join on tt_projects table.
+ if (ttReportHelper::groupingBy('project', $options)) {
$join .= ' left join tt_projects p on (ei.project_id = p.id)';
}
return $join;
}
-
- // makeGroupByFieldsPart builds a commma-separated list of fields for sql query using group_by1,
- // group_by2, and group_by3 values passed in $options.
- static function makeGroupByFieldsPart($options) {
- $no_grouping = ($options['group_by1'] == null || $options['group_by1'] == 'no_grouping') &&
- ($options['group_by2'] == null || $options['group_by2'] == 'no_grouping') &&
- ($options['group_by3'] == null || $options['group_by3'] == 'no_grouping');
- if ($no_grouping) return null;
-
- if ($options['group_by1'] != null && $options['group_by1'] != 'no_grouping') {
- // We have group_by1.
- $group_by_fields .= ', '.$options['group_by1'];
- }
- if ($options['group_by2'] != null && $options['group_by2'] != 'no_grouping') {
- // We have group_by2.
- $group_by_fields .= ', '.$options['group_by2'];
- }
- if ($options['group_by3'] != null && $options['group_by3'] != 'no_grouping') {
- // We have group_by3.
- $group_by_fields .= ', '.$options['group_by3'];
- }
- $group_by_fields = ltrim($group_by_fields, ', ');
- return $group_by_fields;
- }
// grouping determines if we are grouping the report by either group_by1,
// group_by2, or group_by3 values passed in $options.
return $grouping;
}
- // groupingByUser determines if we are grouping a report by user.
- static function groupingByUser($options) {
- if ($options['group_by1'] == 'user' || $options['group_by2'] == 'user' || $options['group_by3'] == 'user') return true;
-
- return false;
- }
-
// groupingBy determines if we are grouping a report by a value of $what
- // ('user', 'project', etc.) by checking group_by1, group_by2, and group_by3
- // values passed in $options.
+ // ('date', 'user', 'project', etc.) by checking group_by1, group_by2,
+ // and group_by3 values passed in $options.
static function groupingBy($what, $options) {
- $grouping = ($options['group_by1'] != null && $options['group_by1'] != $what) ||
- ($options['group_by2'] != null && $options['group_by2'] != $what) ||
- ($options['group_by3'] != null && $options['group_by3'] != $what);
+ $grouping = ($options['group_by1'] == $what) || ($options['group_by2'] == $what) || ($options['group_by3'] == $what);
return $grouping;
}
projects / timetracker.git / blobdiff