@@ -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) { |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | * @param int $max |
14 | 14 | * @param string $icon star or heart |
15 | 15 | */ |
16 | - public function __construct($identifier, $value,$max=5,$icon="") { |
|
16 | + public function __construct($identifier, $value, $max=5, $icon="") { |
|
17 | 17 | parent::__construct($identifier, "div", "ui {$icon} rating"); |
18 | 18 | $this->setValue($value); |
19 | 19 | $this->setMax($max); |
@@ -23,11 +23,11 @@ discard block |
||
23 | 23 | * {@inheritDoc} |
24 | 24 | * @see \Ajax\common\html\HtmlDoubleElement::setValue() |
25 | 25 | */ |
26 | - public function setValue($value){ |
|
26 | + public function setValue($value) { |
|
27 | 27 | $this->setProperty("data-rating", $value); |
28 | 28 | } |
29 | 29 | |
30 | - public function setMax($max){ |
|
30 | + public function setMax($max) { |
|
31 | 31 | $this->setProperty("data-max-rating", $max); |
32 | 32 | } |
33 | 33 | |
@@ -35,21 +35,21 @@ discard block |
||
35 | 35 | * {@inheritDoc} |
36 | 36 | * @see HtmlSemDoubleElement::run() |
37 | 37 | */ |
38 | - public function run(JsUtils $js){ |
|
38 | + public function run(JsUtils $js) { |
|
39 | 39 | parent::run($js); |
40 | - return $js->semantic()->rating("#".$this->identifier,$this->_params); |
|
40 | + return $js->semantic()->rating("#".$this->identifier, $this->_params); |
|
41 | 41 | } |
42 | 42 | |
43 | - public function asStar(){ |
|
43 | + public function asStar() { |
|
44 | 44 | return $this->setIcon(); |
45 | 45 | } |
46 | 46 | |
47 | - public function asHeart(){ |
|
47 | + public function asHeart() { |
|
48 | 48 | return $this->setIcon("heart"); |
49 | 49 | } |
50 | 50 | |
51 | - public function setIcon($icon="star"){ |
|
52 | - return $this->addToPropertyCtrl("class", $icon, ["star","heart",""]); |
|
51 | + public function setIcon($icon="star") { |
|
52 | + return $this->addToPropertyCtrl("class", $icon, ["star", "heart", ""]); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | } |
56 | 56 | \ No newline at end of file |
@@ -19,211 +19,211 @@ discard block |
||
19 | 19 | |
20 | 20 | public static $index=0; |
21 | 21 | |
22 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
22 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
26 | + if (isset($instance)) |
|
27 | 27 | $this->setInstance($instance); |
28 | 28 | $this->setCaptions($captions); |
29 | 29 | $this->captionCallback=NULL; |
30 | - $this->defaultValueFunction=function($name,$value){return $value;}; |
|
30 | + $this->defaultValueFunction=function($name, $value) {return $value; }; |
|
31 | 31 | } |
32 | 32 | |
33 | - public function moveFieldTo($from,$to){ |
|
34 | - if(JArray::moveElementTo($this->visibleProperties, $from, $to)){ |
|
33 | + public function moveFieldTo($from, $to) { |
|
34 | + if (JArray::moveElementTo($this->visibleProperties, $from, $to)) { |
|
35 | 35 | return JArray::moveElementTo($this->values, $from, $to); |
36 | 36 | } |
37 | 37 | return false; |
38 | 38 | } |
39 | 39 | |
40 | - public function swapFields($index1,$index2){ |
|
41 | - if(JArray::swapElements($this->visibleProperties, $index1, $index2)){ |
|
40 | + public function swapFields($index1, $index2) { |
|
41 | + if (JArray::swapElements($this->visibleProperties, $index1, $index2)) { |
|
42 | 42 | return JArray::swapElements($this->values, $index1, $index2); |
43 | 43 | } |
44 | 44 | return false; |
45 | 45 | } |
46 | 46 | |
47 | - public function removeField($index){ |
|
48 | - \array_splice($this->visibleProperties,$index,1); |
|
49 | - \array_splice($this->values,$index,1); |
|
50 | - \array_splice($this->captions,$index,1); |
|
47 | + public function removeField($index) { |
|
48 | + \array_splice($this->visibleProperties, $index, 1); |
|
49 | + \array_splice($this->values, $index, 1); |
|
50 | + \array_splice($this->captions, $index, 1); |
|
51 | 51 | return $this; |
52 | 52 | } |
53 | 53 | |
54 | - public function getValues(){ |
|
54 | + public function getValues() { |
|
55 | 55 | $values=[]; |
56 | 56 | $index=0; |
57 | 57 | $count=$this->count(); |
58 | - while($index<$count){ |
|
58 | + while ($index<$count) { |
|
59 | 59 | $values[]=$this->getValue($index++); |
60 | 60 | } |
61 | 61 | return $values; |
62 | 62 | } |
63 | 63 | |
64 | - public function getIdentifier($index=NULL){ |
|
65 | - if(!isset($index)) |
|
64 | + public function getIdentifier($index=NULL) { |
|
65 | + if (!isset($index)) |
|
66 | 66 | $index=self::$index; |
67 | 67 | $value=$index; |
68 | - if(isset($this->values["identifier"])){ |
|
69 | - if(\is_string($this->values["identifier"])) |
|
68 | + if (isset($this->values["identifier"])) { |
|
69 | + if (\is_string($this->values["identifier"])) |
|
70 | 70 | $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
71 | 71 | else |
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
72 | + $value=$this->values["identifier"]($index, $this->instance); |
|
73 | 73 | } |
74 | 74 | return $value; |
75 | 75 | } |
76 | 76 | |
77 | - public function getValue($index){ |
|
77 | + public function getValue($index) { |
|
78 | 78 | $property=$this->properties[$index]; |
79 | 79 | return $this->_getValue($property, $index); |
80 | 80 | } |
81 | 81 | |
82 | - protected function _beforeAddProperty($index,&$field){ |
|
82 | + protected function _beforeAddProperty($index, &$field) { |
|
83 | 83 | |
84 | 84 | } |
85 | 85 | |
86 | - protected function _getDefaultValue($name,$value,$index){ |
|
86 | + protected function _getDefaultValue($name, $value, $index) { |
|
87 | 87 | $func=$this->defaultValueFunction; |
88 | - return $func($name,$value,$index,$this->instance); |
|
88 | + return $func($name, $value, $index, $this->instance); |
|
89 | 89 | } |
90 | 90 | |
91 | - protected function _getPropertyValue(\ReflectionProperty $property,$index){ |
|
91 | + protected function _getPropertyValue(\ReflectionProperty $property, $index) { |
|
92 | 92 | $property->setAccessible(true); |
93 | 93 | $value=$property->getValue($this->instance); |
94 | - if(isset($this->values[$index])){ |
|
95 | - $value= $this->values[$index]($value,$this->instance,$index); |
|
96 | - }else{ |
|
97 | - $value=$this->_getDefaultValue($property->getName(),$value, $index); |
|
94 | + if (isset($this->values[$index])) { |
|
95 | + $value=$this->values[$index]($value, $this->instance, $index); |
|
96 | + } else { |
|
97 | + $value=$this->_getDefaultValue($property->getName(), $value, $index); |
|
98 | 98 | } |
99 | 99 | return $value; |
100 | 100 | } |
101 | 101 | |
102 | - protected function _getValue($property,$index){ |
|
102 | + protected function _getValue($property, $index) { |
|
103 | 103 | $value=null; |
104 | - if($property instanceof \ReflectionProperty){ |
|
104 | + if ($property instanceof \ReflectionProperty) { |
|
105 | 105 | $value=$this->_getPropertyValue($property, $index); |
106 | - }else{ |
|
107 | - if(\is_callable($property)) |
|
106 | + } else { |
|
107 | + if (\is_callable($property)) |
|
108 | 108 | $value=$property($this->instance); |
109 | - elseif(\is_array($property)){ |
|
110 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
109 | + elseif (\is_array($property)) { |
|
110 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
111 | 111 | $value=\implode("", $values); |
112 | - }else{ |
|
113 | - if(isset($this->values[$index])){ |
|
114 | - $value= $this->values[$index]($property,$this->instance,$index); |
|
115 | - }elseif(isset($this->instance->{$property})){ |
|
112 | + } else { |
|
113 | + if (isset($this->values[$index])) { |
|
114 | + $value=$this->values[$index]($property, $this->instance, $index); |
|
115 | + }elseif (isset($this->instance->{$property})) { |
|
116 | 116 | $value=$this->instance->{$property}; |
117 | 117 | } |
118 | 118 | } |
119 | 119 | } |
120 | - if(isset($this->afterCompile[$index])){ |
|
121 | - if(\is_callable($this->afterCompile[$index])){ |
|
122 | - $this->afterCompile[$index]($value,$this->instance,$index); |
|
120 | + if (isset($this->afterCompile[$index])) { |
|
121 | + if (\is_callable($this->afterCompile[$index])) { |
|
122 | + $this->afterCompile[$index]($value, $this->instance, $index); |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | return $value; |
126 | 126 | } |
127 | 127 | |
128 | - public function insertField($index,$field){ |
|
129 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
128 | + public function insertField($index, $field) { |
|
129 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
130 | 130 | return $this; |
131 | 131 | } |
132 | 132 | |
133 | - public function insertInField($index,$field){ |
|
133 | + public function insertInField($index, $field) { |
|
134 | 134 | $vb=$this->visibleProperties; |
135 | - if(isset($vb[$index])){ |
|
136 | - if(\is_array($vb[$index])){ |
|
135 | + if (isset($vb[$index])) { |
|
136 | + if (\is_array($vb[$index])) { |
|
137 | 137 | $this->visibleProperties[$index][]=$field; |
138 | - }else{ |
|
139 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
138 | + } else { |
|
139 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
140 | 140 | } |
141 | - }else{ |
|
141 | + } else { |
|
142 | 142 | return $this->insertField($index, $field); |
143 | 143 | } |
144 | 144 | return $this; |
145 | 145 | } |
146 | 146 | |
147 | - public function addField($field){ |
|
147 | + public function addField($field) { |
|
148 | 148 | $this->visibleProperties[]=$field; |
149 | 149 | return $this; |
150 | 150 | } |
151 | 151 | |
152 | - public function count(){ |
|
152 | + public function count() { |
|
153 | 153 | return \sizeof($this->properties); |
154 | 154 | } |
155 | 155 | |
156 | - public function visiblePropertiesCount(){ |
|
156 | + public function visiblePropertiesCount() { |
|
157 | 157 | return \sizeof($this->visibleProperties); |
158 | 158 | } |
159 | 159 | |
160 | - public function getProperty($index){ |
|
160 | + public function getProperty($index) { |
|
161 | 161 | return $this->properties[$index]; |
162 | 162 | } |
163 | 163 | |
164 | - public function getFieldName($index){ |
|
164 | + public function getFieldName($index) { |
|
165 | 165 | $property=$this->getProperty($index); |
166 | - if($property instanceof \ReflectionProperty){ |
|
166 | + if ($property instanceof \ReflectionProperty) { |
|
167 | 167 | $result=$property->getName(); |
168 | - }elseif(\is_callable($property)){ |
|
168 | + }elseif (\is_callable($property)) { |
|
169 | 169 | $result=$this->visibleProperties[$index]; |
170 | - }else{ |
|
170 | + } else { |
|
171 | 171 | $result=$property; |
172 | 172 | } |
173 | 173 | return $result; |
174 | 174 | } |
175 | 175 | |
176 | 176 | |
177 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
178 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
177 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
178 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | public function setInstance($instance) { |
182 | - if(\is_string($instance)){ |
|
182 | + if (\is_string($instance)) { |
|
183 | 183 | $instance=new $instance(); |
184 | 184 | } |
185 | 185 | $this->instance=$instance; |
186 | 186 | $this->properties=[]; |
187 | 187 | $this->reflect=new \ReflectionClass($instance); |
188 | - if(\sizeof($this->visibleProperties)===0){ |
|
188 | + if (\sizeof($this->visibleProperties)===0) { |
|
189 | 189 | $this->properties=$this->getDefaultProperties(); |
190 | - }else{ |
|
191 | - foreach ($this->visibleProperties as $property){ |
|
190 | + } else { |
|
191 | + foreach ($this->visibleProperties as $property) { |
|
192 | 192 | $this->setInstanceProperty($property); |
193 | 193 | } |
194 | 194 | } |
195 | 195 | return $this; |
196 | 196 | } |
197 | 197 | |
198 | - private function setInstanceProperty($property){ |
|
199 | - if(\is_callable($property)){ |
|
198 | + private function setInstanceProperty($property) { |
|
199 | + if (\is_callable($property)) { |
|
200 | 200 | $this->properties[]=$property; |
201 | - }elseif(\is_string($property)){ |
|
202 | - try{ |
|
201 | + }elseif (\is_string($property)) { |
|
202 | + try { |
|
203 | 203 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
204 | 204 | $rProperty=$this->reflect->getProperty($property); |
205 | 205 | $this->properties[]=$rProperty; |
206 | - }catch(\Exception $e){ |
|
206 | + }catch (\Exception $e) { |
|
207 | 207 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
208 | 208 | $this->properties[]=$property; |
209 | 209 | } |
210 | - }elseif(\is_int($property)){ |
|
210 | + }elseif (\is_int($property)) { |
|
211 | 211 | $props=$this->getDefaultProperties(); |
212 | - if(isset($props[$property])) |
|
212 | + if (isset($props[$property])) |
|
213 | 213 | $this->properties[]=$props[$property]; |
214 | 214 | else |
215 | 215 | $this->properties[]=$property; |
216 | - }else{ |
|
216 | + } else { |
|
217 | 217 | $this->properties[]=$property; |
218 | 218 | } |
219 | 219 | } |
220 | 220 | |
221 | - protected function getDefaultProperties(){ |
|
221 | + protected function getDefaultProperties() { |
|
222 | 222 | $result=[]; |
223 | 223 | $properties=$this->reflect->getProperties(); |
224 | - foreach ($properties as $property){ |
|
224 | + foreach ($properties as $property) { |
|
225 | 225 | $showable=$this->showableProperty($property); |
226 | - if($showable!==false){ |
|
226 | + if ($showable!==false) { |
|
227 | 227 | $result[]=$property; |
228 | 228 | } |
229 | 229 | } |
@@ -235,12 +235,12 @@ discard block |
||
235 | 235 | return $this; |
236 | 236 | } |
237 | 237 | |
238 | - public function setValueFunction($index,$callback){ |
|
238 | + public function setValueFunction($index, $callback) { |
|
239 | 239 | $this->values[$index]=$callback; |
240 | 240 | return $this; |
241 | 241 | } |
242 | 242 | |
243 | - public function setIdentifierFunction($callback){ |
|
243 | + public function setIdentifierFunction($callback) { |
|
244 | 244 | $this->values["identifier"]=$callback; |
245 | 245 | return $this; |
246 | 246 | } |
@@ -253,41 +253,41 @@ discard block |
||
253 | 253 | return $this->properties; |
254 | 254 | } |
255 | 255 | |
256 | - public function getCaption($index){ |
|
257 | - if(isset($this->captions[$index])){ |
|
256 | + public function getCaption($index) { |
|
257 | + if (isset($this->captions[$index])) { |
|
258 | 258 | return $this->captions[$index]; |
259 | 259 | } |
260 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
260 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
261 | 261 | return $this->properties[$index]->getName(); |
262 | - elseif(\is_callable($this->properties[$index])) |
|
262 | + elseif (\is_callable($this->properties[$index])) |
|
263 | 263 | return ""; |
264 | 264 | else |
265 | 265 | return $this->properties[$index]; |
266 | 266 | } |
267 | 267 | |
268 | - public function getCaptions(){ |
|
269 | - if(isset($this->captions)){ |
|
270 | - $captions= \array_values($this->captions); |
|
271 | - for($i=\sizeof($captions);$i<$this->count();$i++){ |
|
268 | + public function getCaptions() { |
|
269 | + if (isset($this->captions)) { |
|
270 | + $captions=\array_values($this->captions); |
|
271 | + for ($i=\sizeof($captions); $i<$this->count(); $i++) { |
|
272 | 272 | $captions[]=""; |
273 | 273 | } |
274 | - }else{ |
|
274 | + } else { |
|
275 | 275 | $captions=[]; |
276 | 276 | $index=0; |
277 | 277 | $count=$this->count(); |
278 | - while($index<$count){ |
|
278 | + while ($index<$count) { |
|
279 | 279 | $captions[]=$this->getCaption($index++); |
280 | 280 | } |
281 | 281 | } |
282 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
282 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
283 | 283 | $callback=$this->captionCallback; |
284 | - $callback($captions,$this->instance); |
|
284 | + $callback($captions, $this->instance); |
|
285 | 285 | } |
286 | 286 | return $captions; |
287 | 287 | } |
288 | 288 | |
289 | - public function setCaption($index,$caption){ |
|
290 | - if(isset($this->captions)===false) |
|
289 | + public function setCaption($index, $caption) { |
|
290 | + if (isset($this->captions)===false) |
|
291 | 291 | $this->captions=[]; |
292 | 292 | $this->captions[$index]=$caption; |
293 | 293 | return $this; |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | * @param callable $callback function called after the field compilation |
306 | 306 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
307 | 307 | */ |
308 | - public function afterCompile($index,$callback){ |
|
308 | + public function afterCompile($index, $callback) { |
|
309 | 309 | $this->afterCompile[$index]=$callback; |
310 | 310 | return $this; |
311 | 311 | } |
@@ -23,8 +23,9 @@ discard block |
||
23 | 23 | $this->widgetIdentifier=$identifier; |
24 | 24 | $this->values=[]; |
25 | 25 | $this->afterCompile=[]; |
26 | - if(isset($instance)) |
|
27 | - $this->setInstance($instance); |
|
26 | + if(isset($instance)) { |
|
27 | + $this->setInstance($instance); |
|
28 | + } |
|
28 | 29 | $this->setCaptions($captions); |
29 | 30 | $this->captionCallback=NULL; |
30 | 31 | $this->defaultValueFunction=function($name,$value){return $value;}; |
@@ -62,14 +63,16 @@ discard block |
||
62 | 63 | } |
63 | 64 | |
64 | 65 | public function getIdentifier($index=NULL){ |
65 | - if(!isset($index)) |
|
66 | - $index=self::$index; |
|
66 | + if(!isset($index)) { |
|
67 | + $index=self::$index; |
|
68 | + } |
|
67 | 69 | $value=$index; |
68 | 70 | if(isset($this->values["identifier"])){ |
69 | - if(\is_string($this->values["identifier"])) |
|
70 | - $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
71 | - else |
|
72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
71 | + if(\is_string($this->values["identifier"])) { |
|
72 | + $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
|
73 | + } else { |
|
74 | + $value=$this->values["identifier"]($index,$this->instance); |
|
75 | + } |
|
73 | 76 | } |
74 | 77 | return $value; |
75 | 78 | } |
@@ -93,7 +96,7 @@ discard block |
||
93 | 96 | $value=$property->getValue($this->instance); |
94 | 97 | if(isset($this->values[$index])){ |
95 | 98 | $value= $this->values[$index]($value,$this->instance,$index); |
96 | - }else{ |
|
99 | + } else{ |
|
97 | 100 | $value=$this->_getDefaultValue($property->getName(),$value, $index); |
98 | 101 | } |
99 | 102 | return $value; |
@@ -103,16 +106,16 @@ discard block |
||
103 | 106 | $value=null; |
104 | 107 | if($property instanceof \ReflectionProperty){ |
105 | 108 | $value=$this->_getPropertyValue($property, $index); |
106 | - }else{ |
|
107 | - if(\is_callable($property)) |
|
108 | - $value=$property($this->instance); |
|
109 | - elseif(\is_array($property)){ |
|
109 | + } else{ |
|
110 | + if(\is_callable($property)) { |
|
111 | + $value=$property($this->instance); |
|
112 | + } elseif(\is_array($property)){ |
|
110 | 113 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
111 | 114 | $value=\implode("", $values); |
112 | - }else{ |
|
115 | + } else{ |
|
113 | 116 | if(isset($this->values[$index])){ |
114 | 117 | $value= $this->values[$index]($property,$this->instance,$index); |
115 | - }elseif(isset($this->instance->{$property})){ |
|
118 | + } elseif(isset($this->instance->{$property})){ |
|
116 | 119 | $value=$this->instance->{$property}; |
117 | 120 | } |
118 | 121 | } |
@@ -135,10 +138,10 @@ discard block |
||
135 | 138 | if(isset($vb[$index])){ |
136 | 139 | if(\is_array($vb[$index])){ |
137 | 140 | $this->visibleProperties[$index][]=$field; |
138 | - }else{ |
|
141 | + } else{ |
|
139 | 142 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
140 | 143 | } |
141 | - }else{ |
|
144 | + } else{ |
|
142 | 145 | return $this->insertField($index, $field); |
143 | 146 | } |
144 | 147 | return $this; |
@@ -165,9 +168,9 @@ discard block |
||
165 | 168 | $property=$this->getProperty($index); |
166 | 169 | if($property instanceof \ReflectionProperty){ |
167 | 170 | $result=$property->getName(); |
168 | - }elseif(\is_callable($property)){ |
|
171 | + } elseif(\is_callable($property)){ |
|
169 | 172 | $result=$this->visibleProperties[$index]; |
170 | - }else{ |
|
173 | + } else{ |
|
171 | 174 | $result=$property; |
172 | 175 | } |
173 | 176 | return $result; |
@@ -187,7 +190,7 @@ discard block |
||
187 | 190 | $this->reflect=new \ReflectionClass($instance); |
188 | 191 | if(\sizeof($this->visibleProperties)===0){ |
189 | 192 | $this->properties=$this->getDefaultProperties(); |
190 | - }else{ |
|
193 | + } else{ |
|
191 | 194 | foreach ($this->visibleProperties as $property){ |
192 | 195 | $this->setInstanceProperty($property); |
193 | 196 | } |
@@ -198,22 +201,23 @@ discard block |
||
198 | 201 | private function setInstanceProperty($property){ |
199 | 202 | if(\is_callable($property)){ |
200 | 203 | $this->properties[]=$property; |
201 | - }elseif(\is_string($property)){ |
|
204 | + } elseif(\is_string($property)){ |
|
202 | 205 | try{ |
203 | 206 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
204 | 207 | $rProperty=$this->reflect->getProperty($property); |
205 | 208 | $this->properties[]=$rProperty; |
206 | - }catch(\Exception $e){ |
|
209 | + } catch(\Exception $e){ |
|
207 | 210 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
208 | 211 | $this->properties[]=$property; |
209 | 212 | } |
210 | - }elseif(\is_int($property)){ |
|
213 | + } elseif(\is_int($property)){ |
|
211 | 214 | $props=$this->getDefaultProperties(); |
212 | - if(isset($props[$property])) |
|
213 | - $this->properties[]=$props[$property]; |
|
214 | - else |
|
215 | - $this->properties[]=$property; |
|
216 | - }else{ |
|
215 | + if(isset($props[$property])) { |
|
216 | + $this->properties[]=$props[$property]; |
|
217 | + } else { |
|
218 | + $this->properties[]=$property; |
|
219 | + } |
|
220 | + } else{ |
|
217 | 221 | $this->properties[]=$property; |
218 | 222 | } |
219 | 223 | } |
@@ -257,12 +261,13 @@ discard block |
||
257 | 261 | if(isset($this->captions[$index])){ |
258 | 262 | return $this->captions[$index]; |
259 | 263 | } |
260 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
261 | - return $this->properties[$index]->getName(); |
|
262 | - elseif(\is_callable($this->properties[$index])) |
|
263 | - return ""; |
|
264 | - else |
|
265 | - return $this->properties[$index]; |
|
264 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
265 | + return $this->properties[$index]->getName(); |
|
266 | + } elseif(\is_callable($this->properties[$index])) { |
|
267 | + return ""; |
|
268 | + } else { |
|
269 | + return $this->properties[$index]; |
|
270 | + } |
|
266 | 271 | } |
267 | 272 | |
268 | 273 | public function getCaptions(){ |
@@ -271,7 +276,7 @@ discard block |
||
271 | 276 | for($i=\sizeof($captions);$i<$this->count();$i++){ |
272 | 277 | $captions[]=""; |
273 | 278 | } |
274 | - }else{ |
|
279 | + } else{ |
|
275 | 280 | $captions=[]; |
276 | 281 | $index=0; |
277 | 282 | $count=$this->count(); |
@@ -287,8 +292,9 @@ discard block |
||
287 | 292 | } |
288 | 293 | |
289 | 294 | public function setCaption($index,$caption){ |
290 | - if(isset($this->captions)===false) |
|
291 | - $this->captions=[]; |
|
295 | + if(isset($this->captions)===false) { |
|
296 | + $this->captions=[]; |
|
297 | + } |
|
292 | 298 | $this->captions[$index]=$caption; |
293 | 299 | return $this; |
294 | 300 | } |
@@ -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) { |
@@ -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,29 +17,29 @@ 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 | $this->visible=true; |
35 | - $this->page_count = (int)ceil($row_count / $this->items_per_page); |
|
36 | - if($this->page > $this->page_count+1) { |
|
37 | - $this->page = 1; |
|
35 | + $this->page_count=(int)ceil($row_count/$this->items_per_page); |
|
36 | + if ($this->page>$this->page_count+1) { |
|
37 | + $this->page=1; |
|
38 | 38 | } |
39 | 39 | } |
40 | - if($auto){ |
|
41 | - $offset = ($this->page - 1) * $this->items_per_page; |
|
42 | - return array_slice($os, $offset,$this->items_per_page); |
|
40 | + if ($auto) { |
|
41 | + $offset=($this->page-1)*$this->items_per_page; |
|
42 | + return array_slice($os, $offset, $this->items_per_page); |
|
43 | 43 | } |
44 | 44 | return $os; |
45 | 45 | } |
@@ -75,22 +75,22 @@ discard block |
||
75 | 75 | return $this->page_count; |
76 | 76 | } |
77 | 77 | |
78 | - public function getPagesNumbers(){ |
|
79 | - $middle= (int)ceil(($this->pages_visibles-1)/ 2); |
|
78 | + public function getPagesNumbers() { |
|
79 | + $middle=(int)ceil(($this->pages_visibles-1)/2); |
|
80 | 80 | $first=$this->page-$middle; |
81 | - if($first<1){ |
|
81 | + if ($first<1) { |
|
82 | 82 | $first=1; |
83 | 83 | } |
84 | 84 | $last=$first+$this->pages_visibles-1; |
85 | - if($last>$this->page_count){ |
|
85 | + if ($last>$this->page_count) { |
|
86 | 86 | $last=$this->page_count; |
87 | 87 | } |
88 | 88 | return \range($first, $last); |
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 | $this->pages_visibles=$pages_visibles; |
95 | 95 | return $this; |
96 | 96 | } |
@@ -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 | } |
@@ -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 | /** |
@@ -16,17 +16,17 @@ discard block |
||
16 | 16 | parent::__construct($identifier, $model, $modelInstance); |
17 | 17 | } |
18 | 18 | |
19 | - protected function _generateContent($table){ |
|
19 | + protected function _generateContent($table) { |
|
20 | 20 | $this->_addRowModel($table); |
21 | 21 | $this->_rowClass="_json"; |
22 | 22 | parent::_generateContent($table); |
23 | 23 | } |
24 | 24 | |
25 | - protected function _addRowModel($table){ |
|
25 | + protected function _addRowModel($table) { |
|
26 | 26 | $object=JReflection::jsonObject($this->_model); |
27 | - $row=$this->_generateRow($object, $table,"_jsonArrayChecked"); |
|
27 | + $row=$this->_generateRow($object, $table, "_jsonArrayChecked"); |
|
28 | 28 | $row->setClass($this->_modelClass); |
29 | - $row->addToProperty("style","display:none;"); |
|
29 | + $row->addToProperty("style", "display:none;"); |
|
30 | 30 | $table->getBody()->_addRow($row); |
31 | 31 | } |
32 | 32 | |
@@ -34,22 +34,22 @@ discard block |
||
34 | 34 | * {@inheritDoc} |
35 | 35 | * @see DataTable::_associatePaginationBehavior() |
36 | 36 | */ |
37 | - protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){ |
|
37 | + protected function _associatePaginationBehavior(HtmlMenu $menu, JsUtils $js=NULL) { |
|
38 | 38 | $callback=null; |
39 | - if(isset($js)){ |
|
39 | + if (isset($js)) { |
|
40 | 40 | $id=$this->identifier; |
41 | 41 | $offset=$js->scriptCount(); |
42 | 42 | $this->run($js); |
43 | 43 | $callback=$js->getScript($offset); |
44 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
44 | + $callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
45 | 45 | $callback.=";var page=parseInt($(self).attr('data-page')); |
46 | 46 | $('#pagination-{$id} .item').removeClass('active'); |
47 | 47 | $('#pagination-{$id} [data-page='+page+']:not(.no-active)').addClass('active'); |
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 | /** |
@@ -60,29 +60,29 @@ discard block |
||
60 | 60 | * @param callable $jsCallback |
61 | 61 | * @return AjaxCall |
62 | 62 | */ |
63 | - public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
64 | - $parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]); |
|
63 | + public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
64 | + $parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]); |
|
65 | 65 | return new AjaxCall("jsonArray", $parameters); |
66 | 66 | } |
67 | 67 | |
68 | - public function jsClear(){ |
|
68 | + public function jsClear() { |
|
69 | 69 | return "$('#{$this->identifier} tbody').find('._json').remove();"; |
70 | 70 | } |
71 | 71 | |
72 | - public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){ |
|
73 | - return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault); |
|
72 | + public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) { |
|
73 | + return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault); |
|
74 | 74 | } |
75 | 75 | |
76 | - public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){ |
|
77 | - return $this->clearOn($element, "click",$stopPropagation,$preventDefault); |
|
76 | + public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) { |
|
77 | + return $this->clearOn($element, "click", $stopPropagation, $preventDefault); |
|
78 | 78 | } |
79 | 79 | |
80 | - public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
81 | - return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters)); |
|
80 | + public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
81 | + return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters)); |
|
82 | 82 | } |
83 | 83 | |
84 | - public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
85 | - return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters); |
|
84 | + public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
85 | + return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @param number $pages_visibles The number of visible pages in the Pagination component |
94 | 94 | * @return DataTable |
95 | 95 | */ |
96 | - public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){ |
|
97 | - return parent::paginate($page, $total_rowcount,$items_per_page,null); |
|
96 | + public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) { |
|
97 | + return parent::paginate($page, $total_rowcount, $items_per_page, null); |
|
98 | 98 | } |
99 | 99 | } |
100 | 100 | \ No newline at end of file |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | * @param array $instances |
18 | 18 | * @return DataTable |
19 | 19 | */ |
20 | - public function dataTable($identifier,$model, $instances){ |
|
21 | - return $this->addHtmlComponent(new DataTable($identifier,$model,$instances)); |
|
20 | + public function dataTable($identifier, $model, $instances) { |
|
21 | + return $this->addHtmlComponent(new DataTable($identifier, $model, $instances)); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | * @param array $instances |
28 | 28 | * @return JsonDataTable |
29 | 29 | */ |
30 | - public function jsonDataTable($identifier,$model, $instances){ |
|
31 | - return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances)); |
|
30 | + public function jsonDataTable($identifier, $model, $instances) { |
|
31 | + return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances)); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
@@ -36,8 +36,8 @@ discard block |
||
36 | 36 | * @param object $instance |
37 | 37 | * @return DataElement |
38 | 38 | */ |
39 | - public function dataElement($identifier, $instance){ |
|
40 | - return $this->addHtmlComponent(new DataElement($identifier,$instance)); |
|
39 | + public function dataElement($identifier, $instance) { |
|
40 | + return $this->addHtmlComponent(new DataElement($identifier, $instance)); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -45,19 +45,19 @@ discard block |
||
45 | 45 | * @param object $instance |
46 | 46 | * @return DataForm |
47 | 47 | */ |
48 | - public function dataForm($identifier, $instance){ |
|
49 | - return $this->addHtmlComponent(new DataForm($identifier,$instance)); |
|
48 | + public function dataForm($identifier, $instance) { |
|
49 | + return $this->addHtmlComponent(new DataForm($identifier, $instance)); |
|
50 | 50 | } |
51 | 51 | |
52 | - public function defaultLogin($identifier,$instance=null){ |
|
53 | - return $this->addHtmlComponent(FormLogin::regular($identifier,$instance)); |
|
52 | + public function defaultLogin($identifier, $instance=null) { |
|
53 | + return $this->addHtmlComponent(FormLogin::regular($identifier, $instance)); |
|
54 | 54 | } |
55 | 55 | |
56 | - public function smallLogin($identifier,$instance=null){ |
|
57 | - return $this->addHtmlComponent(FormLogin::small($identifier,$instance)); |
|
56 | + public function smallLogin($identifier, $instance=null) { |
|
57 | + return $this->addHtmlComponent(FormLogin::small($identifier, $instance)); |
|
58 | 58 | } |
59 | 59 | |
60 | - public function segmentedLogin($identifier,$instance=null){ |
|
61 | - return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance)); |
|
60 | + public function segmentedLogin($identifier, $instance=null) { |
|
61 | + return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance)); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | \ No newline at end of file |
@@ -67,6 +67,9 @@ discard block |
||
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | + /** |
|
71 | + * @param HtmlForm $form |
|
72 | + */ |
|
70 | 73 | protected function _generateFields($form,$values,$headers,$sepFirst,$sepLast,$wrappers){ |
71 | 74 | $wrapper=null; |
72 | 75 | $fields=\array_slice($values, $sepFirst+1,$sepLast-$sepFirst); |
@@ -132,12 +135,20 @@ discard block |
||
132 | 135 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
133 | 136 | } |
134 | 137 | |
138 | + /** |
|
139 | + * @param integer $index |
|
140 | + * @param string $title |
|
141 | + */ |
|
135 | 142 | public function addDividerBefore($index,$title){ |
136 | 143 | $index=$this->_getIndex($index); |
137 | 144 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
138 | 145 | return $this; |
139 | 146 | } |
140 | 147 | |
148 | + /** |
|
149 | + * @param string $index |
|
150 | + * @param string $contentAfter |
|
151 | + */ |
|
141 | 152 | public function addWrapper($index,$contentBefore,$contentAfter=null){ |
142 | 153 | $index=$this->_getIndex($index); |
143 | 154 | $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
@@ -19,80 +19,80 @@ discard block |
||
19 | 19 | class DataForm extends Widget { |
20 | 20 | |
21 | 21 | public function __construct($identifier, $modelInstance=NULL) { |
22 | - parent::__construct($identifier, null,$modelInstance); |
|
22 | + parent::__construct($identifier, null, $modelInstance); |
|
23 | 23 | $this->_form=new HtmlForm($identifier); |
24 | 24 | $this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true); |
25 | 25 | } |
26 | 26 | |
27 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
27 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
28 | 28 | return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier(); |
29 | 29 | } |
30 | 30 | |
31 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
32 | - if(!$this->_generated){ |
|
31 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
32 | + if (!$this->_generated) { |
|
33 | 33 | $this->_instanceViewer->setInstance($this->_modelInstance); |
34 | 34 | |
35 | 35 | $form=$this->content["form"]; |
36 | 36 | $this->_generateContent($form); |
37 | 37 | |
38 | - if(isset($this->_toolbar)){ |
|
38 | + if (isset($this->_toolbar)) { |
|
39 | 39 | $this->_setToolbarPosition($form); |
40 | 40 | } |
41 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
41 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
42 | 42 | $this->_generated=true; |
43 | 43 | } |
44 | - return parent::compile($js,$view); |
|
44 | + return parent::compile($js, $view); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
48 | 48 | * @param HtmlForm $form |
49 | 49 | */ |
50 | - protected function _generateContent($form){ |
|
51 | - $values= $this->_instanceViewer->getValues(); |
|
50 | + protected function _generateContent($form) { |
|
51 | + $values=$this->_instanceViewer->getValues(); |
|
52 | 52 | $count=$this->_instanceViewer->count(); |
53 | 53 | $separators=$this->_instanceViewer->getSeparators(); |
54 | 54 | $headers=$this->_instanceViewer->getHeaders(); |
55 | 55 | $wrappers=$this->_instanceViewer->getWrappers(); |
56 | 56 | \sort($separators); |
57 | 57 | $size=\sizeof($separators); |
58 | - if($size===1){ |
|
59 | - foreach ($values as $v){ |
|
58 | + if ($size===1) { |
|
59 | + foreach ($values as $v) { |
|
60 | 60 | $form->addField($v); |
61 | 61 | } |
62 | - }else{ |
|
62 | + } else { |
|
63 | 63 | $separators[]=$count; |
64 | - for($i=0;$i<$size;$i++){ |
|
64 | + for ($i=0; $i<$size; $i++) { |
|
65 | 65 | $this->_generateFields($form, $values, $headers, $separators[$i], $separators[$i+1], $wrappers); |
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | - protected function _generateFields($form,$values,$headers,$sepFirst,$sepLast,$wrappers){ |
|
70 | + protected function _generateFields($form, $values, $headers, $sepFirst, $sepLast, $wrappers) { |
|
71 | 71 | $wrapper=null; |
72 | - $fields=\array_slice($values, $sepFirst+1,$sepLast-$sepFirst); |
|
73 | - if(isset($headers[$sepFirst+1])) |
|
74 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
75 | - if(isset($wrappers[$sepFirst+1])){ |
|
72 | + $fields=\array_slice($values, $sepFirst+1, $sepLast-$sepFirst); |
|
73 | + if (isset($headers[$sepFirst+1])) |
|
74 | + $form->addHeader($headers[$sepFirst+1], 4, true); |
|
75 | + if (isset($wrappers[$sepFirst+1])) { |
|
76 | 76 | $wrapper=$wrappers[$sepFirst+1]; |
77 | 77 | } |
78 | - if(\sizeof($fields)===1){ |
|
78 | + if (\sizeof($fields)===1) { |
|
79 | 79 | $added=$form->addField($fields[0]); |
80 | - }elseif(\sizeof($fields)>1){ |
|
80 | + }elseif (\sizeof($fields)>1) { |
|
81 | 81 | $added=$form->addFields($fields); |
82 | 82 | } |
83 | - if(isset($wrapper)) |
|
84 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
83 | + if (isset($wrapper)) |
|
84 | + $added->wrap($wrapper[0], $wrapper[1]); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
88 | 88 | * {@inheritDoc} |
89 | 89 | * @see \Ajax\common\Widget::getForm() |
90 | 90 | */ |
91 | - public function getForm(){ |
|
91 | + public function getForm() { |
|
92 | 92 | return $this->content["form"]; |
93 | 93 | } |
94 | 94 | |
95 | - public function addSeparatorAfter($fieldNum){ |
|
95 | + public function addSeparatorAfter($fieldNum) { |
|
96 | 96 | $fieldNum=$this->_getIndex($fieldNum); |
97 | 97 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
98 | 98 | return $this; |
@@ -107,12 +107,12 @@ discard block |
||
107 | 107 | return $this; |
108 | 108 | } |
109 | 109 | |
110 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
111 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
112 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
110 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
111 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
112 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
113 | 113 | $button->setProperty("type", "reset"); |
114 | 114 | return $button; |
115 | - }, $index,$attributes); |
|
115 | + }, $index, $attributes); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -131,19 +131,19 @@ discard block |
||
131 | 131 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
132 | 132 | } |
133 | 133 | |
134 | - public function addDividerBefore($index,$title){ |
|
134 | + public function addDividerBefore($index, $title) { |
|
135 | 135 | $index=$this->_getIndex($index); |
136 | 136 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
137 | 137 | return $this; |
138 | 138 | } |
139 | 139 | |
140 | - public function addWrapper($index,$contentBefore,$contentAfter=null){ |
|
140 | + public function addWrapper($index, $contentBefore, $contentAfter=null) { |
|
141 | 141 | $index=$this->_getIndex($index); |
142 | - $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
|
142 | + $this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter); |
|
143 | 143 | return $this; |
144 | 144 | } |
145 | 145 | |
146 | - public function run(JsUtils $js){ |
|
146 | + public function run(JsUtils $js) { |
|
147 | 147 | return parent::run($js); |
148 | 148 | } |
149 | 149 | } |
150 | 150 | \ No newline at end of file |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | foreach ($values as $v){ |
60 | 60 | $form->addField($v); |
61 | 61 | } |
62 | - }else{ |
|
62 | + } else{ |
|
63 | 63 | $separators[]=$count; |
64 | 64 | for($i=0;$i<$size;$i++){ |
65 | 65 | $this->_generateFields($form, $values, $headers, $separators[$i], $separators[$i+1], $wrappers); |
@@ -70,18 +70,20 @@ discard block |
||
70 | 70 | protected function _generateFields($form,$values,$headers,$sepFirst,$sepLast,$wrappers){ |
71 | 71 | $wrapper=null; |
72 | 72 | $fields=\array_slice($values, $sepFirst+1,$sepLast-$sepFirst); |
73 | - if(isset($headers[$sepFirst+1])) |
|
74 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
73 | + if(isset($headers[$sepFirst+1])) { |
|
74 | + $form->addHeader($headers[$sepFirst+1],4,true); |
|
75 | + } |
|
75 | 76 | if(isset($wrappers[$sepFirst+1])){ |
76 | 77 | $wrapper=$wrappers[$sepFirst+1]; |
77 | 78 | } |
78 | 79 | if(\sizeof($fields)===1){ |
79 | 80 | $added=$form->addField($fields[0]); |
80 | - }elseif(\sizeof($fields)>1){ |
|
81 | + } elseif(\sizeof($fields)>1){ |
|
81 | 82 | $added=$form->addFields($fields); |
82 | 83 | } |
83 | - if(isset($wrapper)) |
|
84 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
84 | + if(isset($wrapper)) { |
|
85 | + $added->wrap($wrapper[0],$wrapper[1]); |
|
86 | + } |
|
85 | 87 | } |
86 | 88 | |
87 | 89 | /** |
@@ -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,7 +29,7 @@ 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 | 36 | \ No newline at end of file |