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->getGroup();
+ $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";
$grouping_by_user = ttReportHelper::groupingBy('user', $options);
$grouping_by_cf_1 = ttReportHelper::groupingBy('cf_1', $options);
}
- $convertTo12Hour = ('%I:%M %p' == $user->time_format) && ($options['show_start'] || $options['show_end']);
+ $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.
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', 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");
+ }
}
// 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);
// With expenses, it becomes a select with group by from a combined set of records obtained with "union all".
static function getSubtotals($options) {
global $user;
-
$mdb2 = getConnection();
$concat_part = ttReportHelper::makeConcatPart($options);
+ $work_unit_part = ttReportHelper::makeWorkUnitPart($options);
$join_part = ttReportHelper::makeJoinPart($options);
+ $cost_part = ttReportHelper::makeCostPart($options);
$where = ttReportHelper::getWhere($options);
$group_by_part = ttReportHelper::makeGroupByPart($options);
- if ($options['show_cost']) {
- if (MODE_TIME == $user->tracking_mode) {
- 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']) {
- if ($user->unit_totals_only)
- $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
- else
- $sql .= ", 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";
- }
- $sql .= ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost,
- null as expenses from tt_log l
- $join_part $left_join $where $group_by_part";
- } else {
- // If we are including cost and tracking projects, our query (the same as above) needs to join the tt_user_project_binds table.
- $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
- if ($options['show_work_units']) {
- if ($user->unit_totals_only)
- $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
- else
- $sql .= ", 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";
- }
- $sql .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost,
- null as expenses from tt_log l
- $join_part
- left join tt_user_project_binds upb on (l.user_id = upb.user_id and l.project_id = upb.project_id) $where $group_by_part";
- }
- } else {
- // $sql = "select $group_field as group_field, sum(time_to_sec(l.duration)) as time";
- $sql = "select $concat_part, sum(time_to_sec(l.duration)) as time";
- if ($options['show_work_units']) {
- if ($user->unit_totals_only)
- $sql .= ", if (sum(l.billable * time_to_sec(l.duration)/60) < $user->first_unit_threshold, 0, ceil(sum(l.billable * time_to_sec(l.duration)/60/$user->minutes_in_unit))) as units";
- else
- $sql .= ", 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";
- }
- $sql .= ", null as expenses from tt_log l
- $join_part $where $group_by_part";
- }
+
+ $parts = "$concat_part, sum(time_to_sec(l.duration)) as time, null as expenses".$work_unit_part.$cost_part;
+ $sql = "select $parts from tt_log l $join_part $where $group_by_part";
// By now we have sql for time items.
// However, when we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table.
$time = $val['time'] ? sec_to_time_fmt_hm($val['time']) : null;
$rowLabel = ttReportHelper::makeGroupByLabel($val['group_field'], $options);
if ($options['show_cost']) {
- if ('.' != $user->decimal_mark) {
- $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
- $val['expenses'] = str_replace('.', $user->decimal_mark, $val['expenses']);
+ $decimalMark = $user->getDecimalMark();
+ if ('.' != $decimalMark) {
+ $val['cost'] = str_replace('.', $decimalMark, $val['cost']);
+ $val['expenses'] = str_replace('.', $decimalMark, $val['expenses']);
}
$subtotals[$val['group_field']] = array('name'=>$rowLabel,'user'=>$val['user'],'project'=>$val['project'],'task'=>$val['task'],'client'=>$val['client'],'cf_1'=>$val['cf_1'],'time'=>$time,'units'=> $val['units'],'cost'=>$val['cost'],'expenses'=>$val['expenses']);
} else
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)";
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();
static function makeJoinPart($options) {
global $user;
- if (ttReportHelper::groupingBy('user', $options)) {
+ $trackingMode = $user->getTrackingMode();
+ if (ttReportHelper::groupingBy('user', $options) || MODE_TIME == $trackingMode) {
$join .= ' left join tt_users u on (l.user_id = u.id)';
}
if (ttReportHelper::groupingBy('client', $options)) {
elseif ($custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN)
$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.option_id = cfo.id)';
}
+ 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)';
+ }
return $join;
}
+ // makeWorkUnitPart builds an sql part for work units for time items.
+ static function makeWorkUnitPart($options) {
+ global $user;
+
+ $workUnits = $options['show_work_units'];
+ if ($workUnits) {
+ $unitTotalsOnly = $user->getConfigOption('unit_totals_only');
+ $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";
+ else
+ $work_unit_part = ", sum(if(l.billable = 0 or time_to_sec(l.duration)/60 < $firstUnitThreshold, 0, ceil(time_to_sec(l.duration)/60/$minutesInUnit))) as units";
+ }
+ return $work_unit_part;
+ }
+
+ // makeCostPart builds a cost part for time items.
+ static function makeCostPart($options) {
+ global $user;
+
+ if ($options['show_cost']) {
+ if (MODE_TIME == $user->getTrackingMode())
+ $cost_part = ", sum(cast(l.billable * coalesce(u.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10, 2))) as cost";
+ else
+ $cost_part .= ", sum(cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2))) as cost";
+ }
+ return $cost_part;
+ }
+
// makeJoinExpensesPart builds a left join part for getSubtotals query for expense items.
static function makeJoinExpensesPart($options) {
if (ttReportHelper::groupingBy('user', $options)) {
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;