DataTable identifier bug fixed

Author: jcheron

Ajax/semantic/html/collections/HtmlTable.php

@@ -8,6 +8,7 @@
 use Ajax\JsUtils;
 
 use Ajax\service\JArray;
+use Ajax\semantic\html\content\table\HtmlTR;
 
 /**
  * Semantic HTML Table component
@@ -18,13 +19,15 @@ class HtmlTable extends HtmlSemDoubleElement {
 	private $_colCount;
 	private $_compileParts;
 	private $_footer;
+	private $_afterCompileEvents;
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
 		$this->content=array ();
 		$this->setRowCount($rowCount, $colCount);
 		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
 		$this->_compileParts=["thead","tbody","tfoot"];
+		$this->_afterCompileEvents=[];
 	}
 
 	/**
@@ -108,12 +111,12 @@ public function getRow($rowIndex) {
 	/**
 	 * Adds a new row and sets $values to his cols
 	 * @param array $values
-	 * @return \Ajax\semantic\html\collections\HtmlTable
+	 * @return HtmlTR
 	 */
 	public function addRow($values=array()) {
 		$row=$this->getBody()->addRow($this->_colCount);
 		$row->setValues(\array_values($values));
-		return $this;
+		return $row;
 	}
 
 	/**
@@ -278,10 +281,15 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 	public function fromDatabaseObject($object, $function) {
 		$result=$function($object);
 		if (\is_array($result)) {
-			return $this->addRow($function($object));
+			$result= $this->addRow($function($object));
 		} else {
-			return $this->getBody()->_addRow($result);
+			$result= $this->getBody()->_addRow($result);
+		}
+		if(isset($this->_afterCompileEvents["onNewRow"])){
+			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
+				$this->_afterCompileEvents["onNewRow"]($result,$object);
 		}
+		return $result;
 	}
 
 	/**
@@ -305,4 +313,14 @@ public function run(JsUtils $js){
 		return $result;
 	}
 
+	/**
+	 * The callback function called after the insertion of each row when fromDatabaseObjects is called
+	 * callback function takes the parameters $row : the row inserted and $object: the instance of model used
+	 * @param callable $callback
+	 * @return \Ajax\semantic\html\collections\HtmlTable
+	 */
+	public function onNewRow($callback) {
+		$this->_afterCompileEvents["onNewRow"]=$callback;
+		return $this;
+	}
 }

Ajax/semantic/widgets/datatable/DataTable.php

@@ -13,6 +13,7 @@
 use Ajax\semantic\html\base\constants\Direction;
 use Ajax\service\JArray;
 use Ajax\semantic\widgets\base\FieldAsTrait;
+use Ajax\semantic\html\base\HtmlSemDoubleElement;
 
 /**
  * DataTable widget for displaying list of objects
@@ -94,6 +95,7 @@ private function _generateContent($table){
 		InstanceViewer::setIndex(0);
 		$table->fromDatabaseObjects($objects, function($instance){
 			$this->_instanceViewer->setInstance($instance);
+			InstanceViewer::$index++;
 			$result= $this->_instanceViewer->getValues();
 			if($this->_hasCheckboxes){
 				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
@@ -227,21 +229,25 @@ public function refresh($compileParts=["tbody"]){
 	 * @return callable
 	 */
 	private function getFieldButtonCallable($caption,$callback=null){
-		return $this->getCallable($this->getFieldButton($caption),$callback);
+		return $this->getCallable("getFieldButton",[$caption],$callback);
 	}
 
 	/**
 	 * @param mixed $object
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($object,$callback=null){
-		$result=function($instance) use($object,$callback){
+	private function getCallable($thisCallback,$parameters,$callback=null){
+		$result=function($instance) use($thisCallback,$parameters,$callback){
+			$object=call_user_func_array(array($this,$thisCallback), $parameters);
 			if(isset($callback)){
 				if(\is_callable($callback)){
 					$callback($object,$instance);
 				}
 			}
+			if($object instanceof HtmlSemDoubleElement){
+				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
+			}
 			return $object;
 		};
 		return $result;
@@ -252,9 +258,7 @@ private function getCallable($object,$callback=null){
 	 * @return HtmlButton
 	 */
 	private function getFieldButton($caption){
-			$bt=new HtmlButton("",$caption);
-			$bt->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
-			return $bt;
+		return new HtmlButton("",$caption);
 	}
 
 	/**
@@ -264,7 +268,7 @@ private function getFieldButton($caption){
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
 	 */
 	public function addFieldButton($caption,$callback=null){
-		$this->addField($this->getFieldButtonCallable($caption,$callback));
+		$this->addField($this->getCallable("getFieldButton",[$caption],$callback));
 		return $this;
 	}
 
@@ -293,14 +297,12 @@ public function insertInFieldButton($index,$caption,$callback=null){
 	}
 
 	private function addDefaultButton($icon,$class=null,$callback=null){
-		$bt=$this->getDefaultButton($icon,$class);
-		$this->addField($this->getCallable($bt,$callback));
+		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$callback));
 		return $this;
 	}
 
 	private function insertDefaultButtonIn($index,$icon,$class=null,$callback=null){
-		$bt=$this->getDefaultButton($icon,$class);
-		$this->insertInField($index,$this->getCallable($bt,$callback));
+		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class],$callback));
 		return $this;
 	}
 
@@ -399,4 +401,15 @@ public function setSortable($colIndex=NULL) {
 	protected function _getFieldIdentifier($prefix){
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
+
+	/**
+	 * The callback function called after the insertion of each row when fromDatabaseObjects is called
+	 * callback function takes the parameters $row : the row inserted and $object: the instance of model used
+	 * @param callable $callback
+	 * @return DataTable
+	 */
+	public function onNewRow($callback) {
+		$this->content["table"]->onNewRow($callback);
+		return $this;
+	}
 }

Ajax/semantic/widgets/datatable/InstanceViewer.php

@@ -10,7 +10,7 @@ class InstanceViewer {
 	private $visibleProperties;
 	private $values;
 	private $afterCompile;
-	private static $index=0;
+	public static $index=0;
 
 	public function __construct($instance=NULL,$captions=NULL){
 		$this->values=[];
@@ -60,7 +60,6 @@ public function getIdentifier(){
 		$value=self::$index;
 		if(isset($this->values["identifier"]))
 			$value=$this->values["identifier"](self::$index,$this->instance);
-		self::$index++;
 		return $value;
 	}