More refactoring on timesheet code.

[timetracker.git] / WEB-INF / lib / ttTimesheetHelper.class.php

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 78e7901654eef5dbba68cfb98176f3a557c6c9ad..743477b2c58267254d0ef7fda5a69c032234260c 100644 (file)
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -27,24 +27,22 @@
 // +----------------------------------------------------------------------+
 
 import('ttUserHelper');
 // +----------------------------------------------------------------------+
 
 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.
 
 // 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();
 
     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).
     $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();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();


@@ -85,7 +83,7 @@ class ttTimesheetHelper {
 
     $last_id = $mdb2->lastInsertID('tt_timesheets', 'id');
 
 
     $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.
     if (isset($fields['client'])) $client_id = (int) $fields['client_id'];
     if (isset($fields['project_id'])) $project_id = (int) $fields['project_id'];
     // sql parts.


@@ -104,31 +102,25 @@ class ttTimesheetHelper {
   }
 
   // The getActiveTimesheets obtains active timesheets for a user.
   }
 
   // The getActiveTimesheets obtains active timesheets for a user.

-  static function getActiveTimesheets($user_id)
+  static function getActiveTimesheets()

   {
     global $user;
     $mdb2 = getConnection();
 
   {
     global $user;
     $mdb2 = getConnection();
 

+    $user_id = $user->getUser();

     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 

-    // $addPaidStatus = $user->isPluginEnabled('ps');

     $result = array();
     $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".
       " 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')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {

-      $dt = new DateAndTime(DB_DATEFORMAT);

       while ($val = $res->fetchRow()) {
       while ($val = $res->fetchRow()) {

-        //if ($addPaidStatus)
-        //  $val['paid'] = ttTimesheetHelper::isPaid($val['id']);

         $result[] = $val;
       }
     }
         $result[] = $val;
       }
     }


@@ -136,31 +128,25 @@ class ttTimesheetHelper {
   }
 
   // The getInactiveTimesheets obtains inactive timesheets for a user.
   }
 
   // The getInactiveTimesheets obtains inactive timesheets for a user.

-  static function getInactiveTimesheets($user_id)
+  static function getInactiveTimesheets()

   {
     global $user;
     $mdb2 = getConnection();
 
   {
     global $user;
     $mdb2 = getConnection();
 

+    $user_id = $user->getUser();

     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 

-    // $addPaidStatus = $user->isPluginEnabled('ps');

     $result = array();
     $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".
       " 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')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {

-      $dt = new DateAndTime(DB_DATEFORMAT);

       while ($val = $res->fetchRow()) {
       while ($val = $res->fetchRow()) {

-        //if ($addPaidStatus)
-        //  $val['paid'] = ttTimesheetHelper::isPaid($val['id']);

         $result[] = $val;
       }
     }
         $result[] = $val;
       }
     }


@@ -227,10 +213,10 @@ class ttTimesheetHelper {
 
     $timesheet_id = $fields['id']; // Timesheet we are updating.
     $name = $fields['name']; // Timesheet name.
 
     $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);
       ", status = ".$mdb2->quote($status).
       " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);