Temporary fix for not billable entries in week view.

diff --git a/WEB-INF/lib/form/Table.class.php b/WEB-INF/lib/form/Table.class.php
index e5aed81dc67b894bbc77bc1820099579a498c6c3..1e692c3167ddce94687c367621a0f31e3a693afd 100644 (file)
--- a/WEB-INF/lib/form/Table.class.php
+++ b/WEB-INF/lib/form/Table.class.php
@@ -53,11 +53,11 @@ class Table extends FormElement {
   }
   
   function setKeyField($value) {
   }
   
   function setKeyField($value) {

-       $this->mKeyField = $value;
+    $this->mKeyField = $value;

   }
   
   function setData($data) {
   }
   
   function setData($data) {

-       if (is_array($data) && isset($data[0]) && is_array($data[0]))
+    if (is_array($data) && isset($data[0]) && is_array($data[0]))

       $this->mData = &$data;
   }
   
       $this->mData = &$data;
   }
   

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index e726b92fba6eb8c28d39100401cddb8883cd9045..ba678fcbc3fc8b45c12209b9ed449f0a52807e92 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -810,9 +810,9 @@ class ttTeamHelper {
     $inactive_teams = array();
     $mdb2 = getConnection();
 
     $inactive_teams = array();
     $mdb2 = getConnection();
 

-    // Get all team ids for teams created or modified more than 1 year ago.
+    // Get all team ids for teams created or modified more than 6 months ago.

     // $ts = date('Y-m-d', strtotime('-1 year'));
     // $ts = date('Y-m-d', strtotime('-1 year'));

-    $ts = date('Y-m-d', strtotime('-4 month'));
+    $ts = date('Y-m-d', strtotime('-6 month'));

     $sql =  "select id from tt_teams where timestamp < '$ts' order by id";
     $res = $mdb2->query($sql);
 
     $sql =  "select id from tt_teams where timestamp < '$ts' order by id";
     $res = $mdb2->query($sql);
 

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 1d0b382e82636c38492e6a97117f394067456e17..da58a09bf89d64bb7ab5ba74b4d88ff30a8bc30d 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.13.3.3712| Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.13.4.3713| 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/week.php b/week.php
index 3cb4ea73ea452185d6f1d623d51ec61bcaa82ba7..bc1e4717c75a0887c538c142f06db429d6cde245 100644 (file)
--- a/week.php
+++ b/week.php
@@ -126,14 +126,13 @@ class LabelCellRenderer extends DefaultCellRenderer {
       $this->setOptions(array('style'=>'text-align: center; font-weight: bold;'));
     }
     // Special handling for not billable entries.
       $this->setOptions(array('style'=>'text-align: center; font-weight: bold;'));
     }
     // Special handling for not billable entries.

-    /* // TODO: this does not work and should be coded properly.

     if ($row > 0) {
     if ($row > 0) {

-      $row_id = $table->getValueAt($row,1+$column)['row_id'];
+      $row_id = $table->getValueAtName($row,'row_id');

       $billable = ttTimeHelper::parseFromWeekViewRow($row_id, 'bl');
       if (!$billable) {
       $billable = ttTimeHelper::parseFromWeekViewRow($row_id, 'bl');
       if (!$billable) {

-        $this->setOptions(array('class'=>'not_billable')); // TODO: Should not we add options instead? How does it work exactly?
+        $this->setOptions(array('style'=>'color: red;')); // TODO: style it properly in CSS.

       }
       }

-    }*/
+    }

     $this->setValue(htmlspecialchars($value)); // This escapes HTML for output.
     return $this->toString();
   }
     $this->setValue(htmlspecialchars($value)); // This escapes HTML for output.
     return $this->toString();
   }