@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | * |
12 | 12 | */ |
13 | 13 | class HtmlTableContent extends HtmlSemCollection { |
14 | - protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ]; |
|
14 | + protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"]; |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function setRowCount($rowCount, $colCount) { |
36 | 36 | $count=$this->count(); |
37 | - for($i=$count; $i < $rowCount; $i++) { |
|
37 | + for ($i=$count; $i<$rowCount; $i++) { |
|
38 | 38 | $this->addItem($colCount); |
39 | 39 | } |
40 | 40 | /* |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $tr=new HtmlTR("", $value); |
63 | 63 | $tr->setContainer($this, $count); |
64 | 64 | $tr->setTdTagName($this->_tdTagNames[$this->tagName]); |
65 | - if (isset($value) === true) { |
|
65 | + if (isset($value)===true) { |
|
66 | 66 | $tr->setColCount($value); |
67 | 67 | } |
68 | 68 | return $tr; |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | */ |
113 | 113 | public function setCellValue($row, $col, $value="") { |
114 | 114 | $cell=$this->getCell($row, $col); |
115 | - if (isset($cell) === true) { |
|
115 | + if (isset($cell)===true) { |
|
116 | 116 | $cell->setValue($value); |
117 | 117 | } |
118 | 118 | return $this; |
@@ -125,16 +125,16 @@ discard block |
||
125 | 125 | public function setValues($values=array()) { |
126 | 126 | $count=$this->count(); |
127 | 127 | $isArray=true; |
128 | - if (\is_array($values) === false) { |
|
128 | + if (\is_array($values)===false) { |
|
129 | 129 | $values=\array_fill(0, $count, $values); |
130 | 130 | $isArray=false; |
131 | 131 | } |
132 | - if (JArray::dimension($values) == 1 && $isArray) |
|
133 | - $values=[ $values ]; |
|
132 | + if (JArray::dimension($values)==1 && $isArray) |
|
133 | + $values=[$values]; |
|
134 | 134 | |
135 | 135 | $count=\min(\sizeof($values), $count); |
136 | 136 | |
137 | - for($i=0; $i < $count; $i++) { |
|
137 | + for ($i=0; $i<$count; $i++) { |
|
138 | 138 | $row=$this->content[$i]; |
139 | 139 | $row->setValues($values[$i]); |
140 | 140 | } |
@@ -143,11 +143,11 @@ discard block |
||
143 | 143 | |
144 | 144 | public function setColValues($colIndex, $values=array()) { |
145 | 145 | $count=$this->count(); |
146 | - if (\is_array($values) === false) { |
|
146 | + if (\is_array($values)===false) { |
|
147 | 147 | $values=\array_fill(0, $count, $values); |
148 | 148 | } |
149 | 149 | $count=\min(\sizeof($values), $count); |
150 | - for($i=0; $i < $count; $i++) { |
|
150 | + for ($i=0; $i<$count; $i++) { |
|
151 | 151 | $this->getCell($i, $colIndex)->setValue($values[$i]); |
152 | 152 | } |
153 | 153 | return $this; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | public function addColVariations($colIndex, $variations=array()) { |
157 | 157 | $count=$this->count(); |
158 | - for($i=0; $i < $count; $i++) { |
|
158 | + for ($i=0; $i<$count; $i++) { |
|
159 | 159 | $this->getCell($i, $colIndex)->addVariations($variations); |
160 | 160 | } |
161 | 161 | return $this; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | |
164 | 164 | public function setRowValues($rowIndex, $values=array()) { |
165 | 165 | $count=$this->count(); |
166 | - if (\is_array($values) === false) { |
|
166 | + if (\is_array($values)===false) { |
|
167 | 167 | $values=\array_fill(0, $count, $values); |
168 | 168 | } |
169 | 169 | $this->getItem($rowIndex)->setValues($values); |
@@ -172,9 +172,9 @@ discard block |
||
172 | 172 | |
173 | 173 | private function colAlign($colIndex, $function) { |
174 | 174 | $count=$this->count(); |
175 | - for($i=0; $i < $count; $i++) { |
|
175 | + for ($i=0; $i<$count; $i++) { |
|
176 | 176 | $index=$this->content[$i]->getColPosition($colIndex); |
177 | - if ($index !== NULL) |
|
177 | + if ($index!==NULL) |
|
178 | 178 | $this->getCell($i, $index)->$function(); |
179 | 179 | } |
180 | 180 | return $this; |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | */ |
207 | 207 | public function getColCount() { |
208 | 208 | $result=0; |
209 | - if ($this->count() > 0) |
|
209 | + if ($this->count()>0) |
|
210 | 210 | $result=$this->getItem(0)->getColCount(); |
211 | 211 | return $result; |
212 | 212 | } |
@@ -220,10 +220,10 @@ discard block |
||
220 | 220 | public function delete($rowIndex, $colIndex=NULL) { |
221 | 221 | if (isset($colIndex)) { |
222 | 222 | $row=$this->getItem($rowIndex); |
223 | - if (isset($row) === true) { |
|
223 | + if (isset($row)===true) { |
|
224 | 224 | $row->delete($colIndex); |
225 | 225 | } |
226 | - } else { |
|
226 | + }else { |
|
227 | 227 | $this->removeItem($rowIndex); |
228 | 228 | } |
229 | 229 | return $this; |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | */ |
253 | 253 | public function conditionalCellFormat($callback, $format) { |
254 | 254 | $rows=$this->content; |
255 | - foreach ( $rows as $row ) { |
|
255 | + foreach ($rows as $row) { |
|
256 | 256 | $row->conditionalCellFormat($callback, $format); |
257 | 257 | } |
258 | 258 | return $this; |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | */ |
266 | 266 | public function conditionalRowFormat($callback, $format) { |
267 | 267 | $rows=$this->content; |
268 | - foreach ( $rows as $row ) { |
|
268 | + foreach ($rows as $row) { |
|
269 | 269 | $row->conditionalRowFormat($callback, $format); |
270 | 270 | } |
271 | 271 | return $this; |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | */ |
278 | 278 | public function applyCells($callback) { |
279 | 279 | $rows=$this->content; |
280 | - foreach ( $rows as $row ) { |
|
280 | + foreach ($rows as $row) { |
|
281 | 281 | $row->applyCells($callback); |
282 | 282 | } |
283 | 283 | return $this; |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | */ |
290 | 290 | public function applyRows($callback) { |
291 | 291 | $rows=$this->content; |
292 | - foreach ( $rows as $row ) { |
|
292 | + foreach ($rows as $row) { |
|
293 | 293 | $row->apply($callback); |
294 | 294 | } |
295 | 295 | return $this; |
@@ -22,8 +22,9 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
24 | 24 | parent::__construct($identifier, $tagName, ""); |
25 | - if (isset($rowCount) && isset($colCount)) |
|
26 | - $this->setRowCount($rowCount, $colCount); |
|
25 | + if (isset($rowCount) && isset($colCount)) { |
|
26 | + $this->setRowCount($rowCount, $colCount); |
|
27 | + } |
|
27 | 28 | } |
28 | 29 | |
29 | 30 | /** |
@@ -129,8 +130,9 @@ discard block |
||
129 | 130 | $values=\array_fill(0, $count, $values); |
130 | 131 | $isArray=false; |
131 | 132 | } |
132 | - if (JArray::dimension($values) == 1 && $isArray) |
|
133 | - $values=[ $values ]; |
|
133 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
134 | + $values=[ $values ]; |
|
135 | + } |
|
134 | 136 | |
135 | 137 | $count=\min(\sizeof($values), $count); |
136 | 138 | |
@@ -174,8 +176,9 @@ discard block |
||
174 | 176 | $count=$this->count(); |
175 | 177 | for($i=0; $i < $count; $i++) { |
176 | 178 | $index=$this->content[$i]->getColPosition($colIndex); |
177 | - if ($index !== NULL) |
|
178 | - $this->getCell($i, $index)->$function(); |
|
179 | + if ($index !== NULL) { |
|
180 | + $this->getCell($i, $index)->$function(); |
|
181 | + } |
|
179 | 182 | } |
180 | 183 | return $this; |
181 | 184 | } |
@@ -206,8 +209,9 @@ discard block |
||
206 | 209 | */ |
207 | 210 | public function getColCount() { |
208 | 211 | $result=0; |
209 | - if ($this->count() > 0) |
|
210 | - $result=$this->getItem(0)->getColCount(); |
|
212 | + if ($this->count() > 0) { |
|
213 | + $result=$this->getItem(0)->getColCount(); |
|
214 | + } |
|
211 | 215 | return $result; |
212 | 216 | } |
213 | 217 |
@@ -68,10 +68,16 @@ discard block |
||
68 | 68 | return $tr; |
69 | 69 | } |
70 | 70 | |
71 | + /** |
|
72 | + * @param integer $value |
|
73 | + */ |
|
71 | 74 | public function newRow($value) { |
72 | 75 | return $this->createItem($value); |
73 | 76 | } |
74 | 77 | |
78 | + /** |
|
79 | + * @param integer $colCount |
|
80 | + */ |
|
75 | 81 | public function addRow($colCount) { |
76 | 82 | return $this->addItem($colCount); |
77 | 83 | } |
@@ -97,7 +103,7 @@ discard block |
||
97 | 103 | /** |
98 | 104 | * |
99 | 105 | * @param int $index |
100 | - * @return \Ajax\semantic\html\content\HtmlTR |
|
106 | + * @return \Ajax\common\html\HtmlDoubleElement |
|
101 | 107 | */ |
102 | 108 | public function getRow($index) { |
103 | 109 | return $this->getItem($index); |
@@ -141,6 +147,9 @@ discard block |
||
141 | 147 | return $this; |
142 | 148 | } |
143 | 149 | |
150 | + /** |
|
151 | + * @param integer $colIndex |
|
152 | + */ |
|
144 | 153 | public function setColValues($colIndex, $values=array()) { |
145 | 154 | $count=$this->count(); |
146 | 155 | if (\is_array($values) === false) { |
@@ -161,6 +170,9 @@ discard block |
||
161 | 170 | return $this; |
162 | 171 | } |
163 | 172 | |
173 | + /** |
|
174 | + * @param integer $rowIndex |
|
175 | + */ |
|
164 | 176 | public function setRowValues($rowIndex, $values=array()) { |
165 | 177 | $count=$this->count(); |
166 | 178 | if (\is_array($values) === false) { |
@@ -170,6 +182,9 @@ discard block |
||
170 | 182 | return $this; |
171 | 183 | } |
172 | 184 | |
185 | + /** |
|
186 | + * @param string $function |
|
187 | + */ |
|
173 | 188 | private function colAlign($colIndex, $function) { |
174 | 189 | $count=$this->count(); |
175 | 190 | for($i=0; $i < $count; $i++) { |
@@ -20,12 +20,12 @@ discard block |
||
20 | 20 | |
21 | 21 | public function __construct($identifier) { |
22 | 22 | parent::__construct($identifier, "tr", ""); |
23 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
23 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function setColCount($colCount) { |
27 | 27 | $count=$this->count(); |
28 | - for($i=$count; $i < $colCount; $i++) { |
|
28 | + for ($i=$count; $i<$colCount; $i++) { |
|
29 | 29 | $item=$this->addItem(NULL); |
30 | 30 | $item->setTagName($this->_tdTagName); |
31 | 31 | } |
@@ -65,16 +65,16 @@ discard block |
||
65 | 65 | */ |
66 | 66 | public function setValues($values=array()) { |
67 | 67 | $count=$this->count(); |
68 | - if (\is_array($values) === false) { |
|
68 | + if (\is_array($values)===false) { |
|
69 | 69 | $values=\array_fill(0, $count, $values); |
70 | - } else { |
|
71 | - if (JArray::isAssociative($values) === true) { |
|
70 | + }else { |
|
71 | + if (JArray::isAssociative($values)===true) { |
|
72 | 72 | $values=\array_values($values); |
73 | 73 | } |
74 | 74 | } |
75 | 75 | $count=\min(\sizeof($values), $count); |
76 | 76 | |
77 | - for($i=0; $i < $count; $i++) { |
|
77 | + for ($i=0; $i<$count; $i++) { |
|
78 | 78 | $cell=$this->content[$i]; |
79 | 79 | $cell->setValue($values[$i]); |
80 | 80 | } |
@@ -101,20 +101,20 @@ discard block |
||
101 | 101 | public function getColPosition($colIndex) { |
102 | 102 | $pos=0; |
103 | 103 | $rows=$this->_container->getContent(); |
104 | - for($i=0; $i < $this->_row; $i++) { |
|
104 | + for ($i=0; $i<$this->_row; $i++) { |
|
105 | 105 | $max=\min($colIndex, $rows[$i]->count()); |
106 | - for($j=0; $j < $max; $j++) { |
|
106 | + for ($j=0; $j<$max; $j++) { |
|
107 | 107 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
108 | - if ($rowspan + $i > $this->_row) |
|
108 | + if ($rowspan+$i>$this->_row) |
|
109 | 109 | $pos++; |
110 | 110 | } |
111 | 111 | } |
112 | - if ($pos > $colIndex) |
|
112 | + if ($pos>$colIndex) |
|
113 | 113 | return NULL; |
114 | 114 | $count=$this->count(); |
115 | - for($i=0; $i < $count; $i++) { |
|
115 | + for ($i=0; $i<$count; $i++) { |
|
116 | 116 | $pos+=$this->content[$i]->getColspan(); |
117 | - if ($pos >= $colIndex + 1) |
|
117 | + if ($pos>=$colIndex+1) |
|
118 | 118 | return $i; |
119 | 119 | } |
120 | 120 | return null; |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | |
123 | 123 | public function conditionalCellFormat($callback, $format) { |
124 | 124 | $cells=$this->content; |
125 | - foreach ( $cells as $cell ) { |
|
125 | + foreach ($cells as $cell) { |
|
126 | 126 | $cell->conditionalCellFormat($callback, $format); |
127 | 127 | } |
128 | 128 | return $this; |
@@ -137,8 +137,8 @@ discard block |
||
137 | 137 | |
138 | 138 | public function containsStr($needle) { |
139 | 139 | $cells=$this->content; |
140 | - foreach ( $cells as $cell ) { |
|
141 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
140 | + foreach ($cells as $cell) { |
|
141 | + if (\strpos($cell->getContent(), $needle)!==false) |
|
142 | 142 | return true; |
143 | 143 | } |
144 | 144 | return false; |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | |
152 | 152 | public function applyCells($callback) { |
153 | 153 | $cells=$this->content; |
154 | - foreach ( $cells as $cell ) { |
|
154 | + foreach ($cells as $cell) { |
|
155 | 155 | $cell->apply($callback); |
156 | 156 | } |
157 | 157 | return $this; |
@@ -105,17 +105,20 @@ discard block |
||
105 | 105 | $max=\min($colIndex, $rows[$i]->count()); |
106 | 106 | for($j=0; $j < $max; $j++) { |
107 | 107 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
108 | - if ($rowspan + $i > $this->_row) |
|
109 | - $pos++; |
|
108 | + if ($rowspan + $i > $this->_row) { |
|
109 | + $pos++; |
|
110 | + } |
|
110 | 111 | } |
111 | 112 | } |
112 | - if ($pos > $colIndex) |
|
113 | - return NULL; |
|
113 | + if ($pos > $colIndex) { |
|
114 | + return NULL; |
|
115 | + } |
|
114 | 116 | $count=$this->count(); |
115 | 117 | for($i=0; $i < $count; $i++) { |
116 | 118 | $pos+=$this->content[$i]->getColspan(); |
117 | - if ($pos >= $colIndex + 1) |
|
118 | - return $i; |
|
119 | + if ($pos >= $colIndex + 1) { |
|
120 | + return $i; |
|
121 | + } |
|
119 | 122 | } |
120 | 123 | return null; |
121 | 124 | } |
@@ -138,8 +141,9 @@ discard block |
||
138 | 141 | public function containsStr($needle) { |
139 | 142 | $cells=$this->content; |
140 | 143 | foreach ( $cells as $cell ) { |
141 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
142 | - return true; |
|
144 | + if (\strpos($cell->getContent(), $needle) !== false) { |
|
145 | + return true; |
|
146 | + } |
|
143 | 147 | } |
144 | 148 | return false; |
145 | 149 | } |
@@ -18,6 +18,9 @@ |
||
18 | 18 | private $_container; |
19 | 19 | private $_row; |
20 | 20 | |
21 | + /** |
|
22 | + * @param string $identifier |
|
23 | + */ |
|
21 | 24 | public function __construct($identifier) { |
22 | 25 | parent::__construct($identifier, "tr", ""); |
23 | 26 | $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | use Ajax\semantic\html\elements\html5\HtmlLink; |
11 | 11 | |
12 | 12 | class HtmlTD extends HtmlSemDoubleElement { |
13 | - use TextAlignmentTrait,TableElementTrait; |
|
13 | + use TextAlignmentTrait, TableElementTrait; |
|
14 | 14 | private $_container; |
15 | 15 | private $_row; |
16 | 16 | private $_col; |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public function __construct($identifier, $content=NULL, $tagName="td") { |
25 | 25 | parent::__construct($identifier, $tagName, "", $content); |
26 | - $this->_variations=[ Variation::COLLAPSING ]; |
|
27 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
26 | + $this->_variations=[Variation::COLLAPSING]; |
|
27 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function setContainer($container, $row, $col) { |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | public function setRowspan($rowspan) { |
42 | - $to=min($this->_container->count(), $this->_row + $rowspan - 1); |
|
43 | - for($i=$to; $i > $this->_row; $i--) { |
|
42 | + $to=min($this->_container->count(), $this->_row+$rowspan-1); |
|
43 | + for ($i=$to; $i>$this->_row; $i--) { |
|
44 | 44 | $this->_container->delete($i, $this->_col); |
45 | 45 | } |
46 | 46 | $this->setProperty("rowspan", $rowspan); |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | public function setColspan($colspan) { |
59 | - $to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1); |
|
60 | - for($i=$to; $i > $this->_col; $i--) { |
|
61 | - $this->_container->delete($this->_row, $this->_col + 1); |
|
59 | + $to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1); |
|
60 | + for ($i=$to; $i>$this->_col; $i--) { |
|
61 | + $this->_container->delete($this->_row, $this->_col+1); |
|
62 | 62 | } |
63 | 63 | $this->setProperty("colspan", $colspan); |
64 | 64 | return $this->_container; |
@@ -66,15 +66,17 @@ |
||
66 | 66 | |
67 | 67 | public function getColspan() { |
68 | 68 | $colspan=1; |
69 | - if (\array_key_exists("colspan", $this->properties)) |
|
70 | - $colspan=$this->getProperty("colspan"); |
|
69 | + if (\array_key_exists("colspan", $this->properties)) { |
|
70 | + $colspan=$this->getProperty("colspan"); |
|
71 | + } |
|
71 | 72 | return $colspan; |
72 | 73 | } |
73 | 74 | |
74 | 75 | public function getRowspan() { |
75 | 76 | $rowspan=1; |
76 | - if (\array_key_exists("rowspan", $this->properties)) |
|
77 | - $rowspan=$this->getProperty("rowspan"); |
|
77 | + if (\array_key_exists("rowspan", $this->properties)) { |
|
78 | + $rowspan=$this->getProperty("rowspan"); |
|
79 | + } |
|
78 | 80 | return $rowspan; |
79 | 81 | } |
80 | 82 |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | |
15 | 15 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
16 | 16 | parent::__construct($identifier, "div", "ui buttons"); |
17 | - $this->content=array (); |
|
18 | - if ($asIcons === true) |
|
17 | + $this->content=array(); |
|
18 | + if ($asIcons===true) |
|
19 | 19 | $this->asIcons(); |
20 | 20 | $this->addElements($elements, $asIcons); |
21 | 21 | } |
@@ -24,25 +24,25 @@ discard block |
||
24 | 24 | $elementO=$element; |
25 | 25 | if (\is_string($element)) { |
26 | 26 | if ($asIcon) { |
27 | - $elementO=new HtmlButton("button-" . $this->identifier . "-" . \sizeof($this->content)); |
|
27 | + $elementO=new HtmlButton("button-".$this->identifier."-".\sizeof($this->content)); |
|
28 | 28 | $elementO->asIcon($element); |
29 | - } else |
|
30 | - $elementO=new HtmlButton("button-" . $this->identifier . "-" . \sizeof($this->content), $element); |
|
29 | + }else |
|
30 | + $elementO=new HtmlButton("button-".$this->identifier."-".\sizeof($this->content), $element); |
|
31 | 31 | } |
32 | 32 | $this->addContent($elementO); |
33 | 33 | } |
34 | 34 | |
35 | 35 | public function addElements($elements, $asIcons=false) { |
36 | - foreach ( $elements as $element ) { |
|
36 | + foreach ($elements as $element) { |
|
37 | 37 | $this->addElement($element, $asIcons); |
38 | 38 | } |
39 | 39 | return $this; |
40 | 40 | } |
41 | 41 | |
42 | 42 | public function insertOr($aferIndex=0, $or="or") { |
43 | - $orElement=new HtmlSemDoubleElement("or-" . $this->identifier, "div", "or"); |
|
43 | + $orElement=new HtmlSemDoubleElement("or-".$this->identifier, "div", "or"); |
|
44 | 44 | $orElement->setProperty("data-text", $or); |
45 | - array_splice($this->content, $aferIndex + 1, 0, array ($orElement )); |
|
45 | + array_splice($this->content, $aferIndex+1, 0, array($orElement)); |
|
46 | 46 | return $this; |
47 | 47 | } |
48 | 48 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | public function asIcons() { |
58 | - foreach ( $this->content as $item ) { |
|
58 | + foreach ($this->content as $item) { |
|
59 | 59 | $item->asIcon($item->getContent()); |
60 | 60 | } |
61 | 61 | return $this->addToProperty("class", "icons"); |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
94 | 94 | */ |
95 | 95 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
96 | - foreach ( $this->content as $element ) { |
|
96 | + foreach ($this->content as $element) { |
|
97 | 97 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
98 | 98 | } |
99 | 99 | return $this; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | public function addClasses($classes=array()) { |
107 | 107 | $i=0; |
108 | - foreach ( $this->content as $button ) { |
|
108 | + foreach ($this->content as $button) { |
|
109 | 109 | $button->addToProperty("class", $classes[$i++]); |
110 | 110 | } |
111 | 111 | return $this; |
@@ -15,8 +15,9 @@ discard block |
||
15 | 15 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
16 | 16 | parent::__construct($identifier, "div", "ui buttons"); |
17 | 17 | $this->content=array (); |
18 | - if ($asIcons === true) |
|
19 | - $this->asIcons(); |
|
18 | + if ($asIcons === true) { |
|
19 | + $this->asIcons(); |
|
20 | + } |
|
20 | 21 | $this->addElements($elements, $asIcons); |
21 | 22 | } |
22 | 23 | |
@@ -26,8 +27,9 @@ discard block |
||
26 | 27 | if ($asIcon) { |
27 | 28 | $elementO=new HtmlButton("button-" . $this->identifier . "-" . \sizeof($this->content)); |
28 | 29 | $elementO->asIcon($element); |
29 | - } else |
|
30 | - $elementO=new HtmlButton("button-" . $this->identifier . "-" . \sizeof($this->content), $element); |
|
30 | + } else { |
|
31 | + $elementO=new HtmlButton("button-" . $this->identifier . "-" . \sizeof($this->content), $element); |
|
32 | + } |
|
31 | 33 | } |
32 | 34 | $this->addContent($elementO); |
33 | 35 | } |
@@ -75,9 +77,9 @@ discard block |
||
75 | 77 | * @return HtmlButton |
76 | 78 | */ |
77 | 79 | public function getElement($index) { |
78 | - if (is_int($index)) |
|
79 | - return $this->content[$index]; |
|
80 | - else { |
|
80 | + if (is_int($index)) { |
|
81 | + return $this->content[$index]; |
|
82 | + } else { |
|
81 | 83 | $elm=$this->getElementById($index, $this->content); |
82 | 84 | return $elm; |
83 | 85 | } |
@@ -29,8 +29,9 @@ discard block |
||
29 | 29 | |
30 | 30 | public function addHeader($title, $niveau=1, $dividing=true) { |
31 | 31 | $header=new HtmlHeader("", $niveau, $title); |
32 | - if ($dividing) |
|
33 | - $header->setDividing(); |
|
32 | + if ($dividing) { |
|
33 | + $header->setDividing(); |
|
34 | + } |
|
34 | 35 | return $this->addItem($header); |
35 | 36 | } |
36 | 37 | |
@@ -43,14 +44,16 @@ discard block |
||
43 | 44 | if (\is_string($end)) { |
44 | 45 | $label=$end; |
45 | 46 | \array_pop($fields); |
46 | - } else |
|
47 | - $label=NULL; |
|
47 | + } else { |
|
48 | + $label=NULL; |
|
49 | + } |
|
48 | 50 | } |
49 | 51 | $this->_fields=\array_merge($this->_fields, $fields); |
50 | 52 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
51 | 53 | } |
52 | - if (isset($label)) |
|
53 | - $fields=new HtmlFormField("", $fields, $label); |
|
54 | + if (isset($label)) { |
|
55 | + $fields=new HtmlFormField("", $fields, $label); |
|
56 | + } |
|
54 | 57 | } else { |
55 | 58 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
56 | 59 | } |
@@ -103,12 +106,15 @@ discard block |
||
103 | 106 | */ |
104 | 107 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
105 | 108 | $message=new HtmlMessage($identifier, $content); |
106 | - if (isset($header)) |
|
107 | - $message->addHeader($header); |
|
108 | - if (isset($icon)) |
|
109 | - $message->setIcon($icon); |
|
110 | - if (isset($type)) |
|
111 | - $message->setStyle($type); |
|
109 | + if (isset($header)) { |
|
110 | + $message->addHeader($header); |
|
111 | + } |
|
112 | + if (isset($icon)) { |
|
113 | + $message->setIcon($icon); |
|
114 | + } |
|
115 | + if (isset($type)) { |
|
116 | + $message->setStyle($type); |
|
117 | + } |
|
112 | 118 | return $this->addItem($message); |
113 | 119 | } |
114 | 120 |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | |
23 | 23 | public function __construct($identifier, $elements=array()) { |
24 | 24 | parent::__construct($identifier, "form", "ui form"); |
25 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
25 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
26 | 26 | $this->setProperty("name", $this->identifier); |
27 | - $this->_fields=array (); |
|
27 | + $this->_fields=array(); |
|
28 | 28 | $this->addItems($elements); |
29 | 29 | } |
30 | 30 | |
@@ -35,29 +35,29 @@ discard block |
||
35 | 35 | return $this->addItem($header); |
36 | 36 | } |
37 | 37 | |
38 | - public function addDivider($caption=NULL){ |
|
39 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
38 | + public function addDivider($caption=NULL) { |
|
39 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function addFields($fields=NULL, $label=NULL) { |
43 | 43 | if (isset($fields)) { |
44 | 44 | if (!$fields instanceof HtmlFormFields) { |
45 | - if (\is_array($fields) === false) { |
|
45 | + if (\is_array($fields)===false) { |
|
46 | 46 | $fields=\func_get_args(); |
47 | 47 | $end=\end($fields); |
48 | 48 | if (\is_string($end)) { |
49 | 49 | $label=$end; |
50 | 50 | \array_pop($fields); |
51 | - } else |
|
51 | + }else |
|
52 | 52 | $label=NULL; |
53 | 53 | } |
54 | 54 | $this->_fields=\array_merge($this->_fields, $fields); |
55 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
55 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
56 | 56 | } |
57 | 57 | if (isset($label)) |
58 | 58 | $fields=new HtmlFormField("", $fields, $label); |
59 | - } else { |
|
60 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
59 | + }else { |
|
60 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
61 | 61 | } |
62 | 62 | $this->addItem($fields); |
63 | 63 | return $fields; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | |
66 | 66 | public function addItem($item) { |
67 | 67 | $item=parent::addItem($item); |
68 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
68 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
69 | 69 | $this->_fields[]=$item; |
70 | 70 | } |
71 | 71 | return $item; |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | public function getField($index) { |
75 | 75 | if (\is_string($index)) { |
76 | 76 | $field=$this->getElementById($index, $this->_fields); |
77 | - } else { |
|
77 | + }else { |
|
78 | 78 | $field=$this->_fields[$index]; |
79 | 79 | } |
80 | 80 | return $field; |
@@ -16,14 +16,14 @@ discard block |
||
16 | 16 | |
17 | 17 | public function __construct(JsUtils $js) { |
18 | 18 | parent::__construct($js); |
19 | - $this->events=array (); |
|
19 | + $this->events=array(); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | protected function compileEvents() { |
23 | - foreach ( $this->events as $event => $jsCode ) { |
|
24 | - if($event=="execute"){ |
|
23 | + foreach ($this->events as $event => $jsCode) { |
|
24 | + if ($event=="execute") { |
|
25 | 25 | $this->jquery_code_for_compile []=$jsCode; |
26 | - }else if($event=="beforeExecute"){ |
|
26 | + }else if ($event=="beforeExecute") { |
|
27 | 27 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
28 | 28 | }else |
29 | 29 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $result=implode("\n", $this->jquery_code_for_compile); |
35 | 35 | $result=str_ireplace("\"%", "", $result); |
36 | 36 | $result=str_ireplace("%\"", "", $result); |
37 | - $result=str_replace(array ( |
|
37 | + $result=str_replace(array( |
|
38 | 38 | "\\n", |
39 | 39 | "\\r", |
40 | 40 | "\\t" |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | public function getScript() { |
46 | 46 | $allParams=$this->params; |
47 | - $this->jquery_code_for_compile=array (); |
|
47 | + $this->jquery_code_for_compile=array(); |
|
48 | 48 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
49 | 49 | $this->compileEvents(); |
50 | 50 | return $this->compileJQueryCode(); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | if (is_array($typeCtrl)) { |
72 | 72 | if (array_search($value, $typeCtrl)===false) |
73 | 73 | throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
74 | - } else { |
|
74 | + }else { |
|
75 | 75 | if (!$typeCtrl($value)) { |
76 | 76 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |
77 | 77 | } |
@@ -23,10 +23,11 @@ discard block |
||
23 | 23 | foreach ( $this->events as $event => $jsCode ) { |
24 | 24 | if($event=="execute"){ |
25 | 25 | $this->jquery_code_for_compile []=$jsCode; |
26 | - }else if($event=="beforeExecute"){ |
|
26 | + } else if($event=="beforeExecute"){ |
|
27 | 27 | \array_unshift($this->jquery_code_for_compile, $jsCode); |
28 | - }else |
|
29 | - $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
|
28 | + } else { |
|
29 | + $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
|
30 | + } |
|
30 | 31 | } |
31 | 32 | } |
32 | 33 | |
@@ -69,8 +70,9 @@ discard block |
||
69 | 70 | |
70 | 71 | protected function setParamCtrl($key, $value, $typeCtrl) { |
71 | 72 | if (is_array($typeCtrl)) { |
72 | - if (array_search($value, $typeCtrl)===false) |
|
73 | - throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
73 | + if (array_search($value, $typeCtrl)===false) { |
|
74 | + throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
75 | + } |
|
74 | 76 | } else { |
75 | 77 | if (!$typeCtrl($value)) { |
76 | 78 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName); |
@@ -20,8 +20,9 @@ |
||
20 | 20 | $result=array (); |
21 | 21 | foreach ( $this->categories as $category ) { |
22 | 22 | $r=$category->search($query, $field); |
23 | - if ($r !== false) |
|
24 | - $result[]=$r; |
|
23 | + if ($r !== false) { |
|
24 | + $result[]=$r; |
|
25 | + } |
|
25 | 26 | } |
26 | 27 | $this->categories=$result; |
27 | 28 | return $this; |
@@ -6,25 +6,25 @@ discard block |
||
6 | 6 | private $categories; |
7 | 7 | |
8 | 8 | public function __construct() { |
9 | - $this->categories=array (); |
|
9 | + $this->categories=array(); |
|
10 | 10 | } |
11 | 11 | |
12 | 12 | public function add($results, $category) { |
13 | 13 | $count=\sizeof($this->categories); |
14 | 14 | if (\array_key_exists($category, $this->categories)) { |
15 | 15 | $this->categories[$category]->addResults($results); |
16 | - } else { |
|
17 | - $categoryO=new SearchCategory("category" . $count, $category, $results); |
|
16 | + }else { |
|
17 | + $categoryO=new SearchCategory("category".$count, $category, $results); |
|
18 | 18 | $this->categories[$category]=$categoryO; |
19 | 19 | } |
20 | 20 | return $this; |
21 | 21 | } |
22 | 22 | |
23 | 23 | public function search($query, $field="title") { |
24 | - $result=array (); |
|
25 | - foreach ( $this->categories as $category ) { |
|
24 | + $result=array(); |
|
25 | + foreach ($this->categories as $category) { |
|
26 | 26 | $r=$category->search($query, $field); |
27 | - if ($r !== false) |
|
27 | + if ($r!==false) |
|
28 | 28 | $result[]=$r; |
29 | 29 | } |
30 | 30 | $this->categories=$result; |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | public function __toString() { |
35 | - return "{\"results\":{" . \implode(",", \array_values($this->categories)) . "}}"; |
|
35 | + return "{\"results\":{".\implode(",", \array_values($this->categories))."}}"; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function getResponse() { |
@@ -6,7 +6,7 @@ |
||
6 | 6 | |
7 | 7 | public function fromDatabaseObjects($objects, $function) { |
8 | 8 | if (isset($objects)) { |
9 | - foreach ( $objects as $object ) { |
|
9 | + foreach ($objects as $object) { |
|
10 | 10 | $this->fromDatabaseObject($object, $function); |
11 | 11 | } |
12 | 12 | } |
@@ -77,8 +77,9 @@ |
||
77 | 77 | $vars=get_object_vars($this); |
78 | 78 | $result=array (); |
79 | 79 | foreach ( $vars as $k => $v ) { |
80 | - if (isset($v)) |
|
81 | - $result[$k]=$v; |
|
80 | + if (isset($v)) { |
|
81 | + $result[$k]=$v; |
|
82 | + } |
|
82 | 83 | } |
83 | 84 | return $result; |
84 | 85 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | public function __construct($id=NULL, $title=NULL, $description=NULL, $image=NULL, $price=NULL) { |
13 | 13 | if (\is_array($id)) { |
14 | 14 | $this->fromArray($id); |
15 | - } else { |
|
15 | + }else { |
|
16 | 16 | $this->id=$id; |
17 | 17 | $this->title=$title; |
18 | 18 | $this->description=$description; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | public function fromArray($array) { |
70 | - foreach ( $array as $key => $value ) { |
|
70 | + foreach ($array as $key => $value) { |
|
71 | 71 | $this->{$key}=$value; |
72 | 72 | } |
73 | 73 | return $this; |
@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | |
80 | 80 | public function JsonSerialize() { |
81 | 81 | $vars=get_object_vars($this); |
82 | - $result=array (); |
|
83 | - foreach ( $vars as $k => $v ) { |
|
82 | + $result=array(); |
|
83 | + foreach ($vars as $k => $v) { |
|
84 | 84 | if (isset($v)) |
85 | 85 | $result[$k]=$v; |
86 | 86 | } |
@@ -89,6 +89,6 @@ discard block |
||
89 | 89 | |
90 | 90 | public function search($query, $field="title") { |
91 | 91 | $value=$this->$field; |
92 | - return \stripos($value, $query) !== false; |
|
92 | + return \stripos($value, $query)!==false; |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | \ No newline at end of file |