$org_id = $user->org_id;
$client_id = $fields['client_id'];
+ $project_id = $fields['project_id'];
$name = $fields['name'];
- $submitter_comment = $fields['comment'];
+ $comment = $fields['comment'];
- $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, name, submitter_comment)".
- " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($name).", ".$mdb2->quote($submitter_comment).")";
+ $start_date = new DateAndTime($user->date_format, $fields['start_date']);
+ $start = $start_date->toString(DB_DATEFORMAT);
+
+ $end_date = new DateAndTime($user->date_format, $fields['end_date']);
+ $end = $end_date->toString(DB_DATEFORMAT);
+
+ $sql = "insert into tt_timesheets (user_id, group_id, org_id, client_id, project_id, name, comment, start_date, end_date)".
+ " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($project_id).", ".$mdb2->quote($name).
+ ", ".$mdb2->quote($comment).", ".$mdb2->quote($start).", ".$mdb2->quote($end).")";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
if ($client_id) $client_part = " and client_id = $client_id";
if ($project_id) $project_part = " and project_id = $project_id";
- $start_date = new DateAndTime($user->date_format, $fields['start_date']);
- $start = $start_date->toString(DB_DATEFORMAT);
-
- $end_date = new DateAndTime($user->date_format, $fields['end_date']);
- $end = $end_date->toString(DB_DATEFORMAT);
-
$sql = "update tt_log set timesheet_id = $last_id".
" where status = 1 $client_part $project_part and timesheet_id is null".
" and date >= ".$mdb2->quote($start)." and date <= ".$mdb2->quote($end).
if ($user->isClient())
$client_part = "and ts.client_id = $user->client_id";
- $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approval_status from tt_timesheets ts".
+ $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name, ts.submit_status, ts.approve_status from tt_timesheets ts".
" left join tt_clients c on (c.id = ts.client_id)".
" where ts.status = 1 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
" $client_part order by ts.name";
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- if ($user->isClient()) $client_part = "and ts.client_id = $user->client_id";
-
- $sql = "select ts.id, ts.user_id, u.name as user_name, ts.client_id, c.name as client_name,".
- " ts.name, ts.submitter_comment, ts.submit_status, ts.approval_status, ts.manager_comment from tt_timesheets ts".
- " left join tt_users u on (u.id = ts.user_id)".
- " left join tt_clients c on (c.id = ts.client_id)".
- " where ts.id = $timesheet_id and ts.group_id = $group_id and ts.org_id = $org_id $client_part and ts.status is not null";
+ $sql = "select ts.*, u.name as user_name, c.name as client_name,".
+ " p.name as project_name from tt_timesheets ts".
+ " left join tt_users u on (ts.user_id = u.id)".
+ " left join tt_clients c on (ts.client_id = c.id)".
+ " left join tt_projects p on (ts.project_id = p.id)".
+ " where ts.id = $timesheet_id and ts.user_id = $user_id and ts.group_id = $group_id and ts.org_id = $org_id and ts.status is not null";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
if ($val = $res->fetchRow())
// in current context.
static function isUserValid($user_id) {
// We have to cover several situations.
- //
- // 1) User is a client.
- // 2) User with view_all_timesheets rights.
- // 3) User with view_timesheets rights.
global $user;
" from tt_users u".
" left join tt_roles r on (r.id = u.role_id)".
" where u.status = 1 and u.email is not null and u.group_id = $group_id and u.org_id = $org_id".
- " and (r.rights like '%approve_all_timesheets%' or (r.rank > $rank and r.rights like '%approve_timesheets%'))";
+ " and (r.rank > $rank and r.rights like '%approve_timesheets%')";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
// Even if mail part below does not work, this will get us a functioning workflow
// (without email notifications).
$timesheet_id = $fields['timesheet_id'];
- $manager_comment = $fields['comment'];
+ $comment = $fields['comment'];
- $sql = "update tt_timesheets set approval_status = 1, manager_comment = ".$mdb2->quote($manager_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";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
// Even if mail part below does not work, this will get us a functioning workflow
// (without email notifications).
$timesheet_id = $fields['timesheet_id'];
- $manager_comment = $fields['comment'];
+ $comment = $fields['comment'];
- $sql = "update tt_timesheets set approval_status = 0, manager_comment = ".$mdb2->quote($manager_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";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;