More refactoring on timesheet code.

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index e2af4e72e2bbc3e5b35e6f0c4b30ccac98611391..743477b2c58267254d0ef7fda5a69c032234260c 100644 (file)
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -83,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.


@@ -102,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;
       }
     }


@@ -134,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.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 = 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;
       }
     }

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c801c7659543151558dbcba26784328d86a1beae..e98faf235c3c86ab6b61d83295faf0b1464157be 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.18.50.4807 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.50.4808 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/timesheet_view.php b/timesheet_view.php
index 57eff61c7e6f65fc05475b91ade0f25047c6d2fc..e6368a396439687d617f61481592757675b30c4a 100644 (file)
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -28,6 +28,7 @@
 
 require_once('initialize.php');
 import('ttTimesheetHelper');
 
 require_once('initialize.php');
 import('ttTimesheetHelper');

+import('ttReportHelper');

 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {

diff --git a/timesheets.php b/timesheets.php
index 650575e699825cd998097e46d8af3d6ed5f4ff11..b3b47772f9ef152db107e723d8ec0d1035aac896 100644 (file)
--- a/timesheets.php
+++ b/timesheets.php
@@ -90,8 +90,8 @@ if ($user->can('track_time')) {
   }
 }
 
   }
 }
 

-$active_timesheets = ttTimesheetHelper::getActiveTimesheets($user_id);
-$inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets($user_id);
+$active_timesheets = ttTimesheetHelper::getActiveTimesheets();
+$inactive_timesheets = ttTimesheetHelper::getInactiveTimesheets();

 
 $showClient = $user->isPluginEnabled('cl');
 
 
 $showClient = $user->isPluginEnabled('cl');