@@ -8,16 +8,16 @@ |
||
8 | 8 | class HtmlFormInput extends HtmlFormField { |
9 | 9 | use TextFieldsTrait; |
10 | 10 | |
11 | - public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
|
12 | - if(!isset($placeholder) && $type==="text") |
|
11 | + public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
12 | + if (!isset($placeholder) && $type==="text") |
|
13 | 13 | $placeholder=$label; |
14 | - parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
|
14 | + parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label); |
|
15 | 15 | } |
16 | 16 | |
17 | - public function getDataField(){ |
|
18 | - $field= $this->getField(); |
|
17 | + public function getDataField() { |
|
18 | + $field=$this->getField(); |
|
19 | 19 | //TODO check getField |
20 | - if($field instanceof HtmlInput) |
|
20 | + if ($field instanceof HtmlInput) |
|
21 | 21 | $field=$field->getDataField(); |
22 | 22 | return $field; |
23 | 23 | } |
@@ -9,16 +9,18 @@ |
||
9 | 9 | use TextFieldsTrait; |
10 | 10 | |
11 | 11 | public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
12 | - if(!isset($placeholder) && $type==="text") |
|
13 | - $placeholder=$label; |
|
12 | + if(!isset($placeholder) && $type==="text") { |
|
13 | + $placeholder=$label; |
|
14 | + } |
|
14 | 15 | parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
15 | 16 | } |
16 | 17 | |
17 | 18 | public function getDataField(){ |
18 | 19 | $field= $this->getField(); |
19 | 20 | //TODO check getField |
20 | - if($field instanceof HtmlInput) |
|
21 | - $field=$field->getDataField(); |
|
21 | + if($field instanceof HtmlInput) { |
|
22 | + $field=$field->getDataField(); |
|
23 | + } |
|
22 | 24 | return $field; |
23 | 25 | } |
24 | 26 | } |
25 | 27 | \ No newline at end of file |
@@ -6,19 +6,19 @@ |
||
6 | 6 | |
7 | 7 | abstract public function getDataField(); |
8 | 8 | abstract public function addToProperty($name, $value, $separator=" "); |
9 | - public function setPlaceholder($value){ |
|
9 | + public function setPlaceholder($value) { |
|
10 | 10 | $this->getDataField()->setPlaceholder($value); |
11 | 11 | return $this; |
12 | 12 | } |
13 | 13 | |
14 | - public function setValue($value){ |
|
14 | + public function setValue($value) { |
|
15 | 15 | $this->getDataField()->setValue($value); |
16 | 16 | return $this; |
17 | 17 | } |
18 | 18 | |
19 | - public function setInputType($type){ |
|
20 | - if($type==="hidden") |
|
21 | - $this->addToProperty("style","display:none;"); |
|
19 | + public function setInputType($type) { |
|
20 | + if ($type==="hidden") |
|
21 | + $this->addToProperty("style", "display:none;"); |
|
22 | 22 | $this->getDataField()->setInputType($type); |
23 | 23 | return $this; |
24 | 24 | } |
@@ -17,8 +17,9 @@ |
||
17 | 17 | } |
18 | 18 | |
19 | 19 | public function setInputType($type){ |
20 | - if($type==="hidden") |
|
21 | - $this->addToProperty("style","display:none;"); |
|
20 | + if($type==="hidden") { |
|
21 | + $this->addToProperty("style","display:none;"); |
|
22 | + } |
|
22 | 23 | $this->getDataField()->setInputType($type); |
23 | 24 | return $this; |
24 | 25 | } |
@@ -31,38 +31,38 @@ discard block |
||
31 | 31 | * @param string|HtmlSemDoubleElement $header |
32 | 32 | * @return \Ajax\semantic\html\collections\HtmlMessage |
33 | 33 | */ |
34 | - public function addHeader($header){ |
|
34 | + public function addHeader($header) { |
|
35 | 35 | $headerO=$header; |
36 | - if(\is_string($header)){ |
|
37 | - $headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div"); |
|
36 | + if (\is_string($header)) { |
|
37 | + $headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div"); |
|
38 | 38 | $headerO->setClass("header"); |
39 | 39 | $headerO->setContent($header); |
40 | 40 | } |
41 | - return $this->addContent($headerO,true); |
|
41 | + return $this->addContent($headerO, true); |
|
42 | 42 | } |
43 | 43 | |
44 | - public function addList($elements,$ordered=false){ |
|
45 | - $list=new HtmlList("list-".$this->identifier,$elements); |
|
44 | + public function addList($elements, $ordered=false) { |
|
45 | + $list=new HtmlList("list-".$this->identifier, $elements); |
|
46 | 46 | $list->setOrdered($ordered); |
47 | 47 | $list->setClass("ui list"); |
48 | 48 | $this->addContent($list); |
49 | 49 | } |
50 | 50 | |
51 | - public function setIcon($icon){ |
|
51 | + public function setIcon($icon) { |
|
52 | 52 | $this->addToProperty("class", "icon"); |
53 | - $this->wrapContent("<div class='content'>","</div>"); |
|
53 | + $this->wrapContent("<div class='content'>", "</div>"); |
|
54 | 54 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
58 | - public function addLoader($loaderIcon="notched circle"){ |
|
58 | + public function addLoader($loaderIcon="notched circle") { |
|
59 | 59 | $this->setIcon($loaderIcon); |
60 | 60 | $this->icon->addToIcon("loading"); |
61 | 61 | return $this; |
62 | 62 | } |
63 | 63 | |
64 | - public function setDismissable($dismiss=true){ |
|
65 | - if($dismiss===true) |
|
64 | + public function setDismissable($dismiss=true) { |
|
65 | + if ($dismiss===true) |
|
66 | 66 | $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
67 | 67 | else |
68 | 68 | $this->close=NULL; |
@@ -73,34 +73,34 @@ discard block |
||
73 | 73 | * {@inheritDoc} |
74 | 74 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
75 | 75 | */ |
76 | - public function run(JsUtils $js){ |
|
76 | + public function run(JsUtils $js) { |
|
77 | 77 | parent::run($js); |
78 | - if(isset($this->close)){ |
|
78 | + if (isset($this->close)) { |
|
79 | 79 | $js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition('fade')"); |
80 | 80 | } |
81 | 81 | } |
82 | 82 | |
83 | - public function setState($visible=true){ |
|
84 | - $visible=($visible===true)?"visible":"hidden"; |
|
85 | - return $this->addToPropertyCtrl("class", $visible, array("visible","hidden")); |
|
83 | + public function setState($visible=true) { |
|
84 | + $visible=($visible===true) ? "visible" : "hidden"; |
|
85 | + return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden")); |
|
86 | 86 | } |
87 | 87 | |
88 | - public function setVariation($value="floating"){ |
|
89 | - return $this->addToPropertyCtrl("class", $value, array("floating","compact")); |
|
88 | + public function setVariation($value="floating") { |
|
89 | + return $this->addToPropertyCtrl("class", $value, array("floating", "compact")); |
|
90 | 90 | } |
91 | 91 | |
92 | - public function setStyle($style){ |
|
92 | + public function setStyle($style) { |
|
93 | 93 | return $this->addToPropertyCtrl("class", $style, Style::getConstants()); |
94 | 94 | } |
95 | 95 | |
96 | - public function setError(){ |
|
96 | + public function setError() { |
|
97 | 97 | return $this->setStyle("error"); |
98 | 98 | } |
99 | 99 | |
100 | - public function setMessage($message){ |
|
101 | - if(\is_array($this->content)){ |
|
100 | + public function setMessage($message) { |
|
101 | + if (\is_array($this->content)) { |
|
102 | 102 | $this->content[\sizeof($this->content)-1]=$message; |
103 | - }else |
|
103 | + } else |
|
104 | 104 | $this->setContent($message); |
105 | 105 | } |
106 | 106 | } |
107 | 107 | \ No newline at end of file |
@@ -62,10 +62,11 @@ discard block |
||
62 | 62 | } |
63 | 63 | |
64 | 64 | public function setDismissable($dismiss=true){ |
65 | - if($dismiss===true) |
|
66 | - $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
67 | - else |
|
68 | - $this->close=NULL; |
|
65 | + if($dismiss===true) { |
|
66 | + $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
67 | + } else { |
|
68 | + $this->close=NULL; |
|
69 | + } |
|
69 | 70 | return $this; |
70 | 71 | } |
71 | 72 | |
@@ -100,7 +101,8 @@ discard block |
||
100 | 101 | public function setMessage($message){ |
101 | 102 | if(\is_array($this->content)){ |
102 | 103 | $this->content[\sizeof($this->content)-1]=$message; |
103 | - }else |
|
104 | - $this->setContent($message); |
|
104 | + } else { |
|
105 | + $this->setContent($message); |
|
106 | + } |
|
105 | 107 | } |
106 | 108 | } |
107 | 109 | \ No newline at end of file |
@@ -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->_validationParams=[]; |
40 | 40 | $this->addItems($elements); |
41 | 41 | } |
42 | 42 | |
43 | - protected function getForm(){ |
|
43 | + protected function getForm() { |
|
44 | 44 | return $this; |
45 | 45 | } |
46 | 46 | |
@@ -61,14 +61,14 @@ 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) { |
69 | 69 | if (isset($fields)) { |
70 | 70 | if (!$fields instanceof HtmlFormFields) { |
71 | - if (\is_array($fields) === false) { |
|
71 | + if (\is_array($fields)===false) { |
|
72 | 72 | $fields=\func_get_args(); |
73 | 73 | $end=\end($fields); |
74 | 74 | if (\is_string($end)) { |
@@ -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; |
@@ -143,10 +143,10 @@ discard block |
||
143 | 143 | return $this->addItem($message); |
144 | 144 | } |
145 | 145 | |
146 | - private function addCompoValidation($js,$compo,$field){ |
|
146 | + private function addCompoValidation($js, $compo, $field) { |
|
147 | 147 | $validation=$field->getValidation(); |
148 | - if(isset($validation)){ |
|
149 | - if(isset($compo)===false){ |
|
148 | + if (isset($validation)) { |
|
149 | + if (isset($compo)===false) { |
|
150 | 150 | $compo=$js->semantic()->form("#".$this->identifier); |
151 | 151 | } |
152 | 152 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
@@ -155,34 +155,34 @@ discard block |
||
155 | 155 | return $compo; |
156 | 156 | } |
157 | 157 | |
158 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
159 | - if(\sizeof($this->_validationParams)>0) |
|
158 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
159 | + if (\sizeof($this->_validationParams)>0) |
|
160 | 160 | $this->setProperty("novalidate", ""); |
161 | - return parent::compile($js,$view); |
|
161 | + return parent::compile($js, $view); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | public function run(JsUtils $js) { |
165 | 165 | $compo=NULL; |
166 | - foreach ($this->_fields as $field){ |
|
167 | - if($field instanceof HtmlFormField) |
|
166 | + foreach ($this->_fields as $field) { |
|
167 | + if ($field instanceof HtmlFormField) |
|
168 | 168 | $compo=$this->addCompoValidation($js, $compo, $field); |
169 | 169 | } |
170 | - foreach ($this->content as $field){ |
|
171 | - if($field instanceof HtmlFormFields){ |
|
170 | + foreach ($this->content as $field) { |
|
171 | + if ($field instanceof HtmlFormFields) { |
|
172 | 172 | $items=$field->getItems(); |
173 | - foreach ($items as $_field){ |
|
174 | - if($_field instanceof HtmlFormField) |
|
173 | + foreach ($items as $_field) { |
|
174 | + if ($_field instanceof HtmlFormField) |
|
175 | 175 | $compo=$this->addCompoValidation($js, $compo, $_field); |
176 | 176 | } |
177 | 177 | } |
178 | 178 | } |
179 | - if(isset($compo)===false){ |
|
179 | + if (isset($compo)===false) { |
|
180 | 180 | return parent::run($js); |
181 | 181 | } |
182 | - if(isset($this->_validationParams["_ajaxSubmit"])){ |
|
183 | - if($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){ |
|
182 | + if (isset($this->_validationParams["_ajaxSubmit"])) { |
|
183 | + if ($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall) { |
|
184 | 184 | $compilation=$this->_validationParams["_ajaxSubmit"]->compile($js); |
185 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
185 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
186 | 186 | $this->onSuccess($compilation); |
187 | 187 | unset($this->_validationParams["_ajaxSubmit"]); |
188 | 188 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | return $this->_bsComponent; |
194 | 194 | } |
195 | 195 | |
196 | - public function addValidationParam($paramName,$paramValue){ |
|
196 | + public function addValidationParam($paramName, $paramValue) { |
|
197 | 197 | $this->_validationParams[$paramName]=$paramValue; |
198 | 198 | return $this; |
199 | 199 | } |
@@ -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,12 +137,15 @@ 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 | |
@@ -156,23 +162,26 @@ discard block |
||
156 | 162 | } |
157 | 163 | |
158 | 164 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
159 | - if(\sizeof($this->_validationParams)>0) |
|
160 | - $this->setProperty("novalidate", ""); |
|
165 | + if(\sizeof($this->_validationParams)>0) { |
|
166 | + $this->setProperty("novalidate", ""); |
|
167 | + } |
|
161 | 168 | return parent::compile($js,$view); |
162 | 169 | } |
163 | 170 | |
164 | 171 | public function run(JsUtils $js) { |
165 | 172 | $compo=NULL; |
166 | 173 | foreach ($this->_fields as $field){ |
167 | - if($field instanceof HtmlFormField) |
|
168 | - $compo=$this->addCompoValidation($js, $compo, $field); |
|
174 | + if($field instanceof HtmlFormField) { |
|
175 | + $compo=$this->addCompoValidation($js, $compo, $field); |
|
176 | + } |
|
169 | 177 | } |
170 | 178 | foreach ($this->content as $field){ |
171 | 179 | if($field instanceof HtmlFormFields){ |
172 | 180 | $items=$field->getItems(); |
173 | 181 | foreach ($items as $_field){ |
174 | - if($_field instanceof HtmlFormField) |
|
175 | - $compo=$this->addCompoValidation($js, $compo, $_field); |
|
182 | + if($_field instanceof HtmlFormField) { |
|
183 | + $compo=$this->addCompoValidation($js, $compo, $_field); |
|
184 | + } |
|
176 | 185 | } |
177 | 186 | } |
178 | 187 | } |
@@ -16,146 +16,146 @@ discard block |
||
16 | 16 | |
17 | 17 | public static $index=0; |
18 | 18 | |
19 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
19 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
20 | 20 | $this->widgetIdentifier=$identifier; |
21 | 21 | $this->values=[]; |
22 | 22 | $this->afterCompile=[]; |
23 | - if(isset($instance)) |
|
23 | + if (isset($instance)) |
|
24 | 24 | $this->setInstance($instance); |
25 | 25 | $this->setCaptions($captions); |
26 | 26 | $this->captionCallback=NULL; |
27 | 27 | } |
28 | 28 | |
29 | - public function getValues(){ |
|
29 | + public function getValues() { |
|
30 | 30 | $values=[]; |
31 | 31 | $index=0; |
32 | 32 | $count=$this->count(); |
33 | - while($index<$count){ |
|
33 | + while ($index<$count) { |
|
34 | 34 | $values[]=$this->getValue($index++); |
35 | 35 | } |
36 | 36 | return $values; |
37 | 37 | } |
38 | 38 | |
39 | - public function getIdentifier(){ |
|
39 | + public function getIdentifier() { |
|
40 | 40 | $value=self::$index; |
41 | - if(isset($this->values["identifier"])) |
|
42 | - $value=$this->values["identifier"](self::$index,$this->instance); |
|
41 | + if (isset($this->values["identifier"])) |
|
42 | + $value=$this->values["identifier"](self::$index, $this->instance); |
|
43 | 43 | return $value; |
44 | 44 | } |
45 | 45 | |
46 | - public function getValue($index){ |
|
46 | + public function getValue($index) { |
|
47 | 47 | $property=$this->properties[$index]; |
48 | 48 | return $this->_getValue($property, $index); |
49 | 49 | } |
50 | 50 | |
51 | - protected function _beforeAddProperty($index,&$field){ |
|
51 | + protected function _beforeAddProperty($index, &$field) { |
|
52 | 52 | |
53 | 53 | } |
54 | 54 | |
55 | - protected function _getDefaultValue($name,$value,$index){ |
|
55 | + protected function _getDefaultValue($name, $value, $index) { |
|
56 | 56 | return $value; |
57 | 57 | } |
58 | 58 | |
59 | - protected function _getValue($property,$index){ |
|
60 | - if($property instanceof \ReflectionProperty){ |
|
59 | + protected function _getValue($property, $index) { |
|
60 | + if ($property instanceof \ReflectionProperty) { |
|
61 | 61 | $property->setAccessible(true); |
62 | 62 | $value=$property->getValue($this->instance); |
63 | - if(isset($this->values[$index])){ |
|
64 | - $value= $this->values[$index]($value,$this->instance,$index); |
|
65 | - }else{ |
|
66 | - $value=$this->_getDefaultValue($property->getName(),$value, $index); |
|
63 | + if (isset($this->values[$index])) { |
|
64 | + $value=$this->values[$index]($value, $this->instance, $index); |
|
65 | + } else { |
|
66 | + $value=$this->_getDefaultValue($property->getName(), $value, $index); |
|
67 | 67 | } |
68 | - }else{ |
|
69 | - if(\is_callable($property)) |
|
68 | + } else { |
|
69 | + if (\is_callable($property)) |
|
70 | 70 | $value=$property($this->instance); |
71 | - elseif(\is_array($property)){ |
|
72 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
71 | + elseif (\is_array($property)) { |
|
72 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
73 | 73 | $value=\implode("", $values); |
74 | - }else{ |
|
75 | - if(isset($this->values[$index])){ |
|
76 | - $value= $this->values[$index]($property,$this->instance,$index); |
|
77 | - }else{ |
|
74 | + } else { |
|
75 | + if (isset($this->values[$index])) { |
|
76 | + $value=$this->values[$index]($property, $this->instance, $index); |
|
77 | + } else { |
|
78 | 78 | $value=$property; |
79 | 79 | } |
80 | 80 | } |
81 | 81 | } |
82 | - if(isset($this->afterCompile[$index])){ |
|
83 | - if(\is_callable($this->afterCompile[$index])){ |
|
84 | - $this->afterCompile[$index]($value,$this->instance,$index); |
|
82 | + if (isset($this->afterCompile[$index])) { |
|
83 | + if (\is_callable($this->afterCompile[$index])) { |
|
84 | + $this->afterCompile[$index]($value, $this->instance, $index); |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | return $value; |
88 | 88 | } |
89 | 89 | |
90 | - public function insertField($index,$field){ |
|
91 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
90 | + public function insertField($index, $field) { |
|
91 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
92 | 92 | return $this; |
93 | 93 | } |
94 | 94 | |
95 | - public function insertInField($index,$field){ |
|
95 | + public function insertInField($index, $field) { |
|
96 | 96 | $vb=$this->visibleProperties; |
97 | - if(isset($vb[$index])){ |
|
98 | - if(\is_array($vb[$index])){ |
|
97 | + if (isset($vb[$index])) { |
|
98 | + if (\is_array($vb[$index])) { |
|
99 | 99 | $this->visibleProperties[$index][]=$field; |
100 | - }else{ |
|
101 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
100 | + } else { |
|
101 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
102 | 102 | } |
103 | - }else{ |
|
103 | + } else { |
|
104 | 104 | return $this->insertField($index, $field); |
105 | 105 | } |
106 | 106 | return $this; |
107 | 107 | } |
108 | 108 | |
109 | - public function addField($field){ |
|
109 | + public function addField($field) { |
|
110 | 110 | $this->visibleProperties[]=$field; |
111 | 111 | return $this; |
112 | 112 | } |
113 | 113 | |
114 | - public function count(){ |
|
114 | + public function count() { |
|
115 | 115 | return \sizeof($this->properties); |
116 | 116 | } |
117 | 117 | |
118 | - public function visiblePropertiesCount(){ |
|
118 | + public function visiblePropertiesCount() { |
|
119 | 119 | return \sizeof($this->visibleProperties); |
120 | 120 | } |
121 | 121 | |
122 | - public function getProperty($index){ |
|
122 | + public function getProperty($index) { |
|
123 | 123 | return $this->properties[$index]; |
124 | 124 | } |
125 | 125 | |
126 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
127 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
126 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
127 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | public function setInstance($instance) { |
131 | - if(\is_string($instance)){ |
|
131 | + if (\is_string($instance)) { |
|
132 | 132 | $instance=new $instance(); |
133 | 133 | } |
134 | 134 | $this->instance=$instance; |
135 | 135 | $this->properties=[]; |
136 | 136 | $this->reflect=new \ReflectionClass($instance); |
137 | - if(\sizeof($this->visibleProperties)===0){ |
|
137 | + if (\sizeof($this->visibleProperties)===0) { |
|
138 | 138 | $this->properties=$this->getDefaultProperties(); |
139 | - }else{ |
|
140 | - foreach ($this->visibleProperties as $property){ |
|
141 | - if(\is_callable($property)){ |
|
139 | + } else { |
|
140 | + foreach ($this->visibleProperties as $property) { |
|
141 | + if (\is_callable($property)) { |
|
142 | 142 | $this->properties[]=$property; |
143 | - }elseif(\is_string($property)){ |
|
144 | - try{ |
|
143 | + }elseif (\is_string($property)) { |
|
144 | + try { |
|
145 | 145 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
146 | 146 | $rProperty=$this->reflect->getProperty($property); |
147 | 147 | $this->properties[]=$rProperty; |
148 | - }catch(\Exception $e){ |
|
148 | + }catch (\Exception $e) { |
|
149 | 149 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
150 | 150 | $this->properties[]=$property; |
151 | 151 | } |
152 | - }elseif(\is_int($property)){ |
|
152 | + }elseif (\is_int($property)) { |
|
153 | 153 | $props=$this->getDefaultProperties(); |
154 | - if(isset($props[$property])) |
|
154 | + if (isset($props[$property])) |
|
155 | 155 | $this->properties[]=$props[$property]; |
156 | 156 | else |
157 | 157 | $this->properties[]=$property; |
158 | - }else{ |
|
158 | + } else { |
|
159 | 159 | $this->properties[]=$property; |
160 | 160 | } |
161 | 161 | } |
@@ -163,12 +163,12 @@ discard block |
||
163 | 163 | return $this; |
164 | 164 | } |
165 | 165 | |
166 | - protected function getDefaultProperties(){ |
|
166 | + protected function getDefaultProperties() { |
|
167 | 167 | $result=[]; |
168 | 168 | $properties=$this->reflect->getProperties(); |
169 | - foreach ($properties as $property){ |
|
169 | + foreach ($properties as $property) { |
|
170 | 170 | $showable=$this->showableProperty($property); |
171 | - if($showable!==false){ |
|
171 | + if ($showable!==false) { |
|
172 | 172 | $result[]=$property; |
173 | 173 | } |
174 | 174 | } |
@@ -180,12 +180,12 @@ discard block |
||
180 | 180 | return $this; |
181 | 181 | } |
182 | 182 | |
183 | - public function setValueFunction($index,$callback){ |
|
183 | + public function setValueFunction($index, $callback) { |
|
184 | 184 | $this->values[$index]=$callback; |
185 | 185 | return $this; |
186 | 186 | } |
187 | 187 | |
188 | - public function setIdentifierFunction($callback){ |
|
188 | + public function setIdentifierFunction($callback) { |
|
189 | 189 | $this->values["identifier"]=$callback; |
190 | 190 | return $this; |
191 | 191 | } |
@@ -198,41 +198,41 @@ discard block |
||
198 | 198 | return $this->properties; |
199 | 199 | } |
200 | 200 | |
201 | - public function getCaption($index){ |
|
202 | - if(isset($this->captions[$index])){ |
|
201 | + public function getCaption($index) { |
|
202 | + if (isset($this->captions[$index])) { |
|
203 | 203 | return $this->captions[$index]; |
204 | 204 | } |
205 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
205 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
206 | 206 | return $this->properties[$index]->getName(); |
207 | - elseif(\is_callable($this->properties[$index])) |
|
207 | + elseif (\is_callable($this->properties[$index])) |
|
208 | 208 | return ""; |
209 | 209 | else |
210 | 210 | return $this->properties[$index]; |
211 | 211 | } |
212 | 212 | |
213 | - public function getCaptions(){ |
|
214 | - if(isset($this->captions)){ |
|
215 | - $captions= $this->captions; |
|
216 | - for($i=\sizeof($captions);$i<$this->count();$i++){ |
|
213 | + public function getCaptions() { |
|
214 | + if (isset($this->captions)) { |
|
215 | + $captions=$this->captions; |
|
216 | + for ($i=\sizeof($captions); $i<$this->count(); $i++) { |
|
217 | 217 | $captions[]=""; |
218 | 218 | } |
219 | - }else{ |
|
219 | + } else { |
|
220 | 220 | $captions=[]; |
221 | 221 | $index=0; |
222 | 222 | $count=$this->count(); |
223 | - while($index<$count){ |
|
223 | + while ($index<$count) { |
|
224 | 224 | $captions[]=$this->getCaption($index++); |
225 | 225 | } |
226 | 226 | } |
227 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
227 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
228 | 228 | $callback=$this->captionCallback; |
229 | - $callback($captions,$this->instance); |
|
229 | + $callback($captions, $this->instance); |
|
230 | 230 | } |
231 | 231 | return $captions; |
232 | 232 | } |
233 | 233 | |
234 | - public function setCaption($index,$caption){ |
|
235 | - if(isset($this->captions)===false) |
|
234 | + public function setCaption($index, $caption) { |
|
235 | + if (isset($this->captions)===false) |
|
236 | 236 | $this->captions=[]; |
237 | 237 | $this->captions[$index]=$caption; |
238 | 238 | return $this; |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | * @param callable $callback function called after the field compilation |
251 | 251 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
252 | 252 | */ |
253 | - public function afterCompile($index,$callback){ |
|
253 | + public function afterCompile($index, $callback) { |
|
254 | 254 | $this->afterCompile[$index]=$callback; |
255 | 255 | return $this; |
256 | 256 | } |
@@ -20,8 +20,9 @@ discard block |
||
20 | 20 | $this->widgetIdentifier=$identifier; |
21 | 21 | $this->values=[]; |
22 | 22 | $this->afterCompile=[]; |
23 | - if(isset($instance)) |
|
24 | - $this->setInstance($instance); |
|
23 | + if(isset($instance)) { |
|
24 | + $this->setInstance($instance); |
|
25 | + } |
|
25 | 26 | $this->setCaptions($captions); |
26 | 27 | $this->captionCallback=NULL; |
27 | 28 | } |
@@ -38,8 +39,9 @@ discard block |
||
38 | 39 | |
39 | 40 | public function getIdentifier(){ |
40 | 41 | $value=self::$index; |
41 | - if(isset($this->values["identifier"])) |
|
42 | - $value=$this->values["identifier"](self::$index,$this->instance); |
|
42 | + if(isset($this->values["identifier"])) { |
|
43 | + $value=$this->values["identifier"](self::$index,$this->instance); |
|
44 | + } |
|
43 | 45 | return $value; |
44 | 46 | } |
45 | 47 | |
@@ -62,19 +64,19 @@ discard block |
||
62 | 64 | $value=$property->getValue($this->instance); |
63 | 65 | if(isset($this->values[$index])){ |
64 | 66 | $value= $this->values[$index]($value,$this->instance,$index); |
65 | - }else{ |
|
67 | + } else{ |
|
66 | 68 | $value=$this->_getDefaultValue($property->getName(),$value, $index); |
67 | 69 | } |
68 | - }else{ |
|
69 | - if(\is_callable($property)) |
|
70 | - $value=$property($this->instance); |
|
71 | - elseif(\is_array($property)){ |
|
70 | + } else{ |
|
71 | + if(\is_callable($property)) { |
|
72 | + $value=$property($this->instance); |
|
73 | + } elseif(\is_array($property)){ |
|
72 | 74 | $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
73 | 75 | $value=\implode("", $values); |
74 | - }else{ |
|
76 | + } else{ |
|
75 | 77 | if(isset($this->values[$index])){ |
76 | 78 | $value= $this->values[$index]($property,$this->instance,$index); |
77 | - }else{ |
|
79 | + } else{ |
|
78 | 80 | $value=$property; |
79 | 81 | } |
80 | 82 | } |
@@ -97,10 +99,10 @@ discard block |
||
97 | 99 | if(isset($vb[$index])){ |
98 | 100 | if(\is_array($vb[$index])){ |
99 | 101 | $this->visibleProperties[$index][]=$field; |
100 | - }else{ |
|
102 | + } else{ |
|
101 | 103 | $this->visibleProperties[$index]=[$vb[$index],$field]; |
102 | 104 | } |
103 | - }else{ |
|
105 | + } else{ |
|
104 | 106 | return $this->insertField($index, $field); |
105 | 107 | } |
106 | 108 | return $this; |
@@ -136,26 +138,27 @@ discard block |
||
136 | 138 | $this->reflect=new \ReflectionClass($instance); |
137 | 139 | if(\sizeof($this->visibleProperties)===0){ |
138 | 140 | $this->properties=$this->getDefaultProperties(); |
139 | - }else{ |
|
141 | + } else{ |
|
140 | 142 | foreach ($this->visibleProperties as $property){ |
141 | 143 | if(\is_callable($property)){ |
142 | 144 | $this->properties[]=$property; |
143 | - }elseif(\is_string($property)){ |
|
145 | + } elseif(\is_string($property)){ |
|
144 | 146 | try{ |
145 | 147 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
146 | 148 | $rProperty=$this->reflect->getProperty($property); |
147 | 149 | $this->properties[]=$rProperty; |
148 | - }catch(\Exception $e){ |
|
150 | + } catch(\Exception $e){ |
|
149 | 151 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
150 | 152 | $this->properties[]=$property; |
151 | 153 | } |
152 | - }elseif(\is_int($property)){ |
|
154 | + } elseif(\is_int($property)){ |
|
153 | 155 | $props=$this->getDefaultProperties(); |
154 | - if(isset($props[$property])) |
|
155 | - $this->properties[]=$props[$property]; |
|
156 | - else |
|
157 | - $this->properties[]=$property; |
|
158 | - }else{ |
|
156 | + if(isset($props[$property])) { |
|
157 | + $this->properties[]=$props[$property]; |
|
158 | + } else { |
|
159 | + $this->properties[]=$property; |
|
160 | + } |
|
161 | + } else{ |
|
159 | 162 | $this->properties[]=$property; |
160 | 163 | } |
161 | 164 | } |
@@ -202,12 +205,13 @@ discard block |
||
202 | 205 | if(isset($this->captions[$index])){ |
203 | 206 | return $this->captions[$index]; |
204 | 207 | } |
205 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
206 | - return $this->properties[$index]->getName(); |
|
207 | - elseif(\is_callable($this->properties[$index])) |
|
208 | - return ""; |
|
209 | - else |
|
210 | - return $this->properties[$index]; |
|
208 | + if($this->properties[$index] instanceof \ReflectionProperty) { |
|
209 | + return $this->properties[$index]->getName(); |
|
210 | + } elseif(\is_callable($this->properties[$index])) { |
|
211 | + return ""; |
|
212 | + } else { |
|
213 | + return $this->properties[$index]; |
|
214 | + } |
|
211 | 215 | } |
212 | 216 | |
213 | 217 | public function getCaptions(){ |
@@ -216,7 +220,7 @@ discard block |
||
216 | 220 | for($i=\sizeof($captions);$i<$this->count();$i++){ |
217 | 221 | $captions[]=""; |
218 | 222 | } |
219 | - }else{ |
|
223 | + } else{ |
|
220 | 224 | $captions=[]; |
221 | 225 | $index=0; |
222 | 226 | $count=$this->count(); |
@@ -232,8 +236,9 @@ discard block |
||
232 | 236 | } |
233 | 237 | |
234 | 238 | public function setCaption($index,$caption){ |
235 | - if(isset($this->captions)===false) |
|
236 | - $this->captions=[]; |
|
239 | + if(isset($this->captions)===false) { |
|
240 | + $this->captions=[]; |
|
241 | + } |
|
237 | 242 | $this->captions[$index]=$caption; |
238 | 243 | return $this; |
239 | 244 | } |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | use Ajax\semantic\html\collections\HtmlMessage; |
6 | 6 | use Ajax\service\AjaxCall; |
7 | 7 | |
8 | -trait FormTrait{ |
|
8 | +trait FormTrait { |
|
9 | 9 | /** |
10 | 10 | * @return HtmlForm |
11 | 11 | */ |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | return $this->getForm()->addToProperty("class", "loading"); |
16 | 16 | } |
17 | 17 | |
18 | - public function addErrorMessage(){ |
|
18 | + public function addErrorMessage() { |
|
19 | 19 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
20 | 20 | } |
21 | 21 | |
@@ -30,35 +30,35 @@ discard block |
||
30 | 30 | * @param string $responseElement |
31 | 31 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
32 | 32 | */ |
33 | - public function submitOn($event,$identifier,$url,$responseElement){ |
|
33 | + public function submitOn($event, $identifier, $url, $responseElement) { |
|
34 | 34 | $form=$this->getForm(); |
35 | 35 | $elem=$form->getElementById($identifier, $form->getContent()); |
36 | - if(isset($elem)){ |
|
37 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement); |
|
36 | + if (isset($elem)) { |
|
37 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement); |
|
38 | 38 | } |
39 | 39 | return $form; |
40 | 40 | } |
41 | 41 | |
42 | - public function submitOnClick($identifier,$url,$responseElement){ |
|
42 | + public function submitOnClick($identifier, $url, $responseElement) { |
|
43 | 43 | return $this->submitOn("click", $identifier, $url, $responseElement); |
44 | 44 | } |
45 | 45 | |
46 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
47 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
48 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement); |
|
46 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
47 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
48 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement); |
|
49 | 49 | } |
50 | 50 | |
51 | - protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL){ |
|
51 | + protected function _buttonAsSubmit(&$button, $event, $url, $responseElement=NULL) { |
|
52 | 52 | $form=$this->getForm(); |
53 | - if(isset($url) && isset($responseElement)){ |
|
53 | + if (isset($url) && isset($responseElement)) { |
|
54 | 54 | $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');"); |
55 | - $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url])); |
|
55 | + $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url])); |
|
56 | 56 | } |
57 | 57 | return $button; |
58 | 58 | } |
59 | 59 | |
60 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
61 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
60 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
61 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
62 | 62 | $bt->setProperty("type", "reset"); |
63 | 63 | return $bt; |
64 | 64 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param string $jsCode |
69 | 69 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
70 | 70 | */ |
71 | - public function onValid($jsCode){ |
|
71 | + public function onValid($jsCode) { |
|
72 | 72 | $form=$this->getForm(); |
73 | 73 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
74 | 74 | return $form; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param string $jsCode can use event and fields parameters |
80 | 80 | * @return HtmlForm |
81 | 81 | */ |
82 | - public function onSuccess($jsCode){ |
|
82 | + public function onSuccess($jsCode) { |
|
83 | 83 | $form=$this->getForm(); |
84 | 84 | $form->addValidationParam("onSuccess", "%function(evt,fields){".$jsCode."}%"); |
85 | 85 | return $form; |
@@ -23,6 +23,10 @@ discard block |
||
23 | 23 | private $_footer; |
24 | 24 | private $_afterCompileEvents; |
25 | 25 | |
26 | + /** |
|
27 | + * @param integer $rowCount |
|
28 | + * @param integer $colCount |
|
29 | + */ |
|
26 | 30 | public function __construct($identifier, $rowCount, $colCount) { |
27 | 31 | parent::__construct($identifier, "table", "ui table"); |
28 | 32 | $this->content=array (); |
@@ -112,7 +116,7 @@ discard block |
||
112 | 116 | /** |
113 | 117 | * Retuns the row at $rowIndex |
114 | 118 | * @param int $rowIndex |
115 | - * @return \Ajax\semantic\html\content\HtmlTR |
|
119 | + * @return \Ajax\common\html\HtmlDoubleElement |
|
116 | 120 | */ |
117 | 121 | public function getRow($rowIndex) { |
118 | 122 | return $this->getBody()->getRow($rowIndex); |
@@ -154,7 +158,7 @@ discard block |
||
154 | 158 | * Sets values to the col at index $colIndex |
155 | 159 | * @param int $colIndex |
156 | 160 | * @param array $values |
157 | - * @return \Ajax\semantic\html\collections\HtmlTable |
|
161 | + * @return HtmlTable |
|
158 | 162 | */ |
159 | 163 | public function setColValues($colIndex, $values=array()) { |
160 | 164 | $this->getBody()->setColValues($colIndex, $values); |
@@ -165,7 +169,7 @@ discard block |
||
165 | 169 | * Sets values to the row at index $rowIndex |
166 | 170 | * @param int $rowIndex |
167 | 171 | * @param array $values |
168 | - * @return \Ajax\semantic\html\collections\HtmlTable |
|
172 | + * @return HtmlTable |
|
169 | 173 | */ |
170 | 174 | public function setRowValues($rowIndex, $values=array()) { |
171 | 175 | $this->getBody()->setRowValues($rowIndex, $values); |
@@ -188,6 +192,9 @@ discard block |
||
188 | 192 | return $this->colAlign($colIndex, "colLeft"); |
189 | 193 | } |
190 | 194 | |
195 | + /** |
|
196 | + * @param string $function |
|
197 | + */ |
|
191 | 198 | private function colAlign($colIndex, $function) { |
192 | 199 | if (\is_array($colIndex)) { |
193 | 200 | foreach ( $colIndex as $cIndex ) { |
@@ -263,7 +270,7 @@ discard block |
||
263 | 270 | |
264 | 271 | /** |
265 | 272 | * @param array $parts |
266 | - * @return \Ajax\semantic\html\collections\HtmlTable |
|
273 | + * @return HtmlTable |
|
267 | 274 | */ |
268 | 275 | public function setCompileParts($parts=["tbody"]) { |
269 | 276 | $this->_compileParts=$parts; |
@@ -286,7 +293,7 @@ discard block |
||
286 | 293 | * The callback function called after the insertion of each row when fromDatabaseObjects is called |
287 | 294 | * callback function takes the parameters $row : the row inserted and $object: the instance of model used |
288 | 295 | * @param callable $callback |
289 | - * @return \Ajax\semantic\html\collections\HtmlTable |
|
296 | + * @return HtmlTable |
|
290 | 297 | */ |
291 | 298 | public function onNewRow($callback) { |
292 | 299 | $this->_afterCompileEvents["onNewRow"]=$callback; |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
6 | 6 | use Ajax\JsUtils; |
7 | 7 | use Ajax\service\JArray; |
8 | - |
|
9 | 8 | use Ajax\semantic\html\base\constants\State; |
10 | 9 | |
11 | 10 | class HtmlProgress extends HtmlSemDoubleElement { |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | |
26 | 26 | public function __construct($identifier, $rowCount, $colCount) { |
27 | 27 | parent::__construct($identifier, "table", "ui table"); |
28 | - $this->content=array (); |
|
28 | + $this->content=array(); |
|
29 | 29 | $this->setRowCount($rowCount, $colCount); |
30 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
31 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
30 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
31 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
32 | 32 | $this->_afterCompileEvents=[]; |
33 | 33 | } |
34 | 34 | |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | * @return HtmlTableContent |
47 | 47 | */ |
48 | 48 | public function getPart($key) { |
49 | - if (\array_key_exists($key, $this->content) === false) { |
|
49 | + if (\array_key_exists($key, $this->content)===false) { |
|
50 | 50 | $this->content[$key]=new HtmlTableContent("", $key); |
51 | - if ($key !== "tbody") { |
|
51 | + if ($key!=="tbody") { |
|
52 | 52 | $this->content[$key]->setRowCount(1, $this->_colCount); |
53 | 53 | } |
54 | 54 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @return boolean |
86 | 86 | */ |
87 | 87 | public function hasPart($key) { |
88 | - return \array_key_exists($key, $this->content) === true; |
|
88 | + return \array_key_exists($key, $this->content)===true; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | |
191 | 191 | private function colAlign($colIndex, $function) { |
192 | 192 | if (\is_array($colIndex)) { |
193 | - foreach ( $colIndex as $cIndex ) { |
|
193 | + foreach ($colIndex as $cIndex) { |
|
194 | 194 | $this->colAlign($cIndex, $function); |
195 | 195 | } |
196 | 196 | } else { |
@@ -229,12 +229,12 @@ discard block |
||
229 | 229 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
230 | 230 | */ |
231 | 231 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
232 | - if(\sizeof($this->_compileParts)<3){ |
|
232 | + if (\sizeof($this->_compileParts)<3) { |
|
233 | 233 | $this->_template="%content%"; |
234 | 234 | $this->refresh(); |
235 | - }else{ |
|
235 | + } else { |
|
236 | 236 | if ($this->propertyContains("class", "sortable")) { |
237 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();"); |
|
237 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort();"); |
|
238 | 238 | } |
239 | 239 | } |
240 | 240 | $this->content=JArray::sortAssociative($this->content, $this->_compileParts); |
@@ -250,13 +250,13 @@ discard block |
||
250 | 250 | public function fromDatabaseObject($object, $function) { |
251 | 251 | $result=$function($object); |
252 | 252 | if (\is_array($result)) { |
253 | - $result= $this->addRow($function($object)); |
|
253 | + $result=$this->addRow($function($object)); |
|
254 | 254 | } else { |
255 | - $result= $this->getBody()->_addRow($result); |
|
255 | + $result=$this->getBody()->_addRow($result); |
|
256 | 256 | } |
257 | - if(isset($this->_afterCompileEvents["onNewRow"])){ |
|
258 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
259 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
257 | + if (isset($this->_afterCompileEvents["onNewRow"])) { |
|
258 | + if (\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
259 | + $this->_afterCompileEvents["onNewRow"]($result, $object); |
|
260 | 260 | } |
261 | 261 | return $result; |
262 | 262 | } |
@@ -270,14 +270,14 @@ discard block |
||
270 | 270 | return $this; |
271 | 271 | } |
272 | 272 | |
273 | - public function refresh(){ |
|
273 | + public function refresh() { |
|
274 | 274 | $this->_footer=$this->getFooter(); |
275 | 275 | $this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");'); |
276 | 276 | } |
277 | 277 | |
278 | - public function run(JsUtils $js){ |
|
279 | - $result= parent::run($js); |
|
280 | - if(isset($this->_footer)) |
|
278 | + public function run(JsUtils $js) { |
|
279 | + $result=parent::run($js); |
|
280 | + if (isset($this->_footer)) |
|
281 | 281 | $this->_footer->run($js); |
282 | 282 | return $result; |
283 | 283 | } |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | if(\sizeof($this->_compileParts)<3){ |
233 | 233 | $this->_template="%content%"; |
234 | 234 | $this->refresh(); |
235 | - }else{ |
|
235 | + } else{ |
|
236 | 236 | if ($this->propertyContains("class", "sortable")) { |
237 | 237 | $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();"); |
238 | 238 | } |
@@ -255,8 +255,9 @@ discard block |
||
255 | 255 | $result= $this->getBody()->_addRow($result); |
256 | 256 | } |
257 | 257 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
258 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
259 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
258 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
259 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
260 | + } |
|
260 | 261 | } |
261 | 262 | return $result; |
262 | 263 | } |
@@ -277,8 +278,9 @@ discard block |
||
277 | 278 | |
278 | 279 | public function run(JsUtils $js){ |
279 | 280 | $result= parent::run($js); |
280 | - if(isset($this->_footer)) |
|
281 | - $this->_footer->run($js); |
|
281 | + if(isset($this->_footer)) { |
|
282 | + $this->_footer->run($js); |
|
283 | + } |
|
282 | 284 | return $result; |
283 | 285 | } |
284 | 286 |
@@ -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,8 +18,8 @@ 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 setCollapsing() { |
@@ -17,8 +17,9 @@ |
||
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 |