@@ -9,22 +9,22 @@ discard block |
||
9 | 9 | class FormInstanceViewer extends InstanceViewer { |
10 | 10 | protected $separators; |
11 | 11 | |
12 | - public function __construct($identifier,$instance=NULL, $captions=NULL) { |
|
13 | - parent::__construct($identifier,$instance=NULL, $captions=NULL); |
|
12 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
13 | + parent::__construct($identifier, $instance=NULL, $captions=NULL); |
|
14 | 14 | $this->separators=[-1]; |
15 | - $this->defaultValueFunction=function($name,$value,$index){ |
|
15 | + $this->defaultValueFunction=function($name, $value, $index) { |
|
16 | 16 | $caption=$this->getCaption($index); |
17 | - $input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value); |
|
17 | + $input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value); |
|
18 | 18 | $input->setName($name); |
19 | 19 | return $input; |
20 | 20 | }; |
21 | 21 | } |
22 | 22 | |
23 | - protected function _beforeAddProperty($index,&$field){ |
|
24 | - if(JString::endswith($field, "\n")===true){ |
|
23 | + protected function _beforeAddProperty($index, &$field) { |
|
24 | + if (JString::endswith($field, "\n")===true) { |
|
25 | 25 | $this->addSeparatorAfter($index); |
26 | 26 | } |
27 | - if($index>1 && JString::startswith($field, "\n")===true){ |
|
27 | + if ($index>1 && JString::startswith($field, "\n")===true) { |
|
28 | 28 | $this->addSeparatorAfter($index-1); |
29 | 29 | } |
30 | 30 | $field=\str_replace("\n", "", $field); |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | |
33 | 33 | |
34 | 34 | |
35 | - public function addSeparatorAfter($fieldNum){ |
|
36 | - if(\array_search($fieldNum, $this->separators)===false) |
|
35 | + public function addSeparatorAfter($fieldNum) { |
|
36 | + if (\array_search($fieldNum, $this->separators)===false) |
|
37 | 37 | $this->separators[]=$fieldNum; |
38 | 38 | return $this; |
39 | 39 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | abstract class HtmlAbsractItem extends HtmlSemDoubleElement { |
13 | 13 | |
14 | - public function __construct($identifier, $baseClass,$content=NULL) { |
|
14 | + public function __construct($identifier, $baseClass, $content=NULL) { |
|
15 | 15 | parent::__construct($identifier, "div", $baseClass); |
16 | 16 | $this->content=array(); |
17 | 17 | $this->initContent($content); |
@@ -19,53 +19,53 @@ discard block |
||
19 | 19 | |
20 | 20 | abstract protected function initContent($content); |
21 | 21 | |
22 | - public function setIcon($icon){ |
|
22 | + public function setIcon($icon) { |
|
23 | 23 | $this->content["icon"]=new HtmlIcon("icon-".$this->identifier, $icon); |
24 | 24 | } |
25 | 25 | |
26 | - public function setImage($image){ |
|
26 | + public function setImage($image) { |
|
27 | 27 | $image=new HtmlImg("icon-".$this->identifier, $image); |
28 | 28 | $image->asAvatar(); |
29 | 29 | $this->content["image"]=$image; |
30 | 30 | } |
31 | 31 | |
32 | - private function createContent(){ |
|
33 | - $this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier,"div","content"); |
|
32 | + private function createContent() { |
|
33 | + $this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content"); |
|
34 | 34 | return $this->content["content"]; |
35 | 35 | } |
36 | 36 | |
37 | - public function setTitle($title,$description=NULL,$baseClass="title"){ |
|
38 | - $title=new HtmlSemDoubleElement("","div",$baseClass,$title); |
|
39 | - if(\array_key_exists("content", $this->content)===false){ |
|
37 | + public function setTitle($title, $description=NULL, $baseClass="title") { |
|
38 | + $title=new HtmlSemDoubleElement("", "div", $baseClass, $title); |
|
39 | + if (\array_key_exists("content", $this->content)===false) { |
|
40 | 40 | $this->createContent(); |
41 | 41 | } |
42 | 42 | $this->content["content"]->addContent($title); |
43 | - if(isset($description)){ |
|
44 | - $description=new HtmlSemDoubleElement("","div","description",$description); |
|
43 | + if (isset($description)) { |
|
44 | + $description=new HtmlSemDoubleElement("", "div", "description", $description); |
|
45 | 45 | $this->content["content"]->addContent($description); |
46 | 46 | } |
47 | 47 | return $this; |
48 | 48 | } |
49 | 49 | |
50 | - public function getPart($partName="header"){ |
|
51 | - $content=\array_merge($this->content["content"]->getContent(),array(@$this->content["icon"],@$this->content["image"])); |
|
50 | + public function getPart($partName="header") { |
|
51 | + $content=\array_merge($this->content["content"]->getContent(), array(@$this->content["icon"], @$this->content["image"])); |
|
52 | 52 | return $this->getElementByPropertyValue("class", $partName, $content); |
53 | 53 | } |
54 | 54 | |
55 | - public function setActive($value=true){ |
|
56 | - if($value){ |
|
55 | + public function setActive($value=true) { |
|
56 | + if ($value) { |
|
57 | 57 | $this->setTagName("div"); |
58 | 58 | $this->removeProperty("href"); |
59 | 59 | $this->addToPropertyCtrl("class", "active", array("active")); |
60 | - }else{ |
|
60 | + } else { |
|
61 | 61 | $this->removePropertyValue("class", "active"); |
62 | 62 | } |
63 | 63 | return $this; |
64 | 64 | } |
65 | 65 | |
66 | - public function asLink($href=NULL,$part=NULL){ |
|
66 | + public function asLink($href=NULL, $part=NULL) { |
|
67 | 67 | $this->setTagName("a"); |
68 | - if(isset($href)) |
|
68 | + if (isset($href)) |
|
69 | 69 | $this->setProperty("href", $href); |
70 | 70 | return $this; |
71 | 71 | } |
@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
78 | 78 | */ |
79 | 79 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
80 | - if(\is_array($this->content) && JArray::isAssociative($this->content)) |
|
81 | - $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
80 | + if (\is_array($this->content) && JArray::isAssociative($this->content)) |
|
81 | + $this->content=JArray::sortAssociative($this->content, ["icon", "image", "content"]); |
|
82 | 82 | return parent::compile($js, $view); |
83 | 83 | } |
84 | 84 | } |
85 | 85 | \ No newline at end of file |
@@ -32,16 +32,16 @@ discard block |
||
32 | 32 | // } |
33 | 33 | $this->setWide($numCols); |
34 | 34 | } |
35 | - if($createCols) |
|
35 | + if ($createCols) |
|
36 | 36 | $this->setRowsCount($numRows, $numCols); |
37 | 37 | } |
38 | 38 | |
39 | 39 | public function asSegment() { |
40 | - return $this->addToPropertyCtrl("class", "segment", array ("segment" )); |
|
40 | + return $this->addToPropertyCtrl("class", "segment", array("segment")); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | public function asContainer() { |
44 | - return $this->addToPropertyCtrl("class", "container", array ("container" )); |
|
44 | + return $this->addToPropertyCtrl("class", "container", array("container")); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -49,10 +49,10 @@ discard block |
||
49 | 49 | * @param int $wide |
50 | 50 | */ |
51 | 51 | public function setWide($wide) { |
52 | - if(isset(Wide::getConstants()["W" . $wide])){ |
|
53 | - $wide=Wide::getConstants()["W" . $wide]; |
|
52 | + if (isset(Wide::getConstants()["W".$wide])) { |
|
53 | + $wide=Wide::getConstants()["W".$wide]; |
|
54 | 54 | $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
55 | - return $this->addToPropertyCtrl("class", "column", array ("column" )); |
|
55 | + return $this->addToPropertyCtrl("class", "column", array("column")); |
|
56 | 56 | } |
57 | 57 | return $this; |
58 | 58 | } |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | * @return mixed |
73 | 73 | */ |
74 | 74 | public function addRow($colsCount=NULL) { |
75 | - $rowCount=$this->rowCount() + 1; |
|
75 | + $rowCount=$this->rowCount()+1; |
|
76 | 76 | $this->setRowsCount($rowCount, $colsCount, true); |
77 | - return $this->content[$rowCount - 1]; |
|
77 | + return $this->content[$rowCount-1]; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -83,10 +83,10 @@ discard block |
||
83 | 83 | * @return mixed|\Ajax\semantic\html\collections\HtmlGrid |
84 | 84 | */ |
85 | 85 | public function addCol($width=NULL) { |
86 | - $colCount=$this->colCount() + 1; |
|
86 | + $colCount=$this->colCount()+1; |
|
87 | 87 | $this->setColsCount($colCount, true, $width); |
88 | 88 | if ($this->hasOnlyCols($this->count())) |
89 | - return $this->content[$colCount - 1]; |
|
89 | + return $this->content[$colCount-1]; |
|
90 | 90 | return $this; |
91 | 91 | } |
92 | 92 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * @return \Ajax\semantic\html\collections\HtmlGrid |
97 | 97 | */ |
98 | 98 | public function addCols($sizes=array()) { |
99 | - foreach ( $sizes as $size ) { |
|
99 | + foreach ($sizes as $size) { |
|
100 | 100 | $this->addCol($size); |
101 | 101 | } |
102 | 102 | return $this; |
@@ -110,19 +110,19 @@ discard block |
||
110 | 110 | */ |
111 | 111 | public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) { |
112 | 112 | $count=$this->count(); |
113 | - if ($rowsCount < 2 && $force === false) { |
|
114 | - for($i=$count; $i < $colsCount; $i++) { |
|
115 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i)); |
|
113 | + if ($rowsCount<2 && $force===false) { |
|
114 | + for ($i=$count; $i<$colsCount; $i++) { |
|
115 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i)); |
|
116 | 116 | } |
117 | 117 | } else { |
118 | 118 | if ($this->hasOnlyCols($count)) { |
119 | 119 | $tmpContent=$this->content; |
120 | 120 | $item=$this->addItem($colsCount); |
121 | 121 | $item->setContent($tmpContent); |
122 | - $this->content=array (); |
|
122 | + $this->content=array(); |
|
123 | 123 | $count=1; |
124 | 124 | } |
125 | - for($i=$count; $i < $rowsCount; $i++) { |
|
125 | + for ($i=$count; $i<$rowsCount; $i++) { |
|
126 | 126 | $this->addItem($colsCount); |
127 | 127 | } |
128 | 128 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | protected function hasOnlyCols($count) { |
133 | - return $count > 0 && $this->content[0] instanceof HtmlGridCol; |
|
133 | + return $count>0 && $this->content[0] instanceof HtmlGridCol; |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -144,14 +144,14 @@ discard block |
||
144 | 144 | if (isset($width)===false) { |
145 | 145 | $this->setWide($numCols); |
146 | 146 | } |
147 | - if ($toCreate === true) { |
|
147 | + if ($toCreate===true) { |
|
148 | 148 | $count=$this->count(); |
149 | - if ($count == 0 || $this->hasOnlyCols($count)) { |
|
150 | - for($i=$count; $i < $numCols; $i++) { |
|
151 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width)); |
|
149 | + if ($count==0 || $this->hasOnlyCols($count)) { |
|
150 | + for ($i=$count; $i<$numCols; $i++) { |
|
151 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width)); |
|
152 | 152 | } |
153 | 153 | } else { |
154 | - for($i=0; $i < $count; $i++) { |
|
154 | + for ($i=0; $i<$count; $i++) { |
|
155 | 155 | $this->getItem($i)->setColsCount($numCols); |
156 | 156 | } |
157 | 157 | } |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $count=$this->count(); |
188 | 188 | if ($this->hasOnlyCols($count)) |
189 | 189 | return $count; |
190 | - if ($count > 0) |
|
190 | + if ($count>0) |
|
191 | 191 | return $this->getItem(0)->count(); |
192 | 192 | return 0; |
193 | 193 | } |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
200 | 200 | */ |
201 | 201 | public function getCell($row, $col) { |
202 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
202 | + if ($row<2 && $this->hasOnlyCols($this->count())) |
|
203 | 203 | return $this->getItem($col); |
204 | 204 | $row=$this->getItem($row); |
205 | 205 | if (isset($row)) { |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | * @return \Ajax\semantic\html\collections\HtmlGrid |
215 | 215 | */ |
216 | 216 | public function setDivided($vertically=false) { |
217 | - $value=($vertically === true) ? "vertically divided" : "divided"; |
|
218 | - return $this->addToPropertyCtrl("class", $value, array ("divided" )); |
|
217 | + $value=($vertically===true) ? "vertically divided" : "divided"; |
|
218 | + return $this->addToPropertyCtrl("class", $value, array("divided")); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | /** |
@@ -224,15 +224,15 @@ discard block |
||
224 | 224 | * @return \Ajax\semantic\html\collections\HtmlGrid |
225 | 225 | */ |
226 | 226 | public function setCelled($internally=false) { |
227 | - $value=($internally === true) ? "internally celled" : "celled"; |
|
228 | - return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" )); |
|
227 | + $value=($internally===true) ? "internally celled" : "celled"; |
|
228 | + return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled")); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | /** |
232 | 232 | * A grid can have its columns centered |
233 | 233 | */ |
234 | 234 | public function setCentered() { |
235 | - return $this->addToPropertyCtrl("class", "centered", array ("centered" )); |
|
235 | + return $this->addToPropertyCtrl("class", "centered", array("centered")); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | /** |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | */ |
251 | 251 | public function setPadded($value=NULL) { |
252 | 252 | if (isset($value)) |
253 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
253 | + $this->addToPropertyCtrl("class", $value, array("vertically", "horizontally")); |
|
254 | 254 | return $this->addToProperty("class", "padded"); |
255 | 255 | } |
256 | 256 | |
@@ -260,12 +260,12 @@ discard block |
||
260 | 260 | * @return \Ajax\semantic\html\collections\HtmlGrid |
261 | 261 | */ |
262 | 262 | public function setRelaxed($very=false) { |
263 | - $value=($very === true) ? "very relaxed" : "relaxed"; |
|
264 | - return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" )); |
|
263 | + $value=($very===true) ? "very relaxed" : "relaxed"; |
|
264 | + return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed")); |
|
265 | 265 | } |
266 | 266 | |
267 | 267 | public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) { |
268 | - return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned")); |
|
268 | + return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned")); |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | /** |
@@ -275,9 +275,9 @@ discard block |
||
275 | 275 | * @see \Ajax\common\html\HtmlCollection::createItem() |
276 | 276 | */ |
277 | 277 | protected function createItem($value) { |
278 | - if ($this->_createCols === false) |
|
278 | + if ($this->_createCols===false) |
|
279 | 279 | $value=null; |
280 | - $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
|
280 | + $item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows); |
|
281 | 281 | return $item; |
282 | 282 | } |
283 | 283 | |
@@ -288,15 +288,15 @@ discard block |
||
288 | 288 | public function setValues($values, $force=true) { |
289 | 289 | $count=$this->count(); |
290 | 290 | $valuesSize=\sizeof($values); |
291 | - if ($this->_createCols === false || $force === true) { |
|
292 | - for($i=$count; $i < $valuesSize; $i++) { |
|
291 | + if ($this->_createCols===false || $force===true) { |
|
292 | + for ($i=$count; $i<$valuesSize; $i++) { |
|
293 | 293 | $colSize=\sizeof($values[$i]); |
294 | - $this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
294 | + $this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
295 | 295 | } |
296 | 296 | } |
297 | - $count=\min(array ($this->count(),$valuesSize )); |
|
298 | - for($i=0; $i < $count; $i++) { |
|
299 | - $this->content[$i]->setValues($values[$i], $this->_createCols === false); |
|
297 | + $count=\min(array($this->count(), $valuesSize)); |
|
298 | + for ($i=0; $i<$count; $i++) { |
|
299 | + $this->content[$i]->setValues($values[$i], $this->_createCols===false); |
|
300 | 300 | } |
301 | 301 | } |
302 | 302 |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | */ |
20 | 20 | class HtmlForm extends HtmlSemCollection { |
21 | 21 | |
22 | - use FieldsTrait,FormTrait; |
|
22 | + use FieldsTrait, FormTrait; |
|
23 | 23 | /** |
24 | 24 | * @var array |
25 | 25 | */ |
@@ -32,13 +32,13 @@ discard block |
||
32 | 32 | |
33 | 33 | public function __construct($identifier, $elements=array()) { |
34 | 34 | parent::__construct($identifier, "form", "ui form"); |
35 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
35 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
36 | 36 | $this->setProperty("name", $this->identifier); |
37 | - $this->_fields=array (); |
|
37 | + $this->_fields=array(); |
|
38 | 38 | $this->addItems($elements); |
39 | 39 | } |
40 | 40 | |
41 | - protected function getForm(){ |
|
41 | + protected function getForm() { |
|
42 | 42 | return $this; |
43 | 43 | } |
44 | 44 | |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | * @param string $caption |
60 | 60 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
61 | 61 | */ |
62 | - public function addDivider($caption=NULL){ |
|
63 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
62 | + public function addDivider($caption=NULL) { |
|
63 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | public function addFields($fields=NULL, $label=NULL) { |
@@ -76,12 +76,12 @@ discard block |
||
76 | 76 | $label=NULL; |
77 | 77 | } |
78 | 78 | $this->_fields=\array_merge($this->_fields, $fields); |
79 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
79 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
80 | 80 | } |
81 | 81 | if (isset($label)) |
82 | 82 | $fields=new HtmlFormField("", $fields, $label); |
83 | 83 | } else { |
84 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
84 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
85 | 85 | } |
86 | 86 | $this->addItem($fields); |
87 | 87 | return $fields; |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | public function addItem($item) { |
91 | 91 | $item=parent::addItem($item); |
92 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
92 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
93 | 93 | $this->_fields[]=$item; |
94 | 94 | } |
95 | 95 | return $item; |
@@ -143,35 +143,35 @@ discard block |
||
143 | 143 | |
144 | 144 | |
145 | 145 | |
146 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
147 | - if(\sizeof($this->_validationParams)>0) |
|
146 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
147 | + if (\sizeof($this->_validationParams)>0) |
|
148 | 148 | $this->setProperty("novalidate", ""); |
149 | - return parent::compile($js,$view); |
|
149 | + return parent::compile($js, $view); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | public function run(JsUtils $js) { |
153 | 153 | $compo=NULL; |
154 | - foreach ($this->_fields as $field){ |
|
155 | - if($field instanceof HtmlFormField) |
|
154 | + foreach ($this->_fields as $field) { |
|
155 | + if ($field instanceof HtmlFormField) |
|
156 | 156 | $compo=$this->addCompoValidation($js, $compo, $field); |
157 | 157 | } |
158 | - foreach ($this->content as $field){ |
|
159 | - if($field instanceof HtmlFormFields){ |
|
158 | + foreach ($this->content as $field) { |
|
159 | + if ($field instanceof HtmlFormFields) { |
|
160 | 160 | $items=$field->getItems(); |
161 | - foreach ($items as $_field){ |
|
162 | - if($_field instanceof HtmlFormField) |
|
161 | + foreach ($items as $_field) { |
|
162 | + if ($_field instanceof HtmlFormField) |
|
163 | 163 | $compo=$this->addCompoValidation($js, $compo, $_field); |
164 | 164 | } |
165 | 165 | } |
166 | 166 | } |
167 | - if(isset($compo)===false){ |
|
167 | + if (isset($compo)===false) { |
|
168 | 168 | return parent::run($js); |
169 | 169 | } |
170 | - $this->_runValidationParams($compo,$js); |
|
170 | + $this->_runValidationParams($compo, $js); |
|
171 | 171 | return $this->_bsComponent; |
172 | 172 | } |
173 | 173 | |
174 | - public function addValidationParam($paramName,$paramValue){ |
|
174 | + public function addValidationParam($paramName, $paramValue) { |
|
175 | 175 | $this->_validationParams[$paramName]=$paramValue; |
176 | 176 | return $this; |
177 | 177 | } |
@@ -6,18 +6,18 @@ discard block |
||
6 | 6 | use Ajax\service\AjaxCall; |
7 | 7 | use Ajax\JsUtils; |
8 | 8 | |
9 | -trait FormTrait{ |
|
9 | +trait FormTrait { |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * @return HtmlForm |
13 | 13 | */ |
14 | 14 | abstract protected function getForm(); |
15 | 15 | |
16 | - protected function addCompoValidation($js,$compo,$field){ |
|
16 | + protected function addCompoValidation($js, $compo, $field) { |
|
17 | 17 | $form=$this->getForm(); |
18 | 18 | $validation=$field->getValidation(); |
19 | - if(isset($validation)){ |
|
20 | - if(isset($compo)===false){ |
|
19 | + if (isset($validation)) { |
|
20 | + if (isset($compo)===false) { |
|
21 | 21 | $compo=$js->semantic()->form("#".$form->getIdentifier()); |
22 | 22 | } |
23 | 23 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
@@ -26,12 +26,12 @@ discard block |
||
26 | 26 | return $compo; |
27 | 27 | } |
28 | 28 | |
29 | - protected function _runValidationParams(&$compo,JsUtils $js=NULL){ |
|
29 | + protected function _runValidationParams(&$compo, JsUtils $js=NULL) { |
|
30 | 30 | $form=$this->getForm(); |
31 | 31 | $params=$form->getValidationParams(); |
32 | - if(isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall){ |
|
32 | + if (isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall) { |
|
33 | 33 | $compilation=$params["_ajaxSubmit"]->compile($js); |
34 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
34 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
35 | 35 | $this->onSuccess($compilation); |
36 | 36 | unset($params["_ajaxSubmit"]); |
37 | 37 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | return $this->getForm()->addToProperty("class", "loading"); |
45 | 45 | } |
46 | 46 | |
47 | - public function addErrorMessage(){ |
|
47 | + public function addErrorMessage() { |
|
48 | 48 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
49 | 49 | } |
50 | 50 | |
@@ -59,35 +59,35 @@ discard block |
||
59 | 59 | * @param string $responseElement |
60 | 60 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
61 | 61 | */ |
62 | - public function submitOn($event,$identifier,$url,$responseElement){ |
|
62 | + public function submitOn($event, $identifier, $url, $responseElement) { |
|
63 | 63 | $form=$this->getForm(); |
64 | 64 | $elem=$form->getElementById($identifier, $form->getContent()); |
65 | - if(isset($elem)){ |
|
66 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement); |
|
65 | + if (isset($elem)) { |
|
66 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement); |
|
67 | 67 | } |
68 | 68 | return $form; |
69 | 69 | } |
70 | 70 | |
71 | - public function submitOnClick($identifier,$url,$responseElement){ |
|
71 | + public function submitOnClick($identifier, $url, $responseElement) { |
|
72 | 72 | return $this->submitOn("click", $identifier, $url, $responseElement); |
73 | 73 | } |
74 | 74 | |
75 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
76 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
77 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement); |
|
75 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
76 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
77 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement); |
|
78 | 78 | } |
79 | 79 | |
80 | - protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL){ |
|
80 | + protected function _buttonAsSubmit(&$button, $event, $url, $responseElement=NULL) { |
|
81 | 81 | $form=$this->getForm(); |
82 | - if(isset($url) && isset($responseElement)){ |
|
82 | + if (isset($url) && isset($responseElement)) { |
|
83 | 83 | $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');"); |
84 | - $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url])); |
|
84 | + $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url])); |
|
85 | 85 | } |
86 | 86 | return $button; |
87 | 87 | } |
88 | 88 | |
89 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
90 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
89 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
90 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
91 | 91 | $bt->setProperty("type", "reset"); |
92 | 92 | return $bt; |
93 | 93 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param string $jsCode |
98 | 98 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
99 | 99 | */ |
100 | - public function onValid($jsCode){ |
|
100 | + public function onValid($jsCode) { |
|
101 | 101 | $form=$this->getForm(); |
102 | 102 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
103 | 103 | return $form; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @param string $jsCode can use event and fields parameters |
109 | 109 | * @return HtmlForm |
110 | 110 | */ |
111 | - public function onSuccess($jsCode){ |
|
111 | + public function onSuccess($jsCode) { |
|
112 | 112 | $form=$this->getForm(); |
113 | 113 | $form->addValidationParam("onSuccess", "%function(evt,fields){".$jsCode."}%"); |
114 | 114 | return $form; |
@@ -18,48 +18,48 @@ discard block |
||
18 | 18 | * @property FormInstanceViewer $_instanceViewer |
19 | 19 | */ |
20 | 20 | class DataForm extends Widget { |
21 | - use FormFieldAsTrait,FormTrait; |
|
21 | + use FormFieldAsTrait, FormTrait; |
|
22 | 22 | |
23 | 23 | public function __construct($identifier, $modelInstance=NULL) { |
24 | - parent::__construct($identifier, null,$modelInstance); |
|
24 | + parent::__construct($identifier, null, $modelInstance); |
|
25 | 25 | $this->_init(new FormInstanceViewer($identifier), "form", new HtmlForm($identifier), true); |
26 | 26 | } |
27 | 27 | |
28 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
28 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
29 | 29 | $this->_instanceViewer->setInstance($this->_modelInstance); |
30 | 30 | |
31 | 31 | $form=$this->content["form"]; |
32 | 32 | $this->_generateContent($form); |
33 | 33 | |
34 | - if(isset($this->_toolbar)){ |
|
34 | + if (isset($this->_toolbar)) { |
|
35 | 35 | $this->_setToolbarPosition($form); |
36 | 36 | } |
37 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
38 | - return parent::compile($js,$view); |
|
37 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
38 | + return parent::compile($js, $view); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
42 | 42 | * @param HtmlForm $form |
43 | 43 | */ |
44 | - protected function _generateContent($form){ |
|
45 | - $values= $this->_instanceViewer->getValues(); |
|
44 | + protected function _generateContent($form) { |
|
45 | + $values=$this->_instanceViewer->getValues(); |
|
46 | 46 | $count=$this->_instanceViewer->count(); |
47 | 47 | |
48 | 48 | $separators=$this->_instanceViewer->getSeparators(); |
49 | 49 | $size=\sizeof($separators); |
50 | - if($size===1){ |
|
51 | - foreach ($values as $v){ |
|
50 | + if ($size===1) { |
|
51 | + foreach ($values as $v) { |
|
52 | 52 | $form->addField($v); |
53 | 53 | } |
54 | - }else{ |
|
54 | + } else { |
|
55 | 55 | $separators[]=$count; |
56 | - for($i=0;$i<$size;$i++){ |
|
57 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
56 | + for ($i=0; $i<$size; $i++) { |
|
57 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
58 | 58 | //TODO check why $fields is empty |
59 | - if(\sizeof($fields)===1){ |
|
59 | + if (\sizeof($fields)===1) { |
|
60 | 60 | $form->addField($fields[0]); |
61 | - }elseif(\sizeof($fields)>1){ |
|
62 | - $form->addFields($fields,"grouped"); |
|
61 | + }elseif (\sizeof($fields)>1) { |
|
62 | + $form->addFields($fields, "grouped"); |
|
63 | 63 | $i+=\sizeof($fields)-1; |
64 | 64 | } |
65 | 65 | } |
@@ -69,11 +69,11 @@ discard block |
||
69 | 69 | /** |
70 | 70 | * @return HtmlForm |
71 | 71 | */ |
72 | - protected function getForm(){ |
|
72 | + protected function getForm() { |
|
73 | 73 | return $this->content["form"]; |
74 | 74 | } |
75 | 75 | |
76 | - public function addSeparatorAfter($fieldNum){ |
|
76 | + public function addSeparatorAfter($fieldNum) { |
|
77 | 77 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
78 | 78 | return $this; |
79 | 79 | } |
@@ -87,26 +87,26 @@ discard block |
||
87 | 87 | return $this; |
88 | 88 | } |
89 | 89 | |
90 | - public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
91 | - $button=new HtmlButton($identifier,$value,$cssStyle); |
|
92 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement); |
|
90 | + public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
91 | + $button=new HtmlButton($identifier, $value, $cssStyle); |
|
92 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement); |
|
93 | 93 | return $this->addInToolbar($button); |
94 | 94 | } |
95 | 95 | |
96 | - public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){ |
|
97 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle){ |
|
98 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
99 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement); |
|
96 | + public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) { |
|
97 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle){ |
|
98 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
99 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement); |
|
100 | 100 | return $button; |
101 | - }, $index,$attributes); |
|
101 | + }, $index, $attributes); |
|
102 | 102 | } |
103 | 103 | |
104 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
105 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
106 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
104 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
105 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
106 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
107 | 107 | $button->setProperty("type", "reset"); |
108 | 108 | return $button; |
109 | - }, $index,$attributes); |
|
109 | + }, $index, $attributes); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |