Some further refactoring in form classes.

[timetracker.git] / WEB-INF / lib / form / Table.class.php

diff --git a/WEB-INF/lib/form/Table.class.php b/WEB-INF/lib/form/Table.class.php
index 833bffa..807e2c7 100644 (file)
--- a/WEB-INF/lib/form/Table.class.php
+++ b/WEB-INF/lib/form/Table.class.php
@@ -41,7 +41,7 @@ class Table extends FormElement {
   var $mBgColor       = '#ffffff';
   var $mBgColorOver   = '#eeeeff';
   var $mWidth         = '';
-  var $cClassName     = 'Table';
+  var $class = 'Table';
   var $mTableOptions  = array();
   var $mRowOptions    = array();
   var $mHeaderOptions = array();
@@ -49,7 +49,7 @@ class Table extends FormElement {
        
   function __construct($name, $value='') {
     $this->name = $name;
-    $this->mValue = $value;
+    $this->value = $value;
   }
   
   function setKeyField($value) {
@@ -95,11 +95,11 @@ class Table extends FormElement {
   }
 
   function _process() {
-       $this->mProccessed = true;
+    $this->mProccessed = true;
        
-       if ($this->mInteractive) {
+    if ($this->mInteractive) {
       // Add a column of clickable checkboxes.
-      $column = new TableColumn("","<input type=\"checkbox\" name=\"".$this->getName()."_all\" onclick=\"setAll(this.checked)\">");
+      $column = new TableColumn("","<input type=\"checkbox\" name=\"".$this->name."_all\" onclick=\"setAll(this.checked)\">");
       import('form.CheckboxCellRenderer');
       $cb = new CheckboxCellRenderer();
       if ($this->getIAScript()) $cb->setOnChangeAdd($this->getIAScript()."(this)");
@@ -114,8 +114,7 @@ class Table extends FormElement {
     }
   }
   
-  function toStringControl() {
-    if (!$this->isRenderable()) return "";
+  function getHtml() {
     if (!$this->mProccessed) $this->_process();
     
     $html = "";
@@ -160,8 +159,8 @@ class Table extends FormElement {
         if (0 == $col && strtolower(get_class($this->mColumns[$col]->getRenderer())) == 'checkboxcellrenderer') {
           // Checkbox for the row. Determine if selected.
           $selected = false;
-          if (is_array($this->mValue)) {
-            foreach ($this->mValue as $p) {
+          if (is_array($this->value)) {
+            foreach ($this->value as $p) {
               if ($p == $this->mData[$row][$this->mKeyField]) {
                $selected = true;
                break;
@@ -191,7 +190,7 @@ class Table extends FormElement {
     // setAll - checks / unchecks all checkboxes in the table.
     $html .= "function setAll(value) {\n";
     $html .= "\tfor (var i = 0; i < ".$this->getFormName().".elements.length; i++) {\n";
-    $html .= "\t\tif ((".$this->getFormName().".elements[i].type=='checkbox') && (".$this->getFormName().".elements[i].name=='".$this->getName()."[]')) {\n";
+    $html .= "\t\tif ((".$this->getFormName().".elements[i].type=='checkbox') && (".$this->getFormName().".elements[i].name=='".$this->name."[]')) {\n";
     $html .= "\t\t\t".$this->getFormName().".elements[i].checked=value;\n";
     if ($this->getIAScript()) {
       $html .= "\t\t\t".$this->getIAScript()."(".$this->getFormName().".elements[i]);\n";