|
@@ -14,15 +14,15 @@ discard block |
|
|
block discarded – undo |
|
14
|
14
|
* @property boolean $_visibleHover |
|
15
|
15
|
* @property InstanceViewer $_instanceViewer |
|
16
|
16
|
*/ |
|
17
|
|
-trait DataTableFieldAsTrait{ |
|
18
|
|
- protected $_buttons=["display","edit","delete"]; |
|
|
17
|
+trait DataTableFieldAsTrait { |
|
|
18
|
+ protected $_buttons=["display", "edit", "delete"]; |
|
19
|
19
|
protected $_buttonsColumn; |
|
20
|
|
- abstract public function addField($field,$key=null); |
|
21
|
|
- abstract public function insertField($index,$field,$key=null); |
|
22
|
|
- abstract public function insertInField($index,$field,$key=null); |
|
23
|
|
- abstract public function fieldAs($index,$type,$attributes=NULL); |
|
|
20
|
+ abstract public function addField($field, $key=null); |
|
|
21
|
+ abstract public function insertField($index, $field, $key=null); |
|
|
22
|
+ abstract public function insertInField($index, $field, $key=null); |
|
|
23
|
+ abstract public function fieldAs($index, $type, $attributes=NULL); |
|
24
|
24
|
abstract protected function cleanIdentifier($id); |
|
25
|
|
- abstract protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null); |
|
|
25
|
+ abstract protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null); |
|
26
|
26
|
|
|
27
|
27
|
/** |
|
28
|
28
|
* @param string $caption |
|
@@ -30,8 +30,8 @@ discard block |
|
|
block discarded – undo |
|
30
|
30
|
* @param boolean $visibleHover |
|
31
|
31
|
* @return callable |
|
32
|
32
|
*/ |
|
33
|
|
- private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){ |
|
34
|
|
- return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback); |
|
|
33
|
+ private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) { |
|
|
34
|
+ return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback); |
|
35
|
35
|
} |
|
36
|
36
|
|
|
37
|
37
|
/** |
|
@@ -40,20 +40,20 @@ discard block |
|
|
block discarded – undo |
|
40
|
40
|
* @param callable $callback |
|
41
|
41
|
* @return callable |
|
42
|
42
|
*/ |
|
43
|
|
- private function getCallable($thisCallback,$parameters,$callback=null){ |
|
44
|
|
- $result=function($instance) use($thisCallback,$parameters,$callback){ |
|
45
|
|
- $object=call_user_func_array(array($this,$thisCallback), $parameters); |
|
46
|
|
- if(isset($callback)){ |
|
47
|
|
- if(\is_callable($callback)){ |
|
48
|
|
- $callback($object,$instance,$this->_instanceViewer->count()+1); |
|
|
43
|
+ private function getCallable($thisCallback, $parameters, $callback=null) { |
|
|
44
|
+ $result=function($instance) use($thisCallback, $parameters, $callback){ |
|
|
45
|
+ $object=call_user_func_array(array($this, $thisCallback), $parameters); |
|
|
46
|
+ if (isset($callback)) { |
|
|
47
|
+ if (\is_callable($callback)) { |
|
|
48
|
+ $callback($object, $instance, $this->_instanceViewer->count()+1); |
|
49
|
49
|
} |
|
50
|
50
|
} |
|
51
|
|
- if($object instanceof HtmlSemDoubleElement){ |
|
|
51
|
+ if ($object instanceof HtmlSemDoubleElement) { |
|
52
|
52
|
$id=$this->_instanceViewer->getIdentifier(); |
|
53
|
|
- $object->setProperty("data-ajax",$id); |
|
54
|
|
- if($object->propertyContains("class","visibleover")){ |
|
|
53
|
+ $object->setProperty("data-ajax", $id); |
|
|
54
|
+ if ($object->propertyContains("class", "visibleover")) { |
|
55
|
55
|
$this->_visibleHover=true; |
|
56
|
|
- $object->setProperty("style","visibility:hidden;"); |
|
|
56
|
+ $object->setProperty("style", "visibility:hidden;"); |
|
57
|
57
|
} |
|
58
|
58
|
} |
|
59
|
59
|
return $object; |
|
@@ -65,16 +65,16 @@ discard block |
|
|
block discarded – undo |
|
65
|
65
|
* @param string $caption |
|
66
|
66
|
* @return HtmlButton |
|
67
|
67
|
*/ |
|
68
|
|
- private function getFieldButton($caption,$visibleHover=true){ |
|
69
|
|
- $bt= new HtmlButton($this->cleanIdentifier($caption),$caption); |
|
70
|
|
- if($visibleHover) |
|
|
68
|
+ private function getFieldButton($caption, $visibleHover=true) { |
|
|
69
|
+ $bt=new HtmlButton($this->cleanIdentifier($caption), $caption); |
|
|
70
|
+ if ($visibleHover) |
|
71
|
71
|
$this->_visibleOver($bt); |
|
72
|
72
|
return $bt; |
|
73
|
73
|
} |
|
74
|
74
|
|
|
75
|
|
- private function getFieldButtons($buttons,$visibleHover=true){ |
|
76
|
|
- $bts=new HtmlButtonGroups("",$buttons); |
|
77
|
|
- if($visibleHover) |
|
|
75
|
+ private function getFieldButtons($buttons, $visibleHover=true) { |
|
|
76
|
+ $bts=new HtmlButtonGroups("", $buttons); |
|
|
77
|
+ if ($visibleHover) |
|
78
|
78
|
$this->_visibleOver($bts); |
|
79
|
79
|
return $bts; |
|
80
|
80
|
} |
|
@@ -88,19 +88,19 @@ discard block |
|
|
block discarded – undo |
|
88
|
88
|
* @param array $attributes associative array (<b>ajax</b> key is for ajax post) |
|
89
|
89
|
* @return DataTable |
|
90
|
90
|
*/ |
|
91
|
|
- public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){ |
|
92
|
|
- return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){ |
|
93
|
|
- $button=new HtmlButton($id,$value,$cssStyle); |
|
94
|
|
- $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
|
95
|
|
- if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
|
91
|
+ public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) { |
|
|
92
|
+ return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){ |
|
|
93
|
+ $button=new HtmlButton($id, $value, $cssStyle); |
|
|
94
|
+ $button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]); |
|
|
95
|
+ if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
96
|
96
|
$this->_visibleOver($button); |
|
97
|
97
|
return $button; |
|
98
|
|
- }, $index,$attributes); |
|
|
98
|
+ }, $index, $attributes); |
|
99
|
99
|
} |
|
100
|
100
|
|
|
101
|
|
- protected function _visibleOver(BaseHtml $element){ |
|
|
101
|
+ protected function _visibleOver(BaseHtml $element) { |
|
102
|
102
|
$this->_visibleHover=true; |
|
103
|
|
- return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;"); |
|
|
103
|
+ return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;"); |
|
104
|
104
|
} |
|
105
|
105
|
|
|
106
|
106
|
/** |
|
@@ -110,8 +110,8 @@ discard block |
|
|
block discarded – undo |
|
110
|
110
|
* @param boolean $visibleHover |
|
111
|
111
|
* @return DataTable |
|
112
|
112
|
*/ |
|
113
|
|
- public function addFieldButton($caption,$visibleHover=true,$callback=null){ |
|
114
|
|
- $this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback)); |
|
|
113
|
+ public function addFieldButton($caption, $visibleHover=true, $callback=null) { |
|
|
114
|
+ $this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback)); |
|
115
|
115
|
return $this; |
|
116
|
116
|
} |
|
117
|
117
|
|
|
@@ -122,8 +122,8 @@ discard block |
|
|
block discarded – undo |
|
122
|
122
|
* @param boolean $visibleHover |
|
123
|
123
|
* @return DataTable |
|
124
|
124
|
*/ |
|
125
|
|
- public function addFieldButtons($buttons,$visibleHover=true,$callback=null){ |
|
126
|
|
- $this->addField($this->getCallable("getFieldButtons",[$buttons,$visibleHover],$callback)); |
|
|
125
|
+ public function addFieldButtons($buttons, $visibleHover=true, $callback=null) { |
|
|
126
|
+ $this->addField($this->getCallable("getFieldButtons", [$buttons, $visibleHover], $callback)); |
|
127
|
127
|
return $this; |
|
128
|
128
|
} |
|
129
|
129
|
|
|
@@ -134,8 +134,8 @@ discard block |
|
|
block discarded – undo |
|
134
|
134
|
* @param callable $callback |
|
135
|
135
|
* @return DataTable |
|
136
|
136
|
*/ |
|
137
|
|
- public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
|
138
|
|
- $this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
|
|
137
|
+ public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) { |
|
|
138
|
+ $this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback)); |
|
139
|
139
|
return $this; |
|
140
|
140
|
} |
|
141
|
141
|
|
|
@@ -146,25 +146,25 @@ discard block |
|
|
block discarded – undo |
|
146
|
146
|
* @param callable $callback |
|
147
|
147
|
* @return DataTable |
|
148
|
148
|
*/ |
|
149
|
|
- public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null,$key=null){ |
|
150
|
|
- $this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback),$key); |
|
|
149
|
+ public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null, $key=null) { |
|
|
150
|
+ $this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback), $key); |
|
151
|
151
|
return $this; |
|
152
|
152
|
} |
|
153
|
153
|
|
|
154
|
|
- public function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null,$key=null){ |
|
155
|
|
- $this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback),$key); |
|
|
154
|
+ public function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null, $key=null) { |
|
|
155
|
+ $this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback), $key); |
|
156
|
156
|
return $this; |
|
157
|
157
|
} |
|
158
|
158
|
|
|
159
|
|
- public function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null,$key=null){ |
|
160
|
|
- $this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback),$key); |
|
|
159
|
+ public function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null, $key=null) { |
|
|
160
|
+ $this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback), $key); |
|
161
|
161
|
return $this; |
|
162
|
162
|
} |
|
163
|
163
|
|
|
164
|
|
- private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
|
165
|
|
- $bt=$this->getFieldButton("",$visibleHover); |
|
|
164
|
+ private function getDefaultButton($icon, $class=null, $visibleHover=true) { |
|
|
165
|
+ $bt=$this->getFieldButton("", $visibleHover); |
|
166
|
166
|
$bt->asIcon($icon); |
|
167
|
|
- if(isset($class)) |
|
|
167
|
+ if (isset($class)) |
|
168
|
168
|
$bt->addClass($class); |
|
169
|
169
|
return $bt; |
|
170
|
170
|
} |
|
@@ -176,9 +176,9 @@ discard block |
|
|
block discarded – undo |
|
176
|
176
|
* @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object |
|
177
|
177
|
* @return DataTable |
|
178
|
178
|
*/ |
|
179
|
|
- public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){ |
|
|
179
|
+ public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) { |
|
180
|
180
|
$this->_deleteBehavior=$deleteBehavior; |
|
181
|
|
- return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback,"delete"); |
|
|
181
|
+ return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback, "delete"); |
|
182
|
182
|
} |
|
183
|
183
|
|
|
184
|
184
|
/** |
|
@@ -188,9 +188,9 @@ discard block |
|
|
block discarded – undo |
|
188
|
188
|
* @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object |
|
189
|
189
|
* @return DataTable |
|
190
|
190
|
*/ |
|
191
|
|
- public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){ |
|
|
191
|
+ public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) { |
|
192
|
192
|
$this->_editBehavior=$editBehavior; |
|
193
|
|
- return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback,"edit"); |
|
|
193
|
+ return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback, "edit"); |
|
194
|
194
|
} |
|
195
|
195
|
|
|
196
|
196
|
/** |
|
@@ -200,9 +200,9 @@ discard block |
|
|
block discarded – undo |
|
200
|
200
|
* @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object |
|
201
|
201
|
* @return DataTable |
|
202
|
202
|
*/ |
|
203
|
|
- public function addDisplayButton($visibleHover=true,$displayBehavior=[],$callback=null){ |
|
|
203
|
+ public function addDisplayButton($visibleHover=true, $displayBehavior=[], $callback=null) { |
|
204
|
204
|
$this->_displayBehavior=$displayBehavior; |
|
205
|
|
- return $this->addDefaultButton("eye","_display basic",$visibleHover,$callback,"display"); |
|
|
205
|
+ return $this->addDefaultButton("eye", "_display basic", $visibleHover, $callback, "display"); |
|
206
|
206
|
} |
|
207
|
207
|
|
|
208
|
208
|
/** |
|
@@ -213,10 +213,10 @@ discard block |
|
|
block discarded – undo |
|
213
|
213
|
* @param callable $callbackDelete this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object |
|
214
|
214
|
* @return DataTable |
|
215
|
215
|
*/ |
|
216
|
|
- public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){ |
|
217
|
|
- $this->addEditButton($visibleHover,$behavior,$callbackEdit); |
|
|
216
|
+ public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) { |
|
|
217
|
+ $this->addEditButton($visibleHover, $behavior, $callbackEdit); |
|
218
|
218
|
$index=$this->_instanceViewer->visiblePropertiesCount()-1; |
|
219
|
|
- $this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete); |
|
|
219
|
+ $this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete); |
|
220
|
220
|
return $this; |
|
221
|
221
|
} |
|
222
|
222
|
|
|
@@ -229,28 +229,28 @@ discard block |
|
|
block discarded – undo |
|
229
|
229
|
* @param callable $callbackDelete this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object |
|
230
|
230
|
* @return DataTable |
|
231
|
231
|
*/ |
|
232
|
|
- public function addAllButtons($visibleHover=true,$behavior=[],$callbackDisplay=null,$callbackEdit=null,$callbackDelete=null){ |
|
233
|
|
- $this->addDisplayButton($visibleHover,$behavior,$callbackDisplay); |
|
|
232
|
+ public function addAllButtons($visibleHover=true, $behavior=[], $callbackDisplay=null, $callbackEdit=null, $callbackDelete=null) { |
|
|
233
|
+ $this->addDisplayButton($visibleHover, $behavior, $callbackDisplay); |
|
234
|
234
|
$index=$this->_instanceViewer->visiblePropertiesCount()-1; |
|
235
|
235
|
$this->_buttonsColumn=$index; |
|
236
|
|
- $this->insertEditButtonIn($index,$visibleHover,$behavior,$callbackEdit); |
|
237
|
|
- $this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete); |
|
|
236
|
+ $this->insertEditButtonIn($index, $visibleHover, $behavior, $callbackEdit); |
|
|
237
|
+ $this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete); |
|
238
|
238
|
return $this; |
|
239
|
239
|
} |
|
240
|
240
|
|
|
241
|
|
- public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){ |
|
|
241
|
+ public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) { |
|
242
|
242
|
$this->_deleteBehavior=$deleteBehavior; |
|
243
|
|
- return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback,"delete"); |
|
|
243
|
+ return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback, "delete"); |
|
244
|
244
|
} |
|
245
|
245
|
|
|
246
|
|
- public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){ |
|
|
246
|
+ public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) { |
|
247
|
247
|
$this->_editBehavior=$editBehavior; |
|
248
|
|
- return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback,"edit"); |
|
|
248
|
+ return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback, "edit"); |
|
249
|
249
|
} |
|
250
|
250
|
|
|
251
|
|
- public function insertDisplayButtonIn($index,$visibleHover=true,$displayBehavior=[],$callback=null){ |
|
|
251
|
+ public function insertDisplayButtonIn($index, $visibleHover=true, $displayBehavior=[], $callback=null) { |
|
252
|
252
|
$this->_displayBehavior=$displayBehavior; |
|
253
|
|
- return $this->insertDefaultButtonIn($index,"eye","_display basic",$visibleHover,$callback,"display"); |
|
|
253
|
+ return $this->insertDefaultButtonIn($index, "eye", "_display basic", $visibleHover, $callback, "display"); |
|
254
|
254
|
} |
|
255
|
255
|
|
|
256
|
256
|
/** |
|
@@ -264,7 +264,7 @@ discard block |
|
|
block discarded – undo |
|
264
|
264
|
* @param array $_buttons |
|
265
|
265
|
*/ |
|
266
|
266
|
public function setButtons($_buttons) { |
|
267
|
|
- $this->_buttons = $_buttons; |
|
|
267
|
+ $this->_buttons=$_buttons; |
|
268
|
268
|
return $this; |
|
269
|
269
|
} |
|
270
|
270
|
|