JReflection added + DataTable checkboxes update

Author: jcheron

Ajax/common/Widget.php

@@ -16,6 +16,7 @@
 use Ajax\JsUtils;
 use Ajax\semantic\html\collections\form\HtmlFormField;
 use Ajax\semantic\html\collections\form\traits\FormTrait;
+use Ajax\common\html\BaseWidget;
 
 abstract class Widget extends HtmlDoubleElement {
 	use FieldAsTrait,FormTrait;
@@ -181,6 +182,11 @@ public function getToolbar(){
 	 */
 	public function addInToolbar($element,$callback=NULL){
 		$tb=$this->getToolbar();
+		if($element instanceof BaseWidget){
+			if($element->getIdentifier()===""){
+				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
+			}
+		}
 		if(isset($callback)){
 			if(\is_callable($callback)){
 				$callback($element);

Ajax/common/html/HtmlCollection.php

@@ -4,6 +4,8 @@
 
 use Ajax\common\html\HtmlDoubleElement;
 use Ajax\service\JArray;
+use Ajax\JsUtils;
+use Ajax\service\JReflection;
 
 /**
  * Base class for Html collections
@@ -47,6 +49,14 @@ protected function getItemToAdd($item){
 		return $itemO;
 	}
 
+	protected function setItemIdentifier($item,$classname,$index){
+		if($item instanceof BaseWidget){
+			if($item->getIdentifier()===""){
+				$item->setIdentifier($classname."-".$this->identifier."-".$index);
+			}
+		}
+	}
+
 	/**
 	 * adds and returns an item
 	 * @param HtmlDoubleElement|string|array $item
@@ -158,4 +168,13 @@ public function setPropertyValues($property,$values){
 		}
 		return $this;
 	}
+
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		$index=0;
+		$classname=\strtolower(JReflection::shortClassName($this));
+		foreach ($this->content as $item){
+			$this->setItemIdentifier($item,$classname,$index++);
+		}
+		return parent::compile($js,$view);
+	}
 }

Ajax/php/ci/JsUtils.php

@@ -88,7 +88,7 @@ public function controller($controller, $name = '', $db_conn = FALSE){
 			if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){
 				continue;
 			}
-			if ($db_conn !== FALSE AND ! class_exists('CI_DB')){
+			if ($db_conn !== FALSE && ! class_exists('CI_DB')){
 				if ($db_conn === TRUE){
 					$db_conn = '';
 				}

Ajax/semantic/html/collections/form/traits/FormTrait.php

@@ -5,7 +5,13 @@
 use Ajax\semantic\html\collections\HtmlMessage;
 use Ajax\service\AjaxCall;
 use Ajax\JsUtils;
+use Ajax\semantic\html\elements\HtmlButton;
 
+/**
+ * trait used in Widget and HtmlForm
+ * @author jc
+ *
+ */
 trait FormTrait{
 
 	/**
@@ -80,10 +86,10 @@ public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseE
 		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
 	}
 
-	protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
 		$form=$this->getForm();
 		if(isset($url) && isset($responseElement)){
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');");
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
 			$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
 			if(\is_array($parameters))
 				$params=\array_merge($params,$parameters);

Ajax/semantic/html/elements/HtmlButtonGroups.php

@@ -21,7 +21,7 @@ public function __construct($identifier, $elements=array(), $asIcons=false) {
 		$this->addElements($elements, $asIcons);
 	}
 	protected function createItem($value){
-		return new HtmlButton("button-" . $this->identifier . "-" . \sizeof($this->content), $value);
+		return new HtmlButton("", $value);
 	}
 
 
@@ -40,7 +40,7 @@ public function addElements($elements, $asIcons=false) {
 	}
 
 	public function insertOr($aferIndex=0, $or="or") {
-		$orElement=new HtmlSemDoubleElement("or-" . $this->identifier, "div", "or");
+		$orElement=new HtmlSemDoubleElement("", "div", "or");
 		$orElement->setProperty("data-text", $or);
 		array_splice($this->content, $aferIndex + 1, 0, array ($orElement ));
 		return $this;

Ajax/semantic/widgets/base/FieldAsTrait.php

@@ -18,6 +18,7 @@
 use Ajax\service\JArray;
 
 /**
+ * trait used in Widget
  * @author jc
  * @property InstanceViewer $_instanceViewer
  * @property boolean $_edition
@@ -29,7 +30,7 @@ abstract protected function _getFieldIdentifier($prefix,$name="");
 	abstract public function setValueFunction($index,$callback);
 	abstract protected function _getFieldName($index);
 	abstract protected function _getFieldCaption($index);
-	abstract protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL,$parameters=NULL);
+	abstract protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL);
 
 	/**
 	 * @param HtmlFormField $element

Ajax/semantic/widgets/datatable/DataTable.php

@@ -34,6 +34,7 @@ class DataTable extends Widget {
 	protected $_hasCheckedMessage=false;
 	protected $_targetSelector;
 	protected $_checkedMessage;
+	protected $_checkedClass;
 
 	public function __construct($identifier,$model,$modelInstance=NULL) {
 		parent::__construct($identifier, $model,$modelInstance);
@@ -66,6 +67,9 @@ protected function _runCheckboxes(JsUtils $js){
 						\$('#checked-count-".$this->identifier."').contents().filter(function() {return this.nodeType == 3;}).each(function(){this.textContent = msg.replace('{count}',count);});
 								\$('#toolbar-{$this->identifier} .visibleOnChecked').toggle(count>0);}\$('#toolbar-".$this->identifier." .visibleOnChecked').hide();";
 			$checkedMessageCall="updateChecked();";
+			if(isset($this->_checkedClass)){
+				$checkedMessageCall.="$(this).closest('tr').toggleClass('".$this->_checkedClass."',$(this).prop('checked'));";
+			}
 			$js->exec($checkedMessageFunction,true);
 		}
 		$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
@@ -135,11 +139,20 @@ private function _generateMainCheckbox(&$captions){
 		$checkedMessageCall="";
 		if($this->_hasCheckedMessage)
 			$checkedMessageCall="updateChecked();";
-		$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);".$checkedMessageCall);
-		$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);".$checkedMessageCall);
+
+		$ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall);
+		$ck->setOnUnchecked($this->_setAllChecked("false").$checkedMessageCall);
 		\array_unshift($captions, $ck);
 	}
 
+	private function _setAllChecked($checked){
+		$result="$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',".$checked.");";
+		if(isset($this->_checkedClass)){
+			$result.="$('#".$this->identifier." tr').toggleClass('".$this->_checkedClass."',".$checked.");";
+		}
+		return $result;
+	}
+
 	protected function _generateContent($table){
 		$objects=$this->_modelInstance;
 		if(isset($this->_pagination)){
@@ -344,5 +357,8 @@ public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=nu
 		$this->addInToolbar($element,$callback);
 	}
 
-
+	public function setCheckedClass($_checkedClass) {
+		$this->_checkedClass=$_checkedClass;
+		return $this;
+	}
 }

Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php

@@ -5,6 +5,7 @@
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 
 /**
+ * trait used in DataTable
  * @author jc
  * @property array $_deleteBehavior
  * @property array $_editBehavior
@@ -145,7 +146,7 @@ private function getDefaultButton($icon,$class=null,$visibleHover=true){
 	 * @param boolean $visibleHover
 	 * @param array $deleteBehavior
 	 * @param callable $callback
-	 * @return \Ajax\semantic\widgets\datatable\DataTableFieldAsTrait
+	 * @return DataTable
 	 */
 	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
 		$this->_deleteBehavior=$deleteBehavior;

Ajax/service/JReflection.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Ajax\service;
+
+class JReflection {
+	public static function shortClassName($object){
+		$classNameWithNamespace = get_class($object);
+		return substr($classNameWithNamespace, strrpos($classNameWithNamespace, '\\')+1);
+	}
+}