From: anuko <support@anuko.com>
Date: Sat, 6 Jan 2018 16:05:51 +0000 (+0000)
Subject: Refactoring. Moved 2 more functions to ttWeekViewHelper class.
X-Git-Tag: timetracker_1.19-1~1399
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=621c2592fb3db0dfdea6be497381d847938f708c;p=timetracker.git

Refactoring. Moved 2 more functions to ttWeekViewHelper class.
---

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index bf0b2e17..3cc2f15d 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -922,42 +922,6 @@ class ttTimeHelper {
     return $record_identifier;
   }
 
-  // getDayHeadersForWeek - obtains day column headers for week view, which are simply day numbers in month.
-  static function getDayHeadersForWeek($start_date) {
-    $dayHeaders = array();
-    $objDate = new DateAndTime(DB_DATEFORMAT, $start_date);
-    $dayHeaders[] = (string) $objDate->getDate(); // It returns an int on first call.
-    if (strlen($dayHeaders[0]) == 1)              // Which is an implementation detail of DateAndTime class.
-      $dayHeaders[0] = '0'.$dayHeaders[0];        // Add a 0 for single digit day.
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate(); // After incDay it returns a string with leading 0, when necessary.
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    $objDate->incDay();
-    $dayHeaders[] = $objDate->getDate();
-    unset($objDate);
-    return $dayHeaders;
-  }
-
-    // getLockedDaysForWeek - builds an array of locked days in week.
-  static function getLockedDaysForWeek($start_date) {
-    global $user;
-    $lockedDays = array();
-    $objDate = new DateAndTime(DB_DATEFORMAT, $start_date);
-    for ($i = 0; $i < 7; $i++) {
-      $lockedDays[] = $user->isDateLocked($objDate);
-      $objDate->incDay();
-    }
-    unset($objDate);
-    return $lockedDays;
-  }
-
   // getDayTotals calculates total durations for each day from the existing data in $dataArray.
   static function getDayTotals($dataArray, $dayHeaders) {
     $dayTotals = array();
diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index e74a3de1..b6dfdd73 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -29,6 +29,42 @@
 // ttWeekViewHelper class groups together functions used in week view.
 class ttWeekViewHelper {
 
+  // getDayHeadersForWeek - obtains day column headers for week view, which are simply day numbers in month.
+  static function getDayHeadersForWeek($start_date) {
+    $dayHeaders = array();
+    $objDate = new DateAndTime(DB_DATEFORMAT, $start_date);
+    $dayHeaders[] = (string) $objDate->getDate(); // It returns an int on first call.
+    if (strlen($dayHeaders[0]) == 1)              // Which is an implementation detail of DateAndTime class.
+      $dayHeaders[0] = '0'.$dayHeaders[0];        // Add a 0 for single digit day.
+    $objDate->incDay();
+    $dayHeaders[] = $objDate->getDate(); // After incDay it returns a string with leading 0, when necessary.
+    $objDate->incDay();
+    $dayHeaders[] = $objDate->getDate();
+    $objDate->incDay();
+    $dayHeaders[] = $objDate->getDate();
+    $objDate->incDay();
+    $dayHeaders[] = $objDate->getDate();
+    $objDate->incDay();
+    $dayHeaders[] = $objDate->getDate();
+    $objDate->incDay();
+    $dayHeaders[] = $objDate->getDate();
+    unset($objDate);
+    return $dayHeaders;
+  }
+
+  // getLockedDaysForWeek - builds an array of locked days in week.
+  static function getLockedDaysForWeek($start_date) {
+    global $user;
+    $lockedDays = array();
+    $objDate = new DateAndTime(DB_DATEFORMAT, $start_date);
+    for ($i = 0; $i < 7; $i++) {
+      $lockedDays[] = $user->isDateLocked($objDate);
+      $objDate->incDay();
+    }
+    unset($objDate);
+    return $lockedDays;
+  }
+
   // 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.
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c3a62297..50c4b126 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.3722 | 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.3723 | 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>
diff --git a/week.php b/week.php
index b8831072..0a69d58e 100644
--- a/week.php
+++ b/week.php
@@ -111,8 +111,8 @@ $cl_note = trim($request->getParameter('note'));
 
 // Get the data we need to display week view.
 // Get column headers, which are day numbers in month.
-$dayHeaders = ttTimeHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
-$lockedDays = ttTimeHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
+$dayHeaders = ttWeekViewHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
+$lockedDays = ttWeekViewHelper::getLockedDaysForWeek($startDate->toString(DB_DATEFORMAT));
 // Build data array for the table. Format is described in the function..
 $dataArray = ttTimeHelper::getDataForWeekView($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT), $dayHeaders);
 // Build day totals (total durations for each day in week).