From: Nik Okuntseff Date: Sat, 2 Mar 2019 15:50:33 +0000 (+0000) Subject: Refactoring timesheet related code. X-Git-Tag: timetracker_1.19-1~239 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=49814b0298d01a1e9efd2add26ea31cb79530f5a;p=timetracker.git Refactoring timesheet related code. --- diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php index 78e79016..e2af4e72 100644 --- a/WEB-INF/lib/ttTimesheetHelper.class.php +++ b/WEB-INF/lib/ttTimesheetHelper.class.php @@ -27,24 +27,22 @@ // +----------------------------------------------------------------------+ 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(); @@ -150,7 +148,7 @@ class ttTimesheetHelper { 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"; @@ -227,10 +225,10 @@ class ttTimesheetHelper { $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"; $affected = $mdb2->exec($sql); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index ac521a4b..c801c765 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.50.4806 | Copyright © Anuko | +  Anuko Time Tracker 1.18.50.4807 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/timesheet_add.php b/timesheet_add.php index 294886be..09a2d384 100644 --- a/timesheet_add.php +++ b/timesheet_add.php @@ -78,7 +78,7 @@ if ($request->isPost()) { if (!ttValidDate($cl_start)) $err->add($i18n->get('error.field'), $i18n->get('label.start_date')); if (!ttValidDate($cl_finish)) $err->add($i18n->get('error.field'), $i18n->get('label.end_date')); if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment')); - if ($err->no() && ttTimesheetHelper::getTimesheetByName($cl_name, $user_id)) $err->add($i18n->get('error.object_exists')); + if ($err->no() && ttTimesheetHelper::getTimesheetByName($cl_name)) $err->add($i18n->get('error.object_exists')); $fields = array('user_id' => $user_id, 'name' => $cl_name, 'client_id' => $cl_client, diff --git a/timesheet_edit.php b/timesheet_edit.php index d275ce5f..7919125a 100644 --- a/timesheet_edit.php +++ b/timesheet_edit.php @@ -53,7 +53,7 @@ if ($request->isPost()) { $cl_status = $request->getParameter('status'); } else { $cl_name = $timesheet['name']; - $cl_comment = $timesheet['submitter_comment']; + $cl_comment = $timesheet['comment']; $cl_status = $timesheet['status']; } @@ -73,13 +73,13 @@ if ($request->isPost()) { if ($request->getParameter('btn_save')) { if ($err->no()) { - $existing_timesheet = ttTimesheetHelper::getTimesheetByName($cl_name, $timesheet['user_id']); + $existing_timesheet = ttTimesheetHelper::getTimesheetByName($cl_name); if (!$existing_timesheet || ($cl_timesheet_id == $existing_timesheet['id'])) { // Update timesheet information. if (ttTimesheetHelper::update(array( 'id' => $cl_timesheet_id, 'name' => $cl_name, - 'submitter_comment' => $cl_comment, + 'comment' => $cl_comment, 'status' => $cl_status))) { header('Location: timesheets.php'); exit();