JsonDataTable widget added

jcheron · jcheron · commit 57dcebf1eadb · 2017-03-06T00:57:41.000+01:00
+ fixed jsCallback
+ __field__ replace [[field]] for json requests
diff --git a/Ajax/Jquery.php b/Ajax/Jquery.php
@@ -259,6 +259,17 @@ public function _compile(&$view=NULL, $view_var='script_foot', $script_tags=TRUE
 		return $output;
 	}
 
+	public function getScript($offset=0){
+		$code=$this->jquery_code_for_compile;
+		if($offset>0)
+			$code=\array_slice($code, $offset);
+		return implode('', $code);
+	}
+
+	public function scriptCount(){
+		return \sizeof($this->jquery_code_for_compile);
+	}
+
 	private function defer($script){
 		$result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};";
 		$result.="window.defer(function(){".$script."})";
diff --git a/Ajax/JsUtils.php b/Ajax/JsUtils.php
@@ -256,6 +256,14 @@ public function clear_compile() {
 		$this->js->_clear_compile();
 	}
 
+	public function getScript($offset=0){
+		return $this->js->getScript($offset);
+	}
+
+	public function scriptCount(){
+		return $this->js->scriptCount();
+	}
+
 	/**
 	 * Outputs a <script> tag
 	 *
diff --git a/Ajax/common/traits/JqueryAjaxTrait.php b/Ajax/common/traits/JqueryAjaxTrait.php
@@ -177,9 +177,10 @@ public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $js
 		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$retour.=$parent.".find('._json').remove();";
-		$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n;newElm.addClass('_json');\n";
+		$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
+				newElm.attr('id',newId);\n;newElm.addClass('_json').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
 		$retour.= $appendTo;
-		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
+		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
 		if ($immediatly)
diff --git a/Ajax/semantic/html/collections/menus/HtmlMenu.php b/Ajax/semantic/html/collections/menus/HtmlMenu.php
@@ -236,7 +236,7 @@ public function getItemHeader() {
 	}
 
 	public function run(JsUtils $js){
-		$this->onClick('if(!$(this).hasClass("dropdown")){$(this).addClass("active").siblings().removeClass("active");}');
+		$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false);
 		$result= parent::run($js);
 		return $result->setItemSelector(".item");
 	}
diff --git a/Ajax/semantic/html/collections/menus/HtmlPaginationMenu.php b/Ajax/semantic/html/collections/menus/HtmlPaginationMenu.php
@@ -17,8 +17,9 @@ public function __construct( $identifier, $items=array() ){
 	 * @see \Ajax\common\html\BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL,&$view=NULL){
-		$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]));
-		$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([\sizeof($this->content)-2,$this->_page+1]));
+		$max=\sizeof($this->content);
+		$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active");
+		$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active");
 		$this->asPagination();
 		return parent::compile($js,$view);
 	}
diff --git a/Ajax/semantic/html/content/table/HtmlTD.php b/Ajax/semantic/html/content/table/HtmlTD.php
@@ -14,6 +14,8 @@ class HtmlTD extends HtmlSemDoubleElement {
 	private $_container;
 	private $_row;
 	private $_col;
+	private $_colMerged=false;
+	private $_rowMerged=false;
 
 	/**
 	 *
@@ -38,6 +40,11 @@ public function setValue($value) {
 		return $this;
 	}
 
+	public function addValue($value) {
+		$this->addContent($value);
+		return $this;
+	}
+
 	public function setRowspan($rowspan) {
 		$to=min($this->_container->count(), $this->_row + $rowspan - 1);
 		for($i=$to; $i > $this->_row; $i--) {
@@ -48,11 +55,19 @@ public function setRowspan($rowspan) {
 	}
 
 	public function mergeRow() {
-		return $this->setRowspan($this->_container->count());
+		if(!$this->_rowMerged){
+			$this->_rowMerged=true;
+			return $this->setRowspan($this->_container->count());
+		}
+		return $this->_container;
 	}
 
 	public function mergeCol() {
-		return $this->setColspan($this->_container->getRow($this->_row)->count());
+		if(!$this->_colMerged){
+			$this->_colMerged=true;
+			return $this->setColspan($this->_container->getRow($this->_row)->count());
+		}
+		return $this->_container;
 	}
 
 	public function setColspan($colspan) {
diff --git a/Ajax/semantic/html/content/table/HtmlTR.php b/Ajax/semantic/html/content/table/HtmlTR.php
@@ -64,6 +64,22 @@ public function setContainer($container, $row) {
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
+		return $this->_addOrSetValues($values, function(&$cell,$value){$cell->setValue($value);});
+	}
+
+	/**
+	 * Adds values to the row cols
+	 * @param mixed $values
+	 */
+	public function addValues($values=array()) {
+		return $this->_addOrSetValues($values, function(&$cell,$value){$cell->addValue($value);});
+	}
+
+	/**
+	 * Sets or adds values to the row cols
+	 * @param mixed $values
+	 */
+	protected function _addOrSetValues($values,$callback) {
 		$count=$this->count();
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
@@ -76,8 +92,9 @@ public function setValues($values=array()) {
 
 		for($i=0; $i < $count; $i++) {
 			$cell=$this->content[$i];
-			$cell->setValue($values[$i]);
+			$callback($cell,$values[$i]);
 		}
+		return $this;
 	}
 
 	/**
diff --git a/Ajax/semantic/html/content/table/HtmlTableContent.php b/Ajax/semantic/html/content/table/HtmlTableContent.php
@@ -125,6 +125,23 @@ public function setCellValue($row, $col, $value="") {
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
+		return $this->_addOrSetValues($values, function($row,$_values){$row->setValues($_values);});
+	}
+
+	/**
+	 * Adds the cells values
+	 * @param mixed $values
+	 */
+	public function addValues($values=array()) {
+		return $this->_addOrSetValues($values, function($row,$_values){$row->addValues($_values);});
+	}
+
+	/**
+	 * Adds or sets the cells values
+	 * @param mixed $values
+	 * @param callable $callback
+	 */
+	protected function _addOrSetValues($values,$callback) {
 		$count=$this->count();
 		$isArray=true;
 		if (!\is_array($values)) {
@@ -138,7 +155,7 @@ public function setValues($values=array()) {
 
 		for($i=0; $i < $count; $i++) {
 			$row=$this->content[$i];
-			$row->setValues($values[$i]);
+			$callback($row,$values[$i]);
 		}
 		return $this;
 	}
diff --git a/Ajax/semantic/widgets/base/FieldAsTrait.php b/Ajax/semantic/widgets/base/FieldAsTrait.php
@@ -38,11 +38,11 @@ abstract protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$res
 	 * @param array $attributes
 	 */
 	protected function _applyAttributes($element,&$attributes,$index){
-		if(isset($attributes["callback"])){
-			$callback=$attributes["callback"];
+		if(isset($attributes["jsCallback"])){
+			$callback=$attributes["jsCallback"];
 			if(\is_callable($callback)){
 				$callback($element,$this->_modelInstance,$index);
-				unset($attributes["callback"]);
+				unset($attributes["jsCallback"]);
 			}
 		}
 		unset($attributes["rules"]);
diff --git a/Ajax/semantic/widgets/base/InstanceViewer.php b/Ajax/semantic/widgets/base/InstanceViewer.php
@@ -2,6 +2,7 @@
 namespace Ajax\semantic\widgets\base;
 use Ajax\service\JString;
 use Ajax\service\JArray;
+use Ajax\service\JReflection;
 
 class InstanceViewer {
 	protected $widgetIdentifier;
@@ -64,8 +65,12 @@ public function getIdentifier($index=NULL){
 		if(!isset($index))
 			$index=self::$index;
 		$value=$index;
-		if(isset($this->values["identifier"]))
-			$value=$this->values["identifier"]($index,$this->instance);
+		if(isset($this->values["identifier"])){
+			if(\is_string($this->values["identifier"]))
+				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
+			else
+				$value=$this->values["identifier"]($index,$this->instance);
+		}
 		return $value;
 	}
 
diff --git a/Ajax/semantic/widgets/datatable/DataTable.php b/Ajax/semantic/widgets/datatable/DataTable.php
@@ -13,6 +13,7 @@
 use Ajax\semantic\widgets\base\InstanceViewer;
 use Ajax\semantic\html\collections\table\traits\TableTrait;
 use Ajax\semantic\html\collections\HtmlMessage;
+use Ajax\semantic\html\collections\menus\HtmlMenu;
 
 /**
  * DataTable widget for displaying list of objects
@@ -105,14 +106,16 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 					$table->getHeader()->getCell(0, 0)->addClass("no-sort");
 			}
 
-			if(isset($this->_pagination) && $this->_pagination->getVisible()){
-				$this->_generatePagination($table,$js);
-			}
 			if(isset($this->_toolbar)){
 				$this->_setToolbarPosition($table, $captions);
 			}
+			if(isset($this->_pagination) && $this->_pagination->getVisible()){
+				$this->_generatePagination($table,$js);
+			}
+
 			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
+
 			$this->_generated=true;
 		}
 		return parent::compile($js,$view);
@@ -136,7 +139,7 @@ protected function _generateContent($table){
 		}
 	}
 
-	protected function _generateRow($instance,&$table){
+	protected function _generateRow($instance,&$table,$checkedClass=null){
 		$this->_instanceViewer->setInstance($instance);
 		InstanceViewer::$index++;
 		$values= $this->_instanceViewer->getValues();
@@ -145,6 +148,8 @@ protected function _generateRow($instance,&$table){
 			$field=$ck->getField();
 			$field->setProperty("value",$this->_instanceViewer->getIdentifier());
 			$field->setProperty("name", "selection[]");
+			if(isset($checkedClass))
+				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
@@ -155,18 +160,23 @@ protected function _generateRow($instance,&$table){
 	}
 
 	protected function _generatePagination($table,$js=NULL){
+		if(isset($this->_toolbar)){
+			if($this->_toolbarPosition==PositionInTable::FOOTER)
+				$this->_toolbar->setFloated("left");
+		}
 		$footer=$table->getFooter();
 		$footer->mergeCol();
 		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
 		$menu->floatRight();
 		$menu->setActiveItem($this->_pagination->getPage()-1);
-		$footer->setValues($menu);
+		$footer->addValues($menu);
 		$this->_associatePaginationBehavior($menu,$js);
 	}
 
-	protected function _associatePaginationBehavior($menu,$js=NULL){
-		if(isset($this->_urls["refresh"]))
+	protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){
+		if(isset($this->_urls["refresh"])){
 			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+		}
 	}
 
 	protected function _getFieldName($index){
@@ -248,7 +258,7 @@ public function setUrls($urls) {
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=4){
+	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
 		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount);
 		return $this;
 	}
diff --git a/Ajax/semantic/widgets/datatable/HasCheckboxesTrait.php b/Ajax/semantic/widgets/datatable/HasCheckboxesTrait.php
@@ -20,27 +20,40 @@ trait HasCheckboxesTrait{
 	abstract public function addInToolbar($element,$callback=NULL);
 
 	protected function _runCheckboxes(JsUtils $js){
-		$checkedMessageCall="";
-		if($this->_hasCheckedMessage){
-			$msg=$this->getCheckedMessage();
-			$checkedMessageFunction="$('#{$this->identifier}').bind('updateChecked',function() {var msg='".$msg[0]."',count=\$('#{$this->identifier} [name=\"selection[]\"]:checked').length,all=\$('#{$this->identifier} [name=\"selection[]\"]').length;
-			if(count==1) msg='".$msg[1]."';
+		$js->execOn("change", "#".$this->identifier." [name='selection[]']:not(._jsonArrayChecked)", $this->_getCheckedChange($js));
+		if(\sizeof($this->_compileParts)<3){
+			$js->trigger("#".$this->identifier." [name='selection[]']","change",true);
+		}
+	}
+
+	protected function _getCheckedChange(JsUtils $js=NULL){
+		$callback="var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
+				\$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}});
+				if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');};".$this->_getCheckedMessageCall($js);
+		return $callback;
+	}
+
+	protected function _getCheckedMessageFunction(){
+		$msg=$this->getCheckedMessage();
+		$checkedMessageFunction="$('#{$this->identifier}').bind('updateChecked',function() {var msg='".$msg[0]."',count=\$('#{$this->identifier} [name=\"selection[]\"]:checked').length,all=\$('#{$this->identifier} [name=\"selection[]\"]').length;
+		if(count==1) msg='".$msg[1]."';
 						else if(count>1) msg='".$msg["other"]."';
 						\$('#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();";
+								\$('#toolbar-{$this->identifier} .visibleOnChecked').toggle(count>0);});\$('#toolbar-".$this->identifier." .visibleOnChecked').hide();";
+		return $checkedMessageFunction;
+	}
+
+	protected function _getCheckedMessageCall(JsUtils $js=NULL){
+		$checkedMessageCall="";
+		if($this->_hasCheckedMessage){
 			$checkedMessageCall="$('#{$this->identifier}').trigger('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[]']", "
-				var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
-				\$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}});
-				if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');};".$checkedMessageCall);
-		if(\sizeof($this->_compileParts)<3){
-			$js->trigger("#".$this->identifier." [name='selection[]']","change",true);
+			if(isset($js))
+				$js->exec($this->_getCheckedMessageFunction(),true);
 		}
+		return $checkedMessageCall;
 	}
 
 	protected function _generateMainCheckbox(&$captions){
@@ -55,7 +68,7 @@ protected function _generateMainCheckbox(&$captions){
 	}
 
 	protected function _setAllChecked($checked){
-		$result="$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',".$checked.");";
+		$result="$('#".$this->identifier." [name=%quote%selection[]%quote%]:not(._jsonArrayChecked)').prop('checked',".$checked.");";
 		if(isset($this->_checkedClass)){
 			$result.="$('#".$this->identifier." tr').toggleClass('".$this->_checkedClass."',".$checked.");";
 		}
diff --git a/Ajax/semantic/widgets/datatable/JsonDataTable.php b/Ajax/semantic/widgets/datatable/JsonDataTable.php
diff --git a/Ajax/semantic/widgets/datatable/Pagination.php b/Ajax/semantic/widgets/datatable/Pagination.php
diff --git a/Ajax/service/AjaxCall.php b/Ajax/service/AjaxCall.php
diff --git a/Ajax/service/JReflection.php b/Ajax/service/JReflection.php

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,14 @@ public function clear_compile() {`
`256`	`256`	`$this->js->_clear_compile();`
`257`	`257`	`}`
`258`	`258`
	`259`	`+ public function getScript($offset=0){`
	`260`	`+ return $this->js->getScript($offset);`
	`261`	`+ }`
	`262`	`+`
	`263`	`+ public function scriptCount(){`
	`264`	`+ return $this->js->scriptCount();`
	`265`	`+ }`
	`266`	`+`
`259`	`267`	`/**`
`260`	`268`	`* Outputs a <script> tag`
`261`	`269`	`*`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public function getItemHeader() {`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`public function run(JsUtils $js){`
`239`		`- $this->onClick('if(!$(this).hasClass("dropdown")){$(this).addClass("active").siblings().removeClass("active");}');`
	`239`	`+ $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false);`
`240`	`240`	`$result= parent::run($js);`
`241`	`241`	`return $result->setItemSelector(".item");`
`242`	`242`	`}`