// +----------------------------------------------------------------------+
import('ttUserHelper');
-import('ttGroupHelper');
-import('form.ActionForm');
-import('ttReportHelper');
// Class ttTimesheetHelper is used to help with project related tasks.
class ttTimesheetHelper {
// The getTimesheetByName looks up a project by name.
- static function getTimesheetByName($name, $user_id) {
+ static function getTimesheetByName($name) {
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
$sql = "select id from tt_timesheets".
" where group_id = $group_id and org_id = $org_id and user_id = $user_id and name = ".$mdb2->quote($name).
- " and (status = 1 or status = 0)";
+ " and status is not null";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$val = $res->fetchRow();
$last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
- // Associate time items with timesheet.
+ // Associate tt_log items with timesheet.
if (isset($fields['client'])) $client_id = (int) $fields['client_id'];
if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
// sql parts.
}
// The getActiveTimesheets obtains active timesheets for a user.
- static function getActiveTimesheets($user_id)
+ static function getActiveTimesheets()
{
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- // $addPaidStatus = $user->isPluginEnabled('ps');
$result = array();
-
- 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.approve_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";
+ " order by ts.name";
$res = $mdb2->query($sql);
$result = array();
if (!is_a($res, 'PEAR_Error')) {
- $dt = new DateAndTime(DB_DATEFORMAT);
while ($val = $res->fetchRow()) {
- //if ($addPaidStatus)
- // $val['paid'] = ttTimesheetHelper::isPaid($val['id']);
$result[] = $val;
}
}
}
// The getInactiveTimesheets obtains inactive timesheets for a user.
- static function getInactiveTimesheets($user_id)
+ static function getInactiveTimesheets()
{
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
- // $addPaidStatus = $user->isPluginEnabled('ps');
$result = array();
-
- 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 = 0 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
- " $client_part order by ts.name";
+ " order by ts.name";
$res = $mdb2->query($sql);
$result = array();
if (!is_a($res, 'PEAR_Error')) {
- $dt = new DateAndTime(DB_DATEFORMAT);
while ($val = $res->fetchRow()) {
- //if ($addPaidStatus)
- // $val['paid'] = ttTimesheetHelper::isPaid($val['id']);
$result[] = $val;
}
}
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;
$timesheet_id = $fields['id']; // Timesheet we are updating.
$name = $fields['name']; // Timesheet name.
- $submitter_comment = $fields['submitter_comment'];
- $status = $fields['status']; // Project status.
+ $comment = $fields['comment'];
+ $status = $fields['status']; // Timesheet status.
- $sql = "update tt_timesheets set name = ".$mdb2->quote($name).", submitter_comment = ".$mdb2->quote($submitter_comment).
+ $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';
projects / timetracker.git / blobdiff