From: anuko <support@anuko.com>
Date: Sat, 6 Jan 2018 15:47:10 +0000 (+0000)
Subject: Refactoring in progress. Moved one more function to ttWeekViewHelper class.
X-Git-Tag: timetracker_1.19-1~1400
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0d4a0c7b9c3486e590c311273bc78109340263dd;p=timetracker.git

Refactoring in progress. Moved one more function to ttWeekViewHelper class.
---

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index f1c00375..bf0b2e17 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -859,7 +859,7 @@ class ttTimeHelper {
       // Find row.
       $pos = ttTimeHelper::findRow($record_id, $dataArray);
       if ($pos < 0) {
-        $dataArray[] = array('row_id' => $record_id,'label' => ttTimeHelper::makeRecordLabel($record)); // Insert row.
+        $dataArray[] = array('row_id' => $record_id,'label' => ttWeekViewHelper::makeRowLabel($record)); // Insert row.
         $pos = ttTimeHelper::findRow($record_id, $dataArray);
         // Insert empty cells with proper control ids.
         for ($i = 0; $i < 7; $i++) {
@@ -922,34 +922,6 @@ class ttTimeHelper {
     return $record_identifier;
   }
 
-  // makeRecordLabel - builds a human readable label for a row in week view,
-  // which is a combination ot record properties.
-  // Client - Project - Task - Custom field 1.
-  // Note that billable property is not part of the label. Instead, we intend to
-  // identify such records with a different color in week view.
-  static function makeRecordLabel($record) {
-    global $user;
-    // Start with client.
-    if ($user->isPluginEnabled('cl'))
-      $label = $record['client'];
-
-    // Add project.
-    if (!empty($label) && !empty($record['project'])) $label .= ' - ';
-    $label .= $record['project'];
-
-    // Add task.
-    if (!empty($label) && !empty($record['task'])) $label .= ' - ';
-    $label .= $record['task'];
-
-    // Add custom field 1.
-    if ($user->isPluginEnabled('cf')) {
-      if (!empty($label) && !empty($record['cf_1_value'])) $label .= ' - ';
-      $label .= $record['cf_1_value'];
-    }
-
-    return $label;
-  }
-
   // getDayHeadersForWeek - obtains day column headers for week view, which are simply day numbers in month.
   static function getDayHeadersForWeek($start_date) {
     $dayHeaders = array();
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 7b9537f9..e74a3de1 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -29,6 +29,34 @@
 // ttWeekViewHelper class groups together functions used in week view.
 class ttWeekViewHelper {
 
+  // makeRowLabel - builds a human readable label for a row in week view,
+  // which is a combination ot record properties.
+  // Client - Project - Task - Custom field 1.
+  // Note that billable property is not part of the label. Instead,
+  // we identify such records with a different color in week view.
+  static function makeRowLabel($record) {
+    global $user;
+    // Start with client.
+    if ($user->isPluginEnabled('cl'))
+      $label = $record['client'];
+
+    // Add project.
+    if (!empty($label) && !empty($record['project'])) $label .= ' - ';
+    $label .= $record['project'];
+
+    // Add task.
+    if (!empty($label) && !empty($record['task'])) $label .= ' - ';
+    $label .= $record['task'];
+
+    // Add custom field 1.
+    if ($user->isPluginEnabled('cf')) {
+      if (!empty($label) && !empty($record['cf_1_value'])) $label .= ' - ';
+      $label .= $record['cf_1_value'];
+    }
+
+    return $label;
+  }
+
   // parseFromWeekViewRow - obtains field value encoded in row identifier.
   // For example, for a row id like "cl:546,bl:0,pr:23456,ts:27464,cf_1:example text"
   // requesting a client "cl" should return 546.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index cbdf9c61..c3a62297 100644
--- 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>
-          <td align="center">&nbsp;Anuko Time Tracker 1.13.7.3721 | 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.7.3722 | 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>