Refactoring. Moved 2 more functions to ttWeekViewHelper class.

[timetracker.git] / week.php

diff --git a/week.php b/week.php
index 5d1e29ff857feaabe094accdfade80fe92ed2e83..0a69d58e3d3dacdad86c2ca2b027d3740dcc9b64 100644 (file)
--- a/week.php
+++ b/week.php
@@ -33,6 +33,7 @@ import('form.Table');
 import('form.TextField');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttWeekViewHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -110,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).
@@ -128,7 +129,7 @@ class LabelCellRenderer extends DefaultCellRenderer {
     // Special handling for not billable entries.
     if ($row > 0) {
       $row_id = $table->getValueAtName($row,'row_id');
-      $billable = ttTimeHelper::parseFromWeekViewRow($row_id, 'bl');
+      $billable = ttWeekViewHelper::parseFromWeekViewRow($row_id, 'bl');
       if (!$billable) {
         $this->setOptions(array('style'=>'color: red;')); // TODO: style it properly in CSS.
       }