// 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;
+ }
+
+ // The getMatchingTimesheets function retrieves a timesheet that "matches"
+ // a report for an option to assign report items to it.
+ //
+ // Condition: report range is fully enclosed in an existing timesheet with
+ // matching client_id and project_id and null approved_status.
+ static function getMatchingTimesheets($options) {
+ global $user;
+ $mdb2 = getConnection();
+
+ $user_id = $user->getUser();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
+ // Check users.
+ if (isset($options['users'])) {
+ $comma_separated = $options['users'];
+ $users = explode(',', $comma_separated);
+ if (count($users) > 1 || $users[0] != $user->getUser())
+ return false;
+ }
+
+ // No timesheets for expenses.
+ if ($options['show_cost'] && $user->isPluginEnabled('ex')) return false;
+
+ // Parts for client and project.
+ if ($options['client_id']) $client_part = ' and client_id = '.(int)$options['client_id'];
+ if ($options['project_id']) $project_part = ' and project_id = '.(int)$options['project_id'];
+ // TODO: test and fix the above for NULL client and project ids...
+
+ // Determine start and end dates.
+ $dateFormat = $user->getDateFormat();
+ if ($options['period'])
+ $period = new Period($options['period'], new DateAndTime($dateFormat));
+ else {
+ $period = new Period();
+ $period->setPeriod(
+ new DateAndTime($dateFormat, $options['period_start']),
+ new DateAndTime($dateFormat, $options['period_end']));
+ }
+ $start = $period->getStartDate(DB_DATEFORMAT);
+ $end = $period->getEndDate(DB_DATEFORMAT);
+
+ $result = false;
+ $sql = "select id, name from tt_timesheets".
+ " where ".$mdb2->quote($start)." >= start_date and ".$mdb2->quote($end)." <= end_date".
+ "$client_part $project_part".
+ " and user_id = $user_id and group_id = $group_id and org_id = $org_id".
+ " and approve_status is null and status is not null";
+ $res = $mdb2->query($sql);
+ if (!is_a($res, 'PEAR_Error')) {
+ while ($val = $res->fetchRow()) {
+ $result[] = $val;
+ }
+ }
+ return $result;
+ }
}
projects / timetracker.git / blobdiff