_getValue refactoring + hiddenColumns in DataTable

Author: jcheron

Ajax/semantic/widgets/base/FieldAsTrait.php

@@ -114,12 +114,13 @@ public function fieldAsRating($index,$max=5, $icon=""){
 			return $this;
 	}
 
-	public function fieldAsLabel($index,$icon=NULL){
-		$this->setValueFunction($index,function($caption) use($icon){
-			$lbl=$this->_getLabelField($caption,$icon);
-			return $lbl;
-		});
-			return $this;
+	public function fieldAsLabel($index,$icon=NULL,$attributes=NULL){
+		return $this->_fieldAs(function($id,$name,$value) use($icon){
+			$lbl=new HtmlLabel($id,$value);
+			if(isset($icon))
+				$lbl->addIcon($icon);
+				return $lbl;
+		}, $index,$attributes,"label");
 	}
 
 	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){

Ajax/semantic/widgets/base/InstanceViewer.php

@@ -90,33 +90,37 @@ protected function _getDefaultValue($name,$value,$index){
 
 	protected function _getPropertyValue(\ReflectionProperty $property,$index){
 		$property->setAccessible(true);
-		$value=$property->getValue($this->instance);
-		if(isset($this->values[$index])){
-			$value= $this->values[$index]($value,$this->instance,$index);
-		}else{
-			$value=$this->_getDefaultValue($property->getName(),$value, $index);
-		}
-		return $value;
+		return $property->getValue($this->instance);
 	}
 
 	protected function _getValue($property,$index){
 		$value=null;
+		$propertyName=$property;
 		if($property instanceof \ReflectionProperty){
 			$value=$this->_getPropertyValue($property, $index);
-		}else{
-			if(\is_callable($property))
-				$value=$property($this->instance);
-			elseif(\is_array($property)){
-				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
-				$value=\implode("", $values);
-			}else{
-				if(isset($this->values[$index])){
-					$value= $this->values[$index]($property,$this->instance,$index);
-				}elseif(isset($this->instance->{$property})){
-					$value=$this->instance->{$property};
-				}
+			$propertyName=$property->getName();
+		}elseif(\is_callable($property))
+			$value=$property($this->instance);
+		elseif(\is_array($property)){
+			$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
+			$value=\implode("", $values);
+		}elseif(\is_string($property)){
+			$value=$property;
+			if(isset($this->instance->{$property})){
+				$value=$this->instance->{$property};
+			}elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){
+				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
+		return $this->_postGetValue($index, $propertyName, $value);
+	}
+
+	protected function _postGetValue($index,$propertyName,$value){
+		if(isset($this->values[$index])){
+			$value= $this->values[$index]($value,$this->instance,$index);
+		}else{
+			$value=$this->_getDefaultValue($propertyName,$value, $index);
+		}
 		if(isset($this->afterCompile[$index])){
 			if(\is_callable($this->afterCompile[$index])){
 				$this->afterCompile[$index]($value,$this->instance,$index);

Ajax/semantic/widgets/datatable/DataTable.php

@@ -37,6 +37,7 @@ class DataTable extends Widget {
 	protected $_json;
 	protected $_rowClass="";
 	protected $_sortable;
+	protected $_hiddenColumns;
 
 
 	public function __construct($identifier,$model,$modelInstance=NULL) {
@@ -117,12 +118,21 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 
 			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
-
+			if(isset($this->_hiddenColumns))
+				$this->_hideColumns();
 			$this->_generated=true;
 		}
 		return parent::compile($js,$view);
 	}
 
+	protected function _hideColumns(){
+		$table=$this->getTable();
+		foreach ($this->_hiddenColumns as $colIndex){
+			$table->hideColumn($colIndex);
+		}
+		return $this;
+	}
+
 	protected function _generateHeader(HtmlTable $table,$captions){
 		$table->setHeaderValues($captions);
 		if(isset($this->_sortable)){
@@ -407,7 +417,9 @@ public function setActiveRowSelector($class="active",$event="click",$multiple=fa
 	}
 
 	public function hideColumn($colIndex){
-		$this->getTable()->hideColumn($colIndex);
+		if(!\is_array($this->_hiddenColumns))
+			$this->_hiddenColumns=[];
+		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 

Ajax/service/JReflection.php

@@ -32,4 +32,8 @@ public static function jsonObject($classname){
 	public static function callMethod($object,$callback,array $values){
 		return \call_user_func_array([$object,$callback],$values);
 	}
+
+	public static function getterName($propertyName,$prefix="get"){
+		return $prefix.\ucfirst($propertyName);
+	}
 }