@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | * |
| 15 | 15 | */ |
| 16 | 16 | class HtmlTableContent extends HtmlSemCollection { |
| 17 | - protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ]; |
|
| 17 | + protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"]; |
|
| 18 | 18 | protected $_merged=false; |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | public function setRowCount($rowCount, $colCount) { |
| 40 | 40 | $count=$this->count(); |
| 41 | - for($i=$count; $i < $rowCount; $i++) { |
|
| 41 | + for ($i=$count; $i<$rowCount; $i++) { |
|
| 42 | 42 | $this->addItem($colCount); |
| 43 | 43 | } |
| 44 | 44 | return $this; |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $tr=new HtmlTR(""); |
| 61 | 61 | $tr->setContainer($this, $count); |
| 62 | 62 | $tr->setTdTagName($this->_tdTagNames[$this->tagName]); |
| 63 | - if (isset($value) === true) { |
|
| 63 | + if (isset($value)===true) { |
|
| 64 | 64 | $tr->setColCount($value); |
| 65 | 65 | } |
| 66 | 66 | return $tr; |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | /** |
| 90 | 90 | * @return HtmlTR |
| 91 | 91 | */ |
| 92 | - public function getItem($index){ |
|
| 92 | + public function getItem($index) { |
|
| 93 | 93 | return parent::getItem($index); |
| 94 | 94 | } |
| 95 | 95 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | $row=$this->getItem($row); |
| 104 | 104 | if (isset($row) && $row instanceof HtmlCollection) { |
| 105 | 105 | $col=$row->getItem($col); |
| 106 | - }else{ |
|
| 106 | + } else { |
|
| 107 | 107 | $col=$row; |
| 108 | 108 | } |
| 109 | 109 | return $col; |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | */ |
| 128 | 128 | public function setCellValue($row, $col, $value="") { |
| 129 | 129 | $cell=$this->getCell($row, $col); |
| 130 | - if (isset($cell) === true) { |
|
| 130 | + if (isset($cell)===true) { |
|
| 131 | 131 | $cell->setValue($value); |
| 132 | 132 | } |
| 133 | 133 | return $this; |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | * @param mixed $values |
| 139 | 139 | */ |
| 140 | 140 | public function setValues($values=array()) { |
| 141 | - return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->setValues($_values);}); |
|
| 141 | + return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->setValues($_values); }); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | /** |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | * @param mixed $values |
| 147 | 147 | */ |
| 148 | 148 | public function addValues($values=array()) { |
| 149 | - return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->addValues($_values);}); |
|
| 149 | + return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->addValues($_values); }); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
@@ -154,21 +154,21 @@ discard block |
||
| 154 | 154 | * @param mixed $values |
| 155 | 155 | * @param callable $callback |
| 156 | 156 | */ |
| 157 | - protected function _addOrSetValues($values,$callback) { |
|
| 157 | + protected function _addOrSetValues($values, $callback) { |
|
| 158 | 158 | $count=$this->count(); |
| 159 | 159 | $isArray=true; |
| 160 | 160 | if (!\is_array($values)) { |
| 161 | 161 | $values=\array_fill(0, $count, $values); |
| 162 | 162 | $isArray=false; |
| 163 | 163 | } |
| 164 | - if (JArray::dimension($values) == 1 && $isArray) |
|
| 165 | - $values=[ $values ]; |
|
| 164 | + if (JArray::dimension($values)==1 && $isArray) |
|
| 165 | + $values=[$values]; |
|
| 166 | 166 | |
| 167 | 167 | $count=\min(\sizeof($values), $count); |
| 168 | 168 | |
| 169 | - for($i=0; $i < $count; $i++) { |
|
| 169 | + for ($i=0; $i<$count; $i++) { |
|
| 170 | 170 | $row=$this->content[$i]; |
| 171 | - $callback($row,$values[$i]); |
|
| 171 | + $callback($row, $values[$i]); |
|
| 172 | 172 | } |
| 173 | 173 | return $this; |
| 174 | 174 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | $values=\array_fill(0, $count, $values); |
| 180 | 180 | } |
| 181 | 181 | $count=\min(\sizeof($values), $count); |
| 182 | - for($i=0; $i < $count; $i++) { |
|
| 182 | + for ($i=0; $i<$count; $i++) { |
|
| 183 | 183 | $this->getCell($i, $colIndex)->setValue($values[$i]); |
| 184 | 184 | } |
| 185 | 185 | return $this; |
@@ -187,9 +187,9 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | public function addColVariations($colIndex, $variations=array()) { |
| 189 | 189 | $count=$this->count(); |
| 190 | - for($i=0; $i < $count; $i++) { |
|
| 190 | + for ($i=0; $i<$count; $i++) { |
|
| 191 | 191 | $cell=$this->getCell($i, $colIndex); |
| 192 | - if($cell instanceof BaseTrait) |
|
| 192 | + if ($cell instanceof BaseTrait) |
|
| 193 | 193 | $cell->addVariations($variations); |
| 194 | 194 | } |
| 195 | 195 | return $this; |
@@ -206,9 +206,9 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | private function colAlign($colIndex, $function) { |
| 208 | 208 | $count=$this->count(); |
| 209 | - for($i=0; $i < $count; $i++) { |
|
| 209 | + for ($i=0; $i<$count; $i++) { |
|
| 210 | 210 | $index=$this->content[$i]->getColPosition($colIndex); |
| 211 | - if ($index !== NULL) |
|
| 211 | + if ($index!==NULL) |
|
| 212 | 212 | $this->getCell($i, $index)->$function(); |
| 213 | 213 | } |
| 214 | 214 | return $this; |
@@ -216,10 +216,10 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | private function colAlignFromRight($colIndex, $function) { |
| 218 | 218 | $count=$this->count(); |
| 219 | - for($i=0; $i < $count; $i++) { |
|
| 219 | + for ($i=0; $i<$count; $i++) { |
|
| 220 | 220 | $maxRow=$this->content[$i]->count(); |
| 221 | 221 | $index=$maxRow-$colIndex-1; |
| 222 | - if (($cell=$this->getCell($i, $index))!== NULL) |
|
| 222 | + if (($cell=$this->getCell($i, $index))!==NULL) |
|
| 223 | 223 | $cell->$function(); |
| 224 | 224 | } |
| 225 | 225 | return $this; |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | */ |
| 264 | 264 | public function getColCount() { |
| 265 | 265 | $result=0; |
| 266 | - if ($this->count() > 0) |
|
| 266 | + if ($this->count()>0) |
|
| 267 | 267 | $result=$this->getItem(0)->count(); |
| 268 | 268 | return $result; |
| 269 | 269 | } |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | public function delete($rowIndex, $colIndex=NULL) { |
| 278 | 278 | if (isset($colIndex)) { |
| 279 | 279 | $row=$this->getItem($rowIndex); |
| 280 | - if (isset($row) === true) { |
|
| 280 | + if (isset($row)===true) { |
|
| 281 | 281 | $row->delete($colIndex); |
| 282 | 282 | } |
| 283 | 283 | } else { |
@@ -286,9 +286,9 @@ discard block |
||
| 286 | 286 | return $this; |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | - public function toDelete($rowIndex, $colIndex){ |
|
| 289 | + public function toDelete($rowIndex, $colIndex) { |
|
| 290 | 290 | $row=$this->getItem($rowIndex); |
| 291 | - if (isset($row) === true) |
|
| 291 | + if (isset($row)===true) |
|
| 292 | 292 | $row->toDelete($colIndex); |
| 293 | 293 | return $this; |
| 294 | 294 | } |
@@ -317,17 +317,17 @@ discard block |
||
| 317 | 317 | */ |
| 318 | 318 | public function conditionalCellFormat($callback, $format) { |
| 319 | 319 | $rows=$this->content; |
| 320 | - foreach ( $rows as $row ) { |
|
| 320 | + foreach ($rows as $row) { |
|
| 321 | 321 | $row->conditionalCellFormat($callback, $format); |
| 322 | 322 | } |
| 323 | 323 | return $this; |
| 324 | 324 | } |
| 325 | 325 | |
| 326 | - public function conditionalColFormat($colIndex,$callback,$format){ |
|
| 326 | + public function conditionalColFormat($colIndex, $callback, $format) { |
|
| 327 | 327 | $rows=$this->content; |
| 328 | - foreach ( $rows as $row ) { |
|
| 328 | + foreach ($rows as $row) { |
|
| 329 | 329 | $cell=$row->getItem($colIndex); |
| 330 | - $cell->conditionnalCellFormat($callback,$format); |
|
| 330 | + $cell->conditionnalCellFormat($callback, $format); |
|
| 331 | 331 | } |
| 332 | 332 | return $this; |
| 333 | 333 | } |
@@ -339,17 +339,17 @@ discard block |
||
| 339 | 339 | */ |
| 340 | 340 | public function conditionalRowFormat($callback, $format) { |
| 341 | 341 | $rows=$this->content; |
| 342 | - foreach ( $rows as $row ) { |
|
| 342 | + foreach ($rows as $row) { |
|
| 343 | 343 | $row->conditionalRowFormat($callback, $format); |
| 344 | 344 | } |
| 345 | 345 | return $this; |
| 346 | 346 | } |
| 347 | 347 | |
| 348 | - public function hideColumn($colIndex){ |
|
| 348 | + public function hideColumn($colIndex) { |
|
| 349 | 349 | $rows=$this->content; |
| 350 | - foreach ( $rows as $row ) { |
|
| 350 | + foreach ($rows as $row) { |
|
| 351 | 351 | $cell=$row->getItem($colIndex); |
| 352 | - $cell->addToProperty("style","display:none;"); |
|
| 352 | + $cell->addToProperty("style", "display:none;"); |
|
| 353 | 353 | } |
| 354 | 354 | return $this; |
| 355 | 355 | } |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | */ |
| 361 | 361 | public function applyCells($callback) { |
| 362 | 362 | $rows=$this->content; |
| 363 | - foreach ( $rows as $row ) { |
|
| 363 | + foreach ($rows as $row) { |
|
| 364 | 364 | $row->applyCells($callback); |
| 365 | 365 | } |
| 366 | 366 | return $this; |
@@ -372,25 +372,25 @@ discard block |
||
| 372 | 372 | */ |
| 373 | 373 | public function applyRows($callback) { |
| 374 | 374 | $rows=$this->content; |
| 375 | - foreach ( $rows as $row ) { |
|
| 375 | + foreach ($rows as $row) { |
|
| 376 | 376 | $row->apply($callback); |
| 377 | 377 | } |
| 378 | 378 | return $this; |
| 379 | 379 | } |
| 380 | 380 | |
| 381 | - public function mergeIdentiqualValues($colIndex,$function="strip_tags"){ |
|
| 381 | + public function mergeIdentiqualValues($colIndex, $function="strip_tags") { |
|
| 382 | 382 | $rows=$this->content; |
| 383 | 383 | $identiqual=null; |
| 384 | 384 | $counter=0; |
| 385 | 385 | $cellToMerge=null; |
| 386 | 386 | $functionExists=\function_exists($function); |
| 387 | - foreach ( $rows as $row ) { |
|
| 387 | + foreach ($rows as $row) { |
|
| 388 | 388 | $cell=$row->getItem($colIndex); |
| 389 | 389 | $value=$cell->getContent(); |
| 390 | - if($functionExists) |
|
| 391 | - $value=\call_user_func($function,$value); |
|
| 392 | - if($value!==$identiqual){ |
|
| 393 | - if($counter>0 && isset($cellToMerge)){ |
|
| 390 | + if ($functionExists) |
|
| 391 | + $value=\call_user_func($function, $value); |
|
| 392 | + if ($value!==$identiqual) { |
|
| 393 | + if ($counter>0 && isset($cellToMerge)) { |
|
| 394 | 394 | $cellToMerge->setRowspan($counter); |
| 395 | 395 | } |
| 396 | 396 | $counter=0; |
@@ -399,17 +399,17 @@ discard block |
||
| 399 | 399 | } |
| 400 | 400 | $counter++; |
| 401 | 401 | } |
| 402 | - if($counter>0 && isset($cellToMerge)){ |
|
| 402 | + if ($counter>0 && isset($cellToMerge)) { |
|
| 403 | 403 | $cellToMerge->setRowspan($counter); |
| 404 | 404 | } |
| 405 | 405 | return $this; |
| 406 | 406 | } |
| 407 | 407 | |
| 408 | - public function _isMerged(){ |
|
| 408 | + public function _isMerged() { |
|
| 409 | 409 | return $this->_merged; |
| 410 | 410 | } |
| 411 | 411 | |
| 412 | - public function _setMerged($value){ |
|
| 412 | + public function _setMerged($value) { |
|
| 413 | 413 | $this->_merged=$value; |
| 414 | 414 | return $this; |
| 415 | 415 | } |
@@ -26,8 +26,9 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
| 28 | 28 | parent::__construct($identifier, $tagName, ""); |
| 29 | - if (isset($rowCount) && isset($colCount)) |
|
| 30 | - $this->setRowCount($rowCount, $colCount); |
|
| 29 | + if (isset($rowCount) && isset($colCount)) { |
|
| 30 | + $this->setRowCount($rowCount, $colCount); |
|
| 31 | + } |
|
| 31 | 32 | } |
| 32 | 33 | |
| 33 | 34 | /** |
@@ -103,7 +104,7 @@ discard block |
||
| 103 | 104 | $row=$this->getItem($row); |
| 104 | 105 | if (isset($row) && $row instanceof HtmlCollection) { |
| 105 | 106 | $col=$row->getItem($col); |
| 106 | - }else{ |
|
| 107 | + } else{ |
|
| 107 | 108 | $col=$row; |
| 108 | 109 | } |
| 109 | 110 | return $col; |
@@ -161,8 +162,9 @@ discard block |
||
| 161 | 162 | $values=\array_fill(0, $count, $values); |
| 162 | 163 | $isArray=false; |
| 163 | 164 | } |
| 164 | - if (JArray::dimension($values) == 1 && $isArray) |
|
| 165 | - $values=[ $values ]; |
|
| 165 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
| 166 | + $values=[ $values ]; |
|
| 167 | + } |
|
| 166 | 168 | |
| 167 | 169 | $count=\min(\sizeof($values), $count); |
| 168 | 170 | |
@@ -189,8 +191,9 @@ discard block |
||
| 189 | 191 | $count=$this->count(); |
| 190 | 192 | for($i=0; $i < $count; $i++) { |
| 191 | 193 | $cell=$this->getCell($i, $colIndex); |
| 192 | - if($cell instanceof BaseTrait) |
|
| 193 | - $cell->addVariations($variations); |
|
| 194 | + if($cell instanceof BaseTrait) { |
|
| 195 | + $cell->addVariations($variations); |
|
| 196 | + } |
|
| 194 | 197 | } |
| 195 | 198 | return $this; |
| 196 | 199 | } |
@@ -208,8 +211,9 @@ discard block |
||
| 208 | 211 | $count=$this->count(); |
| 209 | 212 | for($i=0; $i < $count; $i++) { |
| 210 | 213 | $index=$this->content[$i]->getColPosition($colIndex); |
| 211 | - if ($index !== NULL) |
|
| 212 | - $this->getCell($i, $index)->$function(); |
|
| 214 | + if ($index !== NULL) { |
|
| 215 | + $this->getCell($i, $index)->$function(); |
|
| 216 | + } |
|
| 213 | 217 | } |
| 214 | 218 | return $this; |
| 215 | 219 | } |
@@ -219,8 +223,9 @@ discard block |
||
| 219 | 223 | for($i=0; $i < $count; $i++) { |
| 220 | 224 | $maxRow=$this->content[$i]->count(); |
| 221 | 225 | $index=$maxRow-$colIndex-1; |
| 222 | - if (($cell=$this->getCell($i, $index))!== NULL) |
|
| 223 | - $cell->$function(); |
|
| 226 | + if (($cell=$this->getCell($i, $index))!== NULL) { |
|
| 227 | + $cell->$function(); |
|
| 228 | + } |
|
| 224 | 229 | } |
| 225 | 230 | return $this; |
| 226 | 231 | } |
@@ -263,8 +268,9 @@ discard block |
||
| 263 | 268 | */ |
| 264 | 269 | public function getColCount() { |
| 265 | 270 | $result=0; |
| 266 | - if ($this->count() > 0) |
|
| 267 | - $result=$this->getItem(0)->count(); |
|
| 271 | + if ($this->count() > 0) { |
|
| 272 | + $result=$this->getItem(0)->count(); |
|
| 273 | + } |
|
| 268 | 274 | return $result; |
| 269 | 275 | } |
| 270 | 276 | |
@@ -288,8 +294,9 @@ discard block |
||
| 288 | 294 | |
| 289 | 295 | public function toDelete($rowIndex, $colIndex){ |
| 290 | 296 | $row=$this->getItem($rowIndex); |
| 291 | - if (isset($row) === true) |
|
| 292 | - $row->toDelete($colIndex); |
|
| 297 | + if (isset($row) === true) { |
|
| 298 | + $row->toDelete($colIndex); |
|
| 299 | + } |
|
| 293 | 300 | return $this; |
| 294 | 301 | } |
| 295 | 302 | |
@@ -387,8 +394,9 @@ discard block |
||
| 387 | 394 | foreach ( $rows as $row ) { |
| 388 | 395 | $cell=$row->getItem($colIndex); |
| 389 | 396 | $value=$cell->getContent(); |
| 390 | - if($functionExists) |
|
| 391 | - $value=\call_user_func($function,$value); |
|
| 397 | + if($functionExists) { |
|
| 398 | + $value=\call_user_func($function,$value); |
|
| 399 | + } |
|
| 392 | 400 | if($value!==$identiqual){ |
| 393 | 401 | if($counter>0 && isset($cellToMerge)){ |
| 394 | 402 | $cellToMerge->setRowspan($counter); |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | public function __construct($identifier, $rowCount, $colCount) { |
| 33 | 33 | parent::__construct($identifier, "table", "ui table"); |
| 34 | - $this->content=array (); |
|
| 34 | + $this->content=array(); |
|
| 35 | 35 | $this->setRowCount($rowCount, $colCount); |
| 36 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
| 37 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
| 36 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
| 37 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
| 38 | 38 | $this->_afterCompileEvents=[]; |
| 39 | 39 | } |
| 40 | 40 | |
@@ -44,17 +44,17 @@ discard block |
||
| 44 | 44 | * @return HtmlTableContent |
| 45 | 45 | */ |
| 46 | 46 | public function getPart($key) { |
| 47 | - if (\array_key_exists($key, $this->content) === false) { |
|
| 47 | + if (\array_key_exists($key, $this->content)===false) { |
|
| 48 | 48 | $this->content[$key]=new HtmlTableContent("", $key); |
| 49 | - if ($key !== "tbody") { |
|
| 49 | + if ($key!=="tbody") { |
|
| 50 | 50 | $this->content[$key]->setRowCount(1, $this->_colCount); |
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | return $this->content[$key]; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - protected function _getFirstPart(){ |
|
| 57 | - if(isset($this->content["thead"])){ |
|
| 56 | + protected function _getFirstPart() { |
|
| 57 | + if (isset($this->content["thead"])) { |
|
| 58 | 58 | return $this->content["thead"]; |
| 59 | 59 | } |
| 60 | 60 | return $this->content["tbody"]; |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * @return boolean |
| 100 | 100 | */ |
| 101 | 101 | public function hasPart($key) { |
| 102 | - return \array_key_exists($key, $this->content) === true; |
|
| 102 | + return \array_key_exists($key, $this->content)===true; |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -259,8 +259,8 @@ discard block |
||
| 259 | 259 | return $this->colAlign($colIndex, "colLeftFromRight"); |
| 260 | 260 | } |
| 261 | 261 | |
| 262 | - public function setColAlignment($colIndex,$alignment){ |
|
| 263 | - switch ($alignment){ |
|
| 262 | + public function setColAlignment($colIndex, $alignment) { |
|
| 263 | + switch ($alignment) { |
|
| 264 | 264 | case TextAlignment::LEFT: |
| 265 | 265 | $function="colLeft"; |
| 266 | 266 | break; |
@@ -280,8 +280,8 @@ discard block |
||
| 280 | 280 | return $this; |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - public function setColAlignmentFromRight($colIndex,$alignment){ |
|
| 284 | - switch ($alignment){ |
|
| 283 | + public function setColAlignmentFromRight($colIndex, $alignment) { |
|
| 284 | + switch ($alignment) { |
|
| 285 | 285 | case TextAlignment::LEFT: |
| 286 | 286 | $function="colLeftFromRight"; |
| 287 | 287 | break; |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | |
| 304 | 304 | private function colAlign($colIndex, $function) { |
| 305 | 305 | if (\is_array($colIndex)) { |
| 306 | - foreach ( $colIndex as $cIndex ) { |
|
| 306 | + foreach ($colIndex as $cIndex) { |
|
| 307 | 307 | $this->colAlign($cIndex, $function); |
| 308 | 308 | } |
| 309 | 309 | } else { |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | * @see HtmlSemDoubleElement::compile() |
| 365 | 365 | */ |
| 366 | 366 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 367 | - if(\sizeof($this->_compileParts)<3){ |
|
| 367 | + if (\sizeof($this->_compileParts)<3) { |
|
| 368 | 368 | $this->_template="%content%"; |
| 369 | 369 | $this->refresh($js); |
| 370 | 370 | } |
@@ -373,9 +373,9 @@ discard block |
||
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
| 376 | - parent::compile_once($js,$view); |
|
| 376 | + parent::compile_once($js, $view); |
|
| 377 | 377 | if ($this->propertyContains("class", "sortable")) { |
| 378 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
| 378 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
| 379 | 379 | } |
| 380 | 380 | } |
| 381 | 381 | |
@@ -388,13 +388,13 @@ discard block |
||
| 388 | 388 | public function fromDatabaseObject($object, $function) { |
| 389 | 389 | $result=$function($object); |
| 390 | 390 | if (\is_array($result)) { |
| 391 | - $result= $this->addRow($function($object)); |
|
| 391 | + $result=$this->addRow($function($object)); |
|
| 392 | 392 | } else { |
| 393 | - $result= $this->getBody()->_addRow($result); |
|
| 393 | + $result=$this->getBody()->_addRow($result); |
|
| 394 | 394 | } |
| 395 | - if(isset($this->_afterCompileEvents["onNewRow"])){ |
|
| 396 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
| 397 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
| 395 | + if (isset($this->_afterCompileEvents["onNewRow"])) { |
|
| 396 | + if (\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
| 397 | + $this->_afterCompileEvents["onNewRow"]($result, $object); |
|
| 398 | 398 | } |
| 399 | 399 | return $result; |
| 400 | 400 | } |
@@ -409,21 +409,21 @@ discard block |
||
| 409 | 409 | return $this; |
| 410 | 410 | } |
| 411 | 411 | |
| 412 | - public function refresh($js){ |
|
| 412 | + public function refresh($js) { |
|
| 413 | 413 | $this->_footer=$this->getFooter(); |
| 414 | - if(isset($js)){ |
|
| 415 | - $js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true); |
|
| 414 | + if (isset($js)) { |
|
| 415 | + $js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true); |
|
| 416 | 416 | } |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | - public function run(JsUtils $js){ |
|
| 420 | - if(!$this->_runned){ |
|
| 421 | - if(isset($this->_activeRowSelector)){ |
|
| 419 | + public function run(JsUtils $js) { |
|
| 420 | + if (!$this->_runned) { |
|
| 421 | + if (isset($this->_activeRowSelector)) { |
|
| 422 | 422 | $this->_activeRowSelector->run(); |
| 423 | 423 | } |
| 424 | 424 | } |
| 425 | - $result= parent::run($js); |
|
| 426 | - if(isset($this->_footer)) |
|
| 425 | + $result=parent::run($js); |
|
| 426 | + if (isset($this->_footer)) |
|
| 427 | 427 | $this->_footer->run($js); |
| 428 | 428 | $this->_runned=true; |
| 429 | 429 | return $result; |
@@ -447,47 +447,47 @@ discard block |
||
| 447 | 447 | * @param boolean $multiple |
| 448 | 448 | * @return HtmlTable |
| 449 | 449 | */ |
| 450 | - public function setActiveRowSelector($class="active",$event="click",$multiple=false){ |
|
| 451 | - $this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple); |
|
| 450 | + public function setActiveRowSelector($class="active", $event="click", $multiple=false) { |
|
| 451 | + $this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple); |
|
| 452 | 452 | return $this; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - public function hideColumn($colIndex){ |
|
| 456 | - if(isset($this->content["thead"])){ |
|
| 455 | + public function hideColumn($colIndex) { |
|
| 456 | + if (isset($this->content["thead"])) { |
|
| 457 | 457 | $this->content["thead"]->hideColumn($colIndex); |
| 458 | 458 | } |
| 459 | 459 | $this->content["tbody"]->hideColumn($colIndex); |
| 460 | - if(isset($this->content["tfoot"])){ |
|
| 460 | + if (isset($this->content["tfoot"])) { |
|
| 461 | 461 | $this->content["tfoot"]->hideColumn($colIndex); |
| 462 | 462 | } |
| 463 | 463 | return $this; |
| 464 | 464 | } |
| 465 | 465 | |
| 466 | - public function setColWidth($colIndex,$width){ |
|
| 466 | + public function setColWidth($colIndex, $width) { |
|
| 467 | 467 | $part=$this->_getFirstPart(); |
| 468 | - if($part!==null && $part->count()>0) |
|
| 468 | + if ($part!==null && $part->count()>0) |
|
| 469 | 469 | $part->getCell(0, $colIndex)->setWidth($width); |
| 470 | 470 | return $this; |
| 471 | 471 | } |
| 472 | 472 | |
| 473 | - public function setColWidths($widths){ |
|
| 473 | + public function setColWidths($widths) { |
|
| 474 | 474 | $part=$this->_getFirstPart(); |
| 475 | - if($part!==null && $part->count()>0){ |
|
| 475 | + if ($part!==null && $part->count()>0) { |
|
| 476 | 476 | $count=$part->getColCount(); |
| 477 | - if(!\is_array($widths)){ |
|
| 477 | + if (!\is_array($widths)) { |
|
| 478 | 478 | $widths=\array_fill(0, $count, $widths); |
| 479 | 479 | } |
| 480 | - $max=\min(\sizeof($widths),$count); |
|
| 481 | - for($i=0;$i<$max;$i++){ |
|
| 480 | + $max=\min(\sizeof($widths), $count); |
|
| 481 | + for ($i=0; $i<$max; $i++) { |
|
| 482 | 482 | $part->getCell(0, $i)->setWidth($widths[$i]); |
| 483 | 483 | } |
| 484 | 484 | } |
| 485 | 485 | return $this; |
| 486 | 486 | } |
| 487 | 487 | |
| 488 | - public function mergeIdentiqualValues($colIndex,$function="strip_tags"){ |
|
| 488 | + public function mergeIdentiqualValues($colIndex, $function="strip_tags") { |
|
| 489 | 489 | $body=$this->getBody(); |
| 490 | - $body->mergeIdentiqualValues($colIndex,$function); |
|
| 490 | + $body->mergeIdentiqualValues($colIndex, $function); |
|
| 491 | 491 | return $this; |
| 492 | 492 | } |
| 493 | 493 | /** |
@@ -501,11 +501,11 @@ discard block |
||
| 501 | 501 | * @param mixed $_innerScript |
| 502 | 502 | */ |
| 503 | 503 | public function setInnerScript($_innerScript) { |
| 504 | - $this->_innerScript = $_innerScript; |
|
| 504 | + $this->_innerScript=$_innerScript; |
|
| 505 | 505 | } |
| 506 | 506 | |
| 507 | - public function onActiveRowChange($jsCode){ |
|
| 508 | - $this->on("activeRowChange",$jsCode); |
|
| 507 | + public function onActiveRowChange($jsCode) { |
|
| 508 | + $this->on("activeRowChange", $jsCode); |
|
| 509 | 509 | return $this; |
| 510 | 510 | } |
| 511 | 511 | |
@@ -15,11 +15,11 @@ discard block |
||
| 15 | 15 | * @version 1.3 |
| 16 | 16 | */ |
| 17 | 17 | abstract class BaseHtml extends BaseWidget { |
| 18 | - use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait; |
|
| 18 | + use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait; |
|
| 19 | 19 | protected $_template; |
| 20 | 20 | protected $tagName; |
| 21 | - protected $_wrapBefore=array (); |
|
| 22 | - protected $_wrapAfter=array (); |
|
| 21 | + protected $_wrapBefore=array(); |
|
| 22 | + protected $_wrapAfter=array(); |
|
| 23 | 23 | protected $_bsComponent; |
| 24 | 24 | protected $_compiled=false; |
| 25 | 25 | protected $_runned=false; |
@@ -33,32 +33,32 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | abstract public function run(JsUtils $js); |
| 35 | 35 | |
| 36 | - private function _callSetter($setter,$key,$value,&$array){ |
|
| 36 | + private function _callSetter($setter, $key, $value, &$array) { |
|
| 37 | 37 | $result=false; |
| 38 | - if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") { |
|
| 38 | + if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") { |
|
| 39 | 39 | try { |
| 40 | 40 | $this->$setter($value); |
| 41 | 41 | unset($array[$key]); |
| 42 | 42 | $result=true; |
| 43 | - } catch ( \Exception $e ) { |
|
| 43 | + }catch (\Exception $e) { |
|
| 44 | 44 | $result=false; |
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | return $result; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - protected function getTemplate(JsUtils $js=NULL,$view=null) { |
|
| 51 | - return PropertyWrapper::wrap($this->_wrapBefore, $js,$view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js,$view); |
|
| 50 | + protected function getTemplate(JsUtils $js=NULL, $view=null) { |
|
| 51 | + return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | protected function ctrl($name, $value, $typeCtrl) { |
| 55 | 55 | if (\is_array($typeCtrl)) { |
| 56 | - if (array_search($value, $typeCtrl) === false) { |
|
| 57 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
| 56 | + if (array_search($value, $typeCtrl)===false) { |
|
| 57 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
| 58 | 58 | } |
| 59 | 59 | } else { |
| 60 | 60 | if (!$typeCtrl($value)) { |
| 61 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
| 61 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | return true; |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
| 76 | 76 | if (\is_array($typeCtrl)) { |
| 77 | 77 | $this->removeOldValues($name, $typeCtrl); |
| 78 | - $name.=$separator . $value; |
|
| 78 | + $name.=$separator.$value; |
|
| 79 | 79 | } |
| 80 | 80 | return $this; |
| 81 | 81 | } |
@@ -87,12 +87,12 @@ discard block |
||
| 87 | 87 | if (\is_array($typeCtrl)) { |
| 88 | 88 | $this->removeOldValues($name, $typeCtrl); |
| 89 | 89 | } |
| 90 | - $name.=$separator . $value; |
|
| 90 | + $name.=$separator.$value; |
|
| 91 | 91 | return $this; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | protected function addToMember(&$name, $value, $separator=" ") { |
| 95 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
| 95 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
| 96 | 96 | return $this; |
| 97 | 97 | } |
| 98 | 98 | |
@@ -103,18 +103,18 @@ discard block |
||
| 103 | 103 | $oldValue=trim($oldValue); |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - protected function _getElementBy($callback,$elements){ |
|
| 106 | + protected function _getElementBy($callback, $elements) { |
|
| 107 | 107 | if (\is_array($elements)) { |
| 108 | 108 | $elements=\array_values($elements); |
| 109 | 109 | $flag=false; |
| 110 | 110 | $index=0; |
| 111 | - while ( !$flag && $index < sizeof($elements) ) { |
|
| 111 | + while (!$flag && $index<sizeof($elements)) { |
|
| 112 | 112 | if ($elements[$index] instanceof BaseHtml) |
| 113 | 113 | $flag=($callback($elements[$index])); |
| 114 | 114 | $index++; |
| 115 | 115 | } |
| 116 | - if ($flag === true) |
|
| 117 | - return $elements[$index - 1]; |
|
| 116 | + if ($flag===true) |
|
| 117 | + return $elements[$index-1]; |
|
| 118 | 118 | } elseif ($elements instanceof BaseHtml) { |
| 119 | 119 | if ($callback($elements)) |
| 120 | 120 | return $elements; |
@@ -142,13 +142,13 @@ discard block |
||
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | public function fromArray($array) { |
| 145 | - foreach ( $this as $key => $value ) { |
|
| 146 | - if(array_key_exists($key, $array)===true) |
|
| 147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 145 | + foreach ($this as $key => $value) { |
|
| 146 | + if (array_key_exists($key, $array)===true) |
|
| 147 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
| 148 | 148 | } |
| 149 | - foreach ( $array as $key => $value ) { |
|
| 150 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
| 151 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
| 149 | + foreach ($array as $key => $value) { |
|
| 150 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
| 151 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 | return $array; |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | public function fromDatabaseObjects($objects, $function) { |
| 158 | 158 | if (isset($objects)) { |
| 159 | - foreach ( $objects as $object ) { |
|
| 159 | + foreach ($objects as $object) { |
|
| 160 | 160 | $this->fromDatabaseObject($object, $function); |
| 161 | 161 | } |
| 162 | 162 | } |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | |
| 179 | 179 | public function getElementById($identifier, $elements) { |
| 180 | - return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements); |
|
| 180 | + return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | public function getBsComponent() { |
@@ -190,11 +190,11 @@ discard block |
||
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
| 193 | - if(!$this->_compiled){ |
|
| 194 | - if(isset($js)){ |
|
| 193 | + if (!$this->_compiled) { |
|
| 194 | + if (isset($js)) { |
|
| 195 | 195 | $beforeCompile=$js->getParam("beforeCompileHtml"); |
| 196 | - if(\is_callable($beforeCompile)){ |
|
| 197 | - $beforeCompile($this,$js,$view); |
|
| 196 | + if (\is_callable($beforeCompile)) { |
|
| 197 | + $beforeCompile($this, $js, $view); |
|
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | $this->callCallback($this->_preCompile); |
@@ -204,17 +204,17 @@ discard block |
||
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 207 | - $this->compile_once($js,$view); |
|
| 208 | - $result=$this->getTemplate($js,$view); |
|
| 209 | - foreach ( $this as $key => $value ) { |
|
| 210 | - if(\strstr($result, "%{$key}%")!==false){ |
|
| 207 | + $this->compile_once($js, $view); |
|
| 208 | + $result=$this->getTemplate($js, $view); |
|
| 209 | + foreach ($this as $key => $value) { |
|
| 210 | + if (\strstr($result, "%{$key}%")!==false) { |
|
| 211 | 211 | if (\is_array($value)) { |
| 212 | - $v=PropertyWrapper::wrap($value, $js,$view); |
|
| 213 | - }elseif($value instanceof \stdClass){ |
|
| 214 | - $v=\print_r($value,true); |
|
| 215 | - }elseif ($value instanceof BaseHtml){ |
|
| 216 | - $v=$value->compile($js,$view); |
|
| 217 | - }else{ |
|
| 212 | + $v=PropertyWrapper::wrap($value, $js, $view); |
|
| 213 | + }elseif ($value instanceof \stdClass) { |
|
| 214 | + $v=\print_r($value, true); |
|
| 215 | + }elseif ($value instanceof BaseHtml) { |
|
| 216 | + $v=$value->compile($js, $view); |
|
| 217 | + } else { |
|
| 218 | 218 | $v=$value; |
| 219 | 219 | } |
| 220 | 220 | $result=str_replace("%{$key}%", $v, $result); |
@@ -222,12 +222,12 @@ discard block |
||
| 222 | 222 | } |
| 223 | 223 | if (isset($js)===true) { |
| 224 | 224 | $this->run($js); |
| 225 | - if (isset($view) === true) { |
|
| 225 | + if (isset($view)===true) { |
|
| 226 | 226 | $js->addViewElement($this->_identifier, $result, $view); |
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | - if(\is_callable($this->_postCompile)){ |
|
| 230 | + if (\is_callable($this->_postCompile)) { |
|
| 231 | 231 | $pc=$this->_postCompile; |
| 232 | 232 | $pc($this); |
| 233 | 233 | } |
@@ -241,13 +241,13 @@ discard block |
||
| 241 | 241 | * @param array $parameters default: ["jsCallback"=>"","jqueryDone"=>"append"] |
| 242 | 242 | * @return \Ajax\common\html\BaseHtml |
| 243 | 243 | */ |
| 244 | - public function setDraggable($attr="id",$dropZone=null,$parameters=[]){ |
|
| 244 | + public function setDraggable($attr="id", $dropZone=null, $parameters=[]) { |
|
| 245 | 245 | $this->setProperty("draggable", "true"); |
| 246 | - $this->addEvent("dragstart",Javascript::draggable($attr)); |
|
| 247 | - if(isset($dropZone)&& $dropZone instanceof BaseHtml){ |
|
| 248 | - $jqueryDone="append";$jsCallback=""; |
|
| 246 | + $this->addEvent("dragstart", Javascript::draggable($attr)); |
|
| 247 | + if (isset($dropZone) && $dropZone instanceof BaseHtml) { |
|
| 248 | + $jqueryDone="append"; $jsCallback=""; |
|
| 249 | 249 | extract($parameters); |
| 250 | - $dropZone->asDropZone($jsCallback,$jqueryDone,$parameters); |
|
| 250 | + $dropZone->asDropZone($jsCallback, $jqueryDone, $parameters); |
|
| 251 | 251 | } |
| 252 | 252 | return $this; |
| 253 | 253 | } |
@@ -259,11 +259,11 @@ discard block |
||
| 259 | 259 | * @param array $parameters |
| 260 | 260 | * @return \Ajax\common\html\BaseHtml |
| 261 | 261 | */ |
| 262 | - public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){ |
|
| 262 | + public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) { |
|
| 263 | 263 | $stopPropagation=false; |
| 264 | - $this->addEvent("dragover", '', $stopPropagation,true); |
|
| 264 | + $this->addEvent("dragover", '', $stopPropagation, true); |
|
| 265 | 265 | extract($parameters); |
| 266 | - $this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true); |
|
| 266 | + $this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true); |
|
| 267 | 267 | return $this; |
| 268 | 268 | } |
| 269 | 269 | |
@@ -271,17 +271,17 @@ discard block |
||
| 271 | 271 | return $this->compile(); |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - public function onPostCompile($callback){ |
|
| 274 | + public function onPostCompile($callback) { |
|
| 275 | 275 | $this->_postCompile=$callback; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - public function onPreCompile($callback){ |
|
| 278 | + public function onPreCompile($callback) { |
|
| 279 | 279 | $this->_preCompile=$this->addCallback($this->_preCompile, $callback); |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - private function addCallback($originalValue,$callback){ |
|
| 283 | - if(isset($originalValue)){ |
|
| 284 | - if(!is_array($originalValue)){ |
|
| 282 | + private function addCallback($originalValue, $callback) { |
|
| 283 | + if (isset($originalValue)) { |
|
| 284 | + if (!is_array($originalValue)) { |
|
| 285 | 285 | $result=[$originalValue]; |
| 286 | 286 | } |
| 287 | 287 | $result[]=$callback; |
@@ -290,12 +290,12 @@ discard block |
||
| 290 | 290 | return $callback; |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | - private function callCallback($callable){ |
|
| 294 | - if(\is_callable($callable)){ |
|
| 293 | + private function callCallback($callable) { |
|
| 294 | + if (\is_callable($callable)) { |
|
| 295 | 295 | return $callable($this); |
| 296 | 296 | } |
| 297 | - if(is_array($callable)){ |
|
| 298 | - foreach ($callable as $call){ |
|
| 297 | + if (is_array($callable)) { |
|
| 298 | + foreach ($callable as $call) { |
|
| 299 | 299 | $this->callCallback($call); |
| 300 | 300 | } |
| 301 | 301 | } |