Work in progress enhancing week view.

[timetracker.git] / week.php

diff --git a/week.php b/week.php
index 3cb4ea73ea452185d6f1d623d51ec61bcaa82ba7..1b014d2bfe14b31459db0c2a1b5187d87f8f77fb 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.
-    /* // TODO: this does not work and should be coded properly.
     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) {
-        $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();
   }
@@ -149,7 +148,7 @@ class TimeCellRenderer extends DefaultCellRenderer {
     if ($lockedDays[$column-1])
       $field->setEnabled(false);
     $field->setFormName($table->getFormName());
-    $field->setSize(2);
+    $field->setStyle('width: 60px;'); // TODO: need to style everything properly, eventually.
     $field->setValue($table->getValueAt($row,$column)['duration']);
     // Disable control when time entry mode is TYPE_START_FINISH and there is no value in control
     // because we can't supply start and finish times in week view - there are no fields for them.
@@ -180,7 +179,7 @@ if ($user->canManageTeam()) {
 }
 
 // Create week_durations table.
-$table = new Table('week_durations');
+$table = new Table('week_durations', 'week_view_table');
 // $table->setIAScript('markModified'); // TODO: write a script to mark table or particular cells as modified.
 $table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
 $table->setRowOptions(array('class'=>'tableHeaderCentered'));