Refactoring timesheet related code.

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 78e7901654eef5dbba68cfb98176f3a557c6c9ad..e2af4e72e2bbc3e5b35e6f0c4b30ccac98611391 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();


@@ -150,7 +148,7 @@ class ttTimesheetHelper {
     if ($user->isClient())
       $client_part = "and ts.client_id = $user->client_id";
 
     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";
       " 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.
 
     $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);

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ac521a4b421242694437ff869f77f643be7c5fb9..c801c7659543151558dbcba26784328d86a1beae 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.4806 | 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.4807 | 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_add.php b/timesheet_add.php
index 294886be754ece683846bd8441d0c54bdddf51f0..09a2d384837309847269c564771cb8241364e05f 100644 (file)
--- 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 (!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,
   $fields = array('user_id' => $user_id,
     'name' => $cl_name,
     'client_id' => $cl_client,

diff --git a/timesheet_edit.php b/timesheet_edit.php
index d275ce5f8fb9d9bf167b5271092212256e5d8f62..7919125a9ed6e28d3538b595baa71bc6764f3240 100644 (file)
--- 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_status = $request->getParameter('status');
 } else {
   $cl_name = $timesheet['name'];

-  $cl_comment = $timesheet['submitter_comment'];
+  $cl_comment = $timesheet['comment'];

   $cl_status = $timesheet['status'];
 }
 
   $cl_status = $timesheet['status'];
 }
 


@@ -73,13 +73,13 @@ if ($request->isPost()) {
 
   if ($request->getParameter('btn_save')) {
     if ($err->no()) {
 
   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,
       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();
            'status' => $cl_status))) {
            header('Location: timesheets.php');
            exit();