X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/5897ea0d3efe16a50706bcf1bde8d33044b5cf5f..d40f3b7898583d430d651cc5210994cf55dd5b13:/WEB-INF/lib/ttTimesheetHelper.class.php

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 6b13ae53..743477b2 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();
@@ -66,6 +64,7 @@ class ttTimesheetHelper {
     $org_id = $user->org_id;
 
     $client_id = $fields['client_id'];
+    $project_id = $fields['project_id'];
     $name = $fields['name'];
     $comment = $fields['comment'];
 
@@ -75,8 +74,8 @@ class ttTimesheetHelper {
     $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, comment, start_date, end_date)".
-      " values ($user_id, $group_id, $org_id, ".$mdb2->quote($client_id).", ".$mdb2->quote($name).
+    $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'))
@@ -84,7 +83,7 @@ class ttTimesheetHelper {
 
     $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.
@@ -103,31 +102,25 @@ class ttTimesheetHelper {
   }
 
   // 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;
       }
     }
@@ -135,31 +128,25 @@ class ttTimesheetHelper {
   }
 
   // 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;
       }
     }
@@ -175,8 +162,12 @@ class ttTimesheetHelper {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $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";
+    $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())
@@ -222,10 +213,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);
@@ -284,7 +275,7 @@ class ttTimesheetHelper {
       " 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()) {
@@ -329,9 +320,9 @@ class ttTimesheetHelper {
     // 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;
@@ -352,9 +343,9 @@ class ttTimesheetHelper {
     // 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;