X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=WEB-INF%2Flib%2FttTimesheetHelper.class.php;h=2ba87abce84e5aee6ebbb81752ea948e856e958e;hb=343dfea2506d317ae99b965667e1b62ea4d83480;hp=94b9beff29c10162911a6d9317b387ee4c5040ec;hpb=bc7836c64252d104495878af3c005210cb977072;p=timetracker.git diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php index 94b9beff..2ba87abc 100644 --- a/WEB-INF/lib/ttTimesheetHelper.class.php +++ b/WEB-INF/lib/ttTimesheetHelper.class.php @@ -215,7 +215,7 @@ class ttTimesheetHelper { 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 from tt_timesheets ts". + " 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"; @@ -285,17 +285,10 @@ class ttTimesheetHelper { global $user; - // Step 1. - // A client must have view_client_timesheets and - // aser must be assigned to one of client projects. - if ($user->isClient()) { - if (!$user->can('view_client_timesheets')) - return false; - $valid_users = ttGroupHelper::getUsersForClient($user->client_id); - $v = 2; - } - - return true; + // 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 @@ -321,4 +314,136 @@ class ttTimesheetHelper { } return $options; } + + // 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) { + global $user; + $mdb2 = getConnection(); + + $group_id = $user->getGroup(); + $org_id = $user->org_id; + + $approvers = array(); + $rank = ttUserHelper::getUserRank($user_id); + $sql = "select u.id, u.name, u.email". + " 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%'))"; + $res = $mdb2->query($sql); + if (!is_a($res, 'PEAR_Error')) { + while ($val = $res->fetchRow()) { + $approvers[] = $val; + } + } + return $approvers; + } + + // submitTimesheet marks a timesheet as submitted and sends an email to an approver. + static function submitTimesheet($fields) { + global $user; + $mdb2 = getConnection(); + + $group_id = $user->getGroup(); + $org_id = $user->org_id; + + // First, mark a timesheet as submitted. + // Even if mail part below does not work, this will get us a functioning workflow + // (without email notifications). + $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"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // TODO: send email to approver here... + // $approver_id = $fields['approver_id']; + + return true; + } + + // approveTimesheet marks a timesheet as approved and sends an email to submitter. + static function approveTimesheet($fields) { + global $user; + $mdb2 = getConnection(); + + $group_id = $user->getGroup(); + $org_id = $user->org_id; + + // First, mark a timesheet as approved. + // 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']; + + $sql = "update tt_timesheets set approval_status = 1, manager_comment = ".$mdb2->quote($manager_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; + + // TODO: send email to submitter here... + return true; + } + + // disapproveTimesheet marks a timesheet as approved and sends an email to submitter. + static function disapproveTimesheet($fields) { + global $user; + $mdb2 = getConnection(); + + $group_id = $user->getGroup(); + $org_id = $user->org_id; + + // First, mark a timesheet as disapproved. + // 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']; + + $sql = "update tt_timesheets set approval_status = 0, manager_comment = ".$mdb2->quote($manager_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; + + // TODO: send email to submitter here... + return true; + } + + // The timesheetItemsExist determines whether tt_log records exist in the specified period + // for inclusion in a new timesheet. + static function timesheetItemsExist($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); + + $end_date = new DateAndTime($user->date_format, $fields['end_date']); + $end = $end_date->toString(DB_DATEFORMAT); + + // sql parts. + if ($client_id) $client_part = " and client_id = $client_id"; + if ($project_id) $project_part = " and project_id = $project_id"; + + $sql = "select count(*) as num from tt_log". + " where status = 1 $client_part $project_part and timesheet_id is null". + " and date >= ".$mdb2->quote($start)." and date <= ".$mdb2->quote($end). + " 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['num']) { + return true; + } + } + + return false; + } }