@@ -186,8 +186,9 @@ discard block |
||
186 | 186 | */ |
187 | 187 | public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
188 | 188 | $result=$this->addInToolbar($caption,$callback); |
189 | - if(isset($icon)) |
|
190 | - $result->addIcon($icon); |
|
189 | + if(isset($icon)) { |
|
190 | + $result->addIcon($icon); |
|
191 | + } |
|
191 | 192 | return $result; |
192 | 193 | } |
193 | 194 | |
@@ -201,7 +202,7 @@ discard block |
||
201 | 202 | foreach ($items as $icon=>$item){ |
202 | 203 | $this->addItemInToolbar($item,$icon,$callback); |
203 | 204 | } |
204 | - }else{ |
|
205 | + } else{ |
|
205 | 206 | foreach ($items as $item){ |
206 | 207 | $this->addItemInToolbar($item,null,$callback); |
207 | 208 | } |
@@ -352,8 +353,9 @@ discard block |
||
352 | 353 | protected function _compileForm(){ |
353 | 354 | if(isset($this->_form)){ |
354 | 355 | $noValidate=""; |
355 | - if(\sizeof($this->_form->getValidationParams())>0) |
|
356 | - $noValidate="novalidate"; |
|
356 | + if(\sizeof($this->_form->getValidationParams())>0) { |
|
357 | + $noValidate="novalidate"; |
|
358 | + } |
|
357 | 359 | $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>"); |
358 | 360 | } |
359 | 361 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | use Ajax\common\html\BaseWidget; |
20 | 20 | |
21 | 21 | abstract class Widget extends HtmlDoubleElement { |
22 | - use FieldAsTrait,FormTrait; |
|
22 | + use FieldAsTrait, FormTrait; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * @var string classname |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | protected $_generated; |
53 | 53 | |
54 | 54 | |
55 | - public function __construct($identifier,$model,$modelInstance=NULL) { |
|
55 | + public function __construct($identifier, $model, $modelInstance=NULL) { |
|
56 | 56 | parent::__construct($identifier); |
57 | 57 | $this->_template="%wrapContentBefore%%content%%wrapContentAfter%"; |
58 | 58 | $this->setModel($model); |
59 | - if(isset($modelInstance)){ |
|
60 | - if(\is_array($modelInstance)){ |
|
59 | + if (isset($modelInstance)) { |
|
60 | + if (\is_array($modelInstance)) { |
|
61 | 61 | $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
62 | 62 | } |
63 | 63 | $this->show($modelInstance); |
@@ -65,28 +65,28 @@ discard block |
||
65 | 65 | $this->_generated=false; |
66 | 66 | } |
67 | 67 | |
68 | - protected function _init($instanceViewer,$contentKey,$content,$edition){ |
|
68 | + protected function _init($instanceViewer, $contentKey, $content, $edition) { |
|
69 | 69 | $this->_instanceViewer=$instanceViewer; |
70 | 70 | $this->content=[$contentKey=>$content]; |
71 | 71 | $this->_toolbarPosition=PositionInTable::BEFORETABLE; |
72 | 72 | $this->_edition=$edition; |
73 | 73 | } |
74 | 74 | |
75 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
75 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
76 | 76 | return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier(); |
77 | 77 | } |
78 | 78 | |
79 | - protected function _getFieldName($index){ |
|
79 | + protected function _getFieldName($index) { |
|
80 | 80 | return $this->_instanceViewer->getFieldName($index); |
81 | 81 | } |
82 | 82 | |
83 | - protected function _getFieldCaption($index){ |
|
83 | + protected function _getFieldCaption($index) { |
|
84 | 84 | return $this->_instanceViewer->getCaption($index); |
85 | 85 | } |
86 | 86 | |
87 | - abstract protected function _setToolbarPosition($table,$captions=NULL); |
|
87 | + abstract protected function _setToolbarPosition($table, $captions=NULL); |
|
88 | 88 | |
89 | - public function show($modelInstance){ |
|
89 | + public function show($modelInstance) { |
|
90 | 90 | $this->_modelInstance=$modelInstance; |
91 | 91 | } |
92 | 92 | |
@@ -110,56 +110,56 @@ discard block |
||
110 | 110 | |
111 | 111 | abstract public function getHtmlComponent(); |
112 | 112 | |
113 | - public function setAttached($value=true){ |
|
113 | + public function setAttached($value=true) { |
|
114 | 114 | return $this->getHtmlComponent()->setAttached($value); |
115 | 115 | } |
116 | 116 | |
117 | - public function setColor($color){ |
|
117 | + public function setColor($color) { |
|
118 | 118 | return $this->getHtmlComponent()->setColor($color); |
119 | 119 | } |
120 | 120 | |
121 | 121 | |
122 | - public function setCaptions($captions){ |
|
122 | + public function setCaptions($captions) { |
|
123 | 123 | $this->_instanceViewer->setCaptions($captions); |
124 | 124 | return $this; |
125 | 125 | } |
126 | 126 | |
127 | - public function setFields($fields){ |
|
127 | + public function setFields($fields) { |
|
128 | 128 | $this->_instanceViewer->setVisibleProperties($fields); |
129 | 129 | return $this; |
130 | 130 | } |
131 | 131 | |
132 | - public function addField($field){ |
|
132 | + public function addField($field) { |
|
133 | 133 | $this->_instanceViewer->addField($field); |
134 | 134 | return $this; |
135 | 135 | } |
136 | 136 | |
137 | - public function addMessage($attributes=NULL,$fieldName="message"){ |
|
137 | + public function addMessage($attributes=NULL, $fieldName="message") { |
|
138 | 138 | $this->_instanceViewer->addField($fieldName); |
139 | 139 | $count=$this->_instanceViewer->visiblePropertiesCount(); |
140 | - return $this->fieldAsMessage($count-1,$attributes); |
|
140 | + return $this->fieldAsMessage($count-1, $attributes); |
|
141 | 141 | } |
142 | 142 | |
143 | - public function addErrorMessage(){ |
|
144 | - return $this->addMessage(["error"=>true],"message"); |
|
143 | + public function addErrorMessage() { |
|
144 | + return $this->addMessage(["error"=>true], "message"); |
|
145 | 145 | } |
146 | 146 | |
147 | - public function insertField($index,$field){ |
|
147 | + public function insertField($index, $field) { |
|
148 | 148 | $this->_instanceViewer->insertField($index, $field); |
149 | 149 | return $this; |
150 | 150 | } |
151 | 151 | |
152 | - public function insertInField($index,$field){ |
|
152 | + public function insertInField($index, $field) { |
|
153 | 153 | $this->_instanceViewer->insertInField($index, $field); |
154 | 154 | return $this; |
155 | 155 | } |
156 | 156 | |
157 | - public function setValueFunction($index,$callback){ |
|
157 | + public function setValueFunction($index, $callback) { |
|
158 | 158 | $this->_instanceViewer->setValueFunction($index, $callback); |
159 | 159 | return $this; |
160 | 160 | } |
161 | 161 | |
162 | - public function setIdentifierFunction($callback){ |
|
162 | + public function setIdentifierFunction($callback) { |
|
163 | 163 | $this->_instanceViewer->setIdentifierFunction($callback); |
164 | 164 | return $this; |
165 | 165 | } |
@@ -167,8 +167,8 @@ discard block |
||
167 | 167 | /** |
168 | 168 | * @return \Ajax\semantic\html\collections\menus\HtmlMenu |
169 | 169 | */ |
170 | - public function getToolbar(){ |
|
171 | - if(isset($this->_toolbar)===false){ |
|
170 | + public function getToolbar() { |
|
171 | + if (isset($this->_toolbar)===false) { |
|
172 | 172 | $this->_toolbar=new HtmlMenu("toolbar-".$this->identifier); |
173 | 173 | } |
174 | 174 | return $this->_toolbar; |
@@ -180,15 +180,15 @@ discard block |
||
180 | 180 | * @param callable $callback function to call on $element |
181 | 181 | * @return \Ajax\common\html\HtmlDoubleElement |
182 | 182 | */ |
183 | - public function addInToolbar($element,$callback=NULL){ |
|
183 | + public function addInToolbar($element, $callback=NULL) { |
|
184 | 184 | $tb=$this->getToolbar(); |
185 | - if($element instanceof BaseWidget){ |
|
186 | - if($element->getIdentifier()===""){ |
|
185 | + if ($element instanceof BaseWidget) { |
|
186 | + if ($element->getIdentifier()==="") { |
|
187 | 187 | $element->setIdentifier("tb-item-".$this->identifier."-".$tb->count()); |
188 | 188 | } |
189 | 189 | } |
190 | - if(isset($callback)){ |
|
191 | - if(\is_callable($callback)){ |
|
190 | + if (isset($callback)) { |
|
191 | + if (\is_callable($callback)) { |
|
192 | 192 | $callback($element); |
193 | 193 | } |
194 | 194 | } |
@@ -201,9 +201,9 @@ discard block |
||
201 | 201 | * @param callable $callback function($element) |
202 | 202 | * @return \Ajax\common\html\HtmlDoubleElement |
203 | 203 | */ |
204 | - public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
|
205 | - $result=$this->addInToolbar($caption,$callback); |
|
206 | - if(isset($icon)) |
|
204 | + public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) { |
|
205 | + $result=$this->addInToolbar($caption, $callback); |
|
206 | + if (isset($icon)) |
|
207 | 207 | $result->addIcon($icon); |
208 | 208 | return $result; |
209 | 209 | } |
@@ -213,14 +213,14 @@ discard block |
||
213 | 213 | * @param callable $callback function($element) |
214 | 214 | * @return \Ajax\common\Widget |
215 | 215 | */ |
216 | - public function addItemsInToolbar(array $items,$callback=NULL){ |
|
217 | - if(JArray::isAssociative($items)){ |
|
218 | - foreach ($items as $icon=>$item){ |
|
219 | - $this->addItemInToolbar($item,$icon,$callback); |
|
216 | + public function addItemsInToolbar(array $items, $callback=NULL) { |
|
217 | + if (JArray::isAssociative($items)) { |
|
218 | + foreach ($items as $icon=>$item) { |
|
219 | + $this->addItemInToolbar($item, $icon, $callback); |
|
220 | 220 | } |
221 | - }else{ |
|
222 | - foreach ($items as $item){ |
|
223 | - $this->addItemInToolbar($item,null,$callback); |
|
221 | + } else { |
|
222 | + foreach ($items as $item) { |
|
223 | + $this->addItemInToolbar($item, null, $callback); |
|
224 | 224 | } |
225 | 225 | } |
226 | 226 | return $this; |
@@ -232,12 +232,12 @@ discard block |
||
232 | 232 | * @param callable $callback function($element) |
233 | 233 | * @return \Ajax\common\html\HtmlDoubleElement |
234 | 234 | */ |
235 | - public function addDropdownInToolbar($value,$items,$callback=NULL){ |
|
235 | + public function addDropdownInToolbar($value, $items, $callback=NULL) { |
|
236 | 236 | $dd=$value; |
237 | 237 | if (\is_string($value)) { |
238 | - $dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items); |
|
238 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items); |
|
239 | 239 | } |
240 | - return $this->addInToolbar($dd,$callback); |
|
240 | + return $this->addInToolbar($dd, $callback); |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | /** |
@@ -246,9 +246,9 @@ discard block |
||
246 | 246 | * @param callable $callback function($element) |
247 | 247 | * @return \Ajax\common\html\HtmlDoubleElement |
248 | 248 | */ |
249 | - public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){ |
|
250 | - $bt=new HtmlButton("bt-".$caption,$caption,$cssStyle); |
|
251 | - return $this->addInToolbar($bt,$callback); |
|
249 | + public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) { |
|
250 | + $bt=new HtmlButton("bt-".$caption, $caption, $cssStyle); |
|
251 | + return $this->addInToolbar($bt, $callback); |
|
252 | 252 | } |
253 | 253 | |
254 | 254 | /** |
@@ -257,9 +257,9 @@ discard block |
||
257 | 257 | * @param callable $callback function($element) |
258 | 258 | * @return \Ajax\common\html\HtmlDoubleElement |
259 | 259 | */ |
260 | - public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){ |
|
261 | - $bts=new HtmlButtonGroups("",$captions,$asIcon); |
|
262 | - return $this->addInToolbar($bts,$callback); |
|
260 | + public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) { |
|
261 | + $bts=new HtmlButtonGroups("", $captions, $asIcon); |
|
262 | + return $this->addInToolbar($bts, $callback); |
|
263 | 263 | } |
264 | 264 | |
265 | 265 | /** |
@@ -269,15 +269,15 @@ discard block |
||
269 | 269 | * @param boolean $labeled |
270 | 270 | * @return \Ajax\common\html\HtmlDoubleElement |
271 | 271 | */ |
272 | - public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){ |
|
273 | - $bt=new HtmlButton("",$caption); |
|
274 | - $bt->addIcon($icon,$before,$labeled); |
|
272 | + public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) { |
|
273 | + $bt=new HtmlButton("", $caption); |
|
274 | + $bt->addIcon($icon, $before, $labeled); |
|
275 | 275 | return $this->addInToolbar($bt); |
276 | 276 | } |
277 | 277 | |
278 | - public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
279 | - $button=new HtmlButton($identifier,$value,$cssStyle); |
|
280 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters); |
|
278 | + public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
279 | + $button=new HtmlButton($identifier, $value, $cssStyle); |
|
280 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters); |
|
281 | 281 | return $this->addInToolbar($button); |
282 | 282 | } |
283 | 283 | |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model |
308 | 308 | * @return \Ajax\common\Widget |
309 | 309 | */ |
310 | - public function setDefaultValueFunction($defaultValueFunction){ |
|
310 | + public function setDefaultValueFunction($defaultValueFunction) { |
|
311 | 311 | $this->_instanceViewer->setDefaultValueFunction($defaultValueFunction); |
312 | 312 | return $this; |
313 | 313 | } |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | * @param string|boolean $disable |
317 | 317 | * @return string |
318 | 318 | */ |
319 | - public function jsDisabled($disable=true){ |
|
319 | + public function jsDisabled($disable=true) { |
|
320 | 320 | return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");"; |
321 | 321 | } |
322 | 322 | |
@@ -325,12 +325,12 @@ discard block |
||
325 | 325 | * @param callable $callback function($element) |
326 | 326 | * @return \Ajax\common\html\HtmlDoubleElement |
327 | 327 | */ |
328 | - public function addEditButtonInToolbar($caption,$callback=NULL){ |
|
329 | - $bt=new HtmlButton($this->identifier."-editBtn",$caption); |
|
328 | + public function addEditButtonInToolbar($caption, $callback=NULL) { |
|
329 | + $bt=new HtmlButton($this->identifier."-editBtn", $caption); |
|
330 | 330 | $bt->setToggle(); |
331 | 331 | $bt->setActive($this->_edition); |
332 | 332 | $bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')"))); |
333 | - return $this->addInToolbar($bt,$callback); |
|
333 | + return $this->addInToolbar($bt, $callback); |
|
334 | 334 | } |
335 | 335 | |
336 | 336 | public function setToolbar(HtmlMenu $_toolbar) { |
@@ -344,35 +344,35 @@ discard block |
||
344 | 344 | } |
345 | 345 | |
346 | 346 | public function getForm() { |
347 | - if(!isset($this->_form)){ |
|
347 | + if (!isset($this->_form)) { |
|
348 | 348 | $this->_form=new HtmlForm("frm-".$this->identifier); |
349 | 349 | $this->setEdition(true); |
350 | 350 | } |
351 | 351 | return $this->_form; |
352 | 352 | } |
353 | 353 | |
354 | - public function run(JsUtils $js){ |
|
354 | + public function run(JsUtils $js) { |
|
355 | 355 | $result=parent::run($js); |
356 | - if(isset($this->_form)){ |
|
356 | + if (isset($this->_form)) { |
|
357 | 357 | $result=$this->runForm($js); |
358 | 358 | } |
359 | 359 | return $result; |
360 | 360 | } |
361 | 361 | |
362 | - protected function runForm(JsUtils $js){ |
|
362 | + protected function runForm(JsUtils $js) { |
|
363 | 363 | $fields=$this->getContentInstances(HtmlFormField::class); |
364 | - foreach ($fields as $field){ |
|
364 | + foreach ($fields as $field) { |
|
365 | 365 | $this->_form->addField($field); |
366 | 366 | } |
367 | 367 | return $this->_form->run($js); |
368 | 368 | } |
369 | 369 | |
370 | - protected function _compileForm(){ |
|
371 | - if(isset($this->_form)){ |
|
370 | + protected function _compileForm() { |
|
371 | + if (isset($this->_form)) { |
|
372 | 372 | $noValidate=""; |
373 | - if(\sizeof($this->_form->getValidationParams())>0) |
|
373 | + if (\sizeof($this->_form->getValidationParams())>0) |
|
374 | 374 | $noValidate="novalidate"; |
375 | - $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>"); |
|
375 | + $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>"); |
|
376 | 376 | } |
377 | 377 | } |
378 | 378 |
@@ -52,8 +52,9 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function addHeader($title, $niveau=1, $dividing=true) { |
54 | 54 | $header=new HtmlHeader("", $niveau, $title); |
55 | - if ($dividing) |
|
56 | - $header->setDividing(); |
|
55 | + if ($dividing) { |
|
56 | + $header->setDividing(); |
|
57 | + } |
|
57 | 58 | return $this->addItem($header); |
58 | 59 | } |
59 | 60 | |
@@ -74,14 +75,16 @@ discard block |
||
74 | 75 | if (\is_string($end)) { |
75 | 76 | $label=$end; |
76 | 77 | \array_pop($fields); |
77 | - } else |
|
78 | - $label=NULL; |
|
78 | + } else { |
|
79 | + $label=NULL; |
|
80 | + } |
|
79 | 81 | } |
80 | 82 | $this->_fields=\array_merge($this->_fields, $fields); |
81 | 83 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
82 | 84 | } |
83 | - if (isset($label)) |
|
84 | - $fields=new HtmlFormField("", $fields, $label); |
|
85 | + if (isset($label)) { |
|
86 | + $fields=new HtmlFormField("", $fields, $label); |
|
87 | + } |
|
85 | 88 | } else { |
86 | 89 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
87 | 90 | } |
@@ -134,27 +137,31 @@ discard block |
||
134 | 137 | */ |
135 | 138 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
136 | 139 | $message=new HtmlMessage($identifier, $content); |
137 | - if (isset($header)) |
|
138 | - $message->addHeader($header); |
|
139 | - if (isset($icon)) |
|
140 | - $message->setIcon($icon); |
|
141 | - if (isset($type)) |
|
142 | - $message->setStyle($type); |
|
140 | + if (isset($header)) { |
|
141 | + $message->addHeader($header); |
|
142 | + } |
|
143 | + if (isset($icon)) { |
|
144 | + $message->setIcon($icon); |
|
145 | + } |
|
146 | + if (isset($type)) { |
|
147 | + $message->setStyle($type); |
|
148 | + } |
|
143 | 149 | return $this->addItem($message); |
144 | 150 | } |
145 | 151 | |
146 | 152 | |
147 | 153 | |
148 | 154 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
149 | - if(\sizeof($this->_validationParams)>0) |
|
150 | - $this->setProperty("novalidate", ""); |
|
155 | + if(\sizeof($this->_validationParams)>0) { |
|
156 | + $this->setProperty("novalidate", ""); |
|
157 | + } |
|
151 | 158 | return parent::compile($js,$view); |
152 | 159 | } |
153 | 160 | |
154 | 161 | public function run(JsUtils $js) { |
155 | 162 | if(isset($js)){ |
156 | 163 | $compo=$js->semantic()->form("#".$this->identifier); |
157 | - }else{ |
|
164 | + } else{ |
|
158 | 165 | $compo=new Form(); |
159 | 166 | $compo->attach("#".$this->identifier); |
160 | 167 | } |
@@ -167,8 +174,9 @@ discard block |
||
167 | 174 | if($field instanceof HtmlFormFields){ |
168 | 175 | $items=$field->getItems(); |
169 | 176 | foreach ($items as $_field){ |
170 | - if($_field instanceof HtmlFormField) |
|
171 | - $compo=$this->addCompoValidation($compo, $_field); |
|
177 | + if($_field instanceof HtmlFormField) { |
|
178 | + $compo=$this->addCompoValidation($compo, $_field); |
|
179 | + } |
|
172 | 180 | } |
173 | 181 | } |
174 | 182 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | class HtmlForm extends HtmlSemCollection { |
22 | 22 | |
23 | - use FieldsTrait,FormTrait; |
|
23 | + use FieldsTrait, FormTrait; |
|
24 | 24 | /** |
25 | 25 | * @var array |
26 | 26 | */ |
@@ -33,14 +33,14 @@ discard block |
||
33 | 33 | |
34 | 34 | public function __construct($identifier, $elements=array()) { |
35 | 35 | parent::__construct($identifier, "form", "ui form"); |
36 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
36 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
37 | 37 | $this->setProperty("name", $this->identifier); |
38 | - $this->_fields=array (); |
|
38 | + $this->_fields=array(); |
|
39 | 39 | $this->addItems($elements); |
40 | 40 | $this->_validationParams=[]; |
41 | 41 | } |
42 | 42 | |
43 | - protected function getForm(){ |
|
43 | + protected function getForm() { |
|
44 | 44 | return $this; |
45 | 45 | } |
46 | 46 | |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | * @param string $caption |
62 | 62 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
63 | 63 | */ |
64 | - public function addDivider($caption=NULL){ |
|
65 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
64 | + public function addDivider($caption=NULL) { |
|
65 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | public function addFields($fields=NULL, $label=NULL) { |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | $label=NULL; |
79 | 79 | } |
80 | 80 | $this->_fields=\array_merge($this->_fields, $fields); |
81 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
81 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
82 | 82 | } |
83 | 83 | if (isset($label)) |
84 | 84 | $fields=new HtmlFormField("", $fields, $label); |
85 | 85 | } else { |
86 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
86 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
87 | 87 | } |
88 | 88 | $this->addItem($fields); |
89 | 89 | return $fields; |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | public function addItem($item) { |
93 | 93 | $item=parent::addItem($item); |
94 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
94 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
95 | 95 | $this->_fields[]=$item; |
96 | 96 | } |
97 | 97 | return $item; |
@@ -145,38 +145,38 @@ discard block |
||
145 | 145 | |
146 | 146 | |
147 | 147 | |
148 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
149 | - if(\sizeof($this->_validationParams)>0) |
|
148 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
149 | + if (\sizeof($this->_validationParams)>0) |
|
150 | 150 | $this->setProperty("novalidate", ""); |
151 | - return parent::compile($js,$view); |
|
151 | + return parent::compile($js, $view); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | public function run(JsUtils $js) { |
155 | - if(isset($js)){ |
|
155 | + if (isset($js)) { |
|
156 | 156 | $compo=$js->semantic()->form("#".$this->identifier); |
157 | - }else{ |
|
157 | + } else { |
|
158 | 158 | $compo=new Form(); |
159 | 159 | $compo->attach("#".$this->identifier); |
160 | 160 | } |
161 | - foreach ($this->_fields as $field){ |
|
162 | - if($field instanceof HtmlFormField){ |
|
161 | + foreach ($this->_fields as $field) { |
|
162 | + if ($field instanceof HtmlFormField) { |
|
163 | 163 | $compo=$this->addCompoValidation($compo, $field); |
164 | 164 | } |
165 | 165 | } |
166 | - foreach ($this->content as $field){ |
|
167 | - if($field instanceof HtmlFormFields){ |
|
166 | + foreach ($this->content as $field) { |
|
167 | + if ($field instanceof HtmlFormFields) { |
|
168 | 168 | $items=$field->getItems(); |
169 | - foreach ($items as $_field){ |
|
170 | - if($_field instanceof HtmlFormField) |
|
169 | + foreach ($items as $_field) { |
|
170 | + if ($_field instanceof HtmlFormField) |
|
171 | 171 | $compo=$this->addCompoValidation($compo, $_field); |
172 | 172 | } |
173 | 173 | } |
174 | 174 | } |
175 | - $this->_runValidationParams($compo,$js); |
|
175 | + $this->_runValidationParams($compo, $js); |
|
176 | 176 | return $this->_bsComponent; |
177 | 177 | } |
178 | 178 | |
179 | - public function addValidationParam($paramName,$paramValue){ |
|
179 | + public function addValidationParam($paramName, $paramValue) { |
|
180 | 180 | $this->_validationParams[$paramName]=$paramValue; |
181 | 181 | return $this; |
182 | 182 | } |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | return $this->_validationParams; |
191 | 191 | } |
192 | 192 | |
193 | - public function removeValidationParam($param){ |
|
193 | + public function removeValidationParam($param) { |
|
194 | 194 | unset($this->_validationParams[$param]); |
195 | 195 | return $this; |
196 | 196 | } |
@@ -57,8 +57,7 @@ discard block |
||
57 | 57 | $rules=$attributes["rules"]; |
58 | 58 | if(\is_array($rules)){ |
59 | 59 | $element->addRules($rules); |
60 | - } |
|
61 | - else{ |
|
60 | + } else{ |
|
62 | 61 | $element->addRule($rules); |
63 | 62 | } |
64 | 63 | unset($attributes["rules"]); |
@@ -118,8 +117,9 @@ discard block |
||
118 | 117 | public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
119 | 118 | return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
120 | 119 | $header=new HtmlHeader($id,$niveau,$value); |
121 | - if(isset($icon)) |
|
122 | - $header->asIcon($icon, $value); |
|
120 | + if(isset($icon)) { |
|
121 | + $header->asIcon($icon, $value); |
|
122 | + } |
|
123 | 123 | return $header; |
124 | 124 | }, $index,$attributes,"header"); |
125 | 125 | } |
@@ -127,7 +127,9 @@ discard block |
||
127 | 127 | |
128 | 128 | public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
129 | 129 | $this->setValueFunction($index,function($img) use($size,$circular){ |
130 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
130 | + $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular) { |
|
131 | + $image->setCircular(); |
|
132 | + } |
|
131 | 133 | return $image; |
132 | 134 | }); |
133 | 135 | return $this; |
@@ -209,12 +211,13 @@ discard block |
||
209 | 211 | $i=0; |
210 | 212 | if(JArray::isAssociative($types)){ |
211 | 213 | foreach ($types as $type=>$attributes){ |
212 | - if(\is_int($type)) |
|
213 | - $this->fieldAs($i++,$attributes,[]); |
|
214 | - else |
|
215 | - $this->fieldAs($i++,$type,$attributes); |
|
214 | + if(\is_int($type)) { |
|
215 | + $this->fieldAs($i++,$attributes,[]); |
|
216 | + } else { |
|
217 | + $this->fieldAs($i++,$type,$attributes); |
|
218 | + } |
|
216 | 219 | } |
217 | - }else{ |
|
220 | + } else{ |
|
218 | 221 | foreach ($types as $type){ |
219 | 222 | $this->fieldAs($i++,$type); |
220 | 223 | } |
@@ -226,7 +229,7 @@ discard block |
||
226 | 229 | if(\method_exists($this, $method)){ |
227 | 230 | if(!\is_array($attributes)){ |
228 | 231 | $attributes=[$index]; |
229 | - }else{ |
|
232 | + } else{ |
|
230 | 233 | \array_unshift($attributes, $index); |
231 | 234 | } |
232 | 235 | \call_user_func_array([$this,$method], $attributes); |
@@ -27,9 +27,17 @@ discard block |
||
27 | 27 | trait FieldAsTrait{ |
28 | 28 | |
29 | 29 | abstract protected function _getFieldIdentifier($prefix,$name=""); |
30 | + |
|
31 | + /** |
|
32 | + * @param \Closure $callback |
|
33 | + */ |
|
30 | 34 | abstract public function setValueFunction($index,$callback); |
31 | 35 | abstract protected function _getFieldName($index); |
32 | 36 | abstract protected function _getFieldCaption($index); |
37 | + |
|
38 | + /** |
|
39 | + * @param string $event |
|
40 | + */ |
|
33 | 41 | abstract protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL); |
34 | 42 | |
35 | 43 | /** |
@@ -68,12 +76,19 @@ discard block |
||
68 | 76 | } |
69 | 77 | } |
70 | 78 | |
79 | + /** |
|
80 | + * @param HtmlFormInput $field |
|
81 | + */ |
|
71 | 82 | protected function _prepareFormFields(&$field,$name,&$attributes){ |
72 | 83 | $field->setName($name); |
73 | 84 | $this->_addRules($field, $attributes); |
74 | 85 | return $field; |
75 | 86 | } |
76 | 87 | |
88 | + /** |
|
89 | + * @param \Closure $elementCallback |
|
90 | + * @param string $prefix |
|
91 | + */ |
|
77 | 92 | protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){ |
78 | 93 | $this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){ |
79 | 94 | $caption=$this->_getFieldCaption($index); |
@@ -224,6 +239,9 @@ discard block |
||
224 | 239 | } |
225 | 240 | } |
226 | 241 | |
242 | + /** |
|
243 | + * @param integer $index |
|
244 | + */ |
|
227 | 245 | public function fieldAs($index,$type,$attributes=NULL){ |
228 | 246 | $method="fieldAs".\ucfirst($type); |
229 | 247 | if(\method_exists($this, $method)){ |
@@ -24,23 +24,23 @@ discard block |
||
24 | 24 | * @property boolean $_edition |
25 | 25 | * @property mixed _modelInstance |
26 | 26 | */ |
27 | -trait FieldAsTrait{ |
|
27 | +trait FieldAsTrait { |
|
28 | 28 | |
29 | - abstract protected function _getFieldIdentifier($prefix,$name=""); |
|
30 | - abstract public function setValueFunction($index,$callback); |
|
29 | + abstract protected function _getFieldIdentifier($prefix, $name=""); |
|
30 | + abstract public function setValueFunction($index, $callback); |
|
31 | 31 | abstract protected function _getFieldName($index); |
32 | 32 | abstract protected function _getFieldCaption($index); |
33 | - abstract protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL); |
|
33 | + abstract protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL); |
|
34 | 34 | |
35 | 35 | /** |
36 | 36 | * @param HtmlFormField $element |
37 | 37 | * @param array $attributes |
38 | 38 | */ |
39 | - protected function _applyAttributes($element,&$attributes,$index){ |
|
40 | - if(isset($attributes["callback"])){ |
|
39 | + protected function _applyAttributes($element, &$attributes, $index) { |
|
40 | + if (isset($attributes["callback"])) { |
|
41 | 41 | $callback=$attributes["callback"]; |
42 | - if(\is_callable($callback)){ |
|
43 | - $callback($element,$this->_modelInstance,$index); |
|
42 | + if (\is_callable($callback)) { |
|
43 | + $callback($element, $this->_modelInstance, $index); |
|
44 | 44 | unset($attributes["callback"]); |
45 | 45 | } |
46 | 46 | } |
@@ -50,42 +50,42 @@ discard block |
||
50 | 50 | $element->fromArray($attributes); |
51 | 51 | } |
52 | 52 | |
53 | - private function _getLabelField($caption,$icon=NULL){ |
|
54 | - $label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon); |
|
53 | + private function _getLabelField($caption, $icon=NULL) { |
|
54 | + $label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon); |
|
55 | 55 | return $label; |
56 | 56 | } |
57 | 57 | |
58 | - protected function _addRules($element,&$attributes){ |
|
59 | - if(isset($attributes["rules"])){ |
|
58 | + protected function _addRules($element, &$attributes) { |
|
59 | + if (isset($attributes["rules"])) { |
|
60 | 60 | $rules=$attributes["rules"]; |
61 | - if(\is_array($rules)){ |
|
61 | + if (\is_array($rules)) { |
|
62 | 62 | $element->addRules($rules); |
63 | 63 | } |
64 | - else{ |
|
64 | + else { |
|
65 | 65 | $element->addRule($rules); |
66 | 66 | } |
67 | 67 | unset($attributes["rules"]); |
68 | 68 | } |
69 | 69 | } |
70 | 70 | |
71 | - protected function _prepareFormFields(&$field,$name,&$attributes){ |
|
71 | + protected function _prepareFormFields(&$field, $name, &$attributes) { |
|
72 | 72 | $field->setName($name); |
73 | 73 | $this->_addRules($field, $attributes); |
74 | 74 | return $field; |
75 | 75 | } |
76 | 76 | |
77 | - protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){ |
|
78 | - $this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){ |
|
77 | + protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) { |
|
78 | + $this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){ |
|
79 | 79 | $caption=$this->_getFieldCaption($index); |
80 | 80 | $name=$this->_getFieldName($index); |
81 | - $id=$this->_getFieldIdentifier($prefix,$name); |
|
82 | - if(isset($attributes["name"])){ |
|
81 | + $id=$this->_getFieldIdentifier($prefix, $name); |
|
82 | + if (isset($attributes["name"])) { |
|
83 | 83 | $name=$attributes["name"]; |
84 | 84 | unset($attributes["name"]); |
85 | 85 | } |
86 | - $element=$elementCallback($id,$name,$value,$caption); |
|
87 | - if(\is_array($attributes)){ |
|
88 | - $this->_applyAttributes($element, $attributes,$index); |
|
86 | + $element=$elementCallback($id, $name, $value, $caption); |
|
87 | + if (\is_array($attributes)) { |
|
88 | + $this->_applyAttributes($element, $attributes, $index); |
|
89 | 89 | } |
90 | 90 | $element->setDisabled(!$this->_edition); |
91 | 91 | return $element; |
@@ -94,160 +94,160 @@ discard block |
||
94 | 94 | } |
95 | 95 | |
96 | 96 | |
97 | - public function fieldAsProgress($index,$label=NULL, $attributes=array()){ |
|
98 | - $this->setValueFunction($index,function($value) use($label,$attributes){ |
|
99 | - $pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes); |
|
97 | + public function fieldAsProgress($index, $label=NULL, $attributes=array()) { |
|
98 | + $this->setValueFunction($index, function($value) use($label, $attributes){ |
|
99 | + $pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes); |
|
100 | 100 | return $pb; |
101 | 101 | }); |
102 | 102 | return $this; |
103 | 103 | } |
104 | 104 | |
105 | - public function fieldAsRating($index,$max=5, $icon=""){ |
|
106 | - $this->setValueFunction($index,function($value) use($max,$icon){ |
|
107 | - $rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon); |
|
105 | + public function fieldAsRating($index, $max=5, $icon="") { |
|
106 | + $this->setValueFunction($index, function($value) use($max, $icon){ |
|
107 | + $rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon); |
|
108 | 108 | return $rating; |
109 | 109 | }); |
110 | 110 | return $this; |
111 | 111 | } |
112 | 112 | |
113 | - public function fieldAsLabel($index,$icon=NULL){ |
|
114 | - $this->setValueFunction($index,function($caption) use($icon){ |
|
115 | - $lbl=$this->_getLabelField($caption,$icon); |
|
113 | + public function fieldAsLabel($index, $icon=NULL) { |
|
114 | + $this->setValueFunction($index, function($caption) use($icon){ |
|
115 | + $lbl=$this->_getLabelField($caption, $icon); |
|
116 | 116 | return $lbl; |
117 | 117 | }); |
118 | 118 | return $this; |
119 | 119 | } |
120 | 120 | |
121 | - public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){ |
|
122 | - return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){ |
|
123 | - $header=new HtmlHeader($id,$niveau,$value); |
|
124 | - if(isset($icon)) |
|
121 | + public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) { |
|
122 | + return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){ |
|
123 | + $header=new HtmlHeader($id, $niveau, $value); |
|
124 | + if (isset($icon)) |
|
125 | 125 | $header->asIcon($icon, $value); |
126 | 126 | return $header; |
127 | - }, $index,$attributes,"header"); |
|
127 | + }, $index, $attributes, "header"); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | |
131 | - public function fieldAsImage($index,$size=Size::MINI,$circular=false){ |
|
132 | - $this->setValueFunction($index,function($img) use($size,$circular){ |
|
133 | - $image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular(); |
|
131 | + public function fieldAsImage($index, $size=Size::MINI, $circular=false) { |
|
132 | + $this->setValueFunction($index, function($img) use($size, $circular){ |
|
133 | + $image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular(); |
|
134 | 134 | return $image; |
135 | 135 | }); |
136 | 136 | return $this; |
137 | 137 | } |
138 | 138 | |
139 | - public function fieldAsAvatar($index,$attributes=NULL){ |
|
140 | - return $this->_fieldAs(function($id,$name,$value){ |
|
141 | - $img=new HtmlImage($id,$value); |
|
139 | + public function fieldAsAvatar($index, $attributes=NULL) { |
|
140 | + return $this->_fieldAs(function($id, $name, $value) { |
|
141 | + $img=new HtmlImage($id, $value); |
|
142 | 142 | $img->asAvatar(); |
143 | 143 | return $img; |
144 | - }, $index,$attributes,"avatar"); |
|
144 | + }, $index, $attributes, "avatar"); |
|
145 | 145 | } |
146 | 146 | |
147 | - public function fieldAsRadio($index,$attributes=NULL){ |
|
148 | - return $this->_fieldAs(function($id,$name,$value){ |
|
149 | - $input= new HtmlRadio($id,$name,$value,$value); |
|
147 | + public function fieldAsRadio($index, $attributes=NULL) { |
|
148 | + return $this->_fieldAs(function($id, $name, $value) { |
|
149 | + $input=new HtmlRadio($id, $name, $value, $value); |
|
150 | 150 | return $input; |
151 | - }, $index,$attributes,"radio"); |
|
151 | + }, $index, $attributes, "radio"); |
|
152 | 152 | } |
153 | 153 | |
154 | - public function fieldAsRadios($index,$elements=[],$attributes=NULL){ |
|
155 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){ |
|
156 | - return HtmlFormFields::radios($name,$elements,$caption,$value); |
|
157 | - }, $index,$attributes,"radios"); |
|
154 | + public function fieldAsRadios($index, $elements=[], $attributes=NULL) { |
|
155 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){ |
|
156 | + return HtmlFormFields::radios($name, $elements, $caption, $value); |
|
157 | + }, $index, $attributes, "radios"); |
|
158 | 158 | } |
159 | 159 | |
160 | - public function fieldAsInput($index,$attributes=NULL){ |
|
161 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){ |
|
162 | - $input= new HtmlFormInput($id,$caption,"text",$value); |
|
160 | + public function fieldAsInput($index, $attributes=NULL) { |
|
161 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){ |
|
162 | + $input=new HtmlFormInput($id, $caption, "text", $value); |
|
163 | 163 | return $this->_prepareFormFields($input, $name, $attributes); |
164 | - }, $index,$attributes,"input"); |
|
164 | + }, $index, $attributes, "input"); |
|
165 | 165 | } |
166 | 166 | |
167 | - public function fieldAsTextarea($index,$attributes=NULL){ |
|
168 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
169 | - $textarea=new HtmlFormTextarea($id,$caption,$value); |
|
167 | + public function fieldAsTextarea($index, $attributes=NULL) { |
|
168 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
169 | + $textarea=new HtmlFormTextarea($id, $caption, $value); |
|
170 | 170 | $textarea->setName($name); |
171 | 171 | return $textarea; |
172 | - }, $index,$attributes,"textarea"); |
|
172 | + }, $index, $attributes, "textarea"); |
|
173 | 173 | } |
174 | 174 | |
175 | - public function fieldAsHidden($index,$attributes=NULL){ |
|
176 | - if(!\is_array($attributes)){ |
|
175 | + public function fieldAsHidden($index, $attributes=NULL) { |
|
176 | + if (!\is_array($attributes)) { |
|
177 | 177 | $attributes=[]; |
178 | 178 | } |
179 | 179 | $attributes["imputType"]="hidden"; |
180 | - return $this->fieldAsInput($index,$attributes); |
|
180 | + return $this->fieldAsInput($index, $attributes); |
|
181 | 181 | } |
182 | 182 | |
183 | - public function fieldAsCheckbox($index,$attributes=NULL){ |
|
184 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
185 | - $input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier()); |
|
183 | + public function fieldAsCheckbox($index, $attributes=NULL) { |
|
184 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
185 | + $input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier()); |
|
186 | 186 | $input->setChecked(JString::isBooleanTrue($value)); |
187 | 187 | $input->setName($name); |
188 | 188 | return $input; |
189 | - }, $index,$attributes,"ck"); |
|
189 | + }, $index, $attributes, "ck"); |
|
190 | 190 | } |
191 | 191 | |
192 | - public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){ |
|
193 | - return $this->_fieldAs(function($id,$name,$value,$caption) use($elements,$multiple){ |
|
194 | - $dd=new HtmlFormDropdown($id,$elements,$caption,$value); |
|
195 | - $dd->asSelect($name,$multiple); |
|
192 | + public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) { |
|
193 | + return $this->_fieldAs(function($id, $name, $value, $caption) use($elements, $multiple){ |
|
194 | + $dd=new HtmlFormDropdown($id, $elements, $caption, $value); |
|
195 | + $dd->asSelect($name, $multiple); |
|
196 | 196 | return $dd; |
197 | - }, $index,$attributes,"dd"); |
|
197 | + }, $index, $attributes, "dd"); |
|
198 | 198 | } |
199 | 199 | |
200 | - public function fieldAsMessage($index,$attributes=NULL){ |
|
201 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
202 | - $mess= new HtmlMessage("message-".$id,$value); |
|
200 | + public function fieldAsMessage($index, $attributes=NULL) { |
|
201 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
202 | + $mess=new HtmlMessage("message-".$id, $value); |
|
203 | 203 | $mess->addHeader($caption); |
204 | 204 | return $mess; |
205 | - }, $index,$attributes,"message"); |
|
205 | + }, $index, $attributes, "message"); |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | /**Change fields type |
209 | 209 | * @param array $types an array or associative array $type=>$attribute |
210 | 210 | */ |
211 | - public function fieldsAs(array $types){ |
|
211 | + public function fieldsAs(array $types) { |
|
212 | 212 | $i=0; |
213 | - if(JArray::isAssociative($types)){ |
|
214 | - foreach ($types as $type=>$attributes){ |
|
215 | - if(\is_int($type)) |
|
216 | - $this->fieldAs($i++,$attributes,[]); |
|
213 | + if (JArray::isAssociative($types)) { |
|
214 | + foreach ($types as $type=>$attributes) { |
|
215 | + if (\is_int($type)) |
|
216 | + $this->fieldAs($i++, $attributes, []); |
|
217 | 217 | else |
218 | - $this->fieldAs($i++,$type,$attributes); |
|
218 | + $this->fieldAs($i++, $type, $attributes); |
|
219 | 219 | } |
220 | - }else{ |
|
221 | - foreach ($types as $type){ |
|
222 | - $this->fieldAs($i++,$type); |
|
220 | + } else { |
|
221 | + foreach ($types as $type) { |
|
222 | + $this->fieldAs($i++, $type); |
|
223 | 223 | } |
224 | 224 | } |
225 | 225 | } |
226 | 226 | |
227 | - public function fieldAs($index,$type,$attributes=NULL){ |
|
227 | + public function fieldAs($index, $type, $attributes=NULL) { |
|
228 | 228 | $method="fieldAs".\ucfirst($type); |
229 | - if(\method_exists($this, $method)){ |
|
230 | - if(!\is_array($attributes)){ |
|
229 | + if (\method_exists($this, $method)) { |
|
230 | + if (!\is_array($attributes)) { |
|
231 | 231 | $attributes=[$index]; |
232 | - }else{ |
|
232 | + } else { |
|
233 | 233 | \array_unshift($attributes, $index); |
234 | 234 | } |
235 | - \call_user_func_array([$this,$method], $attributes); |
|
235 | + \call_user_func_array([$this, $method], $attributes); |
|
236 | 236 | } |
237 | 237 | } |
238 | 238 | |
239 | - public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){ |
|
240 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){ |
|
241 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
242 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]); |
|
239 | + public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) { |
|
240 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){ |
|
241 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
242 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]); |
|
243 | 243 | return $button; |
244 | - }, $index,$attributes,"submit"); |
|
244 | + }, $index, $attributes, "submit"); |
|
245 | 245 | } |
246 | 246 | |
247 | - public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){ |
|
248 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
249 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
247 | + public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) { |
|
248 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
249 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
250 | 250 | return $button; |
251 | - }, $index,$attributes,"button"); |
|
251 | + }, $index, $attributes, "button"); |
|
252 | 252 | } |
253 | 253 | } |
254 | 254 | \ No newline at end of file |
@@ -19,45 +19,45 @@ discard block |
||
19 | 19 | class DataElement extends Widget { |
20 | 20 | |
21 | 21 | public function __construct($identifier, $modelInstance=NULL) { |
22 | - parent::__construct($identifier, null,$modelInstance); |
|
23 | - $this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false); |
|
22 | + parent::__construct($identifier, null, $modelInstance); |
|
23 | + $this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false); |
|
24 | 24 | $this->content["table"]->setDefinition(); |
25 | 25 | } |
26 | 26 | |
27 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
28 | - if(!$this->_generated){ |
|
27 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
28 | + if (!$this->_generated) { |
|
29 | 29 | $this->_instanceViewer->setInstance($this->_modelInstance); |
30 | 30 | |
31 | 31 | $table=$this->content["table"]; |
32 | 32 | $this->_generateContent($table); |
33 | 33 | |
34 | - if(isset($this->_toolbar)){ |
|
34 | + if (isset($this->_toolbar)) { |
|
35 | 35 | $this->_setToolbarPosition($table); |
36 | 36 | } |
37 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
|
37 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]); |
|
38 | 38 | $this->_compileForm(); |
39 | 39 | $this->_generated=true; |
40 | 40 | } |
41 | - return parent::compile($js,$view); |
|
41 | + return parent::compile($js, $view); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
45 | 45 | * @param HtmlTable $table |
46 | 46 | */ |
47 | - protected function _generateContent($table){ |
|
47 | + protected function _generateContent($table) { |
|
48 | 48 | $captions=$this->_instanceViewer->getCaptions(); |
49 | - $values= $this->_instanceViewer->getValues(); |
|
49 | + $values=$this->_instanceViewer->getValues(); |
|
50 | 50 | $count=$this->_instanceViewer->count(); |
51 | - for($i=0;$i<$count;$i++){ |
|
52 | - $table->addRow([$captions[$i],$values[$i]]); |
|
51 | + for ($i=0; $i<$count; $i++) { |
|
52 | + $table->addRow([$captions[$i], $values[$i]]); |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
56 | - protected function _getFieldName($index){ |
|
56 | + protected function _getFieldName($index) { |
|
57 | 57 | return $this->_instanceViewer->getFieldName($index); |
58 | 58 | } |
59 | 59 | |
60 | - protected function _getFieldCaption($index){ |
|
60 | + protected function _getFieldCaption($index) { |
|
61 | 61 | return null; |
62 | 62 | } |
63 | 63 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | return $this; |
90 | 90 | } |
91 | 91 | |
92 | - public function asForm(){ |
|
92 | + public function asForm() { |
|
93 | 93 | return $this->getForm(); |
94 | 94 | } |
95 | 95 | } |
96 | 96 | \ No newline at end of file |
@@ -16,6 +16,6 @@ |
||
16 | 16 | if (isset($toElement)) { |
17 | 17 | $toElement->setAttached(true); |
18 | 18 | } |
19 | - return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached")); |
|
19 | + return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached")); |
|
20 | 20 | } |
21 | 21 | } |
22 | 22 | \ No newline at end of file |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | * @property string $identifier |
13 | 13 | */ |
14 | 14 | trait BaseTrait { |
15 | - protected $_variations=[ ]; |
|
16 | - protected $_states=[ ]; |
|
15 | + protected $_variations=[]; |
|
16 | + protected $_states=[]; |
|
17 | 17 | protected $_baseClass; |
18 | 18 | |
19 | 19 | abstract protected function setPropertyCtrl($name, $value, $typeCtrl); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | |
27 | 27 | abstract public function setProperty($name, $value); |
28 | 28 | |
29 | - abstract public function addContent($content,$before=false); |
|
29 | + abstract public function addContent($content, $before=false); |
|
30 | 30 | |
31 | 31 | abstract public function onCreate($jsCode); |
32 | 32 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $this->setProperty("class", $this->_baseClass); |
48 | 48 | if (\is_string($variations)) |
49 | 49 | $variations=\explode(" ", $variations); |
50 | - foreach ( $variations as $variation ) { |
|
50 | + foreach ($variations as $variation) { |
|
51 | 51 | $this->addVariation($variation); |
52 | 52 | } |
53 | 53 | return $this; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | public function addVariations($variations=array()) { |
62 | 62 | if (\is_string($variations)) |
63 | 63 | $variations=\explode(" ", $variations); |
64 | - foreach ( $variations as $variation ) { |
|
64 | + foreach ($variations as $variation) { |
|
65 | 65 | $this->addVariation($variation); |
66 | 66 | } |
67 | 67 | return $this; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | public function addStates($states=array()) { |
71 | 71 | if (\is_string($states)) |
72 | 72 | $states=\explode(" ", $states); |
73 | - foreach ( $states as $state ) { |
|
73 | + foreach ($states as $state) { |
|
74 | 74 | $this->addState($state); |
75 | 75 | } |
76 | 76 | return $this; |
@@ -80,17 +80,17 @@ discard block |
||
80 | 80 | $this->setProperty("class", $this->_baseClass); |
81 | 81 | if (\is_string($states)) |
82 | 82 | $states=\explode(" ", $states); |
83 | - foreach ( $states as $state ) { |
|
83 | + foreach ($states as $state) { |
|
84 | 84 | $this->addState($state); |
85 | 85 | } |
86 | 86 | return $this; |
87 | 87 | } |
88 | 88 | |
89 | 89 | public function addIcon($icon, $before=true) { |
90 | - return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before); |
|
90 | + return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before); |
|
91 | 91 | } |
92 | 92 | |
93 | - public function addSticky($context="body"){ |
|
93 | + public function addSticky($context="body") { |
|
94 | 94 | $this->onCreate("$('#".$this->identifier."').sticky({ context: '".$context."'});"); |
95 | 95 | return $this; |
96 | 96 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement |
112 | 112 | */ |
113 | 113 | public function setDisabled($disable=true) { |
114 | - if($disable) |
|
114 | + if ($disable) |
|
115 | 115 | $this->addToProperty("class", "disabled"); |
116 | 116 | return $this; |
117 | 117 | } |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * |
138 | 138 | * @return \Ajax\semantic\html\base\HtmlSemDoubleElement |
139 | 139 | */ |
140 | - public function asHeader(){ |
|
140 | + public function asHeader() { |
|
141 | 141 | return $this->addToProperty("class", "header"); |
142 | 142 | } |
143 | 143 | |
@@ -145,15 +145,15 @@ discard block |
||
145 | 145 | * show it is currently the active user selection |
146 | 146 | * @return \Ajax\semantic\html\base\HtmlSemDoubleElement |
147 | 147 | */ |
148 | - public function setActive($value=true){ |
|
149 | - if($value) |
|
148 | + public function setActive($value=true) { |
|
149 | + if ($value) |
|
150 | 150 | $this->addToProperty("class", "active"); |
151 | 151 | return $this; |
152 | 152 | } |
153 | 153 | |
154 | - public function setAttached($value=true){ |
|
155 | - if($value) |
|
156 | - $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
154 | + public function setAttached($value=true) { |
|
155 | + if ($value) |
|
156 | + $this->addToPropertyCtrl("class", "attached", array("attached")); |
|
157 | 157 | return $this; |
158 | 158 | } |
159 | 159 | |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | } |
170 | 170 | |
171 | 171 | public function setFloated($direction="right") { |
172 | - return $this->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated")); |
|
172 | + return $this->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated")); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | public function floatRight() { |
@@ -45,8 +45,9 @@ discard block |
||
45 | 45 | |
46 | 46 | public function setVariations($variations) { |
47 | 47 | $this->setProperty("class", $this->_baseClass); |
48 | - if (\is_string($variations)) |
|
49 | - $variations=\explode(" ", $variations); |
|
48 | + if (\is_string($variations)) { |
|
49 | + $variations=\explode(" ", $variations); |
|
50 | + } |
|
50 | 51 | foreach ( $variations as $variation ) { |
51 | 52 | $this->addVariation($variation); |
52 | 53 | } |
@@ -59,8 +60,9 @@ discard block |
||
59 | 60 | } |
60 | 61 | |
61 | 62 | public function addVariations($variations=array()) { |
62 | - if (\is_string($variations)) |
|
63 | - $variations=\explode(" ", $variations); |
|
63 | + if (\is_string($variations)) { |
|
64 | + $variations=\explode(" ", $variations); |
|
65 | + } |
|
64 | 66 | foreach ( $variations as $variation ) { |
65 | 67 | $this->addVariation($variation); |
66 | 68 | } |
@@ -68,8 +70,9 @@ discard block |
||
68 | 70 | } |
69 | 71 | |
70 | 72 | public function addStates($states=array()) { |
71 | - if (\is_string($states)) |
|
72 | - $states=\explode(" ", $states); |
|
73 | + if (\is_string($states)) { |
|
74 | + $states=\explode(" ", $states); |
|
75 | + } |
|
73 | 76 | foreach ( $states as $state ) { |
74 | 77 | $this->addState($state); |
75 | 78 | } |
@@ -78,8 +81,9 @@ discard block |
||
78 | 81 | |
79 | 82 | public function setStates($states) { |
80 | 83 | $this->setProperty("class", $this->_baseClass); |
81 | - if (\is_string($states)) |
|
82 | - $states=\explode(" ", $states); |
|
84 | + if (\is_string($states)) { |
|
85 | + $states=\explode(" ", $states); |
|
86 | + } |
|
83 | 87 | foreach ( $states as $state ) { |
84 | 88 | $this->addState($state); |
85 | 89 | } |
@@ -111,8 +115,9 @@ discard block |
||
111 | 115 | * @return \Ajax\semantic\html\elements\HtmlSemDoubleElement |
112 | 116 | */ |
113 | 117 | public function setDisabled($disable=true) { |
114 | - if($disable) |
|
115 | - $this->addToProperty("class", "disabled"); |
|
118 | + if($disable) { |
|
119 | + $this->addToProperty("class", "disabled"); |
|
120 | + } |
|
116 | 121 | return $this; |
117 | 122 | } |
118 | 123 | |
@@ -146,14 +151,16 @@ discard block |
||
146 | 151 | * @return \Ajax\semantic\html\base\HtmlSemDoubleElement |
147 | 152 | */ |
148 | 153 | public function setActive($value=true){ |
149 | - if($value) |
|
150 | - $this->addToProperty("class", "active"); |
|
154 | + if($value) { |
|
155 | + $this->addToProperty("class", "active"); |
|
156 | + } |
|
151 | 157 | return $this; |
152 | 158 | } |
153 | 159 | |
154 | 160 | public function setAttached($value=true){ |
155 | - if($value) |
|
156 | - $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
161 | + if($value) { |
|
162 | + $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
163 | + } |
|
157 | 164 | return $this; |
158 | 165 | } |
159 | 166 |
@@ -1,13 +1,13 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace Ajax\semantic\html\collections\table\traits; |
3 | 3 | |
4 | -trait TableTrait{ |
|
4 | +trait TableTrait { |
|
5 | 5 | /** |
6 | 6 | * @return HtmlTable |
7 | 7 | */ |
8 | 8 | abstract protected function getTable(); |
9 | 9 | |
10 | - protected function addToPropertyTable($property,$value){ |
|
10 | + protected function addToPropertyTable($property, $value) { |
|
11 | 11 | return $this->getTable()->addToProperty($property, $value); |
12 | 12 | } |
13 | 13 | |
@@ -18,15 +18,15 @@ discard block |
||
18 | 18 | public function setBasic($very=false) { |
19 | 19 | $table=$this->getTable(); |
20 | 20 | if ($very) |
21 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
22 | - return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
|
21 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
22 | + return $table->addToPropertyCtrl("class", "basic", array("basic")); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function setCompact($very=false) { |
26 | 26 | $table=$this->getTable(); |
27 | 27 | if ($very) |
28 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
29 | - return $table->addToPropertyCtrl("class", "compact", array ("compact" )); |
|
28 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
29 | + return $table->addToPropertyCtrl("class", "compact", array("compact")); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | public function setCollapsing() { |
@@ -17,15 +17,17 @@ |
||
17 | 17 | |
18 | 18 | public function setBasic($very=false) { |
19 | 19 | $table=$this->getTable(); |
20 | - if ($very) |
|
21 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
20 | + if ($very) { |
|
21 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
22 | + } |
|
22 | 23 | return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
23 | 24 | } |
24 | 25 | |
25 | 26 | public function setCompact($very=false) { |
26 | 27 | $table=$this->getTable(); |
27 | - if ($very) |
|
28 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
28 | + if ($very) { |
|
29 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
30 | + } |
|
29 | 31 | return $table->addToPropertyCtrl("class", "compact", array ("compact" )); |
30 | 32 | } |
31 | 33 |
@@ -6,8 +6,8 @@ |
||
6 | 6 | public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n"; |
7 | 7 | public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n"; |
8 | 8 | |
9 | - public static function containsCode($expression){ |
|
10 | - return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false; |
|
9 | + public static function containsCode($expression) { |
|
10 | + return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false; |
|
11 | 11 | } |
12 | 12 | |
13 | 13 | /** |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | } |
14 | 14 | |
15 | 15 | public function setClass($classNames) { |
16 | - if(\is_array($classNames)){ |
|
16 | + if (\is_array($classNames)) { |
|
17 | 17 | $classNames=implode(" ", $classNames); |
18 | 18 | } |
19 | 19 | $this->setProperty("class", $classNames); |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | public function addClass($classNames) { |
24 | - if(\is_array($classNames)){ |
|
24 | + if (\is_array($classNames)) { |
|
25 | 25 | $classNames=implode(" ", $classNames); |
26 | 26 | } |
27 | 27 | $this->addToProperty("class", $classNames); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function fromArray($array) { |
54 | 54 | $array=parent::fromArray($array); |
55 | - foreach ( $array as $key => $value ) { |
|
55 | + foreach ($array as $key => $value) { |
|
56 | 56 | $this->setProperty($key, $value); |
57 | 57 | } |
58 | 58 | return $array; |