X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTimesheetHelper.class.php;h=25685483bc70ccdbb0d4892c94717139ed8ff16d;hb=66d86939b62dc5ae3d5f16088b61822e611cf58f;hp=0583265746c5080bc51a3a62d710aac55fda1622;hpb=b14cf15f563feabc7015e3af99ea8cb7a1903dc1;p=timetracker.git diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php index 05832657..25685483 100644 --- a/WEB-INF/lib/ttTimesheetHelper.class.php +++ b/WEB-INF/lib/ttTimesheetHelper.class.php @@ -54,59 +54,17 @@ class ttTimesheetHelper { 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']; $name = $fields['name']; $submitter_comment = $fields['comment']; @@ -120,22 +78,25 @@ class ttTimesheetHelper { $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"; + + $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). + " 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; } @@ -209,16 +170,12 @@ class ttTimesheetHelper { 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 * from tt_timesheets". + " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id and status is not null"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { if ($val = $res->fetchRow()) @@ -285,17 +242,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 @@ -415,4 +365,42 @@ class ttTimesheetHelper { // 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; + } }