More timesheet related refactoring.

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 743477b2c58267254d0ef7fda5a69c032234260c..d03f8010ab7983e76a85f03c48a5924531d35b41 100644 (file)
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -181,24 +181,19 @@ class ttTimesheetHelper {
     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;
 

-    // Handle time records.
+    // Handle tt_log records.

     $sql = "update tt_log set timesheet_id = null".
     $sql = "update tt_log set timesheet_id = null".

-      " where timesheet_id = $timesheet_id and group_id = $group_id and org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Handle expense items.
-    $sql = "update tt_expense_items set timesheet_id = null".
-      " where timesheet_id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+      " where timesheet_id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";

     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Delete timesheet.
     $sql = "update tt_timesheets set status = null".
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Delete timesheet.
     $sql = "update tt_timesheets set status = null".

-      " where id = $timesheet_id and group_id = $group_id and org_id = $org_id";
+      " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";

     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }


@@ -208,6 +203,7 @@ class ttTimesheetHelper {
     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;
 


@@ -218,24 +214,11 @@ class ttTimesheetHelper {
 
     $sql = "update tt_timesheets set name = ".$mdb2->quote($name).", comment = ".$mdb2->quote($comment).
       ", status = ".$mdb2->quote($status).
 
     $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";
+      " where id = $timesheet_id and user_id = $user_id and group_id = $group_id and org_id = $org_id";

     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }
 

-  // isUserValid function is used during access checks and determines whether user id, passed in post, is valid
-  // in current context.
-  static function isUserValid($user_id) {
-    // We have to cover several situations.
-
-    global $user;
-
-    // TODO: we are currently re-designing timesheets.
-    // Clients are not supposed to view them at all.
-    // And the post will change on_behalf user, to keep things consistent.
-    return false;
-  }
-

   // getReportOptions prepares $options array to be used with ttReportHelper
   // to obtain items for timesheet view.
   static function getReportOptions($timesheet) {
   // getReportOptions prepares $options array to be used with ttReportHelper
   // to obtain items for timesheet view.
   static function getReportOptions($timesheet) {


@@ -245,11 +228,6 @@ class ttTimesheetHelper {
     $group_by_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 
     $options['timesheet_id'] = $timesheet['id'];
     $group_by_project = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
 
     $options['timesheet_id'] = $timesheet['id'];

-    $options['client_id'] = $timesheet['client_id'];
-    $options['users'] = $timesheet['user_id'];
-    $options['show_durarion'] = 1;
-    $options['show_cost'] = 1; // To include expenses.
-    $options['show_totals_only'] = 1;

     $options['group_by1'] = 'date';
     if ($group_by_client || $group_by_project) {
       $options['group_by2'] = $group_by_client ? 'client' : 'project';
     $options['group_by1'] = 'date';
     if ($group_by_client || $group_by_project) {
       $options['group_by2'] = $group_by_client ? 'client' : 'project';

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index e98faf235c3c86ab6b61d83295faf0b1464157be..c9463c886b0cba12dfb2b18854991b26ebbb5f54 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.4808 | 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.4809 | 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/WEB-INF/templates/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 76481eed93a670392561b49934584adf5b9f6fd4..3bd8ddd201a0b5ef62d0127cc185410d466434c7 100644 (file)
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -37,20 +37,17 @@
       <tr>
         <td class="tableHeader">{$group_by_header|escape}</td>
         <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>
       <tr>
         <td class="tableHeader">{$group_by_header|escape}</td>
         <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>

-        <td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>

       </tr>
   {foreach $subtotals as $subtotal}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
         <td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>
       </tr>
   {foreach $subtotals as $subtotal}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
         <td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>

-        <td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>

       </tr>
   {/foreach}
       <tr><td>&nbsp;</td></tr>
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
         <td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>
       </tr>
   {/foreach}
       <tr><td>&nbsp;</td></tr>
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
         <td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>

-        <td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>

       </tr>
       </table>
 
       </tr>
       </table>