@@ -18,6 +18,9 @@ discard block |
||
18 | 18 | private $_container; |
19 | 19 | private $_row; |
20 | 20 | |
21 | + /** |
|
22 | + * @param string $identifier |
|
23 | + */ |
|
21 | 24 | public function __construct($identifier) { |
22 | 25 | parent::__construct($identifier, "tr", ""); |
23 | 26 | $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
@@ -78,6 +81,7 @@ discard block |
||
78 | 81 | /** |
79 | 82 | * Sets or adds values to the row cols |
80 | 83 | * @param mixed $values |
84 | + * @param \Closure $callback |
|
81 | 85 | */ |
82 | 86 | protected function _addOrSetValues($values,$callback) { |
83 | 87 | $count=$this->count(); |
@@ -120,25 +120,29 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | public function getColPosition($colIndex) { |
123 | - if($this->_container->_isMerged()!==true) |
|
124 | - return $colIndex; |
|
123 | + if($this->_container->_isMerged()!==true) { |
|
124 | + return $colIndex; |
|
125 | + } |
|
125 | 126 | $pos=0; |
126 | 127 | $rows=$this->_container->getContent(); |
127 | 128 | for($i=0; $i < $this->_row; $i++) { |
128 | 129 | $max=\min($colIndex, $rows[$i]->count()); |
129 | 130 | for($j=0; $j < $max; $j++) { |
130 | 131 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
131 | - if ($rowspan + $i > $this->_row) |
|
132 | - $pos++; |
|
132 | + if ($rowspan + $i > $this->_row) { |
|
133 | + $pos++; |
|
134 | + } |
|
133 | 135 | } |
134 | 136 | } |
135 | - if ($pos > $colIndex) |
|
136 | - return NULL; |
|
137 | + if ($pos > $colIndex) { |
|
138 | + return NULL; |
|
139 | + } |
|
137 | 140 | $count=$this->count(); |
138 | 141 | for($i=0; $i < $count; $i++) { |
139 | 142 | $pos+=$this->content[$i]->getColspan(); |
140 | - if ($pos >= $colIndex + 1) |
|
141 | - return $i; |
|
143 | + if ($pos >= $colIndex + 1) { |
|
144 | + return $i; |
|
145 | + } |
|
142 | 146 | } |
143 | 147 | return null; |
144 | 148 | } |
@@ -161,8 +165,9 @@ discard block |
||
161 | 165 | public function containsStr($needle) { |
162 | 166 | $cells=$this->content; |
163 | 167 | foreach ( $cells as $cell ) { |
164 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
165 | - return true; |
|
168 | + if (\strpos($cell->getContent(), $needle) !== false) { |
|
169 | + return true; |
|
170 | + } |
|
166 | 171 | } |
167 | 172 | return false; |
168 | 173 | } |
@@ -20,19 +20,19 @@ discard block |
||
20 | 20 | |
21 | 21 | public function __construct($identifier) { |
22 | 22 | parent::__construct($identifier, "tr", ""); |
23 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
23 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function setColCount($colCount) { |
27 | 27 | $count=$this->count(); |
28 | - for($i=$count; $i < $colCount; $i++) { |
|
28 | + for ($i=$count; $i<$colCount; $i++) { |
|
29 | 29 | $item=$this->addItem(NULL); |
30 | 30 | $item->setTagName($this->_tdTagName); |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function getColCount(){ |
|
35 | + public function getColCount() { |
|
36 | 36 | return $this->count(); |
37 | 37 | } |
38 | 38 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param mixed $values |
69 | 69 | */ |
70 | 70 | public function setValues($values=array()) { |
71 | - return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);}); |
|
71 | + return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->setValue($value); }); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -76,27 +76,27 @@ discard block |
||
76 | 76 | * @param mixed $values |
77 | 77 | */ |
78 | 78 | public function addValues($values=array()) { |
79 | - return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);}); |
|
79 | + return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->addValue($value); }); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
83 | 83 | * Sets or adds values to the row cols |
84 | 84 | * @param mixed $values |
85 | 85 | */ |
86 | - protected function _addOrSetValues($values,$callback) { |
|
86 | + protected function _addOrSetValues($values, $callback) { |
|
87 | 87 | $count=$this->count(); |
88 | 88 | if (!\is_array($values)) { |
89 | 89 | $values=\array_fill(0, $count, $values); |
90 | 90 | } else { |
91 | - if (JArray::isAssociative($values) === true) { |
|
91 | + if (JArray::isAssociative($values)===true) { |
|
92 | 92 | $values=\array_values($values); |
93 | 93 | } |
94 | 94 | } |
95 | 95 | $count=\min(\sizeof($values), $count); |
96 | 96 | |
97 | - for($i=0; $i < $count; $i++) { |
|
97 | + for ($i=0; $i<$count; $i++) { |
|
98 | 98 | $cell=$this->content[$i]; |
99 | - $callback($cell,$values[$i]); |
|
99 | + $callback($cell, $values[$i]); |
|
100 | 100 | } |
101 | 101 | return $this; |
102 | 102 | } |
@@ -120,24 +120,24 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | public function getColPosition($colIndex) { |
123 | - if($this->_container->_isMerged()!==true) |
|
123 | + if ($this->_container->_isMerged()!==true) |
|
124 | 124 | return $colIndex; |
125 | 125 | $pos=0; |
126 | 126 | $rows=$this->_container->getContent(); |
127 | - for($i=0; $i < $this->_row; $i++) { |
|
127 | + for ($i=0; $i<$this->_row; $i++) { |
|
128 | 128 | $max=\min($colIndex, $rows[$i]->count()); |
129 | - for($j=0; $j < $max; $j++) { |
|
129 | + for ($j=0; $j<$max; $j++) { |
|
130 | 130 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
131 | - if ($rowspan + $i > $this->_row) |
|
131 | + if ($rowspan+$i>$this->_row) |
|
132 | 132 | $pos++; |
133 | 133 | } |
134 | 134 | } |
135 | - if ($pos > $colIndex) |
|
135 | + if ($pos>$colIndex) |
|
136 | 136 | return NULL; |
137 | 137 | $count=$this->count(); |
138 | - for($i=0; $i < $count; $i++) { |
|
138 | + for ($i=0; $i<$count; $i++) { |
|
139 | 139 | $pos+=$this->content[$i]->getColspan(); |
140 | - if ($pos >= $colIndex + 1) |
|
140 | + if ($pos>=$colIndex+1) |
|
141 | 141 | return $i; |
142 | 142 | } |
143 | 143 | return null; |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | |
146 | 146 | public function conditionalCellFormat($callback, $format) { |
147 | 147 | $cells=$this->content; |
148 | - foreach ( $cells as $cell ) { |
|
148 | + foreach ($cells as $cell) { |
|
149 | 149 | $cell->conditionalCellFormat($callback, $format); |
150 | 150 | } |
151 | 151 | return $this; |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | |
161 | 161 | public function containsStr($needle) { |
162 | 162 | $cells=$this->content; |
163 | - foreach ( $cells as $cell ) { |
|
164 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
163 | + foreach ($cells as $cell) { |
|
164 | + if (\strpos($cell->getContent(), $needle)!==false) |
|
165 | 165 | return true; |
166 | 166 | } |
167 | 167 | return false; |
@@ -174,13 +174,13 @@ discard block |
||
174 | 174 | |
175 | 175 | public function applyCells($callback) { |
176 | 176 | $cells=$this->content; |
177 | - foreach ( $cells as $cell ) { |
|
177 | + foreach ($cells as $cell) { |
|
178 | 178 | $cell->apply($callback); |
179 | 179 | } |
180 | 180 | return $this; |
181 | 181 | } |
182 | 182 | |
183 | - public function toDelete($colIndex){ |
|
183 | + public function toDelete($colIndex) { |
|
184 | 184 | $this->getItem($colIndex)->toDelete(); |
185 | 185 | return $this; |
186 | 186 | } |
@@ -63,6 +63,9 @@ discard block |
||
63 | 63 | |
64 | 64 | |
65 | 65 | |
66 | + /** |
|
67 | + * @param string $op |
|
68 | + */ |
|
66 | 69 | protected function _generateBehavior($op,$params,JsUtils $js){ |
67 | 70 | if(isset($this->_urls[$op])){ |
68 | 71 | $params=\array_merge($params,["attr"=>"data-ajax"]); |
@@ -139,6 +142,9 @@ discard block |
||
139 | 142 | } |
140 | 143 | } |
141 | 144 | |
145 | + /** |
|
146 | + * @param string $checkedClass |
|
147 | + */ |
|
142 | 148 | protected function _generateRow($instance,&$table,$checkedClass=null){ |
143 | 149 | $this->_instanceViewer->setInstance($instance); |
144 | 150 | InstanceViewer::$index++; |
@@ -215,6 +221,9 @@ discard block |
||
215 | 221 | return $this; |
216 | 222 | } |
217 | 223 | |
224 | + /** |
|
225 | + * @param PositionInTable $part |
|
226 | + */ |
|
218 | 227 | private function addToolbarRow($part,$table,$captions){ |
219 | 228 | $hasPart=$table->hasPart($part); |
220 | 229 | if($hasPart){ |
@@ -254,7 +263,7 @@ discard block |
||
254 | 263 | * Paginates the DataTable element with a Semantic HtmlPaginationMenu component |
255 | 264 | * @param number $page the active page number |
256 | 265 | * @param number $total_rowcount the total number of items |
257 | - * @param number $items_per_page The number of items per page |
|
266 | + * @param integer $items_per_page The number of items per page |
|
258 | 267 | * @param number $pages_visibles The number of visible pages in the Pagination component |
259 | 268 | * @return DataTable |
260 | 269 | */ |
@@ -265,9 +274,9 @@ discard block |
||
265 | 274 | |
266 | 275 | /** |
267 | 276 | * Auto Paginates the DataTable element with a Semantic HtmlPaginationMenu component |
268 | - * @param number $page the active page number |
|
269 | - * @param number $items_per_page The number of items per page |
|
270 | - * @param number $pages_visibles The number of visible pages in the Pagination component |
|
277 | + * @param integer $page the active page number |
|
278 | + * @param integer $items_per_page The number of items per page |
|
279 | + * @param integer $pages_visibles The number of visible pages in the Pagination component |
|
271 | 280 | * @return DataTable |
272 | 281 | */ |
273 | 282 | public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){ |
@@ -333,6 +342,9 @@ discard block |
||
333 | 342 | return $this; |
334 | 343 | } |
335 | 344 | |
345 | + /** |
|
346 | + * @return string |
|
347 | + */ |
|
336 | 348 | public function getRefreshSelector() { |
337 | 349 | if(isset($this->_refreshSelector)) |
338 | 350 | return $this->_refreshSelector; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * |
25 | 25 | */ |
26 | 26 | class DataTable extends Widget { |
27 | - use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait; |
|
27 | + use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait; |
|
28 | 28 | protected $_searchField; |
29 | 29 | protected $_urls; |
30 | 30 | protected $_pagination; |
@@ -42,35 +42,35 @@ discard block |
||
42 | 42 | protected $_colWidths; |
43 | 43 | |
44 | 44 | |
45 | - public function __construct($identifier,$model,$modelInstance=NULL) { |
|
46 | - parent::__construct($identifier, $model,$modelInstance); |
|
47 | - $this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false); |
|
45 | + public function __construct($identifier, $model, $modelInstance=NULL) { |
|
46 | + parent::__construct($identifier, $model, $modelInstance); |
|
47 | + $this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false); |
|
48 | 48 | $this->_urls=[]; |
49 | - $this->_emptyMessage=new HtmlMessage("","nothing to display"); |
|
49 | + $this->_emptyMessage=new HtmlMessage("", "nothing to display"); |
|
50 | 50 | $this->_emptyMessage->setIcon("info circle"); |
51 | 51 | } |
52 | 52 | |
53 | - public function run(JsUtils $js){ |
|
54 | - if($this->_hasCheckboxes && isset($js)){ |
|
53 | + public function run(JsUtils $js) { |
|
54 | + if ($this->_hasCheckboxes && isset($js)) { |
|
55 | 55 | $this->_runCheckboxes($js); |
56 | 56 | } |
57 | - if($this->_visibleHover){ |
|
58 | - $js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]); |
|
59 | - $js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]); |
|
57 | + if ($this->_visibleHover) { |
|
58 | + $js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]); |
|
59 | + $js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]); |
|
60 | 60 | } |
61 | - if(\is_array($this->_deleteBehavior)) |
|
62 | - $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
63 | - if(\is_array($this->_editBehavior)) |
|
64 | - $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
61 | + if (\is_array($this->_deleteBehavior)) |
|
62 | + $this->_generateBehavior("delete", $this->_deleteBehavior, $js); |
|
63 | + if (\is_array($this->_editBehavior)) |
|
64 | + $this->_generateBehavior("edit", $this->_editBehavior, $js); |
|
65 | 65 | return parent::run($js); |
66 | 66 | } |
67 | 67 | |
68 | 68 | |
69 | 69 | |
70 | - protected function _generateBehavior($op,$params,JsUtils $js){ |
|
71 | - if(isset($this->_urls[$op])){ |
|
72 | - $params=\array_merge($params,["attr"=>"data-ajax"]); |
|
73 | - $js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector($op),$params); |
|
70 | + protected function _generateBehavior($op, $params, JsUtils $js) { |
|
71 | + if (isset($this->_urls[$op])) { |
|
72 | + $params=\array_merge($params, ["attr"=>"data-ajax"]); |
|
73 | + $js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
@@ -83,158 +83,158 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | |
86 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
87 | - if(!$this->_generated){ |
|
86 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
87 | + if (!$this->_generated) { |
|
88 | 88 | $this->_instanceViewer->setInstance($this->_model); |
89 | 89 | $captions=$this->_instanceViewer->getCaptions(); |
90 | 90 | $table=$this->content["table"]; |
91 | - if($this->_hasCheckboxes){ |
|
91 | + if ($this->_hasCheckboxes) { |
|
92 | 92 | $this->_generateMainCheckbox($captions); |
93 | 93 | } |
94 | 94 | $table->setRowCount(0, \sizeof($captions)); |
95 | - $this->_generateHeader($table,$captions); |
|
95 | + $this->_generateHeader($table, $captions); |
|
96 | 96 | |
97 | - if(isset($this->_compileParts)) |
|
97 | + if (isset($this->_compileParts)) |
|
98 | 98 | $table->setCompileParts($this->_compileParts); |
99 | 99 | |
100 | 100 | $this->_generateContent($table); |
101 | 101 | |
102 | - $this->compileExtraElements($table, $captions,$js); |
|
102 | + $this->compileExtraElements($table, $captions, $js); |
|
103 | 103 | |
104 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
|
104 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]); |
|
105 | 105 | $this->_compileForm(); |
106 | 106 | $this->_applyStyleAttributes($table); |
107 | 107 | $this->_generated=true; |
108 | 108 | } |
109 | - return parent::compile($js,$view); |
|
109 | + return parent::compile($js, $view); |
|
110 | 110 | } |
111 | 111 | |
112 | - protected function compileExtraElements($table,$captions,JsUtils $js=NULL){ |
|
113 | - if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){ |
|
114 | - $this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]); |
|
112 | + protected function compileExtraElements($table, $captions, JsUtils $js=NULL) { |
|
113 | + if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) { |
|
114 | + $this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]); |
|
115 | 115 | } |
116 | - if($this->_hasCheckboxes && $table->hasPart("thead")){ |
|
116 | + if ($this->_hasCheckboxes && $table->hasPart("thead")) { |
|
117 | 117 | $table->getHeader()->getCell(0, 0)->addClass("no-sort"); |
118 | 118 | } |
119 | 119 | |
120 | - if(isset($this->_toolbar)){ |
|
120 | + if (isset($this->_toolbar)) { |
|
121 | 121 | $this->_setToolbarPosition($table, $captions); |
122 | 122 | } |
123 | - if(isset($this->_pagination) && $this->_pagination->getVisible()){ |
|
124 | - $this->_generatePagination($table,$js); |
|
123 | + if (isset($this->_pagination) && $this->_pagination->getVisible()) { |
|
124 | + $this->_generatePagination($table, $js); |
|
125 | 125 | } |
126 | 126 | } |
127 | 127 | |
128 | - protected function _applyStyleAttributes($table){ |
|
129 | - if(isset($this->_hiddenColumns)) |
|
128 | + protected function _applyStyleAttributes($table) { |
|
129 | + if (isset($this->_hiddenColumns)) |
|
130 | 130 | $this->_hideColumns(); |
131 | - if(isset($this->_colWidths)){ |
|
132 | - foreach ($this->_colWidths as $colIndex=>$width){ |
|
133 | - $table->setColWidth($colIndex,$width); |
|
131 | + if (isset($this->_colWidths)) { |
|
132 | + foreach ($this->_colWidths as $colIndex=>$width) { |
|
133 | + $table->setColWidth($colIndex, $width); |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | } |
137 | 137 | |
138 | - protected function _hideColumns(){ |
|
139 | - foreach ($this->_hiddenColumns as $colIndex){ |
|
138 | + protected function _hideColumns() { |
|
139 | + foreach ($this->_hiddenColumns as $colIndex) { |
|
140 | 140 | $this->_self->hideColumn($colIndex); |
141 | 141 | } |
142 | 142 | return $this; |
143 | 143 | } |
144 | 144 | |
145 | - protected function _generateHeader(HtmlTable $table,$captions){ |
|
145 | + protected function _generateHeader(HtmlTable $table, $captions) { |
|
146 | 146 | $table->setHeaderValues($captions); |
147 | - if(isset($this->_sortable)){ |
|
147 | + if (isset($this->_sortable)) { |
|
148 | 148 | $table->setSortable($this->_sortable); |
149 | 149 | } |
150 | 150 | } |
151 | 151 | |
152 | 152 | |
153 | 153 | |
154 | - protected function _generateContent($table){ |
|
154 | + protected function _generateContent($table) { |
|
155 | 155 | $objects=$this->_modelInstance; |
156 | - if(isset($this->_pagination)){ |
|
156 | + if (isset($this->_pagination)) { |
|
157 | 157 | $objects=$this->_pagination->getObjects($this->_modelInstance); |
158 | 158 | } |
159 | 159 | InstanceViewer::setIndex(0); |
160 | 160 | $table->fromDatabaseObjects($objects, function($instance) use($table){ |
161 | 161 | return $this->_generateRow($instance, $table); |
162 | 162 | }); |
163 | - if($table->getRowCount()==0){ |
|
163 | + if ($table->getRowCount()==0) { |
|
164 | 164 | $result=$table->addRow(); |
165 | 165 | $result->mergeRow(); |
166 | 166 | $result->setValues([$this->_emptyMessage]); |
167 | 167 | } |
168 | 168 | } |
169 | 169 | |
170 | - protected function _generateRow($instance,&$table,$checkedClass=null){ |
|
170 | + protected function _generateRow($instance, &$table, $checkedClass=null) { |
|
171 | 171 | $this->_instanceViewer->setInstance($instance); |
172 | 172 | InstanceViewer::$index++; |
173 | - $values= $this->_instanceViewer->getValues(); |
|
173 | + $values=$this->_instanceViewer->getValues(); |
|
174 | 174 | $id=$this->_instanceViewer->getIdentifier(); |
175 | 175 | $dataAjax=$id; |
176 | 176 | $id=$this->cleanIdentifier($id); |
177 | - if($this->_hasCheckboxes){ |
|
178 | - $ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,""); |
|
177 | + if ($this->_hasCheckboxes) { |
|
178 | + $ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, ""); |
|
179 | 179 | $ck->setOnChange("event.stopPropagation();"); |
180 | 180 | $field=$ck->getField(); |
181 | - $field->setProperty("value",$dataAjax); |
|
181 | + $field->setProperty("value", $dataAjax); |
|
182 | 182 | $field->setProperty("name", "selection[]"); |
183 | - if(isset($checkedClass)) |
|
183 | + if (isset($checkedClass)) |
|
184 | 184 | $field->setClass($checkedClass); |
185 | 185 | \array_unshift($values, $ck); |
186 | 186 | } |
187 | 187 | $result=$table->newRow(); |
188 | 188 | $result->setIdentifier($this->identifier."-tr-".$id); |
189 | - $result->setProperty("data-ajax",$dataAjax); |
|
189 | + $result->setProperty("data-ajax", $dataAjax); |
|
190 | 190 | $result->setValues($values); |
191 | - $result->addToProperty("class",$this->_rowClass); |
|
191 | + $result->addToProperty("class", $this->_rowClass); |
|
192 | 192 | return $result; |
193 | 193 | } |
194 | 194 | |
195 | - protected function _generatePagination($table,$js=NULL){ |
|
196 | - if(isset($this->_toolbar)){ |
|
197 | - if($this->_toolbarPosition==PositionInTable::FOOTER) |
|
195 | + protected function _generatePagination($table, $js=NULL) { |
|
196 | + if (isset($this->_toolbar)) { |
|
197 | + if ($this->_toolbarPosition==PositionInTable::FOOTER) |
|
198 | 198 | $this->_toolbar->setFloated("left"); |
199 | 199 | } |
200 | 200 | $footer=$table->getFooter(); |
201 | 201 | $footer->mergeCol(); |
202 | - $menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers()); |
|
202 | + $menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers()); |
|
203 | 203 | $menu->floatRight(); |
204 | 204 | $menu->setActiveItem($this->_pagination->getPage()-1); |
205 | 205 | $footer->addValues($menu); |
206 | - $this->_associatePaginationBehavior($menu,$js); |
|
206 | + $this->_associatePaginationBehavior($menu, $js); |
|
207 | 207 | } |
208 | 208 | |
209 | - protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){ |
|
210 | - if(isset($this->_urls["refresh"])){ |
|
211 | - $menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>false]); |
|
209 | + protected function _associatePaginationBehavior(HtmlMenu $menu, JsUtils $js=NULL) { |
|
210 | + if (isset($this->_urls["refresh"])) { |
|
211 | + $menu->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page')}", $this->getRefreshSelector(), ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>false]); |
|
212 | 212 | } |
213 | 213 | } |
214 | 214 | |
215 | - protected function _getFieldName($index){ |
|
215 | + protected function _getFieldName($index) { |
|
216 | 216 | $fieldName=parent::_getFieldName($index); |
217 | - if(\is_object($fieldName)) |
|
217 | + if (\is_object($fieldName)) |
|
218 | 218 | $fieldName="field-".$index; |
219 | 219 | return $fieldName."[]"; |
220 | 220 | } |
221 | 221 | |
222 | - protected function _getFieldCaption($index){ |
|
222 | + protected function _getFieldCaption($index) { |
|
223 | 223 | return null; |
224 | 224 | } |
225 | 225 | |
226 | - protected function _setToolbarPosition($table,$captions=NULL){ |
|
227 | - switch ($this->_toolbarPosition){ |
|
226 | + protected function _setToolbarPosition($table, $captions=NULL) { |
|
227 | + switch ($this->_toolbarPosition) { |
|
228 | 228 | case PositionInTable::BEFORETABLE: |
229 | 229 | case PositionInTable::AFTERTABLE: |
230 | - if(isset($this->_compileParts)===false){ |
|
230 | + if (isset($this->_compileParts)===false) { |
|
231 | 231 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
232 | 232 | } |
233 | 233 | break; |
234 | 234 | case PositionInTable::HEADER: |
235 | 235 | case PositionInTable::FOOTER: |
236 | 236 | case PositionInTable::BODY: |
237 | - $this->addToolbarRow($this->_toolbarPosition,$table, $captions); |
|
237 | + $this->addToolbarRow($this->_toolbarPosition, $table, $captions); |
|
238 | 238 | break; |
239 | 239 | } |
240 | 240 | } |
@@ -246,16 +246,16 @@ discard block |
||
246 | 246 | * @param callable $callback function called after the field compilation |
247 | 247 | * @return DataTable |
248 | 248 | */ |
249 | - public function afterCompile($index,$callback){ |
|
250 | - $this->_instanceViewer->afterCompile($index,$callback); |
|
249 | + public function afterCompile($index, $callback) { |
|
250 | + $this->_instanceViewer->afterCompile($index, $callback); |
|
251 | 251 | return $this; |
252 | 252 | } |
253 | 253 | |
254 | - private function addToolbarRow($part,$table,$captions){ |
|
254 | + private function addToolbarRow($part, $table, $captions) { |
|
255 | 255 | $hasPart=$table->hasPart($part); |
256 | - if($hasPart){ |
|
256 | + if ($hasPart) { |
|
257 | 257 | $row=$table->getPart($part)->addRow(\sizeof($captions)); |
258 | - }else{ |
|
258 | + } else { |
|
259 | 259 | $row=$table->getPart($part)->getRow(0); |
260 | 260 | } |
261 | 261 | $row->mergeCol(); |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | * @see Widget::getHtmlComponent() |
268 | 268 | * @return HtmlTable |
269 | 269 | */ |
270 | - public function getHtmlComponent(){ |
|
270 | + public function getHtmlComponent() { |
|
271 | 271 | return $this->content["table"]; |
272 | 272 | } |
273 | 273 | |
@@ -282,12 +282,12 @@ discard block |
||
282 | 282 | * @return DataTable |
283 | 283 | */ |
284 | 284 | public function setUrls($urls) { |
285 | - if(\is_array($urls)){ |
|
286 | - $this->_urls["refresh"]=JArray::getValue($urls, "refresh",0); |
|
287 | - $this->_urls["edit"]=JArray::getValue($urls, "edit",1); |
|
288 | - $this->_urls["delete"]=JArray::getValue($urls, "delete",2); |
|
289 | - }else{ |
|
290 | - $this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls]; |
|
285 | + if (\is_array($urls)) { |
|
286 | + $this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0); |
|
287 | + $this->_urls["edit"]=JArray::getValue($urls, "edit", 1); |
|
288 | + $this->_urls["delete"]=JArray::getValue($urls, "delete", 2); |
|
289 | + } else { |
|
290 | + $this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls]; |
|
291 | 291 | } |
292 | 292 | return $this; |
293 | 293 | } |
@@ -300,8 +300,8 @@ discard block |
||
300 | 300 | * @param number $pages_visibles The number of visible pages in the Pagination component |
301 | 301 | * @return DataTable |
302 | 302 | */ |
303 | - public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){ |
|
304 | - $this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount); |
|
303 | + public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) { |
|
304 | + $this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount); |
|
305 | 305 | return $this; |
306 | 306 | } |
307 | 307 | |
@@ -312,8 +312,8 @@ discard block |
||
312 | 312 | * @param number $pages_visibles The number of visible pages in the Pagination component |
313 | 313 | * @return DataTable |
314 | 314 | */ |
315 | - public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){ |
|
316 | - $this->_pagination=new Pagination($items_per_page,$pages_visibles,$page); |
|
315 | + public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) { |
|
316 | + $this->_pagination=new Pagination($items_per_page, $pages_visibles, $page); |
|
317 | 317 | return $this; |
318 | 318 | } |
319 | 319 | |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | * @param array $compileParts |
324 | 324 | * @return DataTable |
325 | 325 | */ |
326 | - public function refresh($compileParts=["tbody"]){ |
|
326 | + public function refresh($compileParts=["tbody"]) { |
|
327 | 327 | $this->_compileParts=$compileParts; |
328 | 328 | return $this; |
329 | 329 | } |
@@ -334,14 +334,14 @@ discard block |
||
334 | 334 | * @param string $position |
335 | 335 | * @return \Ajax\common\html\HtmlDoubleElement |
336 | 336 | */ |
337 | - public function addSearchInToolbar($position=Direction::RIGHT){ |
|
337 | + public function addSearchInToolbar($position=Direction::RIGHT) { |
|
338 | 338 | return $this->addInToolbar($this->getSearchField())->setPosition($position); |
339 | 339 | } |
340 | 340 | |
341 | - public function getSearchField(){ |
|
342 | - if(isset($this->_searchField)===false){ |
|
343 | - $this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search..."); |
|
344 | - $this->_searchField->addIcon("search",Direction::RIGHT); |
|
341 | + public function getSearchField() { |
|
342 | + if (isset($this->_searchField)===false) { |
|
343 | + $this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search..."); |
|
344 | + $this->_searchField->addIcon("search", Direction::RIGHT); |
|
345 | 345 | } |
346 | 346 | return $this->_searchField; |
347 | 347 | } |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | * Returns a form corresponding to the Datatable |
362 | 362 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
363 | 363 | */ |
364 | - public function asForm(){ |
|
364 | + public function asForm() { |
|
365 | 365 | return $this->getForm(); |
366 | 366 | } |
367 | 367 | |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | |
370 | 370 | protected function getTargetSelector($op) { |
371 | 371 | $result=$this->_targetSelector; |
372 | - if(!isset($result[$op])) |
|
372 | + if (!isset($result[$op])) |
|
373 | 373 | $result="#".$this->identifier; |
374 | 374 | return $result[$op]; |
375 | 375 | } |
@@ -380,15 +380,15 @@ discard block |
||
380 | 380 | * @return DataTable |
381 | 381 | */ |
382 | 382 | public function setTargetSelector($_targetSelector) { |
383 | - if(!\is_array($_targetSelector)){ |
|
384 | - $_targetSelector=["edit"=>$_targetSelector,"delete"=>$_targetSelector]; |
|
383 | + if (!\is_array($_targetSelector)) { |
|
384 | + $_targetSelector=["edit"=>$_targetSelector, "delete"=>$_targetSelector]; |
|
385 | 385 | } |
386 | 386 | $this->_targetSelector=$_targetSelector; |
387 | 387 | return $this; |
388 | 388 | } |
389 | 389 | |
390 | 390 | public function getRefreshSelector() { |
391 | - if(isset($this->_refreshSelector)) |
|
391 | + if (isset($this->_refreshSelector)) |
|
392 | 392 | return $this->_refreshSelector; |
393 | 393 | return "#".$this->identifier." tbody"; |
394 | 394 | } |
@@ -406,9 +406,9 @@ discard block |
||
406 | 406 | * {@inheritDoc} |
407 | 407 | * @see \Ajax\common\Widget::show() |
408 | 408 | */ |
409 | - public function show($modelInstance){ |
|
410 | - if(\is_array($modelInstance)){ |
|
411 | - if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
409 | + public function show($modelInstance) { |
|
410 | + if (\is_array($modelInstance)) { |
|
411 | + if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
412 | 412 | $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
413 | 413 | } |
414 | 414 | $this->_modelInstance=$modelInstance; |
@@ -443,29 +443,29 @@ discard block |
||
443 | 443 | return $this; |
444 | 444 | } |
445 | 445 | |
446 | - public function setActiveRowSelector($class="active",$event="click",$multiple=false){ |
|
447 | - $this->_self->setActiveRowSelector($class,$event,$multiple); |
|
446 | + public function setActiveRowSelector($class="active", $event="click", $multiple=false) { |
|
447 | + $this->_self->setActiveRowSelector($class, $event, $multiple); |
|
448 | 448 | return $this; |
449 | 449 | } |
450 | 450 | |
451 | - public function hideColumn($colIndex){ |
|
452 | - if(!\is_array($this->_hiddenColumns)) |
|
451 | + public function hideColumn($colIndex) { |
|
452 | + if (!\is_array($this->_hiddenColumns)) |
|
453 | 453 | $this->_hiddenColumns=[]; |
454 | 454 | $this->_hiddenColumns[]=$colIndex; |
455 | 455 | return $this; |
456 | 456 | } |
457 | 457 | |
458 | - public function setColWidth($colIndex,$width){ |
|
458 | + public function setColWidth($colIndex, $width) { |
|
459 | 459 | $this->_colWidths[$colIndex]=$width; |
460 | 460 | return $this; |
461 | 461 | } |
462 | 462 | public function setColWidths($_colWidths) { |
463 | - $this->_colWidths = $_colWidths; |
|
463 | + $this->_colWidths=$_colWidths; |
|
464 | 464 | return $this; |
465 | 465 | } |
466 | 466 | |
467 | - public function setColAlignment($colIndex,$alignment){ |
|
468 | - $this->content["table"]->setColAlignment($colIndex,$alignment); |
|
467 | + public function setColAlignment($colIndex, $alignment) { |
|
468 | + $this->content["table"]->setColAlignment($colIndex, $alignment); |
|
469 | 469 | return $this; |
470 | 470 | } |
471 | 471 | } |
@@ -58,10 +58,12 @@ discard block |
||
58 | 58 | $js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]); |
59 | 59 | $js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]); |
60 | 60 | } |
61 | - if(\is_array($this->_deleteBehavior)) |
|
62 | - $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
63 | - if(\is_array($this->_editBehavior)) |
|
64 | - $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
61 | + if(\is_array($this->_deleteBehavior)) { |
|
62 | + $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
63 | + } |
|
64 | + if(\is_array($this->_editBehavior)) { |
|
65 | + $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
66 | + } |
|
65 | 67 | return parent::run($js); |
66 | 68 | } |
67 | 69 | |
@@ -94,8 +96,9 @@ discard block |
||
94 | 96 | $table->setRowCount(0, \sizeof($captions)); |
95 | 97 | $this->_generateHeader($table,$captions); |
96 | 98 | |
97 | - if(isset($this->_compileParts)) |
|
98 | - $table->setCompileParts($this->_compileParts); |
|
99 | + if(isset($this->_compileParts)) { |
|
100 | + $table->setCompileParts($this->_compileParts); |
|
101 | + } |
|
99 | 102 | |
100 | 103 | $this->_generateContent($table); |
101 | 104 | |
@@ -126,8 +129,9 @@ discard block |
||
126 | 129 | } |
127 | 130 | |
128 | 131 | protected function _applyStyleAttributes($table){ |
129 | - if(isset($this->_hiddenColumns)) |
|
130 | - $this->_hideColumns(); |
|
132 | + if(isset($this->_hiddenColumns)) { |
|
133 | + $this->_hideColumns(); |
|
134 | + } |
|
131 | 135 | if(isset($this->_colWidths)){ |
132 | 136 | foreach ($this->_colWidths as $colIndex=>$width){ |
133 | 137 | $table->setColWidth($colIndex,$width); |
@@ -180,8 +184,9 @@ discard block |
||
180 | 184 | $field=$ck->getField(); |
181 | 185 | $field->setProperty("value",$dataAjax); |
182 | 186 | $field->setProperty("name", "selection[]"); |
183 | - if(isset($checkedClass)) |
|
184 | - $field->setClass($checkedClass); |
|
187 | + if(isset($checkedClass)) { |
|
188 | + $field->setClass($checkedClass); |
|
189 | + } |
|
185 | 190 | \array_unshift($values, $ck); |
186 | 191 | } |
187 | 192 | $result=$table->newRow(); |
@@ -194,8 +199,9 @@ discard block |
||
194 | 199 | |
195 | 200 | protected function _generatePagination($table,$js=NULL){ |
196 | 201 | if(isset($this->_toolbar)){ |
197 | - if($this->_toolbarPosition==PositionInTable::FOOTER) |
|
198 | - $this->_toolbar->setFloated("left"); |
|
202 | + if($this->_toolbarPosition==PositionInTable::FOOTER) { |
|
203 | + $this->_toolbar->setFloated("left"); |
|
204 | + } |
|
199 | 205 | } |
200 | 206 | $footer=$table->getFooter(); |
201 | 207 | $footer->mergeCol(); |
@@ -214,8 +220,9 @@ discard block |
||
214 | 220 | |
215 | 221 | protected function _getFieldName($index){ |
216 | 222 | $fieldName=parent::_getFieldName($index); |
217 | - if(\is_object($fieldName)) |
|
218 | - $fieldName="field-".$index; |
|
223 | + if(\is_object($fieldName)) { |
|
224 | + $fieldName="field-".$index; |
|
225 | + } |
|
219 | 226 | return $fieldName."[]"; |
220 | 227 | } |
221 | 228 | |
@@ -255,7 +262,7 @@ discard block |
||
255 | 262 | $hasPart=$table->hasPart($part); |
256 | 263 | if($hasPart){ |
257 | 264 | $row=$table->getPart($part)->addRow(\sizeof($captions)); |
258 | - }else{ |
|
265 | + } else{ |
|
259 | 266 | $row=$table->getPart($part)->getRow(0); |
260 | 267 | } |
261 | 268 | $row->mergeCol(); |
@@ -286,7 +293,7 @@ discard block |
||
286 | 293 | $this->_urls["refresh"]=JArray::getValue($urls, "refresh",0); |
287 | 294 | $this->_urls["edit"]=JArray::getValue($urls, "edit",1); |
288 | 295 | $this->_urls["delete"]=JArray::getValue($urls, "delete",2); |
289 | - }else{ |
|
296 | + } else{ |
|
290 | 297 | $this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls]; |
291 | 298 | } |
292 | 299 | return $this; |
@@ -369,8 +376,9 @@ discard block |
||
369 | 376 | |
370 | 377 | protected function getTargetSelector($op) { |
371 | 378 | $result=$this->_targetSelector; |
372 | - if(!isset($result[$op])) |
|
373 | - $result="#".$this->identifier; |
|
379 | + if(!isset($result[$op])) { |
|
380 | + $result="#".$this->identifier; |
|
381 | + } |
|
374 | 382 | return $result[$op]; |
375 | 383 | } |
376 | 384 | |
@@ -388,8 +396,9 @@ discard block |
||
388 | 396 | } |
389 | 397 | |
390 | 398 | public function getRefreshSelector() { |
391 | - if(isset($this->_refreshSelector)) |
|
392 | - return $this->_refreshSelector; |
|
399 | + if(isset($this->_refreshSelector)) { |
|
400 | + return $this->_refreshSelector; |
|
401 | + } |
|
393 | 402 | return "#".$this->identifier." tbody"; |
394 | 403 | } |
395 | 404 | |
@@ -408,8 +417,9 @@ discard block |
||
408 | 417 | */ |
409 | 418 | public function show($modelInstance){ |
410 | 419 | if(\is_array($modelInstance)){ |
411 | - if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
412 | - $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
420 | + if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) { |
|
421 | + $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
|
422 | + } |
|
413 | 423 | } |
414 | 424 | $this->_modelInstance=$modelInstance; |
415 | 425 | } |
@@ -449,8 +459,9 @@ discard block |
||
449 | 459 | } |
450 | 460 | |
451 | 461 | public function hideColumn($colIndex){ |
452 | - if(!\is_array($this->_hiddenColumns)) |
|
453 | - $this->_hiddenColumns=[]; |
|
462 | + if(!\is_array($this->_hiddenColumns)) { |
|
463 | + $this->_hiddenColumns=[]; |
|
464 | + } |
|
454 | 465 | $this->_hiddenColumns[]=$colIndex; |
455 | 466 | return $this; |
456 | 467 | } |
@@ -7,21 +7,21 @@ |
||
7 | 7 | |
8 | 8 | use Ajax\semantic\html\elements\HtmlIcon; |
9 | 9 | |
10 | -class HtmlPaginationMenu extends HtmlMenu{ |
|
10 | +class HtmlPaginationMenu extends HtmlMenu { |
|
11 | 11 | private $_page; |
12 | - public function __construct( $identifier, $items=array() ){ |
|
13 | - parent::__construct( $identifier,$items); |
|
12 | + public function __construct($identifier, $items=array()) { |
|
13 | + parent::__construct($identifier, $items); |
|
14 | 14 | } |
15 | 15 | /** |
16 | 16 | * {@inheritDoc} |
17 | 17 | * @see \Ajax\common\html\BaseHtml::compile() |
18 | 18 | */ |
19 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
19 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
20 | 20 | $max=\sizeof($this->content); |
21 | - $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active"); |
|
22 | - $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active"); |
|
21 | + $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]))->addToProperty("class", "_firstPage no-active"); |
|
22 | + $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max, $this->_page+1]))->setProperty("data-max", $max)->addToProperty("class", "_lastPage no-active"); |
|
23 | 23 | $this->asPagination(); |
24 | - return parent::compile($js,$view); |
|
24 | + return parent::compile($js, $view); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function setActiveItem($index) { |
@@ -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 | } |