return false;
}
- // insert function inserts a new timesheet into database.
- static function insert($fields)
+ // createTimesheet function creates a new timesheet.
+ static function createTimesheet($fields)
{
- // First, we obtain report items.
-
- // Obtain session bean with report attributes.
- $bean = new ActionForm('reportBean', new Form('reportForm'));
- $options = ttReportHelper::getReportOptions($bean);
- $report_items = ttReportHelper::getItems($options);
-
- // Prepare ids for time and expense items, at the same time checking
- // if we can proceed with creating a timesheet.
- $canCreateTimesheet = true;
- $first_user_id = null;
-
- foreach ($report_items as $report_item) {
- // Check user id.
- if (!$first_user_id)
- $first_user_id = $report_item['user_id'];
- else {
- if ($report_item['user_id'] != $first_user_id) {
- // We have items for multiple users.
- $canCreateTimesheet = false;
- break;
- }
- }
- // Check timesheet id.
- if ($report_item['timesheet_id']) {
- // We have an item already assigned to a timesheet.
- $canCreateTimesheet = false;
- break;
- }
- if ($report_item['type'] == 1)
- $time_ids[] = $report_item['id'];
- elseif ($report_item['type'] == 2)
- $expense_ids[] = $report_item['id'];
- }
- if (!$canCreateTimesheet) return false;
-
- // Make comma-seperated lists of ids for sql.
- if ($time_ids)
- $comma_separated_time_ids = implode(',', $time_ids);
- if ($expense_ids)
- $comma_separated_expense_ids = implode(',', $expense_ids);
-
// Create a new timesheet entry.
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- $user_id = $fields['user_id'];
$client_id = $fields['client_id'];
+ $project_id = $fields['project_id'];
$name = $fields['name'];
- $submitter_comment = $fields['comment'];
+ $comment = $fields['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, name, submitter_comment)".
- " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($name).", ".$mdb2->quote($submitter_comment).")";
+ $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;
$last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
// Associate time items with timesheet.
- if ($comma_separated_time_ids) {
- $sql = "update tt_log set timesheet_id = $last_id".
- " where id in ($comma_separated_time_ids) and group_id = $group_id and org_id = $org_id";
- $affected = $mdb2->exec($sql);
- if (is_a($affected, 'PEAR_Error'))
- return false;
- }
-
- // Associate expense items with timesheet.
- if ($comma_separated_expense_ids) {
- $sql = "update tt_expense_items set timesheet_id = $last_id".
- " where id in ($comma_separated_expense_ids) and group_id = $group_id and org_id = $org_id";
- $affected = $mdb2->exec($sql);
- if (is_a($affected, 'PEAR_Error'))
- return false;
- }
+ if (isset($fields['client'])) $client_id = (int) $fields['client_id'];
+ if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
+ // sql parts.
+ if ($client_id) $client_part = " and client_id = $client_id";
+ if ($project_id) $project_part = " and project_id = $project_id";
+
+ $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).
+ " 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 $last_id;
}
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;
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- $client_id = (int) $fields['client_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);
- if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
+ // sql parts.
+ if ($client_id) $client_part = " and client_id = $client_id";
+ if ($project_id) $project_part = " and project_id = $project_id";
- // Our query is different depending on tracking mode.
- if (MODE_TIME == $user->getTrackingMode()) {
- // In "time only" tracking mode there is a single user rate.
- $sql = "select count(*) as num from tt_log l, tt_users u".
- " where l.status = 1 and l.client_id = $client_id and l.invoice_id is null".
- " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
- " and l.user_id = u.id and l.group_id = $group_id and l.org_id = $org_id".
- " and l.billable = 1"; // l.billable * u.rate * time_to_sec(l.duration)/3600 > 0 // See explanation below.
- } else {
- // sql part for project id.
- if ($project_id) $project_part = " and l.project_id = $project_id";
-
- // When we have projects, rates are defined for each project in tt_user_project_binds table.
- $sql = "select count(*) as num from tt_log l, tt_user_project_binds upb".
- " where l.status = 1 and l.client_id = $client_id $project_part and l.invoice_id is null".
- " and l.date >= ".$mdb2->quote($start)." and l.date <= ".$mdb2->quote($end).
- " and l.group_id = $group_id and l.org_id = $org_id".
- " and upb.user_id = l.user_id and upb.project_id = l.project_id".
- " and l.billable = 1"; // l.billable * upb.rate * time_to_sec(l.duration)/3600 > 0
- // Users with a lot of clients and projects (Jaro) may forget to set user rates properly.
- // Specifically, user rate may be set to 0 on a project, by mistake. This leads to error.no_invoiceable_items
- // and increased support cost. Commenting out allows us to include 0 cost items in invoices so that
- // the problem becomes obvious.
-
- // TODO: If the above turns out useful, rework the query to simplify it by removing left join.
- }
+ $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 ($user->isPluginEnabled('ex')) {
- // sql part for project id.
- if ($project_id) $project_part = " and ei.project_id = $project_id";
-
- $sql = "select count(*) as num from tt_expense_items ei".
- " where ei.client_id = $client_id $project_part and ei.invoice_id is null".
- " and ei.date >= ".$mdb2->quote($start)." and ei.date <= ".$mdb2->quote($end).
- " and ei.group_id = $group_id and ei.org_id = $org_id".
- " and ei.cost <> 0 and ei.status = 1";
- $res = $mdb2->query($sql);
- if (!is_a($res, 'PEAR_Error')) {
- $val = $res->fetchRow();
- if ($val['num']) {
- return true;
- }
- }
- }
-
return false;
}
}
projects / timetracker.git / blobdiff