@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | if(isset($this->_checkedClass)){ |
| 51 | 51 | $checkedMessageCall.="$(this).closest('tr').toggleClass('".$this->_checkedClass."',$(this).prop('checked'));"; |
| 52 | 52 | } |
| 53 | - if(isset($js)) |
|
| 54 | - $js->exec($this->_getCheckedMessageFunction(),true); |
|
| 53 | + if(isset($js)) { |
|
| 54 | + $js->exec($this->_getCheckedMessageFunction(),true); |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | 57 | return $checkedMessageCall; |
| 57 | 58 | } |
@@ -59,8 +60,9 @@ discard block |
||
| 59 | 60 | protected function _generateMainCheckbox(&$captions){ |
| 60 | 61 | $ck=new HtmlCheckbox("main-ck-".$this->identifier,""); |
| 61 | 62 | $checkedMessageCall=""; |
| 62 | - if($this->_hasCheckedMessage) |
|
| 63 | - $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
|
| 63 | + if($this->_hasCheckedMessage) { |
|
| 64 | + $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
|
| 65 | + } |
|
| 64 | 66 | |
| 65 | 67 | $ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall); |
| 66 | 68 | $ck->setOnUnchecked($this->_setAllChecked("false").$checkedMessageCall); |
@@ -108,8 +110,9 @@ discard block |
||
| 108 | 110 | * @param callable $callback |
| 109 | 111 | */ |
| 110 | 112 | public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){ |
| 111 | - if(isset($checkedMessage)) |
|
| 112 | - $this->_checkedMessage=$checkedMessage; |
|
| 113 | + if(isset($checkedMessage)) { |
|
| 114 | + $this->_checkedMessage=$checkedMessage; |
|
| 115 | + } |
|
| 113 | 116 | $checkedMessage=$this->getCheckedMessage(); |
| 114 | 117 | $this->_hasCheckboxes=true; |
| 115 | 118 | $this->_hasCheckedMessage=true; |
@@ -11,29 +11,29 @@ discard block |
||
| 11 | 11 | * @property string identifier |
| 12 | 12 | * @property array $_compileParts |
| 13 | 13 | */ |
| 14 | -trait HasCheckboxesTrait{ |
|
| 14 | +trait HasCheckboxesTrait { |
|
| 15 | 15 | protected $_hasCheckboxes; |
| 16 | 16 | protected $_hasCheckedMessage=false; |
| 17 | 17 | protected $_checkedMessage; |
| 18 | 18 | protected $_checkedClass; |
| 19 | 19 | |
| 20 | - abstract public function addInToolbar($element,$callback=NULL); |
|
| 20 | + abstract public function addInToolbar($element, $callback=NULL); |
|
| 21 | 21 | |
| 22 | - protected function _runCheckboxes(JsUtils $js){ |
|
| 22 | + protected function _runCheckboxes(JsUtils $js) { |
|
| 23 | 23 | $js->execOn("change", "#".$this->identifier." [name='selection[]']:not(._jsonArrayChecked)", $this->_getCheckedChange($js)); |
| 24 | - if(\sizeof($this->_compileParts)<3){ |
|
| 25 | - $js->trigger("#".$this->identifier." [name='selection[]']","change",true); |
|
| 24 | + if (\sizeof($this->_compileParts)<3) { |
|
| 25 | + $js->trigger("#".$this->identifier." [name='selection[]']", "change", true); |
|
| 26 | 26 | } |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - protected function _getCheckedChange(JsUtils $js=NULL){ |
|
| 29 | + protected function _getCheckedChange(JsUtils $js=NULL) { |
|
| 30 | 30 | $callback="var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true; |
| 31 | 31 | \$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}}); |
| 32 | 32 | if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');};".$this->_getCheckedMessageCall($js); |
| 33 | 33 | return $callback; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - protected function _getCheckedMessageFunction(){ |
|
| 36 | + protected function _getCheckedMessageFunction() { |
|
| 37 | 37 | $msg=$this->getCheckedMessage(); |
| 38 | 38 | $checkedMessageFunction="$('#{$this->identifier}').bind('updateChecked',function() {var msg='".$msg[0]."',count=\$('#{$this->identifier} [name=\"selection[]\"]:checked').length,all=\$('#{$this->identifier} [name=\"selection[]\"]').length; |
| 39 | 39 | if(count==1) msg='".$msg[1]."'; |
@@ -43,23 +43,23 @@ discard block |
||
| 43 | 43 | return $checkedMessageFunction; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - protected function _getCheckedMessageCall(JsUtils $js=NULL){ |
|
| 46 | + protected function _getCheckedMessageCall(JsUtils $js=NULL) { |
|
| 47 | 47 | $checkedMessageCall=""; |
| 48 | - if($this->_hasCheckedMessage){ |
|
| 48 | + if ($this->_hasCheckedMessage) { |
|
| 49 | 49 | $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
| 50 | - if(isset($this->_checkedClass)){ |
|
| 50 | + if (isset($this->_checkedClass)) { |
|
| 51 | 51 | $checkedMessageCall.="$(this).closest('tr').toggleClass('".$this->_checkedClass."',$(this).prop('checked'));"; |
| 52 | 52 | } |
| 53 | - if(isset($js)) |
|
| 54 | - $js->exec($this->_getCheckedMessageFunction(),true); |
|
| 53 | + if (isset($js)) |
|
| 54 | + $js->exec($this->_getCheckedMessageFunction(), true); |
|
| 55 | 55 | } |
| 56 | 56 | return $checkedMessageCall; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - protected function _generateMainCheckbox(&$captions){ |
|
| 60 | - $ck=new HtmlCheckbox("main-ck-".$this->identifier,""); |
|
| 59 | + protected function _generateMainCheckbox(&$captions) { |
|
| 60 | + $ck=new HtmlCheckbox("main-ck-".$this->identifier, ""); |
|
| 61 | 61 | $checkedMessageCall=""; |
| 62 | - if($this->_hasCheckedMessage) |
|
| 62 | + if ($this->_hasCheckedMessage) |
|
| 63 | 63 | $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
| 64 | 64 | |
| 65 | 65 | $ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall); |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | \array_unshift($captions, $ck); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - protected function _setAllChecked($checked){ |
|
| 70 | + protected function _setAllChecked($checked) { |
|
| 71 | 71 | $result="$('#".$this->identifier." [name=%quote%selection[]%quote%]:not(._jsonArrayChecked)').prop('checked',".$checked.");"; |
| 72 | - if(isset($this->_checkedClass)){ |
|
| 72 | + if (isset($this->_checkedClass)) { |
|
| 73 | 73 | $result.="$('#".$this->identifier." tr').toggleClass('".$this->_checkedClass."',".$checked.");"; |
| 74 | 74 | } |
| 75 | 75 | return $result; |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | protected function getCheckedMessage() { |
| 88 | - $result= $this->_checkedMessage; |
|
| 89 | - if(!isset($result)){ |
|
| 90 | - $result=[0=>"none selected",1=>"one item selected","other"=>"{count} items selected"]; |
|
| 88 | + $result=$this->_checkedMessage; |
|
| 89 | + if (!isset($result)) { |
|
| 90 | + $result=[0=>"none selected", 1=>"one item selected", "other"=>"{count} items selected"]; |
|
| 91 | 91 | } |
| 92 | 92 | return $result; |
| 93 | 93 | } |
@@ -107,14 +107,14 @@ discard block |
||
| 107 | 107 | * @param array $checkedMessage |
| 108 | 108 | * @param callable $callback |
| 109 | 109 | */ |
| 110 | - public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){ |
|
| 111 | - if(isset($checkedMessage)) |
|
| 110 | + public function addCountCheckedInToolbar(array $checkedMessage=null, $callback=null) { |
|
| 111 | + if (isset($checkedMessage)) |
|
| 112 | 112 | $this->_checkedMessage=$checkedMessage; |
| 113 | 113 | $checkedMessage=$this->getCheckedMessage(); |
| 114 | 114 | $this->_hasCheckboxes=true; |
| 115 | 115 | $this->_hasCheckedMessage=true; |
| 116 | - $element=new HtmlLabel("checked-count-".$this->identifier,$checkedMessage[0]); |
|
| 117 | - $this->addInToolbar($element,$callback); |
|
| 116 | + $element=new HtmlLabel("checked-count-".$this->identifier, $checkedMessage[0]); |
|
| 117 | + $this->addInToolbar($element, $callback); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | public function setCheckedClass($_checkedClass) { |
@@ -89,8 +89,9 @@ |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | public function setPagesVisibles($pages_visibles) { |
| 92 | - if(!isset($pages_visibles)) |
|
| 93 | - $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
| 92 | + if(!isset($pages_visibles)) { |
|
| 93 | + $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
| 94 | + } |
|
| 94 | 95 | $this->pages_visibles=$pages_visibles; |
| 95 | 96 | return $this; |
| 96 | 97 | } |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | private $pages_visibles; |
| 10 | 10 | private $row_count; |
| 11 | 11 | |
| 12 | - public function __construct($items_per_page=10,$pages_visibles=null,$page=1,$row_count=null){ |
|
| 12 | + public function __construct($items_per_page=10, $pages_visibles=null, $page=1, $row_count=null) { |
|
| 13 | 13 | $this->items_per_page=$items_per_page; |
| 14 | 14 | $this->row_count=$row_count; |
| 15 | 15 | $this->page=$page; |
@@ -17,30 +17,30 @@ discard block |
||
| 17 | 17 | $this->visible=true; |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function getObjects($objects){ |
|
| 20 | + public function getObjects($objects) { |
|
| 21 | 21 | $auto=(!isset($this->row_count)); |
| 22 | 22 | $os=$objects; |
| 23 | - if(!\is_array($os)){ |
|
| 23 | + if (!\is_array($os)) { |
|
| 24 | 24 | $os=[]; |
| 25 | - foreach ($objects as $o){ |
|
| 25 | + foreach ($objects as $o) { |
|
| 26 | 26 | $os[]=$o; |
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | - $this->page_count = 0; |
|
| 30 | - $row_count=($auto)?\sizeof($os):$this->row_count; |
|
| 31 | - if (0 === $row_count) { |
|
| 29 | + $this->page_count=0; |
|
| 30 | + $row_count=($auto) ?\sizeof($os) : $this->row_count; |
|
| 31 | + if (0===$row_count) { |
|
| 32 | 32 | $this->visible=false; |
| 33 | 33 | } else { |
| 34 | 34 | |
| 35 | - $this->page_count = (int)ceil($row_count / $this->items_per_page); |
|
| 35 | + $this->page_count=(int)ceil($row_count/$this->items_per_page); |
|
| 36 | 36 | $this->visible=$this->page_count>1; |
| 37 | - if($this->page > $this->page_count+1) { |
|
| 38 | - $this->page = 1; |
|
| 37 | + if ($this->page>$this->page_count+1) { |
|
| 38 | + $this->page=1; |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | - if($auto){ |
|
| 42 | - $offset = ($this->page - 1) * $this->items_per_page; |
|
| 43 | - return array_slice($os, $offset,$this->items_per_page); |
|
| 41 | + if ($auto) { |
|
| 42 | + $offset=($this->page-1)*$this->items_per_page; |
|
| 43 | + return array_slice($os, $offset, $this->items_per_page); |
|
| 44 | 44 | } |
| 45 | 45 | return $os; |
| 46 | 46 | } |
@@ -76,22 +76,22 @@ discard block |
||
| 76 | 76 | return $this->page_count; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - public function getPagesNumbers(){ |
|
| 80 | - $middle= (int)ceil(($this->pages_visibles-1)/ 2); |
|
| 79 | + public function getPagesNumbers() { |
|
| 80 | + $middle=(int)ceil(($this->pages_visibles-1)/2); |
|
| 81 | 81 | $first=$this->page-$middle; |
| 82 | - if($first<1){ |
|
| 82 | + if ($first<1) { |
|
| 83 | 83 | $first=1; |
| 84 | 84 | } |
| 85 | 85 | $last=$first+$this->pages_visibles-1; |
| 86 | - if($last>$this->page_count){ |
|
| 86 | + if ($last>$this->page_count) { |
|
| 87 | 87 | $last=$this->page_count; |
| 88 | 88 | } |
| 89 | 89 | return \range($first, $last); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | public function setPagesVisibles($pages_visibles) { |
| 93 | - if(!isset($pages_visibles)) |
|
| 94 | - $pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1; |
|
| 93 | + if (!isset($pages_visibles)) |
|
| 94 | + $pages_visibles=(int)ceil($this->row_count/$this->items_per_page)+1; |
|
| 95 | 95 | $this->pages_visibles=$pages_visibles; |
| 96 | 96 | return $this; |
| 97 | 97 | } |
@@ -48,8 +48,9 @@ |
||
| 48 | 48 | $('#pagination-{$id} ._firstPage').attr('data-page',Math.max(1,page-1)); |
| 49 | 49 | var lastPage=$('#pagination-{$id} ._lastPage');lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));"; |
| 50 | 50 | } |
| 51 | - if(isset($this->_urls["refresh"])) |
|
| 52 | - $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
| 51 | + if(isset($this->_urls["refresh"])) { |
|
| 52 | + $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
| 53 | + } |
|
| 53 | 54 | } |
| 54 | 55 | |
| 55 | 56 | /** |
@@ -23,24 +23,24 @@ discard block |
||
| 23 | 23 | $this->_rowClass="_json"; |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - protected function _generateContent($table){ |
|
| 26 | + protected function _generateContent($table) { |
|
| 27 | 27 | $this->_addRowModel($table); |
| 28 | 28 | parent::_generateContent($table); |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - protected function _addRowModel($table){ |
|
| 31 | + protected function _addRowModel($table) { |
|
| 32 | 32 | $row=$this->_createRow($table, $this->_modelClass); |
| 33 | - $row->addToProperty("style","display:none;"); |
|
| 33 | + $row->addToProperty("style", "display:none;"); |
|
| 34 | 34 | $table->getBody()->_addRow($row); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - protected function _createRow($table,$rowClass){ |
|
| 37 | + protected function _createRow($table, $rowClass) { |
|
| 38 | 38 | $object=JReflection::jsonObject($this->_model); |
| 39 | - if(isset($this->_rowModelCallback)){ |
|
| 39 | + if (isset($this->_rowModelCallback)) { |
|
| 40 | 40 | $callback=$this->_rowModelCallback; |
| 41 | 41 | $callback($object); |
| 42 | 42 | } |
| 43 | - $row=$this->_generateRow($object, $table,"_jsonArrayChecked"); |
|
| 43 | + $row=$this->_generateRow($object, $table, "_jsonArrayChecked"); |
|
| 44 | 44 | $row->setClass($rowClass); |
| 45 | 45 | return $row; |
| 46 | 46 | } |
@@ -49,22 +49,22 @@ discard block |
||
| 49 | 49 | * {@inheritDoc} |
| 50 | 50 | * @see DataTable::_associatePaginationBehavior() |
| 51 | 51 | */ |
| 52 | - protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){ |
|
| 52 | + protected function _associatePaginationBehavior(HtmlMenu $menu, JsUtils $js=NULL) { |
|
| 53 | 53 | $callback=null; |
| 54 | - if(isset($js)){ |
|
| 54 | + if (isset($js)) { |
|
| 55 | 55 | $id=$this->identifier; |
| 56 | 56 | $offset=$js->scriptCount(); |
| 57 | 57 | $this->run($js); |
| 58 | 58 | $callback=$js->getScript($offset); |
| 59 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
| 59 | + $callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
| 60 | 60 | $callback.=";var page=parseInt($(self).attr('data-page')); |
| 61 | 61 | $('#pagination-{$id} .item').removeClass('active'); |
| 62 | 62 | $('#pagination-{$id} [data-page='+page+']:not(.no-active)').addClass('active'); |
| 63 | 63 | $('#pagination-{$id} ._firstPage').attr('data-page',Math.max(1,page-1)); |
| 64 | 64 | var lastPage=$('#pagination-{$id} ._lastPage');lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));"; |
| 65 | 65 | } |
| 66 | - if(isset($this->_urls["refresh"])) |
|
| 67 | - $this->jsonArrayOnClick($menu, $this->_urls["refresh"],"post","{'p':$(this).attr('data-page')}",$callback); |
|
| 66 | + if (isset($this->_urls["refresh"])) |
|
| 67 | + $this->jsonArrayOnClick($menu, $this->_urls["refresh"], "post", "{'p':$(this).attr('data-page')}", $callback); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -75,29 +75,29 @@ discard block |
||
| 75 | 75 | * @param string $jsCallback |
| 76 | 76 | * @return AjaxCall |
| 77 | 77 | */ |
| 78 | - public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
| 79 | - $parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]); |
|
| 78 | + public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
| 79 | + $parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]); |
|
| 80 | 80 | return new AjaxCall("jsonArray", $parameters); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - public function jsClear(){ |
|
| 83 | + public function jsClear() { |
|
| 84 | 84 | return "$('#{$this->identifier} tbody').find('._json').remove();"; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){ |
|
| 88 | - return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault); |
|
| 87 | + public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) { |
|
| 88 | + return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){ |
|
| 92 | - return $this->clearOn($element, "click",$stopPropagation,$preventDefault); |
|
| 91 | + public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) { |
|
| 92 | + return $this->clearOn($element, "click", $stopPropagation, $preventDefault); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
| 96 | - return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters)); |
|
| 95 | + public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
| 96 | + return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters)); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
| 100 | - return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters); |
|
| 99 | + public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
| 100 | + return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
@@ -108,8 +108,8 @@ discard block |
||
| 108 | 108 | * @param number $pages_visibles The number of visible pages in the Pagination component |
| 109 | 109 | * @return DataTable |
| 110 | 110 | */ |
| 111 | - public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){ |
|
| 112 | - return parent::paginate($page, $total_rowcount,$items_per_page,null); |
|
| 111 | + public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) { |
|
| 112 | + return parent::paginate($page, $total_rowcount, $items_per_page, null); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | public function setRowModelCallback($_rowModelCallback) { |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | if($class->getProperty($property)!==null){ |
| 22 | 22 | \call_user_func_array([$object,$name],[$value]); |
| 23 | 23 | } |
| 24 | - }catch(\Exception $e){ |
|
| 24 | + } catch(\Exception $e){ |
|
| 25 | 25 | //Nothing to do |
| 26 | 26 | } |
| 27 | 27 | } |
@@ -3,25 +3,25 @@ discard block |
||
| 3 | 3 | namespace Ajax\service; |
| 4 | 4 | |
| 5 | 5 | class JReflection { |
| 6 | - public static function shortClassName($object){ |
|
| 7 | - $classNameWithNamespace = get_class($object); |
|
| 6 | + public static function shortClassName($object) { |
|
| 7 | + $classNameWithNamespace=get_class($object); |
|
| 8 | 8 | return substr($classNameWithNamespace, strrpos($classNameWithNamespace, '\\')+1); |
| 9 | 9 | } |
| 10 | 10 | |
| 11 | - public static function jsonObject($classname){ |
|
| 11 | + public static function jsonObject($classname) { |
|
| 12 | 12 | $object=new $classname(); |
| 13 | - $class = new \ReflectionClass($classname); |
|
| 13 | + $class=new \ReflectionClass($classname); |
|
| 14 | 14 | $methods=$class->getMethods(\ReflectionMethod::IS_PUBLIC); |
| 15 | - foreach ($methods as $method){ |
|
| 15 | + foreach ($methods as $method) { |
|
| 16 | 16 | $name=$method->getName(); |
| 17 | - if(JString::startswith($name, "set")){ |
|
| 17 | + if (JString::startswith($name, "set")) { |
|
| 18 | 18 | $property=\lcfirst(JString::replaceAtFirst($name, "set", "")); |
| 19 | 19 | $value="__".$property."__"; |
| 20 | - try{ |
|
| 21 | - if($class->getProperty($property)!==null){ |
|
| 22 | - \call_user_func_array([$object,$name],[$value]); |
|
| 20 | + try { |
|
| 21 | + if ($class->getProperty($property)!==null) { |
|
| 22 | + \call_user_func_array([$object, $name], [$value]); |
|
| 23 | 23 | } |
| 24 | - }catch(\Exception $e){ |
|
| 24 | + }catch (\Exception $e) { |
|
| 25 | 25 | //Nothing to do |
| 26 | 26 | } |
| 27 | 27 | } |
@@ -29,18 +29,18 @@ discard block |
||
| 29 | 29 | return $object; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - public static function callMethod($object,$callback,array $values){ |
|
| 33 | - return \call_user_func_array([$object,$callback],$values); |
|
| 32 | + public static function callMethod($object, $callback, array $values) { |
|
| 33 | + return \call_user_func_array([$object, $callback], $values); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public static function getterName($propertyName,$prefix="get"){ |
|
| 36 | + public static function getterName($propertyName, $prefix="get") { |
|
| 37 | 37 | return $prefix.\ucfirst($propertyName); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public static function callMethodFromAssociativeArray($object,$array,$methodPrefix="add"){ |
|
| 41 | - foreach ($array as $key=>$value){ |
|
| 42 | - if(\method_exists($object, $methodPrefix.\ucfirst($key))){ |
|
| 43 | - \call_user_func([$object,$methodPrefix.\ucfirst($key)],$value); |
|
| 40 | + public static function callMethodFromAssociativeArray($object, $array, $methodPrefix="add") { |
|
| 41 | + foreach ($array as $key=>$value) { |
|
| 42 | + if (\method_exists($object, $methodPrefix.\ucfirst($key))) { |
|
| 43 | + \call_user_func([$object, $methodPrefix.\ucfirst($key)], $value); |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -10,10 +10,10 @@ discard block |
||
| 10 | 10 | class HtmlLink extends HtmlSemDoubleElement { |
| 11 | 11 | use HtmlLinkTrait; |
| 12 | 12 | |
| 13 | - public function __construct($identifier, $href="#", $content="Link",$target=NULL) { |
|
| 13 | + public function __construct($identifier, $href="#", $content="Link", $target=NULL) { |
|
| 14 | 14 | parent::__construct($identifier, "a", ""); |
| 15 | 15 | $this->setHref($href); |
| 16 | - if(isset($target)) |
|
| 16 | + if (isset($target)) |
|
| 17 | 17 | $this->setTarget($target); |
| 18 | 18 | $this->content=$content; |
| 19 | 19 | } |
@@ -23,13 +23,13 @@ discard block |
||
| 23 | 23 | * @see \Ajax\bootstrap\html\base\HtmlSingleElement::run() |
| 24 | 24 | */ |
| 25 | 25 | public function run(JsUtils $js) { |
| 26 | - $this->_bsComponent=$js->semantic()->generic("#" . $this->identifier); |
|
| 26 | + $this->_bsComponent=$js->semantic()->generic("#".$this->identifier); |
|
| 27 | 27 | $this->addEventsOnRun($js); |
| 28 | 28 | return $this->_bsComponent; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | public function addIcon($icon, $before=true) { |
| 32 | - return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before); |
|
| 32 | + return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public static function icon($identifier, $icon, $href="#", $label=NULL) { |
@@ -13,8 +13,9 @@ |
||
| 13 | 13 | public function __construct($identifier, $href="#", $content="Link",$target=NULL) { |
| 14 | 14 | parent::__construct($identifier, "a", ""); |
| 15 | 15 | $this->setHref($href); |
| 16 | - if(isset($target)) |
|
| 17 | - $this->setTarget($target); |
|
| 16 | + if(isset($target)) { |
|
| 17 | + $this->setTarget($target); |
|
| 18 | + } |
|
| 18 | 19 | $this->content=$content; |
| 19 | 20 | } |
| 20 | 21 | |
@@ -89,8 +89,9 @@ discard block |
||
| 89 | 89 | public function asLink($href=NULL,$target=NULL) { |
| 90 | 90 | if (isset($href)) { |
| 91 | 91 | $_target=""; |
| 92 | - if(isset($target)) |
|
| 93 | - $_target="target='{$target}'"; |
|
| 92 | + if(isset($target)) { |
|
| 93 | + $_target="target='{$target}'"; |
|
| 94 | + } |
|
| 94 | 95 | $this->wrap("<a href='" . $href . "' {$_target}>", "</a>"); |
| 95 | 96 | } |
| 96 | 97 | return $this->addToProperty("class", "link"); |
@@ -107,8 +108,9 @@ discard block |
||
| 107 | 108 | */ |
| 108 | 109 | public function setBordered($inverted=false) { |
| 109 | 110 | $invertedStr=""; |
| 110 | - if ($inverted !== false) |
|
| 111 | - $invertedStr=" inverted"; |
|
| 111 | + if ($inverted !== false) { |
|
| 112 | + $invertedStr=" inverted"; |
|
| 113 | + } |
|
| 112 | 114 | return $this->addToProperty("class", "bordered" . $invertedStr); |
| 113 | 115 | } |
| 114 | 116 | |
@@ -121,12 +123,14 @@ discard block |
||
| 121 | 123 | } |
| 122 | 124 | |
| 123 | 125 | public function addLabel($label, $before=false, $icon=NULL) { |
| 124 | - if($before) |
|
| 125 | - $this->wrap($label); |
|
| 126 | - else |
|
| 127 | - $this->wrap("", $label); |
|
| 128 | - if(isset($icon)) |
|
| 129 | - $this->addToIcon($icon); |
|
| 126 | + if($before) { |
|
| 127 | + $this->wrap($label); |
|
| 128 | + } else { |
|
| 129 | + $this->wrap("", $label); |
|
| 130 | + } |
|
| 131 | + if(isset($icon)) { |
|
| 132 | + $this->addToIcon($icon); |
|
| 133 | + } |
|
| 130 | 134 | return $this; |
| 131 | 135 | } |
| 132 | 136 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @return HtmlIcon |
| 70 | 70 | */ |
| 71 | 71 | public function setFlipped($sens="horizontally") { |
| 72 | - return $this->addToProperty("class", "flipped " . $sens); |
|
| 72 | + return $this->addToProperty("class", "flipped ".$sens); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | * @return HtmlIcon |
| 79 | 79 | */ |
| 80 | 80 | public function setRotated($sens="clockwise") { |
| 81 | - return $this->addToProperty("class", "rotated " . $sens); |
|
| 81 | + return $this->addToProperty("class", "rotated ".$sens); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | /** |
@@ -87,12 +87,12 @@ discard block |
||
| 87 | 87 | * @param string target |
| 88 | 88 | * @return HtmlIcon |
| 89 | 89 | */ |
| 90 | - public function asLink($href=NULL,$target=NULL) { |
|
| 90 | + public function asLink($href=NULL, $target=NULL) { |
|
| 91 | 91 | if (isset($href)) { |
| 92 | 92 | $_target=""; |
| 93 | - if(isset($target)) |
|
| 93 | + if (isset($target)) |
|
| 94 | 94 | $_target="target='{$target}'"; |
| 95 | - $this->wrap("<a href='" . $href . "' {$_target}>", "</a>"); |
|
| 95 | + $this->wrap("<a href='".$href."' {$_target}>", "</a>"); |
|
| 96 | 96 | } |
| 97 | 97 | return $this->addToProperty("class", "link"); |
| 98 | 98 | } |
@@ -108,9 +108,9 @@ discard block |
||
| 108 | 108 | */ |
| 109 | 109 | public function setBordered($inverted=false) { |
| 110 | 110 | $invertedStr=""; |
| 111 | - if ($inverted !== false) |
|
| 111 | + if ($inverted!==false) |
|
| 112 | 112 | $invertedStr=" inverted"; |
| 113 | - return $this->addToProperty("class", "bordered" . $invertedStr); |
|
| 113 | + return $this->addToProperty("class", "bordered".$invertedStr); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | /** |
@@ -122,11 +122,11 @@ discard block |
||
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | public function addLabel($label, $before=false, $icon=NULL) { |
| 125 | - if($before) |
|
| 125 | + if ($before) |
|
| 126 | 126 | $this->wrap($label); |
| 127 | 127 | else |
| 128 | 128 | $this->wrap("", $label); |
| 129 | - if(isset($icon)) |
|
| 129 | + if (isset($icon)) |
|
| 130 | 130 | $this->addToIcon($icon); |
| 131 | 131 | return $this; |
| 132 | 132 | } |
@@ -40,8 +40,9 @@ discard block |
||
| 40 | 40 | * @param string $popupEvent |
| 41 | 41 | */ |
| 42 | 42 | public function setPopupAttributes($variation=NULL, $popupEvent=NULL) { |
| 43 | - if (isset($this->_popup)) |
|
| 44 | - $this->_popup->setAttributes($variation, $popupEvent); |
|
| 43 | + if (isset($this->_popup)) { |
|
| 44 | + $this->_popup->setAttributes($variation, $popupEvent); |
|
| 45 | + } |
|
| 45 | 46 | } |
| 46 | 47 | |
| 47 | 48 | /** |
@@ -96,8 +97,9 @@ discard block |
||
| 96 | 97 | $labelO=$label; |
| 97 | 98 | if (\is_object($label) === false) { |
| 98 | 99 | $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
| 99 | - if (isset($icon)) |
|
| 100 | - $labelO->addIcon($icon); |
|
| 100 | + if (isset($icon)) { |
|
| 101 | + $labelO->addIcon($icon); |
|
| 102 | + } |
|
| 101 | 103 | } else { |
| 102 | 104 | $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
| 103 | 105 | } |
@@ -124,10 +126,12 @@ discard block |
||
| 124 | 126 | * @return HtmlSemDoubleElement |
| 125 | 127 | */ |
| 126 | 128 | public function asLink($href=NULL,$target=NULL) { |
| 127 | - if (isset($href)) |
|
| 128 | - $this->setProperty("href", $href); |
|
| 129 | - if(isset($target)) |
|
| 130 | - $this->setProperty("target", $target); |
|
| 129 | + if (isset($href)) { |
|
| 130 | + $this->setProperty("href", $href); |
|
| 131 | + } |
|
| 132 | + if(isset($target)) { |
|
| 133 | + $this->setProperty("target", $target); |
|
| 134 | + } |
|
| 131 | 135 | return $this->setTagName("a"); |
| 132 | 136 | } |
| 133 | 137 | |
@@ -138,8 +142,9 @@ discard block |
||
| 138 | 142 | */ |
| 139 | 143 | public function jsShowDimmer($show=true) { |
| 140 | 144 | $status="hide"; |
| 141 | - if ($show === true) |
|
| 142 | - $status="show"; |
|
| 145 | + if ($show === true) { |
|
| 146 | + $status="show"; |
|
| 147 | + } |
|
| 143 | 148 | return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
| 144 | 149 | } |
| 145 | 150 | |
@@ -148,8 +153,9 @@ discard block |
||
| 148 | 153 | * @see BaseHtml::compile() |
| 149 | 154 | */ |
| 150 | 155 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 151 | - if (isset($this->_popup)) |
|
| 152 | - $this->_popup->compile($js); |
|
| 156 | + if (isset($this->_popup)) { |
|
| 157 | + $this->_popup->compile($js); |
|
| 158 | + } |
|
| 153 | 159 | return parent::compile($js, $view); |
| 154 | 160 | } |
| 155 | 161 | |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | use BaseTrait; |
| 23 | 23 | protected $_popup=NULL; |
| 24 | 24 | protected $_dimmer=NULL; |
| 25 | - protected $_params=array (); |
|
| 25 | + protected $_params=array(); |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | 28 | public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) { |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | * @return HtmlDimmer |
| 79 | 79 | */ |
| 80 | 80 | public function addDimmer($params=array(), $content=NULL) { |
| 81 | - $dimmer=new HtmlDimmer("dimmer-" . $this->identifier, $content); |
|
| 81 | + $dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content); |
|
| 82 | 82 | $dimmer->setParams($params); |
| 83 | 83 | $dimmer->setContainer($this); |
| 84 | 84 | $this->addContent($dimmer); |
@@ -94,12 +94,12 @@ discard block |
||
| 94 | 94 | */ |
| 95 | 95 | public function addLabel($label, $before=false, $icon=NULL) { |
| 96 | 96 | $labelO=$label; |
| 97 | - if (\is_object($label) === false) { |
|
| 98 | - $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
|
| 97 | + if (\is_object($label)===false) { |
|
| 98 | + $labelO=new HtmlLabel("label-".$this->identifier, $label); |
|
| 99 | 99 | if (isset($icon)) |
| 100 | 100 | $labelO->addIcon($icon); |
| 101 | 101 | } else { |
| 102 | - $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
|
| 102 | + $labelO->addToPropertyCtrl("class", "label", array("label")); |
|
| 103 | 103 | } |
| 104 | 104 | $this->addContent($labelO, $before); |
| 105 | 105 | return $labelO; |
@@ -113,9 +113,9 @@ discard block |
||
| 113 | 113 | * @param string $icon |
| 114 | 114 | * @return HtmlSemDoubleElement |
| 115 | 115 | */ |
| 116 | - public function attachLabel($label,$side=Side::TOP,$direction=Direction::NONE,$icon=NULL){ |
|
| 117 | - $label=$this->addLabel($label,true,$icon); |
|
| 118 | - $label->setAttached($side,$direction); |
|
| 116 | + public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) { |
|
| 117 | + $label=$this->addLabel($label, true, $icon); |
|
| 118 | + $label->setAttached($side, $direction); |
|
| 119 | 119 | return $this; |
| 120 | 120 | } |
| 121 | 121 | |
@@ -123,10 +123,10 @@ discard block |
||
| 123 | 123 | * Transforms the element into a link |
| 124 | 124 | * @return HtmlSemDoubleElement |
| 125 | 125 | */ |
| 126 | - public function asLink($href=NULL,$target=NULL) { |
|
| 126 | + public function asLink($href=NULL, $target=NULL) { |
|
| 127 | 127 | if (isset($href)) |
| 128 | 128 | $this->setProperty("href", $href); |
| 129 | - if(isset($target)) |
|
| 129 | + if (isset($target)) |
|
| 130 | 130 | $this->setProperty("target", $target); |
| 131 | 131 | return $this->setTagName("a"); |
| 132 | 132 | } |
@@ -138,9 +138,9 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | public function jsShowDimmer($show=true) { |
| 140 | 140 | $status="hide"; |
| 141 | - if ($show === true) |
|
| 141 | + if ($show===true) |
|
| 142 | 142 | $status="show"; |
| 143 | - return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
|
| 143 | + return '$("#.'.$this->identifier.').dimmer("'.$status.'");'; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | /** |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | * @see HtmlDoubleElement::run() |
| 159 | 159 | */ |
| 160 | 160 | public function run(JsUtils $js) { |
| 161 | - $this->_bsComponent=$js->semantic()->generic("#" . $this->identifier); |
|
| 161 | + $this->_bsComponent=$js->semantic()->generic("#".$this->identifier); |
|
| 162 | 162 | parent::run($js); |
| 163 | 163 | $this->addEventsOnRun($js); |
| 164 | 164 | if (isset($this->_popup)) { |
@@ -167,8 +167,8 @@ discard block |
||
| 167 | 167 | return $this->_bsComponent; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - public function addList($elements,$ordered=false){ |
|
| 171 | - $list=new HtmlList("list-".$this->identifier,$elements); |
|
| 170 | + public function addList($elements, $ordered=false) { |
|
| 171 | + $list=new HtmlList("list-".$this->identifier, $elements); |
|
| 172 | 172 | $list->setOrdered($ordered); |
| 173 | 173 | $list->setClass("ui list"); |
| 174 | 174 | $this->addContent($list); |
@@ -2,63 +2,63 @@ |
||
| 2 | 2 | namespace Ajax\service; |
| 3 | 3 | class JString { |
| 4 | 4 | |
| 5 | - public static function contains($hay,$needle){ |
|
| 6 | - return strpos($hay, $needle) !== false; |
|
| 5 | + public static function contains($hay, $needle) { |
|
| 6 | + return strpos($hay, $needle)!==false; |
|
| 7 | 7 | } |
| 8 | 8 | public static function startswith($hay, $needle) { |
| 9 | - return substr($hay, 0, strlen($needle)) === $needle; |
|
| 9 | + return substr($hay, 0, strlen($needle))===$needle; |
|
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | public static function endswith($hay, $needle) { |
| 13 | - return substr($hay, -strlen($needle)) === $needle; |
|
| 13 | + return substr($hay, -strlen($needle))===$needle; |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | - public static function isNull($s){ |
|
| 16 | + public static function isNull($s) { |
|
| 17 | 17 | return (!isset($s) || NULL===$s || ""===$s); |
| 18 | 18 | } |
| 19 | - public static function isNotNull($s){ |
|
| 19 | + public static function isNotNull($s) { |
|
| 20 | 20 | return (isset($s) && NULL!==$s && ""!==$s); |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public static function isBoolean($value){ |
|
| 23 | + public static function isBoolean($value) { |
|
| 24 | 24 | return \is_bool($value) || $value==1 || $value==0; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - public static function isBooleanTrue($value){ |
|
| 27 | + public static function isBooleanTrue($value) { |
|
| 28 | 28 | return $value==1 || $value; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - public static function isBooleanFalse($value){ |
|
| 31 | + public static function isBooleanFalse($value) { |
|
| 32 | 32 | return $value==0 || !$value; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - public static function camelCaseToSeparated($input,$separator=" "){ |
|
| 35 | + public static function camelCaseToSeparated($input, $separator=" ") { |
|
| 36 | 36 | return strtolower(preg_replace('/(?<!^)[A-Z]/', $separator.'$0', $input)); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - public static function replaceAtFirst($subject,$from, $to){ |
|
| 40 | - $from = '/\A'.preg_quote($from, '/').'/'; |
|
| 39 | + public static function replaceAtFirst($subject, $from, $to) { |
|
| 40 | + $from='/\A'.preg_quote($from, '/').'/'; |
|
| 41 | 41 | return \preg_replace($from, $to, $subject, 1); |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - public static function replaceAtLast($subject,$from, $to){ |
|
| 45 | - $from = '/'.preg_quote($from, '/').'\z/'; |
|
| 44 | + public static function replaceAtLast($subject, $from, $to) { |
|
| 45 | + $from='/'.preg_quote($from, '/').'\z/'; |
|
| 46 | 46 | return \preg_replace($from, $to, $subject, 1); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - public static function replaceAtFirstAndLast($subject,$fromFirst,$toFirst,$fromLast,$toLast){ |
|
| 49 | + public static function replaceAtFirstAndLast($subject, $fromFirst, $toFirst, $fromLast, $toLast) { |
|
| 50 | 50 | $s=self::replaceAtFirst($subject, $fromFirst, $toFirst); |
| 51 | 51 | return self::replaceAtLast($s, $fromLast, $toLast); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - public static function getValueBetween(&$str,$before="{{",$after="}}"){ |
|
| 54 | + public static function getValueBetween(&$str, $before="{{", $after="}}") { |
|
| 55 | 55 | $matches=[]; |
| 56 | 56 | $result=null; |
| 57 | 57 | $_before=\preg_quote($before); |
| 58 | 58 | $_after=\preg_quote($after); |
| 59 | - if(\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1){ |
|
| 59 | + if (\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1) { |
|
| 60 | 60 | $result=$matches[1]; |
| 61 | - $str=\str_replace($before.$result.$after,"", $str); |
|
| 61 | + $str=\str_replace($before.$result.$after, "", $str); |
|
| 62 | 62 | } |
| 63 | 63 | return $result; |
| 64 | 64 | } |
@@ -62,6 +62,9 @@ discard block |
||
| 62 | 62 | return $tr; |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | + /** |
|
| 66 | + * @param integer $value |
|
| 67 | + */ |
|
| 65 | 68 | public function newRow($value) { |
| 66 | 69 | return $this->createItem($value); |
| 67 | 70 | } |
@@ -160,6 +163,9 @@ discard block |
||
| 160 | 163 | return $this; |
| 161 | 164 | } |
| 162 | 165 | |
| 166 | + /** |
|
| 167 | + * @param integer $colIndex |
|
| 168 | + */ |
|
| 163 | 169 | public function setColValues($colIndex, $values=array()) { |
| 164 | 170 | $count=$this->count(); |
| 165 | 171 | if (!\is_array($values)) { |
@@ -180,6 +186,9 @@ discard block |
||
| 180 | 186 | return $this; |
| 181 | 187 | } |
| 182 | 188 | |
| 189 | + /** |
|
| 190 | + * @param integer $rowIndex |
|
| 191 | + */ |
|
| 183 | 192 | public function setRowValues($rowIndex, $values=array()) { |
| 184 | 193 | $count=$this->count(); |
| 185 | 194 | if (!\is_array($values)) { |
@@ -189,6 +198,9 @@ discard block |
||
| 189 | 198 | return $this; |
| 190 | 199 | } |
| 191 | 200 | |
| 201 | + /** |
|
| 202 | + * @param string $function |
|
| 203 | + */ |
|
| 192 | 204 | private function colAlign($colIndex, $function) { |
| 193 | 205 | $count=$this->count(); |
| 194 | 206 | for($i=0; $i < $count; $i++) { |
@@ -266,7 +278,7 @@ discard block |
||
| 266 | 278 | } |
| 267 | 279 | |
| 268 | 280 | /** |
| 269 | - * @param mixed $callback |
|
| 281 | + * @param callable $callback |
|
| 270 | 282 | * @param string $format |
| 271 | 283 | * @return HtmlTableContent |
| 272 | 284 | */ |
@@ -279,7 +291,7 @@ discard block |
||
| 279 | 291 | } |
| 280 | 292 | |
| 281 | 293 | /** |
| 282 | - * @param mixed $callback |
|
| 294 | + * @param callable $callback |
|
| 283 | 295 | * @param string $format |
| 284 | 296 | * @return HtmlTableContent |
| 285 | 297 | */ |
@@ -292,7 +304,7 @@ discard block |
||
| 292 | 304 | } |
| 293 | 305 | |
| 294 | 306 | /** |
| 295 | - * @param mixed $callback |
|
| 307 | + * @param callable $callback |
|
| 296 | 308 | * @return HtmlTableContent |
| 297 | 309 | */ |
| 298 | 310 | public function applyCells($callback) { |
@@ -304,7 +316,7 @@ discard block |
||
| 304 | 316 | } |
| 305 | 317 | |
| 306 | 318 | /** |
| 307 | - * @param mixed $callback |
|
| 319 | + * @param callable $callback |
|
| 308 | 320 | * @return HtmlTableContent |
| 309 | 321 | */ |
| 310 | 322 | public function applyRows($callback) { |
@@ -22,8 +22,9 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
| 24 | 24 | parent::__construct($identifier, $tagName, ""); |
| 25 | - if (isset($rowCount) && isset($colCount)) |
|
| 26 | - $this->setRowCount($rowCount, $colCount); |
|
| 25 | + if (isset($rowCount) && isset($colCount)) { |
|
| 26 | + $this->setRowCount($rowCount, $colCount); |
|
| 27 | + } |
|
| 27 | 28 | } |
| 28 | 29 | |
| 29 | 30 | /** |
@@ -148,8 +149,9 @@ discard block |
||
| 148 | 149 | $values=\array_fill(0, $count, $values); |
| 149 | 150 | $isArray=false; |
| 150 | 151 | } |
| 151 | - if (JArray::dimension($values) == 1 && $isArray) |
|
| 152 | - $values=[ $values ]; |
|
| 152 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
| 153 | + $values=[ $values ]; |
|
| 154 | + } |
|
| 153 | 155 | |
| 154 | 156 | $count=\min(\sizeof($values), $count); |
| 155 | 157 | |
@@ -193,8 +195,9 @@ discard block |
||
| 193 | 195 | $count=$this->count(); |
| 194 | 196 | for($i=0; $i < $count; $i++) { |
| 195 | 197 | $index=$this->content[$i]->getColPosition($colIndex); |
| 196 | - if ($index !== NULL) |
|
| 197 | - $this->getCell($i, $index)->$function(); |
|
| 198 | + if ($index !== NULL) { |
|
| 199 | + $this->getCell($i, $index)->$function(); |
|
| 200 | + } |
|
| 198 | 201 | } |
| 199 | 202 | return $this; |
| 200 | 203 | } |
@@ -225,8 +228,9 @@ discard block |
||
| 225 | 228 | */ |
| 226 | 229 | public function getColCount() { |
| 227 | 230 | $result=0; |
| 228 | - if ($this->count() > 0) |
|
| 229 | - $result=$this->getItem(0)->count(); |
|
| 231 | + if ($this->count() > 0) { |
|
| 232 | + $result=$this->getItem(0)->count(); |
|
| 233 | + } |
|
| 230 | 234 | return $result; |
| 231 | 235 | } |
| 232 | 236 | |
@@ -250,8 +254,9 @@ discard block |
||
| 250 | 254 | |
| 251 | 255 | public function toDelete($rowIndex, $colIndex){ |
| 252 | 256 | $row=$this->getItem($rowIndex); |
| 253 | - if (isset($row) === true) |
|
| 254 | - $row->toDelete($colIndex); |
|
| 257 | + if (isset($row) === true) { |
|
| 258 | + $row->toDelete($colIndex); |
|
| 259 | + } |
|
| 255 | 260 | return $this; |
| 256 | 261 | } |
| 257 | 262 | |
@@ -349,8 +354,9 @@ discard block |
||
| 349 | 354 | foreach ( $rows as $row ) { |
| 350 | 355 | $cell=$row->getItem($colIndex); |
| 351 | 356 | $value=$cell->getContent(); |
| 352 | - if($functionExists) |
|
| 353 | - $value=\call_user_func($function,$value); |
|
| 357 | + if($functionExists) { |
|
| 358 | + $value=\call_user_func($function,$value); |
|
| 359 | + } |
|
| 354 | 360 | if($value!==$identiqual){ |
| 355 | 361 | if($counter>0 && isset($cellToMerge)){ |
| 356 | 362 | $cellToMerge->setRowspan($counter); |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | * |
| 12 | 12 | */ |
| 13 | 13 | class HtmlTableContent extends HtmlSemCollection { |
| 14 | - protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ]; |
|
| 14 | + protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"]; |
|
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function setRowCount($rowCount, $colCount) { |
| 36 | 36 | $count=$this->count(); |
| 37 | - for($i=$count; $i < $rowCount; $i++) { |
|
| 37 | + for ($i=$count; $i<$rowCount; $i++) { |
|
| 38 | 38 | $this->addItem($colCount); |
| 39 | 39 | } |
| 40 | 40 | return $this; |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $tr=new HtmlTR("", $value); |
| 57 | 57 | $tr->setContainer($this, $count); |
| 58 | 58 | $tr->setTdTagName($this->_tdTagNames[$this->tagName]); |
| 59 | - if (isset($value) === true) { |
|
| 59 | + if (isset($value)===true) { |
|
| 60 | 60 | $tr->setColCount($value); |
| 61 | 61 | } |
| 62 | 62 | return $tr; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | public function setCellValue($row, $col, $value="") { |
| 116 | 116 | $cell=$this->getCell($row, $col); |
| 117 | - if (isset($cell) === true) { |
|
| 117 | + if (isset($cell)===true) { |
|
| 118 | 118 | $cell->setValue($value); |
| 119 | 119 | } |
| 120 | 120 | return $this; |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * @param mixed $values |
| 126 | 126 | */ |
| 127 | 127 | public function setValues($values=array()) { |
| 128 | - return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->setValues($_values);}); |
|
| 128 | + return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->setValues($_values); }); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | * @param mixed $values |
| 134 | 134 | */ |
| 135 | 135 | public function addValues($values=array()) { |
| 136 | - return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->addValues($_values);}); |
|
| 136 | + return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->addValues($_values); }); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** |
@@ -141,21 +141,21 @@ discard block |
||
| 141 | 141 | * @param mixed $values |
| 142 | 142 | * @param callable $callback |
| 143 | 143 | */ |
| 144 | - protected function _addOrSetValues($values,$callback) { |
|
| 144 | + protected function _addOrSetValues($values, $callback) { |
|
| 145 | 145 | $count=$this->count(); |
| 146 | 146 | $isArray=true; |
| 147 | 147 | if (!\is_array($values)) { |
| 148 | 148 | $values=\array_fill(0, $count, $values); |
| 149 | 149 | $isArray=false; |
| 150 | 150 | } |
| 151 | - if (JArray::dimension($values) == 1 && $isArray) |
|
| 152 | - $values=[ $values ]; |
|
| 151 | + if (JArray::dimension($values)==1 && $isArray) |
|
| 152 | + $values=[$values]; |
|
| 153 | 153 | |
| 154 | 154 | $count=\min(\sizeof($values), $count); |
| 155 | 155 | |
| 156 | - for($i=0; $i < $count; $i++) { |
|
| 156 | + for ($i=0; $i<$count; $i++) { |
|
| 157 | 157 | $row=$this->content[$i]; |
| 158 | - $callback($row,$values[$i]); |
|
| 158 | + $callback($row, $values[$i]); |
|
| 159 | 159 | } |
| 160 | 160 | return $this; |
| 161 | 161 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | $values=\array_fill(0, $count, $values); |
| 167 | 167 | } |
| 168 | 168 | $count=\min(\sizeof($values), $count); |
| 169 | - for($i=0; $i < $count; $i++) { |
|
| 169 | + for ($i=0; $i<$count; $i++) { |
|
| 170 | 170 | $this->getCell($i, $colIndex)->setValue($values[$i]); |
| 171 | 171 | } |
| 172 | 172 | return $this; |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | |
| 175 | 175 | public function addColVariations($colIndex, $variations=array()) { |
| 176 | 176 | $count=$this->count(); |
| 177 | - for($i=0; $i < $count; $i++) { |
|
| 177 | + for ($i=0; $i<$count; $i++) { |
|
| 178 | 178 | $this->getCell($i, $colIndex)->addVariations($variations); |
| 179 | 179 | } |
| 180 | 180 | return $this; |
@@ -191,9 +191,9 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | private function colAlign($colIndex, $function) { |
| 193 | 193 | $count=$this->count(); |
| 194 | - for($i=0; $i < $count; $i++) { |
|
| 194 | + for ($i=0; $i<$count; $i++) { |
|
| 195 | 195 | $index=$this->content[$i]->getColPosition($colIndex); |
| 196 | - if ($index !== NULL) |
|
| 196 | + if ($index!==NULL) |
|
| 197 | 197 | $this->getCell($i, $index)->$function(); |
| 198 | 198 | } |
| 199 | 199 | return $this; |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | */ |
| 226 | 226 | public function getColCount() { |
| 227 | 227 | $result=0; |
| 228 | - if ($this->count() > 0) |
|
| 228 | + if ($this->count()>0) |
|
| 229 | 229 | $result=$this->getItem(0)->count(); |
| 230 | 230 | return $result; |
| 231 | 231 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | public function delete($rowIndex, $colIndex=NULL) { |
| 240 | 240 | if (isset($colIndex)) { |
| 241 | 241 | $row=$this->getItem($rowIndex); |
| 242 | - if (isset($row) === true) { |
|
| 242 | + if (isset($row)===true) { |
|
| 243 | 243 | $row->delete($colIndex); |
| 244 | 244 | } |
| 245 | 245 | } else { |
@@ -248,9 +248,9 @@ discard block |
||
| 248 | 248 | return $this; |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | - public function toDelete($rowIndex, $colIndex){ |
|
| 251 | + public function toDelete($rowIndex, $colIndex) { |
|
| 252 | 252 | $row=$this->getItem($rowIndex); |
| 253 | - if (isset($row) === true) |
|
| 253 | + if (isset($row)===true) |
|
| 254 | 254 | $row->toDelete($colIndex); |
| 255 | 255 | return $this; |
| 256 | 256 | } |
@@ -279,17 +279,17 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | public function conditionalCellFormat($callback, $format) { |
| 281 | 281 | $rows=$this->content; |
| 282 | - foreach ( $rows as $row ) { |
|
| 282 | + foreach ($rows as $row) { |
|
| 283 | 283 | $row->conditionalCellFormat($callback, $format); |
| 284 | 284 | } |
| 285 | 285 | return $this; |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | - public function conditionalColFormat($colIndex,$callback,$format){ |
|
| 288 | + public function conditionalColFormat($colIndex, $callback, $format) { |
|
| 289 | 289 | $rows=$this->content; |
| 290 | - foreach ( $rows as $row ) { |
|
| 290 | + foreach ($rows as $row) { |
|
| 291 | 291 | $cell=$row->getItem($colIndex); |
| 292 | - $cell->conditionnalCellFormat($callback,$format); |
|
| 292 | + $cell->conditionnalCellFormat($callback, $format); |
|
| 293 | 293 | } |
| 294 | 294 | return $this; |
| 295 | 295 | } |
@@ -301,17 +301,17 @@ discard block |
||
| 301 | 301 | */ |
| 302 | 302 | public function conditionalRowFormat($callback, $format) { |
| 303 | 303 | $rows=$this->content; |
| 304 | - foreach ( $rows as $row ) { |
|
| 304 | + foreach ($rows as $row) { |
|
| 305 | 305 | $row->conditionalRowFormat($callback, $format); |
| 306 | 306 | } |
| 307 | 307 | return $this; |
| 308 | 308 | } |
| 309 | 309 | |
| 310 | - public function hideColumn($colIndex){ |
|
| 310 | + public function hideColumn($colIndex) { |
|
| 311 | 311 | $rows=$this->content; |
| 312 | - foreach ( $rows as $row ) { |
|
| 312 | + foreach ($rows as $row) { |
|
| 313 | 313 | $cell=$row->getItem($colIndex); |
| 314 | - $cell->addToProperty("style","display:none;"); |
|
| 314 | + $cell->addToProperty("style", "display:none;"); |
|
| 315 | 315 | } |
| 316 | 316 | return $this; |
| 317 | 317 | } |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | */ |
| 323 | 323 | public function applyCells($callback) { |
| 324 | 324 | $rows=$this->content; |
| 325 | - foreach ( $rows as $row ) { |
|
| 325 | + foreach ($rows as $row) { |
|
| 326 | 326 | $row->applyCells($callback); |
| 327 | 327 | } |
| 328 | 328 | return $this; |
@@ -334,25 +334,25 @@ discard block |
||
| 334 | 334 | */ |
| 335 | 335 | public function applyRows($callback) { |
| 336 | 336 | $rows=$this->content; |
| 337 | - foreach ( $rows as $row ) { |
|
| 337 | + foreach ($rows as $row) { |
|
| 338 | 338 | $row->apply($callback); |
| 339 | 339 | } |
| 340 | 340 | return $this; |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | - public function mergeIdentiqualValues($colIndex,$function="strip_tags"){ |
|
| 343 | + public function mergeIdentiqualValues($colIndex, $function="strip_tags") { |
|
| 344 | 344 | $rows=$this->content; |
| 345 | 345 | $identiqual=null; |
| 346 | 346 | $counter=0; |
| 347 | 347 | $cellToMerge=null; |
| 348 | 348 | $functionExists=\function_exists($function); |
| 349 | - foreach ( $rows as $row ) { |
|
| 349 | + foreach ($rows as $row) { |
|
| 350 | 350 | $cell=$row->getItem($colIndex); |
| 351 | 351 | $value=$cell->getContent(); |
| 352 | - if($functionExists) |
|
| 353 | - $value=\call_user_func($function,$value); |
|
| 354 | - if($value!==$identiqual){ |
|
| 355 | - if($counter>0 && isset($cellToMerge)){ |
|
| 352 | + if ($functionExists) |
|
| 353 | + $value=\call_user_func($function, $value); |
|
| 354 | + if ($value!==$identiqual) { |
|
| 355 | + if ($counter>0 && isset($cellToMerge)) { |
|
| 356 | 356 | $cellToMerge->setRowspan($counter); |
| 357 | 357 | } |
| 358 | 358 | $counter=0; |
@@ -361,7 +361,7 @@ discard block |
||
| 361 | 361 | } |
| 362 | 362 | $counter++; |
| 363 | 363 | } |
| 364 | - if($counter>0 && isset($cellToMerge)){ |
|
| 364 | + if ($counter>0 && isset($cellToMerge)) { |
|
| 365 | 365 | $cellToMerge->setRowspan($counter); |
| 366 | 366 | } |
| 367 | 367 | return $this; |