X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/6d39778a39a1ac2441b00150ca8ecdb049d655fe..621c2592fb3db0dfdea6be497381d847938f708c:/WEB-INF/lib/ttTimeHelper.class.php

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 35900f87..3cc2f15d 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,92 +922,6 @@ class ttTimeHelper {
     return $record_identifier;
   }
 
-  // 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.
-  static function parseFromWeekViewRow($row_id, $field_label) {
-    // Find beginning of label.
-    $pos = strpos($row_id, $field_label);
-    if ($pos === false) return null; // Not found.
-
-    // Strip suffix from row id.
-    $suffixPos = strrpos($row_id, '_');
-    if ($suffixPos)
-      $remaninder = substr($row_id, 0, $suffixPos);
-
-    // Find beginning of value.
-    $posBegin = 1 + strpos($remaninder, ':', $pos);
-    // Find end of value.
-    $posEnd = strpos($remaninder, ',', $posBegin);
-    if ($posEnd === false) $posEnd = strlen($remaninder);
-    // Return value.
-    return substr($remaninder, $posBegin, $posEnd - $posBegin);
-  }
-
-  // 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();
-    $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();
@@ -1070,10 +984,10 @@ class ttTimeHelper {
     $fields4insert['user_id'] = $user->getActiveUser();
     $fields4insert['date'] = $entry_date;
     $fields4insert['duration'] = $fields['duration'];
-    $fields4insert['client'] = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'cl');
-    $fields4insert['billable'] = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'bl');
-    $fields4insert['project'] = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'pr');
-    $fields4insert['task'] = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'ts');
+    $fields4insert['client'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cl');
+    $fields4insert['billable'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'bl');
+    $fields4insert['project'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'pr');
+    $fields4insert['task'] = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'ts');
     $fields4insert['note'] = $fields['note'];
 
     // Try to insert a record.
@@ -1082,7 +996,7 @@ class ttTimeHelper {
 
     // Insert custom field if we have it.
     $result = true;
-    $cf_1 = ttTimeHelper::parseFromWeekViewRow($fields['row_id'], 'cf_1');
+    $cf_1 = ttWeekViewHelper::parseFromWeekViewRow($fields['row_id'], 'cf_1');
     if ($custom_fields && $cf_1) {
       if ($custom_fields->fields[0]['type'] == CustomFields::TYPE_TEXT)
         $result = $custom_fields->insert($id, $custom_fields->fields[0]['id'], null, $cf_1);