Completed
Push — master ( 778966...3abce3 )
by Jean-Christophe
03:06
created
Ajax/common/Widget.php 1 patch
Spacing   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 use Ajax\semantic\html\collections\form\traits\FormTrait;
19 19
 
20 20
 abstract class Widget extends HtmlDoubleElement {
21
-	use FieldAsTrait,FormTrait;
21
+	use FieldAsTrait, FormTrait;
22 22
 
23 23
 	/**
24 24
 	 * @var string classname
@@ -49,36 +49,36 @@  discard block
 block discarded – undo
49 49
 	protected $_form;
50 50
 
51 51
 
52
-	public function __construct($identifier,$model,$modelInstance=NULL) {
52
+	public function __construct($identifier, $model, $modelInstance=NULL) {
53 53
 		parent::__construct($identifier);
54 54
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
55 55
 		$this->setModel($model);
56
-		if(isset($modelInstance));
56
+		if (isset($modelInstance));
57 57
 			$this->show($modelInstance);
58 58
 	}
59 59
 
60
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
60
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
61 61
 		$this->_instanceViewer=$instanceViewer;
62 62
 		$this->content=[$contentKey=>$content];
63 63
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
64 64
 		$this->_edition=$edition;
65 65
 	}
66 66
 
67
-	protected function _getFieldIdentifier($prefix,$name=""){
67
+	protected function _getFieldIdentifier($prefix, $name="") {
68 68
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
69 69
 	}
70 70
 
71
-	protected function _getFieldName($index){
71
+	protected function _getFieldName($index) {
72 72
 		return $this->_instanceViewer->getFieldName($index);
73 73
 	}
74 74
 
75
-	protected function _getFieldCaption($index){
75
+	protected function _getFieldCaption($index) {
76 76
 		return $this->_instanceViewer->getCaption($index);
77 77
 	}
78 78
 
79
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
79
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
80 80
 
81
-	public function show($modelInstance){
81
+	public function show($modelInstance) {
82 82
 		$this->_modelInstance=$modelInstance;
83 83
 	}
84 84
 
@@ -102,52 +102,52 @@  discard block
 block discarded – undo
102 102
 
103 103
 	abstract public function getHtmlComponent();
104 104
 
105
-	public function setColor($color){
105
+	public function setColor($color) {
106 106
 		return $this->getHtmlComponent()->setColor($color);
107 107
 	}
108 108
 
109 109
 
110
-	public function setCaptions($captions){
110
+	public function setCaptions($captions) {
111 111
 		$this->_instanceViewer->setCaptions($captions);
112 112
 		return $this;
113 113
 	}
114 114
 
115
-	public function setFields($fields){
115
+	public function setFields($fields) {
116 116
 		$this->_instanceViewer->setVisibleProperties($fields);
117 117
 		return $this;
118 118
 	}
119 119
 
120
-	public function addField($field){
120
+	public function addField($field) {
121 121
 		$this->_instanceViewer->addField($field);
122 122
 		return $this;
123 123
 	}
124 124
 
125
-	public function addMessage($attributes=NULL,$fieldName="message"){
125
+	public function addMessage($attributes=NULL, $fieldName="message") {
126 126
 		$this->_instanceViewer->addField($fieldName);
127 127
 		$count=$this->_instanceViewer->visiblePropertiesCount();
128
-		return $this->fieldAsMessage($count-1,$attributes);
128
+		return $this->fieldAsMessage($count-1, $attributes);
129 129
 	}
130 130
 
131
-	public function addErrorMessage(){
132
-		return $this->addMessage(["error"=>true],"message");
131
+	public function addErrorMessage() {
132
+		return $this->addMessage(["error"=>true], "message");
133 133
 	}
134 134
 
135
-	public function insertField($index,$field){
135
+	public function insertField($index, $field) {
136 136
 		$this->_instanceViewer->insertField($index, $field);
137 137
 		return $this;
138 138
 	}
139 139
 
140
-	public function insertInField($index,$field){
140
+	public function insertInField($index, $field) {
141 141
 		$this->_instanceViewer->insertInField($index, $field);
142 142
 		return $this;
143 143
 	}
144 144
 
145
-	public function setValueFunction($index,$callback){
145
+	public function setValueFunction($index, $callback) {
146 146
 		$this->_instanceViewer->setValueFunction($index, $callback);
147 147
 		return $this;
148 148
 	}
149 149
 
150
-	public function setIdentifierFunction($callback){
150
+	public function setIdentifierFunction($callback) {
151 151
 		$this->_instanceViewer->setIdentifierFunction($callback);
152 152
 		return $this;
153 153
 	}
@@ -155,8 +155,8 @@  discard block
 block discarded – undo
155 155
 	/**
156 156
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
157 157
 	 */
158
-	public function getToolbar(){
159
-		if(isset($this->_toolbar)===false){
158
+	public function getToolbar() {
159
+		if (isset($this->_toolbar)===false) {
160 160
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
161 161
 		}
162 162
 		return $this->_toolbar;
@@ -168,10 +168,10 @@  discard block
 block discarded – undo
168 168
 	 * @param callable $callback function to call on $element
169 169
 	 * @return \Ajax\common\html\HtmlDoubleElement
170 170
 	 */
171
-	public function addInToolbar($element,$callback=NULL){
171
+	public function addInToolbar($element, $callback=NULL) {
172 172
 		$tb=$this->getToolbar();
173
-		if(isset($callback)){
174
-			if(\is_callable($callback)){
173
+		if (isset($callback)) {
174
+			if (\is_callable($callback)) {
175 175
 				$callback($element);
176 176
 			}
177 177
 		}
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
 	 * @param callable $callback function($element)
185 185
 	 * @return \Ajax\common\html\HtmlDoubleElement
186 186
 	 */
187
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
188
-		$result=$this->addInToolbar($caption,$callback);
189
-		if(isset($icon))
187
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
188
+		$result=$this->addInToolbar($caption, $callback);
189
+		if (isset($icon))
190 190
 			$result->addIcon($icon);
191 191
 		return $result;
192 192
 	}
@@ -196,14 +196,14 @@  discard block
 block discarded – undo
196 196
 	 * @param callable $callback function($element)
197 197
 	 * @return \Ajax\common\Widget
198 198
 	 */
199
-	public function addItemsInToolbar(array $items,$callback=NULL){
200
-		if(JArray::isAssociative($items)){
201
-			foreach ($items as $icon=>$item){
202
-				$this->addItemInToolbar($item,$icon,$callback);
199
+	public function addItemsInToolbar(array $items, $callback=NULL) {
200
+		if (JArray::isAssociative($items)) {
201
+			foreach ($items as $icon=>$item) {
202
+				$this->addItemInToolbar($item, $icon, $callback);
203 203
 			}
204
-		}else{
205
-			foreach ($items as $item){
206
-				$this->addItemInToolbar($item,null,$callback);
204
+		} else {
205
+			foreach ($items as $item) {
206
+				$this->addItemInToolbar($item, null, $callback);
207 207
 			}
208 208
 		}
209 209
 		return $this;
@@ -215,12 +215,12 @@  discard block
 block discarded – undo
215 215
 	 * @param callable $callback function($element)
216 216
 	 * @return \Ajax\common\html\HtmlDoubleElement
217 217
 	 */
218
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
218
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
219 219
 		$dd=$value;
220 220
 		if (\is_string($value)) {
221
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
221
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
222 222
 		}
223
-		return $this->addInToolbar($dd,$callback);
223
+		return $this->addInToolbar($dd, $callback);
224 224
 	}
225 225
 
226 226
 	/**
@@ -228,9 +228,9 @@  discard block
 block discarded – undo
228 228
 	 * @param callable $callback function($element)
229 229
 	 * @return \Ajax\common\html\HtmlDoubleElement
230 230
 	 */
231
-	public function addButtonInToolbar($caption,$callback=NULL){
232
-		$bt=new HtmlButton("bt-".$caption,$caption);
233
-		return $this->addInToolbar($bt,$callback);
231
+	public function addButtonInToolbar($caption, $callback=NULL) {
232
+		$bt=new HtmlButton("bt-".$caption, $caption);
233
+		return $this->addInToolbar($bt, $callback);
234 234
 	}
235 235
 
236 236
 	/**
@@ -239,9 +239,9 @@  discard block
 block discarded – undo
239 239
 	 * @param callable $callback function($element)
240 240
 	 * @return \Ajax\common\html\HtmlDoubleElement
241 241
 	 */
242
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
243
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
244
-		return $this->addInToolbar($bts,$callback);
242
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
243
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
244
+		return $this->addInToolbar($bts, $callback);
245 245
 	}
246 246
 
247 247
 	/**
@@ -251,15 +251,15 @@  discard block
 block discarded – undo
251 251
 	 * @param boolean $labeled
252 252
 	 * @return \Ajax\common\html\HtmlDoubleElement
253 253
 	 */
254
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
255
-		$bt=new HtmlButton("",$caption);
256
-		$bt->addIcon($icon,$before,$labeled);
254
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
255
+		$bt=new HtmlButton("", $caption);
256
+		$bt->addIcon($icon, $before, $labeled);
257 257
 		return $this->addInToolbar($bt);
258 258
 	}
259 259
 
260
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
261
-		$button=new HtmlButton($identifier,$value,$cssStyle);
262
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement);
260
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
261
+		$button=new HtmlButton($identifier, $value, $cssStyle);
262
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement);
263 263
 		return $this->addInToolbar($button);
264 264
 	}
265 265
 
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
290 290
 	 * @return \Ajax\common\Widget
291 291
 	 */
292
-	public function setDefaultValueFunction($defaultValueFunction){
292
+	public function setDefaultValueFunction($defaultValueFunction) {
293 293
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
294 294
 		return $this;
295 295
 	}
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 	 * @param string|boolean $disable
299 299
 	 * @return string
300 300
 	 */
301
-	public function jsDisabled($disable=true){
301
+	public function jsDisabled($disable=true) {
302 302
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
303 303
 	}
304 304
 
@@ -307,12 +307,12 @@  discard block
 block discarded – undo
307 307
 	 * @param callable $callback function($element)
308 308
 	 * @return \Ajax\common\html\HtmlDoubleElement
309 309
 	 */
310
-	public function addEditButtonInToolbar($caption,$callback=NULL){
311
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
310
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
311
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
312 312
 		$bt->setToggle();
313 313
 		$bt->setActive($this->_edition);
314 314
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
315
-		return $this->addInToolbar($bt,$callback);
315
+		return $this->addInToolbar($bt, $callback);
316 316
 	}
317 317
 
318 318
 	public function setToolbar(HtmlMenu $_toolbar) {
@@ -326,35 +326,35 @@  discard block
 block discarded – undo
326 326
 	}
327 327
 
328 328
 	public function getForm() {
329
-		if(!isset($this->_form)){
329
+		if (!isset($this->_form)) {
330 330
 			$this->_form=new HtmlForm("frm-".$this->identifier);
331 331
 			$this->setEdition(true);
332 332
 		}
333 333
 		return $this->_form;
334 334
 	}
335 335
 
336
-	public function run(JsUtils $js){
336
+	public function run(JsUtils $js) {
337 337
 		$result=parent::run($js);
338
-		if(isset($this->_form)){
338
+		if (isset($this->_form)) {
339 339
 			$this->runForm($js);
340 340
 		}
341 341
 		return $result;
342 342
 	}
343 343
 
344
-	protected function runForm(JsUtils $js){
344
+	protected function runForm(JsUtils $js) {
345 345
 		$fields=$this->getContentInstances(HtmlFormField::class);
346
-		foreach ($fields as $field){
346
+		foreach ($fields as $field) {
347 347
 			$this->_form->addField($field);
348 348
 		}
349 349
 		return $this->_form->run($js);
350 350
 	}
351 351
 
352
-	protected function _compileForm(){
353
-		if(isset($this->_form)){
352
+	protected function _compileForm() {
353
+		if (isset($this->_form)) {
354 354
 			$noValidate="";
355
-			if(\sizeof($this->_form->getValidationParams())>0)
355
+			if (\sizeof($this->_form->getValidationParams())>0)
356 356
 				$noValidate="novalidate";
357
-			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
357
+			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
358 358
 		}
359 359
 	}
360 360
 
Please login to merge, or discard this patch.
Ajax/semantic/widgets/dataform/DataForm.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -19,49 +19,49 @@  discard block
 block discarded – undo
19 19
 class DataForm extends Widget {
20 20
 
21 21
 	public function __construct($identifier, $modelInstance=NULL) {
22
-		parent::__construct($identifier, null,$modelInstance);
22
+		parent::__construct($identifier, null, $modelInstance);
23 23
 		$this->_form=new HtmlForm($identifier);
24 24
 		$this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true);
25 25
 	}
26 26
 
27
-	protected function _getFieldIdentifier($prefix,$name=""){
27
+	protected function _getFieldIdentifier($prefix, $name="") {
28 28
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
29 29
 	}
30 30
 
31
-	public function compile(JsUtils $js=NULL,&$view=NULL){
31
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
32 32
 		$this->_instanceViewer->setInstance($this->_modelInstance);
33 33
 
34 34
 		$form=$this->content["form"];
35 35
 		$this->_generateContent($form);
36 36
 
37
-		if(isset($this->_toolbar)){
37
+		if (isset($this->_toolbar)) {
38 38
 			$this->_setToolbarPosition($form);
39 39
 		}
40
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
41
-		return parent::compile($js,$view);
40
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
41
+		return parent::compile($js, $view);
42 42
 	}
43 43
 
44 44
 	/**
45 45
 	 * @param HtmlForm $form
46 46
 	 */
47
-	protected function _generateContent($form){
48
-		$values= $this->_instanceViewer->getValues();
47
+	protected function _generateContent($form) {
48
+		$values=$this->_instanceViewer->getValues();
49 49
 		$count=$this->_instanceViewer->count();
50 50
 
51 51
 		$separators=$this->_instanceViewer->getSeparators();
52 52
 		$size=\sizeof($separators);
53
-		if($size===1){
54
-			foreach ($values as $v){
53
+		if ($size===1) {
54
+			foreach ($values as $v) {
55 55
 				$form->addField($v);
56 56
 			}
57
-		}else{
57
+		} else {
58 58
 			$separators[]=$count;
59
-			for($i=0;$i<$size;$i++){
60
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
59
+			for ($i=0; $i<$size; $i++) {
60
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
61 61
 				//TODO check why $fields is empty
62
-				if(\sizeof($fields)===1){
62
+				if (\sizeof($fields)===1) {
63 63
 					$form->addField($fields[0]);
64
-				}elseif(\sizeof($fields)>1){
64
+				}elseif (\sizeof($fields)>1) {
65 65
 					$form->addFields($fields);
66 66
 					$i+=\sizeof($fields)-1;
67 67
 				}
@@ -73,11 +73,11 @@  discard block
 block discarded – undo
73 73
 	 * {@inheritDoc}
74 74
 	 * @see \Ajax\common\Widget::getForm()
75 75
 	 */
76
-	public function getForm(){
76
+	public function getForm() {
77 77
 		return $this->content["form"];
78 78
 	}
79 79
 
80
-	public function addSeparatorAfter($fieldNum){
80
+	public function addSeparatorAfter($fieldNum) {
81 81
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
82 82
 		return $this;
83 83
 	}
@@ -91,12 +91,12 @@  discard block
 block discarded – undo
91 91
 		return $this;
92 92
 	}
93 93
 
94
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
95
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
96
-			$button=new HtmlButton($id,$value,$cssStyle);
94
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
95
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
96
+			$button=new HtmlButton($id, $value, $cssStyle);
97 97
 			$button->setProperty("type", "reset");
98 98
 			return $button;
99
-		}, $index,$attributes);
99
+		}, $index, $attributes);
100 100
 	}
101 101
 
102 102
 	/**
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
116 116
 	}
117 117
 
118
-	public function run(JsUtils $js){
118
+	public function run(JsUtils $js) {
119 119
 		return parent::run($js);
120 120
 	}
121 121
 }
122 122
\ No newline at end of file
Please login to merge, or discard this patch.