global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- // Handle time records.
+ // Handle tt_log records.
$sql = "update tt_log set timesheet_id = null".
- " where timesheet_id = $timesheet_id and group_id = $group_id and org_id = $org_id";
- $affected = $mdb2->exec($sql);
- if (is_a($affected, 'PEAR_Error')) return false;
-
- // Handle expense items.
- $sql = "update tt_expense_items set timesheet_id = null".
- " where timesheet_id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+ " where timesheet_id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
// Delete timesheet.
$sql = "update tt_timesheets set status = null".
- " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+ " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
$sql = "update tt_timesheets set name = ".$mdb2->quote($name).", comment = ".$mdb2->quote($comment).
", status = ".$mdb2->quote($status).
- " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+ " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
- // isUserValid function is used during access checks and determines whether user id, passed in post, is valid
- // in current context.
- static function isUserValid($user_id) {
- // We have to cover several situations.
-
- global $user;
-
- // TODO: we are currently re-designing timesheets.
- // Clients are not supposed to view them at all.
- // And the post will change on_behalf user, to keep things consistent.
- return false;
- }
-
// getReportOptions prepares $options array to be used with ttReportHelper
// to obtain items for timesheet view.
static function getReportOptions($timesheet) {
$group_by_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
$options['timesheet_id'] = $timesheet['id'];
- $options['client_id'] = $timesheet['client_id'];
- $options['users'] = $timesheet['user_id'];
- $options['show_durarion'] = 1;
- $options['show_cost'] = 1; // To include expenses.
- $options['show_totals_only'] = 1;
$options['group_by1'] = 'date';
if ($group_by_client || $group_by_project) {
$options['group_by2'] = $group_by_client ? 'client' : 'project';
// getApprovers obtains a list of users who can approve a timesheet for a given user
// and also have an email to receive a notification about it.
- static function getApprovers($user_id) {
+ static function getApprovers() {
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
return $approvers;
}
- // submitTimesheet marks a timesheet as submitted and sends an email to an approver.
+ // submitTimesheet marks a timesheet as submitted and also sends an email
+ // to a selected approver.
static function submitTimesheet($fields) {
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- // First, mark a timesheet as submitted.
+ // First, mark timesheet as submitted.
// Even if mail part below does not work, this will get us a functioning workflow
- // (without email notifications).
+ // without email notification.
$timesheet_id = $fields['timesheet_id'];
$sql = "update tt_timesheets set submit_status = 1".
- " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+ " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- // First, mark a timesheet as approved.
+ // First, mark timesheet as approved.
// Even if mail part below does not work, this will get us a functioning workflow
- // (without email notifications).
+ // without email notification.
$timesheet_id = $fields['timesheet_id'];
$comment = $fields['comment'];
$sql = "update tt_timesheets set approve_status = 1, approve_comment = ".$mdb2->quote($comment).
- " where id = $timesheet_id and submit_status = 1 and group_id = $group_id and org_id = $org_id";
+ " where id = $timesheet_id and submit_status = 1 and user_id = $user_id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- // First, mark a timesheet as disapproved.
+ // First, mark timesheet as disapproved.
// Even if mail part below does not work, this will get us a functioning workflow
- // (without email notifications).
+ // without email notification.
$timesheet_id = $fields['timesheet_id'];
$comment = $fields['comment'];
$sql = "update tt_timesheets set approve_status = 0, approve_comment = ".$mdb2->quote($comment).
- " where id = $timesheet_id and submit_status = 1 and group_id = $group_id and org_id = $org_id";
+ " where id = $timesheet_id and submit_status = 1 and user_id = $user_id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
return false;
}
+
+ // The overlaps function determines if a new timesheet overlaps with
+ // an already existing timesheet.
+ static function overlaps($fields) {
+ global $user;
+ $mdb2 = getConnection();
+
+ $user_id = $user->getUser();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
+ if (isset($fields['client_id'])) $client_id = (int) $fields['client_id'];
+ if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
+
+ $start_date = new DateAndTime($user->date_format, $fields['start_date']);
+ $start = $start_date->toString(DB_DATEFORMAT);
+ $quoted_start = $mdb2->quote($start);
+
+ $end_date = new DateAndTime($user->date_format, $fields['end_date']);
+ $end = $end_date->toString(DB_DATEFORMAT);
+ $quoted_end = $mdb2->quote($end);
+
+ // sql parts.
+ if ($client_id) $client_part = " and client_id = $client_id";
+ if ($project_id) $project_part = " and project_id = $project_id";
+
+ $sql = "select id from tt_timesheets".
+ " where status is not null $client_part $project_part".
+ " and (($quoted_start >= start_date and $quoted_start <= end_date)".
+ " or ($quoted_end >= start_date and $quoted_end <= end_date))".
+ " and user_id = $user_id and group_id = $group_id and org_id = $org_id";
+ $res = $mdb2->query($sql);
+ if (!is_a($res, 'PEAR_Error')) {
+ $val = $res->fetchRow();
+ if ($val['id']) {
+ return true;
+ }
+ }
+ return false;
+ }
}