@@ -31,11 +31,11 @@ |
||
31 | 31 | return $this->getHtmlCk()->attachEvents($events); |
32 | 32 | } |
33 | 33 | |
34 | - public function getField(){ |
|
34 | + public function getField() { |
|
35 | 35 | return $this->content["field"]->getField(); |
36 | 36 | } |
37 | 37 | |
38 | - public function getHtmlCk(){ |
|
38 | + public function getHtmlCk() { |
|
39 | 39 | return $this->content["field"]; |
40 | 40 | } |
41 | 41 |
@@ -32,9 +32,9 @@ 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->_validationParams=[]; |
39 | 39 | $this->addItems($elements); |
40 | 40 | } |
@@ -56,14 +56,14 @@ discard block |
||
56 | 56 | * @param string $caption |
57 | 57 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
58 | 58 | */ |
59 | - public function addDivider($caption=NULL){ |
|
60 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
59 | + public function addDivider($caption=NULL) { |
|
60 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | public function addFields($fields=NULL, $label=NULL) { |
64 | 64 | if (isset($fields)) { |
65 | 65 | if (!$fields instanceof HtmlFormFields) { |
66 | - if (\is_array($fields) === false) { |
|
66 | + if (\is_array($fields)===false) { |
|
67 | 67 | $fields=\func_get_args(); |
68 | 68 | $end=\end($fields); |
69 | 69 | if (\is_string($end)) { |
@@ -73,12 +73,12 @@ discard block |
||
73 | 73 | $label=NULL; |
74 | 74 | } |
75 | 75 | $this->_fields=\array_merge($this->_fields, $fields); |
76 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
76 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
77 | 77 | } |
78 | 78 | if (isset($label)) |
79 | 79 | $fields=new HtmlFormField("", $fields, $label); |
80 | 80 | } else { |
81 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
81 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
82 | 82 | } |
83 | 83 | $this->addItem($fields); |
84 | 84 | return $fields; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | |
87 | 87 | public function addItem($item) { |
88 | 88 | $item=parent::addItem($item); |
89 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
89 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
90 | 90 | $this->_fields[]=$item; |
91 | 91 | } |
92 | 92 | return $item; |
@@ -118,17 +118,17 @@ discard block |
||
118 | 118 | return $this->addItem($field); |
119 | 119 | } |
120 | 120 | |
121 | - public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){ |
|
121 | + public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) { |
|
122 | 122 | $field=$this->getItem($index); |
123 | - if(isset($field)){ |
|
124 | - $field->addRule($type,$prompt,$value); |
|
123 | + if (isset($field)) { |
|
124 | + $field->addRule($type, $prompt, $value); |
|
125 | 125 | } |
126 | 126 | return $this; |
127 | 127 | } |
128 | 128 | |
129 | - public function addFieldRules($index,$rules){ |
|
129 | + public function addFieldRules($index, $rules) { |
|
130 | 130 | $field=$this->getItem($index); |
131 | - if(isset($field)){ |
|
131 | + if (isset($field)) { |
|
132 | 132 | $field->addRules($rules); |
133 | 133 | } |
134 | 134 | return $this; |
@@ -154,10 +154,10 @@ discard block |
||
154 | 154 | return $this->addItem($message); |
155 | 155 | } |
156 | 156 | |
157 | - private function addCompoValidation($js,$compo,$field){ |
|
157 | + private function addCompoValidation($js, $compo, $field) { |
|
158 | 158 | $validation=$field->getValidation(); |
159 | - if(isset($validation)){ |
|
160 | - if(isset($compo)===false){ |
|
159 | + if (isset($validation)) { |
|
160 | + if (isset($compo)===false) { |
|
161 | 161 | $compo=$js->semantic()->form("#".$this->identifier); |
162 | 162 | } |
163 | 163 | $validation->setIdentifier($field->getField()->getIdentifier()); |
@@ -168,26 +168,26 @@ discard block |
||
168 | 168 | |
169 | 169 | public function run(JsUtils $js) { |
170 | 170 | $compo=NULL; |
171 | - foreach ($this->_fields as $field){ |
|
172 | - if($field instanceof HtmlFormField) |
|
171 | + foreach ($this->_fields as $field) { |
|
172 | + if ($field instanceof HtmlFormField) |
|
173 | 173 | $compo=$this->addCompoValidation($js, $compo, $field); |
174 | 174 | } |
175 | - foreach ($this->content as $field){ |
|
176 | - if($field instanceof HtmlFormFields){ |
|
175 | + foreach ($this->content as $field) { |
|
176 | + if ($field instanceof HtmlFormFields) { |
|
177 | 177 | $items=$field->getItems(); |
178 | - foreach ($items as $_field){ |
|
179 | - if($_field instanceof HtmlFormField) |
|
178 | + foreach ($items as $_field) { |
|
179 | + if ($_field instanceof HtmlFormField) |
|
180 | 180 | $compo=$this->addCompoValidation($js, $compo, $_field); |
181 | 181 | } |
182 | 182 | } |
183 | 183 | } |
184 | - if(isset($compo)===false){ |
|
184 | + if (isset($compo)===false) { |
|
185 | 185 | return parent::run($js); |
186 | 186 | } |
187 | - if(isset($this->_validationParams["_ajaxSubmit"])){ |
|
188 | - if($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){ |
|
187 | + if (isset($this->_validationParams["_ajaxSubmit"])) { |
|
188 | + if ($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall) { |
|
189 | 189 | $compilation=$this->_validationParams["_ajaxSubmit"]->compile($js); |
190 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
190 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
191 | 191 | $this->onSuccess($compilation); |
192 | 192 | unset($this->_validationParams["_ajaxSubmit"]); |
193 | 193 | } |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | return $this->addToProperty("class", "loading"); |
203 | 203 | } |
204 | 204 | |
205 | - public function addErrorMessage(){ |
|
205 | + public function addErrorMessage() { |
|
206 | 206 | return $this->addContent((new HtmlMessage(""))->setError()); |
207 | 207 | } |
208 | 208 | |
@@ -215,22 +215,22 @@ discard block |
||
215 | 215 | return $this; |
216 | 216 | } |
217 | 217 | |
218 | - public function submitOn($event,$identifier,$url,$responseElement){ |
|
218 | + public function submitOn($event, $identifier, $url, $responseElement) { |
|
219 | 219 | $elem=$this->getElementById($identifier, $this->content); |
220 | - if(isset($elem)){ |
|
220 | + if (isset($elem)) { |
|
221 | 221 | $elem->addEvent($event, "$('#".$this->identifier."').form('validate form');"); |
222 | - $this->_validationParams["_ajaxSubmit"]=new AjaxCall("postForm", ["form"=>$this->identifier,"responseElement"=>$responseElement,"url"=>$url]); |
|
222 | + $this->_validationParams["_ajaxSubmit"]=new AjaxCall("postForm", ["form"=>$this->identifier, "responseElement"=>$responseElement, "url"=>$url]); |
|
223 | 223 | } |
224 | 224 | return $this; |
225 | 225 | } |
226 | 226 | |
227 | - public function submitOnClick($identifier,$url,$responseElement){ |
|
227 | + public function submitOnClick($identifier, $url, $responseElement) { |
|
228 | 228 | return $this->submitOn("click", $identifier, $url, $responseElement); |
229 | 229 | } |
230 | 230 | |
231 | - public function addSubmit($identifier,$value,$CssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
232 | - $bt=$this->addButton($identifier, $value,$CssStyle); |
|
233 | - if(isset($url) && isset($responseElement)) |
|
231 | + public function addSubmit($identifier, $value, $CssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
232 | + $bt=$this->addButton($identifier, $value, $CssStyle); |
|
233 | + if (isset($url) && isset($responseElement)) |
|
234 | 234 | $this->submitOnClick($identifier, $url, $responseElement); |
235 | 235 | return $bt; |
236 | 236 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | * @param string $jsCode |
241 | 241 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
242 | 242 | */ |
243 | - public function onValid($jsCode){ |
|
243 | + public function onValid($jsCode) { |
|
244 | 244 | $this->_validationParams["onValid"]="%function(){".$jsCode."}%"; |
245 | 245 | return $this; |
246 | 246 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | * @param string $jsCode can use event and fields parameters |
251 | 251 | * @return HtmlForm |
252 | 252 | */ |
253 | - public function onSuccess($jsCode){ |
|
253 | + public function onSuccess($jsCode) { |
|
254 | 254 | $this->_validationParams["onSuccess"]="%function(evt,fields){".$jsCode."}%"; |
255 | 255 | return $this; |
256 | 256 | } |
@@ -47,8 +47,9 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function addHeader($title, $niveau=1, $dividing=true) { |
49 | 49 | $header=new HtmlHeader("", $niveau, $title); |
50 | - if ($dividing) |
|
51 | - $header->setDividing(); |
|
50 | + if ($dividing) { |
|
51 | + $header->setDividing(); |
|
52 | + } |
|
52 | 53 | return $this->addItem($header); |
53 | 54 | } |
54 | 55 | |
@@ -69,14 +70,16 @@ discard block |
||
69 | 70 | if (\is_string($end)) { |
70 | 71 | $label=$end; |
71 | 72 | \array_pop($fields); |
72 | - } else |
|
73 | - $label=NULL; |
|
73 | + } else { |
|
74 | + $label=NULL; |
|
75 | + } |
|
74 | 76 | } |
75 | 77 | $this->_fields=\array_merge($this->_fields, $fields); |
76 | 78 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
77 | 79 | } |
78 | - if (isset($label)) |
|
79 | - $fields=new HtmlFormField("", $fields, $label); |
|
80 | + if (isset($label)) { |
|
81 | + $fields=new HtmlFormField("", $fields, $label); |
|
82 | + } |
|
80 | 83 | } else { |
81 | 84 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
82 | 85 | } |
@@ -145,12 +148,15 @@ discard block |
||
145 | 148 | */ |
146 | 149 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
147 | 150 | $message=new HtmlMessage($identifier, $content); |
148 | - if (isset($header)) |
|
149 | - $message->addHeader($header); |
|
150 | - if (isset($icon)) |
|
151 | - $message->setIcon($icon); |
|
152 | - if (isset($type)) |
|
153 | - $message->setStyle($type); |
|
151 | + if (isset($header)) { |
|
152 | + $message->addHeader($header); |
|
153 | + } |
|
154 | + if (isset($icon)) { |
|
155 | + $message->setIcon($icon); |
|
156 | + } |
|
157 | + if (isset($type)) { |
|
158 | + $message->setStyle($type); |
|
159 | + } |
|
154 | 160 | return $this->addItem($message); |
155 | 161 | } |
156 | 162 | |
@@ -169,15 +175,17 @@ discard block |
||
169 | 175 | public function run(JsUtils $js) { |
170 | 176 | $compo=NULL; |
171 | 177 | foreach ($this->_fields as $field){ |
172 | - if($field instanceof HtmlFormField) |
|
173 | - $compo=$this->addCompoValidation($js, $compo, $field); |
|
178 | + if($field instanceof HtmlFormField) { |
|
179 | + $compo=$this->addCompoValidation($js, $compo, $field); |
|
180 | + } |
|
174 | 181 | } |
175 | 182 | foreach ($this->content as $field){ |
176 | 183 | if($field instanceof HtmlFormFields){ |
177 | 184 | $items=$field->getItems(); |
178 | 185 | foreach ($items as $_field){ |
179 | - if($_field instanceof HtmlFormField) |
|
180 | - $compo=$this->addCompoValidation($js, $compo, $_field); |
|
186 | + if($_field instanceof HtmlFormField) { |
|
187 | + $compo=$this->addCompoValidation($js, $compo, $_field); |
|
188 | + } |
|
181 | 189 | } |
182 | 190 | } |
183 | 191 | } |
@@ -230,8 +238,9 @@ discard block |
||
230 | 238 | |
231 | 239 | public function addSubmit($identifier,$value,$CssStyle=NULL,$url=NULL,$responseElement=NULL){ |
232 | 240 | $bt=$this->addButton($identifier, $value,$CssStyle); |
233 | - if(isset($url) && isset($responseElement)) |
|
234 | - $this->submitOnClick($identifier, $url, $responseElement); |
|
241 | + if(isset($url) && isset($responseElement)) { |
|
242 | + $this->submitOnClick($identifier, $url, $responseElement); |
|
243 | + } |
|
235 | 244 | return $bt; |
236 | 245 | } |
237 | 246 |
@@ -6,6 +6,9 @@ |
||
6 | 6 | |
7 | 7 | trait CheckboxTrait { |
8 | 8 | |
9 | + /** |
|
10 | + * @param string $name |
|
11 | + */ |
|
9 | 12 | public abstract function addToPropertyCtrl($name, $value, $typeCtrl); |
10 | 13 | |
11 | 14 | public function setType($checkboxType) { |
@@ -11,51 +11,51 @@ |
||
11 | 11 | |
12 | 12 | public abstract function addToProperty($name, $value, $separator=" "); |
13 | 13 | public abstract function addLabel($caption, $style="label-default", $leftSeparator=" "); |
14 | - public abstract function addContent($content,$before=false); |
|
14 | + public abstract function addContent($content, $before=false); |
|
15 | 15 | public function setFocus() { |
16 | 16 | $this->addToProperty("class", State::FOCUS); |
17 | 17 | } |
18 | 18 | |
19 | 19 | public function addLoading() { |
20 | - if ($this->_hasIcon === false) { |
|
20 | + if ($this->_hasIcon===false) { |
|
21 | 21 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
22 | 22 | } |
23 | 23 | return $this->addToProperty("class", State::LOADING); |
24 | 24 | } |
25 | 25 | |
26 | 26 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
27 | - $labelO=$this->addLabel($label,$direction===Direction::LEFT,$icon); |
|
28 | - $this->addToProperty("class", $direction . " labeled"); |
|
27 | + $labelO=$this->addLabel($label, $direction===Direction::LEFT, $icon); |
|
28 | + $this->addToProperty("class", $direction." labeled"); |
|
29 | 29 | return $labelO; |
30 | 30 | } |
31 | 31 | |
32 | 32 | public function labeledToCorner($icon, $direction=Direction::LEFT) { |
33 | - return $this->labeled("", $direction . " corner", $icon)->toCorner($direction); |
|
33 | + return $this->labeled("", $direction." corner", $icon)->toCorner($direction); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
37 | 37 | $actionO=$action; |
38 | - if (\is_object($action) === false) { |
|
39 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
38 | + if (\is_object($action)===false) { |
|
39 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
40 | 40 | if (isset($icon)) |
41 | 41 | $actionO->addIcon($icon, true, $labeled); |
42 | 42 | } |
43 | - $this->addToProperty("class", $direction . " action"); |
|
44 | - $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
43 | + $this->addToProperty("class", $direction." action"); |
|
44 | + $this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
45 | 45 | return $actionO; |
46 | 46 | } |
47 | 47 | |
48 | - public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){ |
|
49 | - $labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items); |
|
50 | - $labelO->asSelect("select-".$this->identifier,false,true); |
|
51 | - return $this->labeled($labelO,$direction); |
|
48 | + public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) { |
|
49 | + $labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items); |
|
50 | + $labelO->asSelect("select-".$this->identifier, false, true); |
|
51 | + return $this->labeled($labelO, $direction); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | public function setTransparent() { |
55 | 55 | return $this->addToProperty("class", "transparent"); |
56 | 56 | } |
57 | 57 | |
58 | - public function setReadonly(){ |
|
58 | + public function setReadonly() { |
|
59 | 59 | $this->getField()->setProperty("readonly", ""); |
60 | 60 | } |
61 | 61 |
@@ -44,8 +44,9 @@ |
||
44 | 44 | $actionO=$action; |
45 | 45 | if (\is_object($action) === false) { |
46 | 46 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
47 | - if (isset($icon)) |
|
48 | - $actionO->addIcon($icon, true, $labeled); |
|
47 | + if (isset($icon)) { |
|
48 | + $actionO->addIcon($icon, true, $labeled); |
|
49 | + } |
|
49 | 50 | } |
50 | 51 | $this->addToProperty("class", $direction . " action"); |
51 | 52 | $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -5,12 +5,12 @@ |
||
5 | 5 | trait TextFieldsTrait { |
6 | 6 | |
7 | 7 | public abstract function getField(); |
8 | - public function setPlaceholder($value){ |
|
8 | + public function setPlaceholder($value) { |
|
9 | 9 | $this->getField()->setPlaceholder($value); |
10 | 10 | return $this; |
11 | 11 | } |
12 | 12 | |
13 | - public function setValue($value){ |
|
13 | + public function setValue($value) { |
|
14 | 14 | $this->getField()->setValue($value); |
15 | 15 | return $this; |
16 | 16 | } |
@@ -9,13 +9,13 @@ |
||
9 | 9 | use Ajax\semantic\html\collections\form\traits\FieldTrait; |
10 | 10 | |
11 | 11 | class HtmlInput extends HtmlSemDoubleElement { |
12 | - use IconTrait,TextFieldsTrait,FieldTrait; |
|
12 | + use IconTrait, TextFieldsTrait, FieldTrait; |
|
13 | 13 | |
14 | 14 | public function __construct($identifier, $type="text", $value="", $placeholder="") { |
15 | - parent::__construct("div-" . $identifier, "div", "ui input"); |
|
16 | - $this->content=[ "field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder) ]; |
|
17 | - $this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ]; |
|
18 | - $this->_variations=[ Variation::TRANSPARENT ]; |
|
15 | + parent::__construct("div-".$identifier, "div", "ui input"); |
|
16 | + $this->content=["field" => new \Ajax\common\html\html5\HtmlInput($identifier, $type, $value, $placeholder)]; |
|
17 | + $this->_states=[State::DISABLED, State::FOCUS, State::ERROR]; |
|
18 | + $this->_variations=[Variation::TRANSPARENT]; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function getField() { |
@@ -7,17 +7,17 @@ |
||
7 | 7 | use Ajax\semantic\html\elements\HtmlInput; |
8 | 8 | |
9 | 9 | class HtmlFormInput extends HtmlFormField { |
10 | - use TextFieldsTrait,FieldTrait; |
|
10 | + use TextFieldsTrait, FieldTrait; |
|
11 | 11 | |
12 | - public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
|
13 | - if(!isset($placeholder) && $type==="text") |
|
12 | + public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
13 | + if (!isset($placeholder) && $type==="text") |
|
14 | 14 | $placeholder=$label; |
15 | - parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
|
15 | + parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label); |
|
16 | 16 | } |
17 | 17 | |
18 | - public function getDataField(){ |
|
19 | - $field= $this->getField(); |
|
20 | - if($field instanceof HtmlInput) |
|
18 | + public function getDataField() { |
|
19 | + $field=$this->getField(); |
|
20 | + if ($field instanceof HtmlInput) |
|
21 | 21 | $field=$field->getField(); |
22 | 22 | return $field; |
23 | 23 | } |
@@ -10,15 +10,17 @@ |
||
10 | 10 | use TextFieldsTrait,FieldTrait; |
11 | 11 | |
12 | 12 | public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
13 | - if(!isset($placeholder) && $type==="text") |
|
14 | - $placeholder=$label; |
|
13 | + if(!isset($placeholder) && $type==="text") { |
|
14 | + $placeholder=$label; |
|
15 | + } |
|
15 | 16 | parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
16 | 17 | } |
17 | 18 | |
18 | 19 | public function getDataField(){ |
19 | 20 | $field= $this->getField(); |
20 | - if($field instanceof HtmlInput) |
|
21 | - $field=$field->getField(); |
|
21 | + if($field instanceof HtmlInput) { |
|
22 | + $field=$field->getField(); |
|
23 | + } |
|
22 | 24 | return $field; |
23 | 25 | } |
24 | 26 | } |
25 | 27 | \ No newline at end of file |