@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | foreach ($ajaxSubmit as $ajaxSubmitItem){ |
49 | 49 | $compilation.=$ajaxSubmitItem->compile($js); |
50 | 50 | } |
51 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
51 | + } elseif($ajaxSubmit instanceof AjaxCall){ |
|
52 | 52 | $compilation=$ajaxSubmit->compile($js); |
53 | 53 | } |
54 | 54 | $compilation=str_ireplace("\"","%quote%", $compilation); |
@@ -66,8 +66,9 @@ discard block |
||
66 | 66 | |
67 | 67 | public function setAttached($value=true){ |
68 | 68 | $form=$this->getForm(); |
69 | - if($value) |
|
70 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
69 | + if($value) { |
|
70 | + $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
71 | + } |
|
71 | 72 | return $form; |
72 | 73 | } |
73 | 74 | |
@@ -89,10 +90,11 @@ discard block |
||
89 | 90 | */ |
90 | 91 | public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
91 | 92 | $form=$this->getForm(); |
92 | - if($identifierOrElement instanceof BaseHtml) |
|
93 | - $elem=$identifierOrElement; |
|
94 | - else |
|
95 | - $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
93 | + if($identifierOrElement instanceof BaseHtml) { |
|
94 | + $elem=$identifierOrElement; |
|
95 | + } else { |
|
96 | + $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
97 | + } |
|
96 | 98 | if(isset($elem)){ |
97 | 99 | $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
98 | 100 | } |
@@ -120,8 +122,9 @@ discard block |
||
120 | 122 | public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
121 | 123 | $form=$this->getForm(); |
122 | 124 | $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
123 | - if(\is_array($parameters)) |
|
124 | - $params=\array_merge($params,$parameters); |
|
125 | + if(\is_array($parameters)) { |
|
126 | + $params=\array_merge($params,$parameters); |
|
127 | + } |
|
125 | 128 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
126 | 129 | return $this; |
127 | 130 | } |
@@ -14,27 +14,27 @@ discard block |
||
14 | 14 | * @author jc |
15 | 15 | * |
16 | 16 | */ |
17 | -trait FormTrait{ |
|
17 | +trait FormTrait { |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * @return HtmlForm |
21 | 21 | */ |
22 | 22 | abstract protected function getForm(); |
23 | 23 | |
24 | - protected function addCompoValidation(Form $compo,HtmlFormField $field){ |
|
24 | + protected function addCompoValidation(Form $compo, HtmlFormField $field) { |
|
25 | 25 | $validation=$field->getValidation(); |
26 | - if(isset($validation)){ |
|
26 | + if (isset($validation)) { |
|
27 | 27 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
28 | 28 | $compo->addFieldValidation($validation); |
29 | 29 | } |
30 | 30 | return $compo; |
31 | 31 | } |
32 | 32 | |
33 | - protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){ |
|
33 | + protected function _runValidationParams(Form &$compo, JsUtils $js=NULL) { |
|
34 | 34 | $form=$this->getForm(); |
35 | 35 | $params=$form->getValidationParams(); |
36 | - if(isset($params["_ajaxSubmit"])){ |
|
37 | - $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js); |
|
36 | + if (isset($params["_ajaxSubmit"])) { |
|
37 | + $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js); |
|
38 | 38 | $this->onSuccess($compilation); |
39 | 39 | $form->removeValidationParam("_ajaxSubmit"); |
40 | 40 | } |
@@ -43,16 +43,16 @@ discard block |
||
43 | 43 | $form->addEventsOnRun($js); |
44 | 44 | } |
45 | 45 | |
46 | - protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){ |
|
46 | + protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) { |
|
47 | 47 | $compilation=""; |
48 | - if(\is_array($ajaxSubmit)){ |
|
49 | - foreach ($ajaxSubmit as $ajaxSubmitItem){ |
|
48 | + if (\is_array($ajaxSubmit)) { |
|
49 | + foreach ($ajaxSubmit as $ajaxSubmitItem) { |
|
50 | 50 | $compilation.=$ajaxSubmitItem->compile($js); |
51 | 51 | } |
52 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
52 | + }elseif ($ajaxSubmit instanceof AjaxCall) { |
|
53 | 53 | $compilation=$ajaxSubmit->compile($js); |
54 | 54 | } |
55 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
55 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
56 | 56 | return $compilation; |
57 | 57 | } |
58 | 58 | |
@@ -65,14 +65,14 @@ discard block |
||
65 | 65 | return $this; |
66 | 66 | } |
67 | 67 | |
68 | - public function setAttached($value=true){ |
|
68 | + public function setAttached($value=true) { |
|
69 | 69 | $form=$this->getForm(); |
70 | - if($value) |
|
71 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
70 | + if ($value) |
|
71 | + $form->addToPropertyCtrl("class", "attached", array("attached")); |
|
72 | 72 | return $form; |
73 | 73 | } |
74 | 74 | |
75 | - public function addErrorMessage(){ |
|
75 | + public function addErrorMessage() { |
|
76 | 76 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
77 | 77 | } |
78 | 78 | |
@@ -88,47 +88,47 @@ discard block |
||
88 | 88 | * @param array $parameters |
89 | 89 | * @return HtmlForm |
90 | 90 | */ |
91 | - public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
|
91 | + public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) { |
|
92 | 92 | $form=$this->getForm(); |
93 | - if($identifierOrElement instanceof BaseHtml) |
|
93 | + if ($identifierOrElement instanceof BaseHtml) |
|
94 | 94 | $elem=$identifierOrElement; |
95 | 95 | else |
96 | 96 | $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
97 | - if(isset($elem)){ |
|
98 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
|
97 | + if (isset($elem)) { |
|
98 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters); |
|
99 | 99 | } |
100 | 100 | return $form; |
101 | 101 | } |
102 | 102 | |
103 | - public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){ |
|
104 | - return $this->submitOn("click", $identifier, $url, $responseElement,$parameters); |
|
103 | + public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) { |
|
104 | + return $this->submitOn("click", $identifier, $url, $responseElement, $parameters); |
|
105 | 105 | } |
106 | 106 | |
107 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
108 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
109 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters); |
|
107 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
108 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
109 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters); |
|
110 | 110 | } |
111 | 111 | |
112 | - protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){ |
|
112 | + protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL) { |
|
113 | 113 | $form=$this->getForm(); |
114 | - if(isset($url) && isset($responseElement)){ |
|
115 | - $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true); |
|
116 | - $this->setSubmitParams($url,$responseElement,$parameters); |
|
114 | + if (isset($url) && isset($responseElement)) { |
|
115 | + $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true); |
|
116 | + $this->setSubmitParams($url, $responseElement, $parameters); |
|
117 | 117 | } |
118 | 118 | return $button; |
119 | 119 | } |
120 | 120 | |
121 | - public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
|
121 | + public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) { |
|
122 | 122 | $form=$this->getForm(); |
123 | - $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
|
124 | - if(\is_array($parameters)) |
|
125 | - $params=\array_merge($params,$parameters); |
|
123 | + $params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true]; |
|
124 | + if (\is_array($parameters)) |
|
125 | + $params=\array_merge($params, $parameters); |
|
126 | 126 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
127 | 127 | return $this; |
128 | 128 | } |
129 | 129 | |
130 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
131 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
130 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
131 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
132 | 132 | $bt->setProperty("type", "reset"); |
133 | 133 | return $bt; |
134 | 134 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | * @param string $jsCode |
139 | 139 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
140 | 140 | */ |
141 | - public function onValid($jsCode){ |
|
141 | + public function onValid($jsCode) { |
|
142 | 142 | $form=$this->getForm(); |
143 | 143 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
144 | 144 | return $form; |
@@ -149,9 +149,9 @@ discard block |
||
149 | 149 | * @param string $jsCode can use event and fields parameters |
150 | 150 | * @return HtmlForm |
151 | 151 | */ |
152 | - public function onSuccess($jsCode){ |
|
152 | + public function onSuccess($jsCode) { |
|
153 | 153 | $form=$this->getForm(); |
154 | - $form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%"); |
|
154 | + $form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%"); |
|
155 | 155 | return $form; |
156 | 156 | } |
157 | 157 | } |
@@ -17,10 +17,10 @@ |
||
17 | 17 | * {@inheritDoc} |
18 | 18 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
19 | 19 | */ |
20 | - public function run(JsUtils $js){ |
|
21 | - if(!isset($this->_bsComponent)){ |
|
22 | - if(isset($this->_timeout)){ |
|
23 | - $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});",true); |
|
20 | + public function run(JsUtils $js) { |
|
21 | + if (!isset($this->_bsComponent)) { |
|
22 | + if (isset($this->_timeout)) { |
|
23 | + $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true); |
|
24 | 24 | } |
25 | 25 | } |
26 | 26 | return parent::run($js); |
@@ -330,8 +330,9 @@ discard block |
||
330 | 330 | $result= $this->getBody()->_addRow($result); |
331 | 331 | } |
332 | 332 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
333 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
334 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
333 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
334 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
335 | + } |
|
335 | 336 | } |
336 | 337 | return $result; |
337 | 338 | } |
@@ -353,8 +354,9 @@ discard block |
||
353 | 354 | |
354 | 355 | public function run(JsUtils $js){ |
355 | 356 | $result= parent::run($js); |
356 | - if(isset($this->_footer)) |
|
357 | - $this->_footer->run($js); |
|
357 | + if(isset($this->_footer)) { |
|
358 | + $this->_footer->run($js); |
|
359 | + } |
|
358 | 360 | return $result; |
359 | 361 | } |
360 | 362 | |
@@ -394,8 +396,9 @@ discard block |
||
394 | 396 | |
395 | 397 | public function setColWidth($colIndex,$width){ |
396 | 398 | $part=$this->_getFirstPart(); |
397 | - if($part!==null && $part->count()>0) |
|
398 | - $part->getCell(0, $colIndex)->setWidth($width); |
|
399 | + if($part!==null && $part->count()>0) { |
|
400 | + $part->getCell(0, $colIndex)->setWidth($width); |
|
401 | + } |
|
399 | 402 | return $this; |
400 | 403 | } |
401 | 404 |
@@ -28,10 +28,10 @@ discard block |
||
28 | 28 | |
29 | 29 | public function __construct($identifier, $rowCount, $colCount) { |
30 | 30 | parent::__construct($identifier, "table", "ui table"); |
31 | - $this->content=array (); |
|
31 | + $this->content=array(); |
|
32 | 32 | $this->setRowCount($rowCount, $colCount); |
33 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
34 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
33 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
34 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
35 | 35 | $this->_afterCompileEvents=[]; |
36 | 36 | } |
37 | 37 | |
@@ -41,17 +41,17 @@ discard block |
||
41 | 41 | * @return HtmlTableContent |
42 | 42 | */ |
43 | 43 | public function getPart($key) { |
44 | - if (\array_key_exists($key, $this->content) === false) { |
|
44 | + if (\array_key_exists($key, $this->content)===false) { |
|
45 | 45 | $this->content[$key]=new HtmlTableContent("", $key); |
46 | - if ($key !== "tbody") { |
|
46 | + if ($key!=="tbody") { |
|
47 | 47 | $this->content[$key]->setRowCount(1, $this->_colCount); |
48 | 48 | } |
49 | 49 | } |
50 | 50 | return $this->content[$key]; |
51 | 51 | } |
52 | 52 | |
53 | - protected function _getFirstPart(){ |
|
54 | - if(isset($this->content["thead"])){ |
|
53 | + protected function _getFirstPart() { |
|
54 | + if (isset($this->content["thead"])) { |
|
55 | 55 | return $this->content["thead"]; |
56 | 56 | } |
57 | 57 | return $this->content["tbody"]; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * @return boolean |
97 | 97 | */ |
98 | 98 | public function hasPart($key) { |
99 | - return \array_key_exists($key, $this->content) === true; |
|
99 | + return \array_key_exists($key, $this->content)===true; |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -229,8 +229,8 @@ discard block |
||
229 | 229 | return $this->colAlign($colIndex, "colLeft"); |
230 | 230 | } |
231 | 231 | |
232 | - public function setColAlignment($colIndex,$alignment){ |
|
233 | - switch ($alignment){ |
|
232 | + public function setColAlignment($colIndex, $alignment) { |
|
233 | + switch ($alignment) { |
|
234 | 234 | case TextAlignment::LEFT: |
235 | 235 | $function="colLeft"; |
236 | 236 | break; |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | |
249 | 249 | private function colAlign($colIndex, $function) { |
250 | 250 | if (\is_array($colIndex)) { |
251 | - foreach ( $colIndex as $cIndex ) { |
|
251 | + foreach ($colIndex as $cIndex) { |
|
252 | 252 | $this->colAlign($cIndex, $function); |
253 | 253 | } |
254 | 254 | } else { |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | * @see HtmlSemDoubleElement::compile() |
310 | 310 | */ |
311 | 311 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
312 | - if(\sizeof($this->_compileParts)<3){ |
|
312 | + if (\sizeof($this->_compileParts)<3) { |
|
313 | 313 | $this->_template="%content%"; |
314 | 314 | $this->refresh(); |
315 | 315 | } |
@@ -318,11 +318,11 @@ discard block |
||
318 | 318 | } |
319 | 319 | |
320 | 320 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
321 | - parent::compile_once($js,$view); |
|
321 | + parent::compile_once($js, $view); |
|
322 | 322 | if ($this->propertyContains("class", "sortable")) { |
323 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
323 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));"); |
|
324 | 324 | } |
325 | - if(isset($this->_activeRowSelector)){ |
|
325 | + if (isset($this->_activeRowSelector)) { |
|
326 | 326 | $this->_activeRowSelector->compile(); |
327 | 327 | } |
328 | 328 | } |
@@ -336,13 +336,13 @@ discard block |
||
336 | 336 | public function fromDatabaseObject($object, $function) { |
337 | 337 | $result=$function($object); |
338 | 338 | if (\is_array($result)) { |
339 | - $result= $this->addRow($function($object)); |
|
339 | + $result=$this->addRow($function($object)); |
|
340 | 340 | } else { |
341 | - $result= $this->getBody()->_addRow($result); |
|
341 | + $result=$this->getBody()->_addRow($result); |
|
342 | 342 | } |
343 | - if(isset($this->_afterCompileEvents["onNewRow"])){ |
|
344 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
345 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
343 | + if (isset($this->_afterCompileEvents["onNewRow"])) { |
|
344 | + if (\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
345 | + $this->_afterCompileEvents["onNewRow"]($result, $object); |
|
346 | 346 | } |
347 | 347 | return $result; |
348 | 348 | } |
@@ -357,14 +357,14 @@ discard block |
||
357 | 357 | return $this; |
358 | 358 | } |
359 | 359 | |
360 | - public function refresh(){ |
|
360 | + public function refresh() { |
|
361 | 361 | $this->_footer=$this->getFooter(); |
362 | 362 | $this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");'); |
363 | 363 | } |
364 | 364 | |
365 | - public function run(JsUtils $js){ |
|
366 | - $result= parent::run($js); |
|
367 | - if(isset($this->_footer)) |
|
365 | + public function run(JsUtils $js) { |
|
366 | + $result=parent::run($js); |
|
367 | + if (isset($this->_footer)) |
|
368 | 368 | $this->_footer->run($js); |
369 | 369 | return $result; |
370 | 370 | } |
@@ -387,47 +387,47 @@ discard block |
||
387 | 387 | * @param boolean $multiple |
388 | 388 | * @return HtmlTable |
389 | 389 | */ |
390 | - public function setActiveRowSelector($class="active",$event="click",$multiple=false){ |
|
391 | - $this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple); |
|
390 | + public function setActiveRowSelector($class="active", $event="click", $multiple=false) { |
|
391 | + $this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple); |
|
392 | 392 | return $this; |
393 | 393 | } |
394 | 394 | |
395 | - public function hideColumn($colIndex){ |
|
396 | - if(isset($this->content["thead"])){ |
|
395 | + public function hideColumn($colIndex) { |
|
396 | + if (isset($this->content["thead"])) { |
|
397 | 397 | $this->content["thead"]->hideColumn($colIndex); |
398 | 398 | } |
399 | 399 | $this->content["tbody"]->hideColumn($colIndex); |
400 | - if(isset($this->content["tfoot"])){ |
|
400 | + if (isset($this->content["tfoot"])) { |
|
401 | 401 | $this->content["tfoot"]->hideColumn($colIndex); |
402 | 402 | } |
403 | 403 | return $this; |
404 | 404 | } |
405 | 405 | |
406 | - public function setColWidth($colIndex,$width){ |
|
406 | + public function setColWidth($colIndex, $width) { |
|
407 | 407 | $part=$this->_getFirstPart(); |
408 | - if($part!==null && $part->count()>0) |
|
408 | + if ($part!==null && $part->count()>0) |
|
409 | 409 | $part->getCell(0, $colIndex)->setWidth($width); |
410 | 410 | return $this; |
411 | 411 | } |
412 | 412 | |
413 | - public function setColWidths($widths){ |
|
413 | + public function setColWidths($widths) { |
|
414 | 414 | $part=$this->_getFirstPart(); |
415 | - if($part!==null && $part->count()>0){ |
|
415 | + if ($part!==null && $part->count()>0) { |
|
416 | 416 | $count=$part->getColCount(); |
417 | - if(!\is_array($widths)){ |
|
417 | + if (!\is_array($widths)) { |
|
418 | 418 | $widths=\array_fill(0, $count, $widths); |
419 | 419 | } |
420 | - $max=\min(\sizeof($widths),$count); |
|
421 | - for($i=0;$i<$max;$i++){ |
|
420 | + $max=\min(\sizeof($widths), $count); |
|
421 | + for ($i=0; $i<$max; $i++) { |
|
422 | 422 | $part->getCell(0, $i)->setWidth($widths[$i]); |
423 | 423 | } |
424 | 424 | } |
425 | 425 | return $this; |
426 | 426 | } |
427 | 427 | |
428 | - public function mergeIdentiqualValues($colIndex,$function="strip_tags"){ |
|
428 | + public function mergeIdentiqualValues($colIndex, $function="strip_tags") { |
|
429 | 429 | $body=$this->getBody(); |
430 | - $body->mergeIdentiqualValues($colIndex,$function); |
|
430 | + $body->mergeIdentiqualValues($colIndex, $function); |
|
431 | 431 | return $this; |
432 | 432 | } |
433 | 433 | } |
@@ -19,56 +19,56 @@ discard block |
||
19 | 19 | protected $_colWidths; |
20 | 20 | |
21 | 21 | public function __construct($identifier, $modelInstance=NULL) { |
22 | - parent::__construct($identifier, null,$modelInstance); |
|
23 | - $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false); |
|
22 | + parent::__construct($identifier, null, $modelInstance); |
|
23 | + $this->_init(new DeInstanceViewer($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 | - if(isset($this->_colWidths)){ |
|
37 | + if (isset($this->_colWidths)) { |
|
38 | 38 | $this->_applyStyleAttributes($table); |
39 | 39 | } |
40 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
|
40 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]); |
|
41 | 41 | $this->_compileForm(); |
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 HtmlTable $table |
49 | 49 | */ |
50 | - protected function _generateContent($table){ |
|
51 | - $values= $this->_instanceViewer->getValues(); |
|
50 | + protected function _generateContent($table) { |
|
51 | + $values=$this->_instanceViewer->getValues(); |
|
52 | 52 | $captions=$this->_instanceViewer->getCaptions(); |
53 | 53 | $count=$this->_instanceViewer->count(); |
54 | 54 | |
55 | - for($i=0;$i<$count;$i++){ |
|
56 | - $table->addRow([$captions[$i],$values[$i]]); |
|
55 | + for ($i=0; $i<$count; $i++) { |
|
56 | + $table->addRow([$captions[$i], $values[$i]]); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | |
60 | - protected function _applyStyleAttributes(HtmlTable $table){ |
|
60 | + protected function _applyStyleAttributes(HtmlTable $table) { |
|
61 | 61 | $table->setColWidths($this->_colWidths); |
62 | 62 | } |
63 | - protected function _getFieldName($index){ |
|
63 | + protected function _getFieldName($index) { |
|
64 | 64 | return $this->_instanceViewer->getFieldName($index); |
65 | 65 | } |
66 | 66 | |
67 | - protected function _getFieldCaption($index){ |
|
67 | + protected function _getFieldCaption($index) { |
|
68 | 68 | return null; |
69 | 69 | } |
70 | 70 | |
71 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
71 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
72 | 72 | return $this->identifier."-{$prefix}-".$name; |
73 | 73 | } |
74 | 74 | |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | return $this; |
101 | 101 | } |
102 | 102 | |
103 | - public function asForm(){ |
|
103 | + public function asForm() { |
|
104 | 104 | return $this->getForm(); |
105 | 105 | } |
106 | 106 | |
107 | - public function setColCaptionWidth($width){ |
|
107 | + public function setColCaptionWidth($width) { |
|
108 | 108 | $this->_colWidths[0]=$width; |
109 | 109 | return $this; |
110 | 110 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | return $this; |
115 | 115 | } |
116 | 116 | |
117 | - public function setColWidths($widths){ |
|
117 | + public function setColWidths($widths) { |
|
118 | 118 | $this->_colWidths=$widths; |
119 | 119 | return $this; |
120 | 120 | } |
@@ -22,15 +22,17 @@ |
||
22 | 22 | |
23 | 23 | public function setBasic($very=false) { |
24 | 24 | $table=$this->_self; |
25 | - if ($very) |
|
26 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
25 | + if ($very) { |
|
26 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
27 | + } |
|
27 | 28 | return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
28 | 29 | } |
29 | 30 | |
30 | 31 | public function setCompact($very=false) { |
31 | 32 | $table=$this->_self; |
32 | - if ($very) |
|
33 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
33 | + if ($very) { |
|
34 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
35 | + } |
|
34 | 36 | return $table->addToPropertyCtrl("class", "compact", array ("compact" )); |
35 | 37 | } |
36 | 38 |
@@ -7,12 +7,12 @@ discard block |
||
7 | 7 | * @author jc |
8 | 8 | * @property HtmlTable $_self |
9 | 9 | */ |
10 | -trait TableTrait{ |
|
10 | +trait TableTrait { |
|
11 | 11 | |
12 | 12 | abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false); |
13 | 13 | abstract public function getOn($event, $url, $responseElement="", $parameters=array()); |
14 | 14 | |
15 | - protected function addToPropertyTable($property,$value){ |
|
15 | + protected function addToPropertyTable($property, $value) { |
|
16 | 16 | return $this->_self->addToProperty($property, $value); |
17 | 17 | } |
18 | 18 | |
@@ -23,15 +23,15 @@ discard block |
||
23 | 23 | public function setBasic($very=false) { |
24 | 24 | $table=$this->_self; |
25 | 25 | if ($very) |
26 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
27 | - return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
|
26 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
27 | + return $table->addToPropertyCtrl("class", "basic", array("basic")); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function setCompact($very=false) { |
31 | 31 | $table=$this->_self; |
32 | 32 | if ($very) |
33 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
34 | - return $table->addToPropertyCtrl("class", "compact", array ("compact" )); |
|
33 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
34 | + return $table->addToPropertyCtrl("class", "compact", array("compact")); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | public function setCollapsing() { |
@@ -70,16 +70,16 @@ discard block |
||
70 | 70 | return $this->addToPropertyTable("class", "striped"); |
71 | 71 | } |
72 | 72 | |
73 | - public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false){ |
|
74 | - return $this->onRow("click", $jsCode,$stopPropagation,$preventDefault); |
|
73 | + public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) { |
|
74 | + return $this->onRow("click", $jsCode, $stopPropagation, $preventDefault); |
|
75 | 75 | } |
76 | 76 | |
77 | - public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){ |
|
78 | - return $this->_self->addEvent($event."{{tr}}",$jsCode,$stopPropagation,$preventDefault); |
|
77 | + public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
|
78 | + return $this->_self->addEvent($event."{{tr}}", $jsCode, $stopPropagation, $preventDefault); |
|
79 | 79 | } |
80 | 80 | |
81 | - public function getOnRow($event, $url, $responseElement="", $parameters=array()){ |
|
82 | - $parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false]); |
|
83 | - return $this->_self->getOn($event."{{tbody tr}}", $url,$responseElement,$parameters); |
|
81 | + public function getOnRow($event, $url, $responseElement="", $parameters=array()) { |
|
82 | + $parameters=\array_merge($parameters, ["stopPropagation"=>false, "preventDefault"=>false]); |
|
83 | + return $this->_self->getOn($event."{{tbody tr}}", $url, $responseElement, $parameters); |
|
84 | 84 | } |
85 | 85 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $this->_generateFields($form, [$v], $headers, $i, $wrappers); |
64 | 64 | $i++; |
65 | 65 | } |
66 | - }else{ |
|
66 | + } else{ |
|
67 | 67 | $separators[]=$count; |
68 | 68 | for($i=0;$i<$size;$i++){ |
69 | 69 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
@@ -74,17 +74,19 @@ discard block |
||
74 | 74 | |
75 | 75 | protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){ |
76 | 76 | $wrapper=null; |
77 | - if(isset($headers[$sepFirst+1])) |
|
78 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
77 | + if(isset($headers[$sepFirst+1])) { |
|
78 | + $form->addHeader($headers[$sepFirst+1],4,true); |
|
79 | + } |
|
79 | 80 | if(isset($wrappers[$sepFirst+1])){ |
80 | 81 | $wrapper=$wrappers[$sepFirst+1]; |
81 | 82 | } |
82 | 83 | if(\sizeof($values)===1){ |
83 | 84 | $added=$form->addField($values[0]); |
84 | - }elseif(\sizeof($values)>1){ |
|
85 | + } elseif(\sizeof($values)>1){ |
|
85 | 86 | $added=$form->addFields($values); |
86 | - }else |
|
87 | - return; |
|
87 | + } else { |
|
88 | + return; |
|
89 | + } |
|
88 | 90 | if(isset($wrapper)){ |
89 | 91 | $added->wrap($wrapper[0],$wrapper[1]); |
90 | 92 | } |
@@ -21,83 +21,83 @@ discard block |
||
21 | 21 | use BaseTrait; |
22 | 22 | |
23 | 23 | public function __construct($identifier, $modelInstance=NULL) { |
24 | - parent::__construct($identifier, null,$modelInstance); |
|
24 | + parent::__construct($identifier, null, $modelInstance); |
|
25 | 25 | $this->_form=new HtmlForm($identifier); |
26 | 26 | $this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true); |
27 | 27 | } |
28 | 28 | |
29 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
29 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
30 | 30 | return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier(); |
31 | 31 | } |
32 | 32 | |
33 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
34 | - if(!$this->_generated){ |
|
33 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
34 | + if (!$this->_generated) { |
|
35 | 35 | $this->_instanceViewer->setInstance($this->_modelInstance); |
36 | 36 | |
37 | 37 | $form=$this->content["form"]; |
38 | 38 | $this->_generateContent($form); |
39 | 39 | |
40 | - if(isset($this->_toolbar)){ |
|
40 | + if (isset($this->_toolbar)) { |
|
41 | 41 | $this->_setToolbarPosition($form); |
42 | 42 | } |
43 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
43 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
44 | 44 | $this->_generated=true; |
45 | 45 | } |
46 | - return parent::compile($js,$view); |
|
46 | + return parent::compile($js, $view); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | 50 | * @param HtmlForm $form |
51 | 51 | */ |
52 | - protected function _generateContent($form){ |
|
53 | - $values= $this->_instanceViewer->getValues(); |
|
52 | + protected function _generateContent($form) { |
|
53 | + $values=$this->_instanceViewer->getValues(); |
|
54 | 54 | $count=$this->_instanceViewer->count(); |
55 | 55 | $separators=$this->_instanceViewer->getSeparators(); |
56 | 56 | $headers=$this->_instanceViewer->getHeaders(); |
57 | 57 | $wrappers=$this->_instanceViewer->getWrappers(); |
58 | 58 | \sort($separators); |
59 | 59 | $size=\sizeof($separators); |
60 | - if($size===1){ |
|
60 | + if ($size===1) { |
|
61 | 61 | $i=-1; |
62 | - foreach ($values as $v){ |
|
62 | + foreach ($values as $v) { |
|
63 | 63 | $this->_generateFields($form, [$v], $headers, $i, $wrappers); |
64 | 64 | $i++; |
65 | 65 | } |
66 | - }else{ |
|
66 | + } else { |
|
67 | 67 | $separators[]=$count; |
68 | - for($i=0;$i<$size;$i++){ |
|
69 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
68 | + for ($i=0; $i<$size; $i++) { |
|
69 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
70 | 70 | $this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers); |
71 | 71 | } |
72 | 72 | } |
73 | 73 | } |
74 | 74 | |
75 | - protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){ |
|
75 | + protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers) { |
|
76 | 76 | $wrapper=null; |
77 | - if(isset($headers[$sepFirst+1])) |
|
78 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
79 | - if(isset($wrappers[$sepFirst+1])){ |
|
77 | + if (isset($headers[$sepFirst+1])) |
|
78 | + $form->addHeader($headers[$sepFirst+1], 4, true); |
|
79 | + if (isset($wrappers[$sepFirst+1])) { |
|
80 | 80 | $wrapper=$wrappers[$sepFirst+1]; |
81 | 81 | } |
82 | - if(\sizeof($values)===1){ |
|
82 | + if (\sizeof($values)===1) { |
|
83 | 83 | $added=$form->addField($values[0]); |
84 | - }elseif(\sizeof($values)>1){ |
|
84 | + }elseif (\sizeof($values)>1) { |
|
85 | 85 | $added=$form->addFields($values); |
86 | - }else |
|
86 | + } else |
|
87 | 87 | return; |
88 | - if(isset($wrapper)){ |
|
89 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
88 | + if (isset($wrapper)) { |
|
89 | + $added->wrap($wrapper[0], $wrapper[1]); |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
94 | 94 | * @return HtmlForm |
95 | 95 | */ |
96 | - public function getForm(){ |
|
96 | + public function getForm() { |
|
97 | 97 | return $this->content["form"]; |
98 | 98 | } |
99 | 99 | |
100 | - public function addSeparatorAfter($fieldNum){ |
|
100 | + public function addSeparatorAfter($fieldNum) { |
|
101 | 101 | $fieldNum=$this->_getIndex($fieldNum); |
102 | 102 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
103 | 103 | return $this; |
@@ -112,12 +112,12 @@ discard block |
||
112 | 112 | return $this; |
113 | 113 | } |
114 | 114 | |
115 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
116 | - return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){ |
|
117 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
115 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
116 | + return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){ |
|
117 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
118 | 118 | $button->setProperty("type", "reset"); |
119 | 119 | return $button; |
120 | - }, $index,$attributes); |
|
120 | + }, $index, $attributes); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | /** |
@@ -136,19 +136,19 @@ discard block |
||
136 | 136 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
137 | 137 | } |
138 | 138 | |
139 | - public function addDividerBefore($index,$title){ |
|
139 | + public function addDividerBefore($index, $title) { |
|
140 | 140 | $index=$this->_getIndex($index); |
141 | 141 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
142 | 142 | return $this; |
143 | 143 | } |
144 | 144 | |
145 | - public function addWrapper($index,$contentBefore,$contentAfter=null){ |
|
145 | + public function addWrapper($index, $contentBefore, $contentAfter=null) { |
|
146 | 146 | $index=$this->_getIndex($index); |
147 | - $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
|
147 | + $this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter); |
|
148 | 148 | return $this; |
149 | 149 | } |
150 | 150 | |
151 | - public function run(JsUtils $js){ |
|
151 | + public function run(JsUtils $js) { |
|
152 | 152 | parent::run($js); |
153 | 153 | } |
154 | 154 | } |
@@ -8,11 +8,11 @@ |
||
8 | 8 | class HtmlCardGroups extends HtmlViewGroups { |
9 | 9 | |
10 | 10 | public function __construct($identifier, $cards=array()) { |
11 | - parent::__construct($identifier, "ui cards",$cards); |
|
11 | + parent::__construct($identifier, "ui cards", $cards); |
|
12 | 12 | } |
13 | 13 | |
14 | - protected function createElement(){ |
|
15 | - return new HtmlCard("card-" . $this->count()); |
|
14 | + protected function createElement() { |
|
15 | + return new HtmlCard("card-".$this->count()); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | public function newItem($identifier) { |
@@ -9,11 +9,11 @@ |
||
9 | 9 | class HtmlItems extends HtmlViewGroups { |
10 | 10 | |
11 | 11 | public function __construct($identifier, $items=[]) { |
12 | - parent::__construct($identifier, "ui items",$items); |
|
12 | + parent::__construct($identifier, "ui items", $items); |
|
13 | 13 | } |
14 | 14 | |
15 | - protected function createElement(){ |
|
16 | - return new HtmlItem("item-" . $this->count()); |
|
15 | + protected function createElement() { |
|
16 | + return new HtmlItem("item-".$this->count()); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | public function newItem($identifier) { |
@@ -6,24 +6,24 @@ |
||
6 | 6 | * @author jc |
7 | 7 | * @property mixed $content |
8 | 8 | */ |
9 | -trait ContentPartTrait{ |
|
10 | - public function addElementInPart($element,$partKey,$before=false,$force=false){ |
|
11 | - $part=$this->getPart($partKey,null,$force); |
|
12 | - if($part instanceof HtmlSemDoubleElement){ |
|
9 | +trait ContentPartTrait { |
|
10 | + public function addElementInPart($element, $partKey, $before=false, $force=false) { |
|
11 | + $part=$this->getPart($partKey, null, $force); |
|
12 | + if ($part instanceof HtmlSemDoubleElement) { |
|
13 | 13 | $this->content[$partKey]=$part; |
14 | - $part->addContent($element,$before); |
|
14 | + $part->addContent($element, $before); |
|
15 | 15 | } |
16 | 16 | return $this; |
17 | 17 | } |
18 | 18 | |
19 | - public function getPart($partKey, $index=NULL,$force=false) { |
|
19 | + public function getPart($partKey, $index=NULL, $force=false) { |
|
20 | 20 | if (\array_key_exists($partKey, $this->content)) { |
21 | 21 | if (isset($index)) |
22 | 22 | return $this->content[$partKey][$index]; |
23 | 23 | return $this->content[$partKey]; |
24 | 24 | } |
25 | - if($force){ |
|
26 | - return new HtmlSemDoubleElement($partKey."-".$this->identifier,"div",$partKey); |
|
25 | + if ($force) { |
|
26 | + return new HtmlSemDoubleElement($partKey."-".$this->identifier, "div", $partKey); |
|
27 | 27 | } |
28 | 28 | return NULL; |
29 | 29 | } |
@@ -18,8 +18,9 @@ |
||
18 | 18 | |
19 | 19 | public function getPart($partKey, $index=NULL,$force=false) { |
20 | 20 | if (\array_key_exists($partKey, $this->content)) { |
21 | - if (isset($index)) |
|
22 | - return $this->content[$partKey][$index]; |
|
21 | + if (isset($index)) { |
|
22 | + return $this->content[$partKey][$index]; |
|
23 | + } |
|
23 | 24 | return $this->content[$partKey]; |
24 | 25 | } |
25 | 26 | if($force){ |