@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | $state=\explode(" ", $state); |
| 14 | 14 | } |
| 15 | 15 | if (\is_array($elements)) { |
| 16 | - foreach ( $elements as $element ) { |
|
| 16 | + foreach ($elements as $element) { |
|
| 17 | 17 | if ($element instanceof BaseHtml) { |
| 18 | 18 | self::_add($state, $element); |
| 19 | 19 | } |
@@ -22,8 +22,8 @@ discard block |
||
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | private static function _add($states, $element) { |
| 25 | - foreach ( $states as $state ) { |
|
| 26 | - $element->addToPropertyCtrl("class", $state, array ($state )); |
|
| 25 | + foreach ($states as $state) { |
|
| 26 | + $element->addToPropertyCtrl("class", $state, array($state)); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | \ No newline at end of file |
@@ -8,34 +8,34 @@ discard block |
||
| 8 | 8 | private $page_count; |
| 9 | 9 | private $pages_visibles; |
| 10 | 10 | |
| 11 | - public function __construct($items_per_page=10,$pages_visibles=4,$page=1){ |
|
| 11 | + public function __construct($items_per_page=10, $pages_visibles=4, $page=1) { |
|
| 12 | 12 | $this->items_per_page=$items_per_page; |
| 13 | 13 | $this->page=$page; |
| 14 | 14 | $this->pages_visibles=$pages_visibles; |
| 15 | 15 | $this->visible=true; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | - public function getObjects($objects){ |
|
| 19 | - $offset = ($this->page - 1) * $this->items_per_page; |
|
| 18 | + public function getObjects($objects) { |
|
| 19 | + $offset=($this->page-1)*$this->items_per_page; |
|
| 20 | 20 | $os=$objects; |
| 21 | - if(!\is_array($os)){ |
|
| 21 | + if (!\is_array($os)) { |
|
| 22 | 22 | $os=[]; |
| 23 | - foreach ($objects as $o){ |
|
| 23 | + foreach ($objects as $o) { |
|
| 24 | 24 | $os[]=$o; |
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | - $this->page_count = 0; |
|
| 27 | + $this->page_count=0; |
|
| 28 | 28 | $row_count=\sizeof($os); |
| 29 | - if (0 === $row_count) { |
|
| 29 | + if (0===$row_count) { |
|
| 30 | 30 | $this->visible=false; |
| 31 | 31 | } else { |
| 32 | 32 | $this->visible=true; |
| 33 | - $this->page_count = (int)ceil($row_count / $this->items_per_page); |
|
| 34 | - if($this->page > $this->page_count+1) { |
|
| 35 | - $this->page = 1; |
|
| 33 | + $this->page_count=(int)ceil($row_count/$this->items_per_page); |
|
| 34 | + if ($this->page>$this->page_count+1) { |
|
| 35 | + $this->page=1; |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | - return array_slice($os, $offset,$this->items_per_page); |
|
| 38 | + return array_slice($os, $offset, $this->items_per_page); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public function getItemsPerPage() { |
@@ -69,14 +69,14 @@ discard block |
||
| 69 | 69 | return $this->page_count; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - public function getPagesNumbers(){ |
|
| 73 | - $middle= (int)ceil(($this->pages_visibles-1)/ 2); |
|
| 72 | + public function getPagesNumbers() { |
|
| 73 | + $middle=(int)ceil(($this->pages_visibles-1)/2); |
|
| 74 | 74 | $first=$this->page-$middle; |
| 75 | - if($first<1){ |
|
| 75 | + if ($first<1) { |
|
| 76 | 76 | $first=1; |
| 77 | 77 | } |
| 78 | 78 | $last=$first+$this->pages_visibles-1; |
| 79 | - if($last>$this->page_count){ |
|
| 79 | + if ($last>$this->page_count) { |
|
| 80 | 80 | $last=$this->page_count; |
| 81 | 81 | } |
| 82 | 82 | return \range($first, $last); |
@@ -124,6 +124,10 @@ discard block |
||
| 124 | 124 | return $this; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | + /** |
|
| 128 | + * @param string $name |
|
| 129 | + * @param string[] $typeCtrl |
|
| 130 | + */ |
|
| 127 | 131 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
| 128 | 132 | if ($this->ctrl($name, $value, $typeCtrl) === true) { |
| 129 | 133 | return $name=$value; |
@@ -139,22 +143,35 @@ discard block |
||
| 139 | 143 | return $this; |
| 140 | 144 | } |
| 141 | 145 | |
| 146 | + /** |
|
| 147 | + * @param string $name |
|
| 148 | + */ |
|
| 142 | 149 | protected function removePropertyValue($name, $value) { |
| 143 | 150 | $this->properties[$name]=\str_replace($value, "", $this->properties[$name]); |
| 144 | 151 | return $this; |
| 145 | 152 | } |
| 146 | 153 | |
| 154 | + /** |
|
| 155 | + * @param string $name |
|
| 156 | + */ |
|
| 147 | 157 | protected function removePropertyValues($name, $values) { |
| 148 | 158 | $this->removeOldValues($this->properties[$name], $values); |
| 149 | 159 | return $this; |
| 150 | 160 | } |
| 151 | 161 | |
| 162 | + /** |
|
| 163 | + * @param string $name |
|
| 164 | + */ |
|
| 152 | 165 | public function removeProperty($name) { |
| 153 | 166 | if (\array_key_exists($name, $this->properties)) |
| 154 | 167 | unset($this->properties[$name]); |
| 155 | 168 | return $this; |
| 156 | 169 | } |
| 157 | 170 | |
| 171 | + /** |
|
| 172 | + * @param string $name |
|
| 173 | + * @param string[] $typeCtrl |
|
| 174 | + */ |
|
| 158 | 175 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
| 159 | 176 | if ($this->ctrl($name, $value, $typeCtrl) === true) { |
| 160 | 177 | if (\is_array($typeCtrl)) { |
@@ -165,6 +182,9 @@ discard block |
||
| 165 | 182 | return $this; |
| 166 | 183 | } |
| 167 | 184 | |
| 185 | + /** |
|
| 186 | + * @param string $name |
|
| 187 | + */ |
|
| 168 | 188 | protected function addToMember(&$name, $value, $separator=" ") { |
| 169 | 189 | $name=str_ireplace($value, "", $name) . $separator . $value; |
| 170 | 190 | return $this; |
@@ -179,6 +199,9 @@ discard block |
||
| 179 | 199 | return $this->addToProperty($name, $value); |
| 180 | 200 | } |
| 181 | 201 | |
| 202 | + /** |
|
| 203 | + * @param string $name |
|
| 204 | + */ |
|
| 182 | 205 | public function addToPropertyCtrl($name, $value, $typeCtrl) { |
| 183 | 206 | return $this->addToPropertyUnique($name, $value, $typeCtrl); |
| 184 | 207 | } |
@@ -278,6 +301,10 @@ discard block |
||
| 278 | 301 | return null; |
| 279 | 302 | } |
| 280 | 303 | |
| 304 | + /** |
|
| 305 | + * @param string $propertyName |
|
| 306 | + * @param string $value |
|
| 307 | + */ |
|
| 281 | 308 | protected function getElementByPropertyValue($propertyName,$value, $elements) { |
| 282 | 309 | if (\is_array($elements)) { |
| 283 | 310 | $flag=false; |
@@ -17,9 +17,9 @@ discard block |
||
| 17 | 17 | use BaseHtmlEventsTrait; |
| 18 | 18 | protected $_template; |
| 19 | 19 | protected $tagName; |
| 20 | - protected $properties=array (); |
|
| 21 | - protected $_wrapBefore=array (); |
|
| 22 | - protected $_wrapAfter=array (); |
|
| 20 | + protected $properties=array(); |
|
| 21 | + protected $_wrapBefore=array(); |
|
| 22 | + protected $_wrapAfter=array(); |
|
| 23 | 23 | protected $_bsComponent; |
| 24 | 24 | |
| 25 | 25 | public function getBsComponent() { |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | protected function getTemplate(JsUtils $js=NULL) { |
| 35 | - return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
| 35 | + return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | public function getProperties() { |
@@ -56,13 +56,13 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | public function addToProperty($name, $value, $separator=" ") { |
| 58 | 58 | if (\is_array($value)) { |
| 59 | - foreach ( $value as $v ) { |
|
| 59 | + foreach ($value as $v) { |
|
| 60 | 60 | $this->addToProperty($name, $v, $separator); |
| 61 | 61 | } |
| 62 | - } else if ($value !== "" && $this->propertyContains($name, $value) === false) { |
|
| 62 | + } else if ($value!=="" && $this->propertyContains($name, $value)===false) { |
|
| 63 | 63 | $v=@$this->properties[$name]; |
| 64 | - if (isset($v) && $v !== "") |
|
| 65 | - $v=$v . $separator . $value; |
|
| 64 | + if (isset($v) && $v!=="") |
|
| 65 | + $v=$v.$separator.$value; |
|
| 66 | 66 | else |
| 67 | 67 | $v=$value; |
| 68 | 68 | |
@@ -78,19 +78,19 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 80 | 80 | $result=$this->getTemplate($js); |
| 81 | - foreach ( $this as $key => $value ) { |
|
| 82 | - if (JString::startswith($key, "_") === false && $key !== "events") { |
|
| 81 | + foreach ($this as $key => $value) { |
|
| 82 | + if (JString::startswith($key, "_")===false && $key!=="events") { |
|
| 83 | 83 | if (\is_array($value)) { |
| 84 | 84 | $v=PropertyWrapper::wrap($value, $js); |
| 85 | 85 | } else { |
| 86 | 86 | $v=$value; |
| 87 | 87 | } |
| 88 | - $result=str_ireplace("%" . $key . "%", $v, $result); |
|
| 88 | + $result=str_ireplace("%".$key."%", $v, $result); |
|
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | if (isset($js)===true) { |
| 92 | 92 | $this->run($js); |
| 93 | - if (isset($view) === true) { |
|
| 93 | + if (isset($view)===true) { |
|
| 94 | 94 | $js->addViewElement($this->identifier, $result, $view); |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -99,12 +99,12 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | protected function ctrl($name, $value, $typeCtrl) { |
| 101 | 101 | if (\is_array($typeCtrl)) { |
| 102 | - if (array_search($value, $typeCtrl) === false) { |
|
| 103 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
| 102 | + if (array_search($value, $typeCtrl)===false) { |
|
| 103 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
| 104 | 104 | } |
| 105 | 105 | } else { |
| 106 | 106 | if (!$typeCtrl($value)) { |
| 107 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
| 107 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | return true; |
@@ -119,13 +119,13 @@ discard block |
||
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
| 122 | - if ($this->ctrl($name, $value, $typeCtrl) === true) |
|
| 122 | + if ($this->ctrl($name, $value, $typeCtrl)===true) |
|
| 123 | 123 | return $this->setProperty($name, $value); |
| 124 | 124 | return $this; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
| 128 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
| 128 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
| 129 | 129 | return $name=$value; |
| 130 | 130 | } |
| 131 | 131 | return $this; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
| 135 | 135 | if (\is_array($typeCtrl)) { |
| 136 | 136 | $this->removeOldValues($name, $typeCtrl); |
| 137 | - $name.=$separator . $value; |
|
| 137 | + $name.=$separator.$value; |
|
| 138 | 138 | } |
| 139 | 139 | return $this; |
| 140 | 140 | } |
@@ -156,17 +156,17 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
| 159 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
| 159 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
| 160 | 160 | if (\is_array($typeCtrl)) { |
| 161 | 161 | $this->removeOldValues($name, $typeCtrl); |
| 162 | 162 | } |
| 163 | - $name.=$separator . $value; |
|
| 163 | + $name.=$separator.$value; |
|
| 164 | 164 | } |
| 165 | 165 | return $this; |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | protected function addToMember(&$name, $value, $separator=" ") { |
| 169 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
| 169 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
| 170 | 170 | return $this; |
| 171 | 171 | } |
| 172 | 172 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
| 187 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
| 187 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
| 188 | 188 | return $this->addToProperty($name, $value); |
| 189 | 189 | } |
| 190 | 190 | return $this; |
@@ -212,26 +212,26 @@ discard block |
||
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | public function fromArray($array) { |
| 215 | - foreach ( $this as $key => $value ) { |
|
| 216 | - if(array_key_exists($key, $array)===true) |
|
| 217 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 215 | + foreach ($this as $key => $value) { |
|
| 216 | + if (array_key_exists($key, $array)===true) |
|
| 217 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
| 218 | 218 | } |
| 219 | - foreach ( $array as $key => $value ) { |
|
| 220 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
| 221 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
| 219 | + foreach ($array as $key => $value) { |
|
| 220 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
| 221 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
| 222 | 222 | } |
| 223 | 223 | } |
| 224 | 224 | return $array; |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | - private function _callSetter($setter,$key,$value,&$array){ |
|
| 227 | + private function _callSetter($setter, $key, $value, &$array) { |
|
| 228 | 228 | $result=false; |
| 229 | 229 | if (method_exists($this, $setter) && !JString::startswith($key, "_")) { |
| 230 | 230 | try { |
| 231 | 231 | $this->$setter($value); |
| 232 | 232 | unset($array[$key]); |
| 233 | 233 | $result=true; |
| 234 | - } catch ( \Exception $e ) { |
|
| 234 | + }catch (\Exception $e) { |
|
| 235 | 235 | $result=false; |
| 236 | 236 | } |
| 237 | 237 | } |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | |
| 241 | 241 | public function fromDatabaseObjects($objects, $function) { |
| 242 | 242 | if (isset($objects)) { |
| 243 | - foreach ( $objects as $object ) { |
|
| 243 | + foreach ($objects as $object) { |
|
| 244 | 244 | $this->fromDatabaseObject($object, $function); |
| 245 | 245 | } |
| 246 | 246 | } |
@@ -264,33 +264,33 @@ discard block |
||
| 264 | 264 | if (\is_array($elements)) { |
| 265 | 265 | $flag=false; |
| 266 | 266 | $index=0; |
| 267 | - while ( !$flag && $index < sizeof($elements) ) { |
|
| 267 | + while (!$flag && $index<sizeof($elements)) { |
|
| 268 | 268 | if ($elements[$index] instanceof BaseHtml) |
| 269 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
| 269 | + $flag=($elements[$index]->getIdentifier()===$identifier); |
|
| 270 | 270 | $index++; |
| 271 | 271 | } |
| 272 | - if ($flag === true) |
|
| 273 | - return $elements[$index - 1]; |
|
| 272 | + if ($flag===true) |
|
| 273 | + return $elements[$index-1]; |
|
| 274 | 274 | } elseif ($elements instanceof BaseHtml) { |
| 275 | - if ($elements->getIdentifier() === $identifier) |
|
| 275 | + if ($elements->getIdentifier()===$identifier) |
|
| 276 | 276 | return $elements; |
| 277 | 277 | } |
| 278 | 278 | return null; |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
| 281 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
| 282 | 282 | if (\is_array($elements)) { |
| 283 | 283 | $flag=false; |
| 284 | 284 | $index=0; |
| 285 | - while ( !$flag && $index < sizeof($elements) ) { |
|
| 285 | + while (!$flag && $index<sizeof($elements)) { |
|
| 286 | 286 | if ($elements[$index] instanceof BaseHtml) |
| 287 | - $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
| 287 | + $flag=($elements[$index]->propertyContains($propertyName, $value)===true); |
|
| 288 | 288 | $index++; |
| 289 | 289 | } |
| 290 | - if ($flag === true) |
|
| 291 | - return $elements[$index - 1]; |
|
| 290 | + if ($flag===true) |
|
| 291 | + return $elements[$index-1]; |
|
| 292 | 292 | } elseif ($elements instanceof BaseHtml) { |
| 293 | - if ($elements->propertyContains($propertyName, $value) === true) |
|
| 293 | + if ($elements->propertyContains($propertyName, $value)===true) |
|
| 294 | 294 | return $elements; |
| 295 | 295 | } |
| 296 | 296 | return null; |
@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | public function getProperty($name) { |
| 53 | - if (array_key_exists($name, $this->properties)) |
|
| 54 | - return $this->properties[$name]; |
|
| 53 | + if (array_key_exists($name, $this->properties)) { |
|
| 54 | + return $this->properties[$name]; |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | 57 | |
| 57 | 58 | public function addToProperty($name, $value, $separator=" ") { |
@@ -61,10 +62,11 @@ discard block |
||
| 61 | 62 | } |
| 62 | 63 | } else if ($value !== "" && $this->propertyContains($name, $value) === false) { |
| 63 | 64 | $v=@$this->properties[$name]; |
| 64 | - if (isset($v) && $v !== "") |
|
| 65 | - $v=$v . $separator . $value; |
|
| 66 | - else |
|
| 67 | - $v=$value; |
|
| 65 | + if (isset($v) && $v !== "") { |
|
| 66 | + $v=$v . $separator . $value; |
|
| 67 | + } else { |
|
| 68 | + $v=$value; |
|
| 69 | + } |
|
| 68 | 70 | |
| 69 | 71 | return $this->setProperty($name, $v); |
| 70 | 72 | } |
@@ -119,8 +121,9 @@ discard block |
||
| 119 | 121 | } |
| 120 | 122 | |
| 121 | 123 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
| 122 | - if ($this->ctrl($name, $value, $typeCtrl) === true) |
|
| 123 | - return $this->setProperty($name, $value); |
|
| 124 | + if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
| 125 | + return $this->setProperty($name, $value); |
|
| 126 | + } |
|
| 124 | 127 | return $this; |
| 125 | 128 | } |
| 126 | 129 | |
@@ -150,8 +153,9 @@ discard block |
||
| 150 | 153 | } |
| 151 | 154 | |
| 152 | 155 | public function removeProperty($name) { |
| 153 | - if (\array_key_exists($name, $this->properties)) |
|
| 154 | - unset($this->properties[$name]); |
|
| 156 | + if (\array_key_exists($name, $this->properties)) { |
|
| 157 | + unset($this->properties[$name]); |
|
| 158 | + } |
|
| 155 | 159 | return $this; |
| 156 | 160 | } |
| 157 | 161 | |
@@ -171,8 +175,9 @@ discard block |
||
| 171 | 175 | } |
| 172 | 176 | |
| 173 | 177 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
| 174 | - if (@class_exists($typeCtrl, true)) |
|
| 175 | - $typeCtrl=$typeCtrl::getConstants(); |
|
| 178 | + if (@class_exists($typeCtrl, true)) { |
|
| 179 | + $typeCtrl=$typeCtrl::getConstants(); |
|
| 180 | + } |
|
| 176 | 181 | if (\is_array($typeCtrl)) { |
| 177 | 182 | $this->removeOldValues($this->properties[$name], $typeCtrl); |
| 178 | 183 | } |
@@ -213,8 +218,9 @@ discard block |
||
| 213 | 218 | |
| 214 | 219 | public function fromArray($array) { |
| 215 | 220 | foreach ( $this as $key => $value ) { |
| 216 | - if(array_key_exists($key, $array)===true) |
|
| 217 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 221 | + if(array_key_exists($key, $array)===true) { |
|
| 222 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
| 223 | + } |
|
| 218 | 224 | } |
| 219 | 225 | foreach ( $array as $key => $value ) { |
| 220 | 226 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -265,15 +271,18 @@ discard block |
||
| 265 | 271 | $flag=false; |
| 266 | 272 | $index=0; |
| 267 | 273 | while ( !$flag && $index < sizeof($elements) ) { |
| 268 | - if ($elements[$index] instanceof BaseHtml) |
|
| 269 | - $flag=($elements[$index]->getIdentifier() === $identifier); |
|
| 274 | + if ($elements[$index] instanceof BaseHtml) { |
|
| 275 | + $flag=($elements[$index]->getIdentifier() === $identifier); |
|
| 276 | + } |
|
| 270 | 277 | $index++; |
| 271 | 278 | } |
| 272 | - if ($flag === true) |
|
| 273 | - return $elements[$index - 1]; |
|
| 279 | + if ($flag === true) { |
|
| 280 | + return $elements[$index - 1]; |
|
| 281 | + } |
|
| 274 | 282 | } elseif ($elements instanceof BaseHtml) { |
| 275 | - if ($elements->getIdentifier() === $identifier) |
|
| 276 | - return $elements; |
|
| 283 | + if ($elements->getIdentifier() === $identifier) { |
|
| 284 | + return $elements; |
|
| 285 | + } |
|
| 277 | 286 | } |
| 278 | 287 | return null; |
| 279 | 288 | } |
@@ -283,15 +292,18 @@ discard block |
||
| 283 | 292 | $flag=false; |
| 284 | 293 | $index=0; |
| 285 | 294 | while ( !$flag && $index < sizeof($elements) ) { |
| 286 | - if ($elements[$index] instanceof BaseHtml) |
|
| 287 | - $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
| 295 | + if ($elements[$index] instanceof BaseHtml) { |
|
| 296 | + $flag=($elements[$index]->propertyContains($propertyName, $value) === true); |
|
| 297 | + } |
|
| 288 | 298 | $index++; |
| 289 | 299 | } |
| 290 | - if ($flag === true) |
|
| 291 | - return $elements[$index - 1]; |
|
| 300 | + if ($flag === true) { |
|
| 301 | + return $elements[$index - 1]; |
|
| 302 | + } |
|
| 292 | 303 | } elseif ($elements instanceof BaseHtml) { |
| 293 | - if ($elements->propertyContains($propertyName, $value) === true) |
|
| 294 | - return $elements; |
|
| 304 | + if ($elements->propertyContains($propertyName, $value) === true) { |
|
| 305 | + return $elements; |
|
| 306 | + } |
|
| 295 | 307 | } |
| 296 | 308 | return null; |
| 297 | 309 | } |
@@ -24,6 +24,10 @@ discard block |
||
| 24 | 24 | trait FieldAsTrait{ |
| 25 | 25 | |
| 26 | 26 | abstract protected function _getFieldIdentifier($prefix); |
| 27 | + |
|
| 28 | + /** |
|
| 29 | + * @param \Closure $callback |
|
| 30 | + */ |
|
| 27 | 31 | abstract public function setValueFunction($index,$callback); |
| 28 | 32 | |
| 29 | 33 | /** |
@@ -49,6 +53,10 @@ discard block |
||
| 49 | 53 | |
| 50 | 54 | protected function _addRules($element,&$attributes){} |
| 51 | 55 | |
| 56 | + /** |
|
| 57 | + * @param \Closure $elementCallback |
|
| 58 | + * @param string $prefix |
|
| 59 | + */ |
|
| 52 | 60 | protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){ |
| 53 | 61 | $this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){ |
| 54 | 62 | $name=$this->_instanceViewer->getCaption($index)."[]"; |
@@ -56,8 +56,9 @@ discard block |
||
| 56 | 56 | $name=$attributes["name"]; |
| 57 | 57 | } |
| 58 | 58 | $element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,""); |
| 59 | - if(\is_array($attributes)) |
|
| 60 | - $this->_applyAttributes($element, $attributes,$index); |
|
| 59 | + if(\is_array($attributes)) { |
|
| 60 | + $this->_applyAttributes($element, $attributes,$index); |
|
| 61 | + } |
|
| 61 | 62 | $element->setDisabled(!$this->_edition); |
| 62 | 63 | return $element; |
| 63 | 64 | }); |
@@ -92,8 +93,9 @@ discard block |
||
| 92 | 93 | public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
| 93 | 94 | return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
| 94 | 95 | $header=new HtmlHeader($id,$niveau,$value); |
| 95 | - if(isset($icon)) |
|
| 96 | - $header->asIcon($icon, $value); |
|
| 96 | + if(isset($icon)) { |
|
| 97 | + $header->asIcon($icon, $value); |
|
| 98 | + } |
|
| 97 | 99 | return $header; |
| 98 | 100 | }, $index,$attributes,"header"); |
| 99 | 101 | } |
@@ -101,7 +103,9 @@ discard block |
||
| 101 | 103 | |
| 102 | 104 | public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
| 103 | 105 | $this->setValueFunction($index,function($img) use($size,$circular){ |
| 104 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
| 106 | + $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular) { |
|
| 107 | + $image->setCircular(); |
|
| 108 | + } |
|
| 105 | 109 | return $image; |
| 106 | 110 | }); |
| 107 | 111 | return $this; |
@@ -18,43 +18,43 @@ discard block |
||
| 18 | 18 | * @property boolean $_edition |
| 19 | 19 | * @property mixed _modelInstance |
| 20 | 20 | */ |
| 21 | -trait FieldAsTrait{ |
|
| 21 | +trait FieldAsTrait { |
|
| 22 | 22 | |
| 23 | 23 | abstract protected function _getFieldIdentifier($prefix); |
| 24 | - abstract public function setValueFunction($index,$callback); |
|
| 24 | + abstract public function setValueFunction($index, $callback); |
|
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * @param HtmlFormField $element |
| 28 | 28 | * @param array $attributes |
| 29 | 29 | */ |
| 30 | - protected function _applyAttributes($element,&$attributes,$index){ |
|
| 30 | + protected function _applyAttributes($element, &$attributes, $index) { |
|
| 31 | 31 | $this->_addRules($element, $attributes); |
| 32 | - if(isset($attributes["callback"])){ |
|
| 32 | + if (isset($attributes["callback"])) { |
|
| 33 | 33 | $callback=$attributes["callback"]; |
| 34 | - if(\is_callable($callback)){ |
|
| 35 | - $callback($element,$this->_modelInstance,$index); |
|
| 34 | + if (\is_callable($callback)) { |
|
| 35 | + $callback($element, $this->_modelInstance, $index); |
|
| 36 | 36 | unset($attributes["callback"]); |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | $element->fromArray($attributes); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - private function _getLabelField($caption,$icon=NULL){ |
|
| 43 | - $label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon); |
|
| 42 | + private function _getLabelField($caption, $icon=NULL) { |
|
| 43 | + $label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon); |
|
| 44 | 44 | return $label; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - protected function _addRules($element,&$attributes){} |
|
| 47 | + protected function _addRules($element, &$attributes) {} |
|
| 48 | 48 | |
| 49 | - protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){ |
|
| 50 | - $this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){ |
|
| 49 | + protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) { |
|
| 50 | + $this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){ |
|
| 51 | 51 | $name=$this->_instanceViewer->getCaption($index)."[]"; |
| 52 | - if(isset($attributes["name"])){ |
|
| 52 | + if (isset($attributes["name"])) { |
|
| 53 | 53 | $name=$attributes["name"]; |
| 54 | 54 | } |
| 55 | - $element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,""); |
|
| 56 | - if(\is_array($attributes)) |
|
| 57 | - $this->_applyAttributes($element, $attributes,$index); |
|
| 55 | + $element=$elementCallback($this->_getFieldIdentifier($prefix), $name, $value, ""); |
|
| 56 | + if (\is_array($attributes)) |
|
| 57 | + $this->_applyAttributes($element, $attributes, $index); |
|
| 58 | 58 | $element->setDisabled(!$this->_edition); |
| 59 | 59 | return $element; |
| 60 | 60 | }); |
@@ -62,94 +62,94 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
| 65 | - public function fieldAsProgress($index,$label=NULL, $attributes=array()){ |
|
| 66 | - $this->setValueFunction($index,function($value) use($label,$attributes){ |
|
| 67 | - $pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes); |
|
| 65 | + public function fieldAsProgress($index, $label=NULL, $attributes=array()) { |
|
| 66 | + $this->setValueFunction($index, function($value) use($label, $attributes){ |
|
| 67 | + $pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes); |
|
| 68 | 68 | return $pb; |
| 69 | 69 | }); |
| 70 | 70 | return $this; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function fieldAsRating($index,$max=5, $icon=""){ |
|
| 74 | - $this->setValueFunction($index,function($value) use($max,$icon){ |
|
| 75 | - $rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon); |
|
| 73 | + public function fieldAsRating($index, $max=5, $icon="") { |
|
| 74 | + $this->setValueFunction($index, function($value) use($max, $icon){ |
|
| 75 | + $rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon); |
|
| 76 | 76 | return $rating; |
| 77 | 77 | }); |
| 78 | 78 | return $this; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - public function fieldAsLabel($index,$icon=NULL){ |
|
| 82 | - $this->setValueFunction($index,function($caption) use($icon){ |
|
| 83 | - $lbl=$this->_getLabelField($caption,$icon); |
|
| 81 | + public function fieldAsLabel($index, $icon=NULL) { |
|
| 82 | + $this->setValueFunction($index, function($caption) use($icon){ |
|
| 83 | + $lbl=$this->_getLabelField($caption, $icon); |
|
| 84 | 84 | return $lbl; |
| 85 | 85 | }); |
| 86 | 86 | return $this; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
|
| 90 | - return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
|
| 91 | - $header=new HtmlHeader($id,$niveau,$value); |
|
| 92 | - if(isset($icon)) |
|
| 89 | + public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) { |
|
| 90 | + return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){ |
|
| 91 | + $header=new HtmlHeader($id, $niveau, $value); |
|
| 92 | + if (isset($icon)) |
|
| 93 | 93 | $header->asIcon($icon, $value); |
| 94 | 94 | return $header; |
| 95 | - }, $index,$attributes,"header"); |
|
| 95 | + }, $index, $attributes, "header"); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
| 99 | - public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
|
| 100 | - $this->setValueFunction($index,function($img) use($size,$circular){ |
|
| 101 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
| 99 | + public function fieldAsImage($index, $size=Size::MINI, $circular=false) { |
|
| 100 | + $this->setValueFunction($index, function($img) use($size, $circular){ |
|
| 101 | + $image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular(); |
|
| 102 | 102 | return $image; |
| 103 | 103 | }); |
| 104 | 104 | return $this; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - public function fieldAsAvatar($index,$attributes=NULL){ |
|
| 108 | - return $this->_fieldAs(function($id,$name,$value){ |
|
| 109 | - $img=new HtmlImage($id,$value); |
|
| 107 | + public function fieldAsAvatar($index, $attributes=NULL) { |
|
| 108 | + return $this->_fieldAs(function($id, $name, $value) { |
|
| 109 | + $img=new HtmlImage($id, $value); |
|
| 110 | 110 | $img->asAvatar(); |
| 111 | 111 | return $img; |
| 112 | - }, $index,$attributes,"avatar"); |
|
| 112 | + }, $index, $attributes, "avatar"); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - public function fieldAsRadio($index,$attributes=NULL){ |
|
| 116 | - return $this->_fieldAs(function($id,$name,$value){ |
|
| 117 | - $input= new HtmlRadio($id,$name,$value,$value); |
|
| 115 | + public function fieldAsRadio($index, $attributes=NULL) { |
|
| 116 | + return $this->_fieldAs(function($id, $name, $value) { |
|
| 117 | + $input=new HtmlRadio($id, $name, $value, $value); |
|
| 118 | 118 | return $input; |
| 119 | - }, $index,$attributes,"radio"); |
|
| 119 | + }, $index, $attributes, "radio"); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - public function fieldAsInput($index,$attributes=NULL){ |
|
| 123 | - return $this->_fieldAs(function($id,$name,$value){ |
|
| 124 | - $input= new HtmlFormInput($id,"","text",$value); |
|
| 122 | + public function fieldAsInput($index, $attributes=NULL) { |
|
| 123 | + return $this->_fieldAs(function($id, $name, $value) { |
|
| 124 | + $input=new HtmlFormInput($id, "", "text", $value); |
|
| 125 | 125 | $input->setName($name); |
| 126 | 126 | return $input; |
| 127 | - }, $index,$attributes,"input"); |
|
| 127 | + }, $index, $attributes, "input"); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - public function fieldAsHidden($index,$attributes=NULL){ |
|
| 131 | - if(!\is_array($attributes)){ |
|
| 130 | + public function fieldAsHidden($index, $attributes=NULL) { |
|
| 131 | + if (!\is_array($attributes)) { |
|
| 132 | 132 | $attributes=[]; |
| 133 | 133 | } |
| 134 | 134 | $attributes["imputType"]="hidden"; |
| 135 | - return $this->fieldAsInput($index,$attributes); |
|
| 135 | + return $this->fieldAsInput($index, $attributes); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - public function fieldAsCheckbox($index,$attributes=NULL){ |
|
| 139 | - return $this->_fieldAs(function($id,$name,$value){ |
|
| 140 | - $input=new HtmlFormCheckbox($id,NULL,$this->_instanceViewer->getIdentifier()); |
|
| 138 | + public function fieldAsCheckbox($index, $attributes=NULL) { |
|
| 139 | + return $this->_fieldAs(function($id, $name, $value) { |
|
| 140 | + $input=new HtmlFormCheckbox($id, NULL, $this->_instanceViewer->getIdentifier()); |
|
| 141 | 141 | $input->setChecked(JString::isBooleanTrue($value)); |
| 142 | 142 | $input->getField()->setProperty("name", $name); |
| 143 | 143 | return $input; |
| 144 | - }, $index,$attributes,"ck"); |
|
| 144 | + }, $index, $attributes, "ck"); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){ |
|
| 148 | - return $this->_fieldAs(function($id,$name,$value) use($elements,$multiple){ |
|
| 147 | + public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) { |
|
| 148 | + return $this->_fieldAs(function($id, $name, $value) use($elements, $multiple){ |
|
| 149 | 149 | //$dd=new HtmlDropdown($id,$value,$elements); |
| 150 | - $dd=new HtmlFormDropdown($id,$elements,NULL,$value); |
|
| 151 | - $dd->asSelect($name,$multiple); |
|
| 150 | + $dd=new HtmlFormDropdown($id, $elements, NULL, $value); |
|
| 151 | + $dd->asSelect($name, $multiple); |
|
| 152 | 152 | return $dd; |
| 153 | - }, $index,$attributes,"dd"); |
|
| 153 | + }, $index, $attributes, "dd"); |
|
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | \ No newline at end of file |
@@ -20,6 +20,9 @@ |
||
| 20 | 20 | class DataForm extends Widget { |
| 21 | 21 | use FormFieldAsTrait,FormTrait; |
| 22 | 22 | |
| 23 | + /** |
|
| 24 | + * @param string $identifier |
|
| 25 | + */ |
|
| 23 | 26 | public function __construct($identifier, $modelInstance=NULL) { |
| 24 | 27 | parent::__construct($identifier, null,$modelInstance); |
| 25 | 28 | $this->_init(new FormInstanceViewer($identifier), "form", new HtmlForm($identifier), true); |
@@ -18,46 +18,46 @@ discard block |
||
| 18 | 18 | * @property FormInstanceViewer $_instanceViewer |
| 19 | 19 | */ |
| 20 | 20 | class DataForm extends Widget { |
| 21 | - use FormFieldAsTrait,FormTrait; |
|
| 21 | + use FormFieldAsTrait, FormTrait; |
|
| 22 | 22 | |
| 23 | 23 | public function __construct($identifier, $modelInstance=NULL) { |
| 24 | - parent::__construct($identifier, null,$modelInstance); |
|
| 24 | + parent::__construct($identifier, null, $modelInstance); |
|
| 25 | 25 | $this->_init(new FormInstanceViewer($identifier), "form", new HtmlForm($identifier), true); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
| 28 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
| 29 | 29 | $this->_instanceViewer->setInstance($this->_modelInstance); |
| 30 | 30 | |
| 31 | 31 | $form=$this->content["form"]; |
| 32 | 32 | $this->_generateContent($form); |
| 33 | 33 | |
| 34 | - if(isset($this->_toolbar)){ |
|
| 34 | + if (isset($this->_toolbar)) { |
|
| 35 | 35 | $this->_setToolbarPosition($form); |
| 36 | 36 | } |
| 37 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
| 38 | - return parent::compile($js,$view); |
|
| 37 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
| 38 | + return parent::compile($js, $view); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * @param HtmlForm $form |
| 43 | 43 | */ |
| 44 | - protected function _generateContent($form){ |
|
| 45 | - $values= $this->_instanceViewer->getValues(); |
|
| 44 | + protected function _generateContent($form) { |
|
| 45 | + $values=$this->_instanceViewer->getValues(); |
|
| 46 | 46 | $count=$this->_instanceViewer->count(); |
| 47 | 47 | |
| 48 | 48 | $separators=$this->_instanceViewer->getSeparators(); |
| 49 | 49 | $size=\sizeof($separators); |
| 50 | - if($size===1){ |
|
| 51 | - foreach ($values as $v){ |
|
| 50 | + if ($size===1) { |
|
| 51 | + foreach ($values as $v) { |
|
| 52 | 52 | $form->addField($v); |
| 53 | 53 | } |
| 54 | - }else{ |
|
| 54 | + } else { |
|
| 55 | 55 | $separators[]=$count; |
| 56 | - for($i=0;$i<$size;$i++){ |
|
| 57 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
| 58 | - if(\sizeof($fields)===1){ |
|
| 56 | + for ($i=0; $i<$size; $i++) { |
|
| 57 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
| 58 | + if (\sizeof($fields)===1) { |
|
| 59 | 59 | $form->addField($fields[0]); |
| 60 | - }else |
|
| 60 | + } else |
|
| 61 | 61 | $form->addFields($fields); |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -66,11 +66,11 @@ discard block |
||
| 66 | 66 | /** |
| 67 | 67 | * @return HtmlForm |
| 68 | 68 | */ |
| 69 | - protected function getForm(){ |
|
| 69 | + protected function getForm() { |
|
| 70 | 70 | return $this->content["form"]; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function addSeparatorAfter($fieldNum){ |
|
| 73 | + public function addSeparatorAfter($fieldNum) { |
|
| 74 | 74 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
| 75 | 75 | return $this; |
| 76 | 76 | } |
@@ -84,26 +84,26 @@ discard block |
||
| 84 | 84 | return $this; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
| 88 | - $button=new HtmlButton($identifier,$value,$cssStyle); |
|
| 89 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement); |
|
| 87 | + public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
| 88 | + $button=new HtmlButton($identifier, $value, $cssStyle); |
|
| 89 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement); |
|
| 90 | 90 | return $this->addInToolbar($button); |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){ |
|
| 94 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle){ |
|
| 95 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
| 96 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement); |
|
| 93 | + public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) { |
|
| 94 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle){ |
|
| 95 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
| 96 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement); |
|
| 97 | 97 | return $button; |
| 98 | - }, $index,$attributes); |
|
| 98 | + }, $index, $attributes); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
| 102 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
| 103 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
| 101 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
| 102 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
| 103 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
| 104 | 104 | $button->setProperty("type", "reset"); |
| 105 | 105 | return $button; |
| 106 | - }, $index,$attributes); |
|
| 106 | + }, $index, $attributes); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
@@ -51,14 +51,15 @@ |
||
| 51 | 51 | foreach ($values as $v){ |
| 52 | 52 | $form->addField($v); |
| 53 | 53 | } |
| 54 | - }else{ |
|
| 54 | + } else{ |
|
| 55 | 55 | $separators[]=$count; |
| 56 | 56 | for($i=0;$i<$size;$i++){ |
| 57 | 57 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
| 58 | 58 | if(\sizeof($fields)===1){ |
| 59 | 59 | $form->addField($fields[0]); |
| 60 | - }else |
|
| 61 | - $form->addFields($fields); |
|
| 60 | + } else { |
|
| 61 | + $form->addFields($fields); |
|
| 62 | + } |
|
| 62 | 63 | } |
| 63 | 64 | } |
| 64 | 65 | } |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | protected $attr; |
| 20 | 20 | |
| 21 | 21 | |
| 22 | - public function __construct($identifier,$tagName){ |
|
| 23 | - parent::__construct($identifier,$tagName); |
|
| 22 | + public function __construct($identifier, $tagName) { |
|
| 23 | + parent::__construct($identifier, $tagName); |
|
| 24 | 24 | $this->root=""; |
| 25 | 25 | $this->attr="data-ajax"; |
| 26 | 26 | } |
@@ -31,11 +31,11 @@ discard block |
||
| 31 | 31 | * @param string $targetSelector the target of the get |
| 32 | 32 | * @return HtmlNavElement |
| 33 | 33 | */ |
| 34 | - public function autoGetOnClick($targetSelector){ |
|
| 35 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
| 34 | + public function autoGetOnClick($targetSelector) { |
|
| 35 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - public function contentAsString(){ |
|
| 38 | + public function contentAsString() { |
|
| 39 | 39 | return implode("", $this->content); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -43,15 +43,15 @@ discard block |
||
| 43 | 43 | * Generate the jquery script to set the elements to the HtmlNavElement |
| 44 | 44 | * @param JsUtils $jsUtils |
| 45 | 45 | */ |
| 46 | - public function jsSetContent(JsUtils $jsUtils){ |
|
| 47 | - $jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true); |
|
| 46 | + public function jsSetContent(JsUtils $jsUtils) { |
|
| 47 | + $jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | public function getRoot() { |
| 51 | 51 | return $this->root; |
| 52 | 52 | } |
| 53 | 53 | public function setRoot($root) { |
| 54 | - $this->root = $root; |
|
| 54 | + $this->root=$root; |
|
| 55 | 55 | return $this; |
| 56 | 56 | } |
| 57 | 57 | public function getAttr() { |
@@ -64,12 +64,12 @@ discard block |
||
| 64 | 64 | * @return HtmlNavElement |
| 65 | 65 | */ |
| 66 | 66 | public function setAttr($attr) { |
| 67 | - $this->attr = $attr; |
|
| 67 | + $this->attr=$attr; |
|
| 68 | 68 | return $this; |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | public function __call($method, $args) { |
| 72 | - if(isset($this->$method) && is_callable($this->$method)) { |
|
| 72 | + if (isset($this->$method) && is_callable($this->$method)) { |
|
| 73 | 73 | return call_user_func_array( |
| 74 | 74 | $this->$method, |
| 75 | 75 | $args |
@@ -77,6 +77,6 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | - abstract public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0); |
|
| 80 | + abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0); |
|
| 81 | 81 | |
| 82 | 82 | } |
| 83 | 83 | \ No newline at end of file |
@@ -158,8 +158,8 @@ discard block |
||
| 158 | 158 | * @param string $tagName |
| 159 | 159 | * @return HtmlLabel |
| 160 | 160 | */ |
| 161 | - public function htmlLabel($identifier, $content="", $icon=NULL,$tagName="div") { |
|
| 162 | - return $this->addHtmlComponent(new HtmlLabel($identifier, $content,$icon, $tagName)); |
|
| 161 | + public function htmlLabel($identifier, $content="", $icon=NULL, $tagName="div") { |
|
| 162 | + return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $icon, $tagName)); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | /** |
@@ -168,8 +168,8 @@ discard block |
||
| 168 | 168 | * @param array $attributes |
| 169 | 169 | * @return HtmlLabelGroups |
| 170 | 170 | */ |
| 171 | - public function htmlLabelGroups($identifier,$labels=array(),$attributes=array()){ |
|
| 172 | - return $this->addHtmlComponent(new HtmlLabelGroups($identifier,$labels,$attributes)); |
|
| 171 | + public function htmlLabelGroups($identifier, $labels=array(), $attributes=array()) { |
|
| 172 | + return $this->addHtmlComponent(new HtmlLabelGroups($identifier, $labels, $attributes)); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | /** |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | abstract public function addToProperty($name, $value, $separator=" "); |
| 18 | 18 | abstract public function addLabel($caption, $style="label-default", $leftSeparator=" "); |
| 19 | - abstract public function addContent($content,$before=false); |
|
| 19 | + abstract public function addContent($content, $before=false); |
|
| 20 | 20 | abstract public function getField(); |
| 21 | 21 | abstract public function getDataField(); |
| 22 | 22 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function addLoading() { |
| 28 | - if ($this->_hasIcon === false) { |
|
| 28 | + if ($this->_hasIcon===false) { |
|
| 29 | 29 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
| 30 | 30 | } |
| 31 | 31 | return $this->addToProperty("class", State::LOADING); |
@@ -33,56 +33,56 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
| 35 | 35 | $field=$this->getField(); |
| 36 | - $labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon); |
|
| 37 | - $field->addToProperty("class", $direction . " labeled"); |
|
| 36 | + $labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon); |
|
| 37 | + $field->addToProperty("class", $direction." labeled"); |
|
| 38 | 38 | return $labelO; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public function labeledToCorner($icon, $direction=Direction::LEFT) { |
| 42 | - return $this->labeled("", $direction . " corner", $icon)->toCorner($direction); |
|
| 42 | + return $this->labeled("", $direction." corner", $icon)->toCorner($direction); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
| 46 | 46 | $field=$this->getField(); |
| 47 | 47 | $actionO=$action; |
| 48 | - if (\is_object($action) === false) { |
|
| 49 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
| 48 | + if (\is_object($action)===false) { |
|
| 49 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
| 50 | 50 | if (isset($icon)) |
| 51 | 51 | $actionO->addIcon($icon, true, $labeled); |
| 52 | 52 | } |
| 53 | - $field->addToProperty("class", $direction . " action"); |
|
| 54 | - $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
| 53 | + $field->addToProperty("class", $direction." action"); |
|
| 54 | + $field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
| 55 | 55 | return $actionO; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){ |
|
| 59 | - $labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items); |
|
| 60 | - $labelO->asSelect("select-".$this->identifier,false,true); |
|
| 61 | - return $this->labeled($labelO,$direction); |
|
| 58 | + public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) { |
|
| 59 | + $labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items); |
|
| 60 | + $labelO->asSelect("select-".$this->identifier, false, true); |
|
| 61 | + return $this->labeled($labelO, $direction); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | public function setTransparent() { |
| 65 | 65 | return $this->getField()->addToProperty("class", "transparent"); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - public function setReadonly(){ |
|
| 68 | + public function setReadonly() { |
|
| 69 | 69 | $this->getDataField()->setProperty("readonly", ""); |
| 70 | 70 | return $this; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function setName($name){ |
|
| 74 | - $this->getDataField()->setProperty("name",$name); |
|
| 73 | + public function setName($name) { |
|
| 74 | + $this->getDataField()->setProperty("name", $name); |
|
| 75 | 75 | return $this; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - public function setFluid(){ |
|
| 79 | - $this->getField()->addToProperty("class","fluid"); |
|
| 78 | + public function setFluid() { |
|
| 79 | + $this->getField()->addToProperty("class", "fluid"); |
|
| 80 | 80 | return $this; |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | public function setDisabled($disable=true) { |
| 84 | 84 | $field=$this->getField(); |
| 85 | - if($disable) |
|
| 85 | + if ($disable) |
|
| 86 | 86 | $field->addToProperty("class", "disabled"); |
| 87 | 87 | return $this; |
| 88 | 88 | } |
@@ -47,8 +47,9 @@ discard block |
||
| 47 | 47 | $actionO=$action; |
| 48 | 48 | if (\is_object($action) === false) { |
| 49 | 49 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
| 50 | - if (isset($icon)) |
|
| 51 | - $actionO->addIcon($icon, true, $labeled); |
|
| 50 | + if (isset($icon)) { |
|
| 51 | + $actionO->addIcon($icon, true, $labeled); |
|
| 52 | + } |
|
| 52 | 53 | } |
| 53 | 54 | $field->addToProperty("class", $direction . " action"); |
| 54 | 55 | $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -82,8 +83,9 @@ discard block |
||
| 82 | 83 | |
| 83 | 84 | public function setDisabled($disable=true) { |
| 84 | 85 | $field=$this->getField(); |
| 85 | - if($disable) |
|
| 86 | - $field->addToProperty("class", "disabled"); |
|
| 86 | + if($disable) { |
|
| 87 | + $field->addToProperty("class", "disabled"); |
|
| 88 | + } |
|
| 87 | 89 | return $this; |
| 88 | 90 | } |
| 89 | 91 | } |
| 90 | 92 | \ No newline at end of file |
@@ -38,18 +38,18 @@ discard block |
||
| 38 | 38 | return $this->getHtmlCk()->attachEvents($events); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - public function getField(){ |
|
| 41 | + public function getField() { |
|
| 42 | 42 | //TODO check getField() ? |
| 43 | 43 | return $this->content["field"]; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - public function getHtmlCk(){ |
|
| 46 | + public function getHtmlCk() { |
|
| 47 | 47 | return $this->content["field"]; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - public function getDataField(){ |
|
| 51 | - $field= $this->getField(); |
|
| 52 | - if($field instanceof AbstractCheckbox) |
|
| 50 | + public function getDataField() { |
|
| 51 | + $field=$this->getField(); |
|
| 52 | + if ($field instanceof AbstractCheckbox) |
|
| 53 | 53 | $field=$field->getField(); |
| 54 | 54 | return $field; |
| 55 | 55 | } |
@@ -59,10 +59,10 @@ discard block |
||
| 59 | 59 | * @param boolean $value |
| 60 | 60 | * @return HtmlFormField |
| 61 | 61 | */ |
| 62 | - public function setChecked($value=true){ |
|
| 63 | - if($value===true){ |
|
| 62 | + public function setChecked($value=true) { |
|
| 63 | + if ($value===true) { |
|
| 64 | 64 | $this->getDataField()->setProperty("checked", "checked"); |
| 65 | - }else{ |
|
| 65 | + } else { |
|
| 66 | 66 | $this->getDataField()->removeProperty("checked"); |
| 67 | 67 | } |
| 68 | 68 | return $this; |
@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | public function getDataField(){ |
| 51 | 51 | $field= $this->getField(); |
| 52 | - if($field instanceof AbstractCheckbox) |
|
| 53 | - $field=$field->getField(); |
|
| 52 | + if($field instanceof AbstractCheckbox) { |
|
| 53 | + $field=$field->getField(); |
|
| 54 | + } |
|
| 54 | 55 | return $field; |
| 55 | 56 | } |
| 56 | 57 | |
@@ -62,7 +63,7 @@ discard block |
||
| 62 | 63 | public function setChecked($value=true){ |
| 63 | 64 | if($value===true){ |
| 64 | 65 | $this->getDataField()->setProperty("checked", "checked"); |
| 65 | - }else{ |
|
| 66 | + } else{ |
|
| 66 | 67 | $this->getDataField()->removeProperty("checked"); |
| 67 | 68 | } |
| 68 | 69 | return $this; |