Skip to content

Commit 85ba6f0

Browse files
bkdotcombkdotcom
committed
Tables: apply column attribs to total row cell; new column options: trueAs & falseAs (ie for replacing true/false as icons)
1 parent 94c416c commit 85ba6f0

File tree

6 files changed

+123
-30
lines changed

6 files changed

+123
-30
lines changed

‎src/Debug/Dump/Html/Table.php‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ private function buildInitOptions(array $options)
103103
$this->options['tableInfo']['columns'][$k] = \array_merge(array(
104104
'attribs' => array(),
105105
'class' => null,
106+
'falseAs' => null,
106107
'key' => '',
107108
'total' => null,
109+
'trueAs' => null,
108110
), $colInfo);
109111
}
110112
}
@@ -179,7 +181,10 @@ protected function buildFooter()
179181
if (\is_float($totalVal)) {
180182
$totalVal = \round($totalVal, 6);
181183
}
182-
$cells[] = $this->dumper->valDumper->dump($totalVal, array('tagName' => 'td'));
184+
$cells[] = $this->dumper->valDumper->dump($totalVal, array(
185+
'attribs' => $colInfo['attribs'],
186+
'tagName' => 'td',
187+
));
183188
$haveTotal = true;
184189
}
185190
if (!$haveTotal) {
@@ -203,7 +208,7 @@ protected function buildHeader()
203208
$labels = array();
204209
foreach ($this->options['tableInfo']['columns'] as $colInfo) {
205210
$label = $colInfo['key'];
206-
if (isset($colInfo['class'])) {
211+
if (!empty($colInfo['class'])) {
207212
$label .= ' ' . $this->dumper->valDumper->markupIdentifier($colInfo['class'], 'className');
208213
}
209214
$labels[] = $label;
@@ -251,10 +256,17 @@ protected function buildRow($row, array $rowInfo, $rowKey)
251256
*/
252257
$i = 0;
253258
foreach ($row as $v) {
254-
$str .= $this->dumper->valDumper->dump($v, array(
255-
'attribs' => $this->options['tableInfo']['columns'][$i]['attribs'],
259+
$colInfo = $this->options['tableInfo']['columns'][$i];
260+
$td = $this->dumper->valDumper->dump($v, array(
261+
'attribs' => $colInfo['attribs'],
256262
'tagName' => 'td',
257263
));
264+
if ($v === true && $colInfo['trueAs'] !== null) {
265+
$td = \str_replace('>true<', '>' . $colInfo['trueAs'] . '<', $td);
266+
} elseif ($v === false && $colInfo['falseAs'] !== null) {
267+
$td = \str_replace('>false<', '>' . $colInfo['falseAs'] . '<', $td);
268+
}
269+
$str .= $td;
258270
$i++;
259271
}
260272
$str .= '</tr>';

‎src/Debug/Utility/Table.php‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,12 @@ class Table
5151
'columns' => array(
5252
/*
5353
array(
54+
attribs
5455
key
5556
class
5657
total
58+
falseAs: ''
59+
trueAs: ''
5760
)
5861
*/
5962
),
@@ -208,16 +211,19 @@ private function initMeta(array $meta)
208211
*/
209212
private function initTableInfoColumns()
210213
{
211-
$columns = array();
212214
$columnNames = $this->meta['columnNames'];
213215
$keys = $this->meta['columns'] ?: self::colKeys($this->rows);
214-
foreach ($keys as $key) {
215-
$columns[$key] = array(
216+
$columns = \array_fill_keys($keys, array());
217+
\array_walk($columns, function (&$column, $key) use ($columnNames) {
218+
$default = isset($this->meta['tableInfo']['columns'][$key])
219+
? $this->meta['tableInfo']['columns'][$key]
220+
: array();
221+
$column = \array_merge($default, array(
216222
'key' => isset($columnNames[$key])
217223
? $columnNames[$key]
218224
: $key,
219-
);
220-
}
225+
));
226+
});
221227
foreach ($this->meta['totalCols'] as $i => $key) {
222228
if (isset($columns[$key]) === false) {
223229
unset($this->meta['totalCols'][$i]);
@@ -376,7 +382,9 @@ private function setMeta()
376382
$columns = array();
377383
foreach ($this->meta['tableInfo']['columns'] as $colInfo) {
378384
$columns[] = \array_filter($colInfo, static function ($val) {
379-
return \strlen((string) $val) > 0;
385+
return \is_array($val)
386+
? !empty($val)
387+
: $val !== null && $val !== false;;
380388
});
381389
}
382390
$this->meta['tableInfo']['columns'] = $columns;
@@ -396,7 +404,6 @@ private function setMeta()
396404
$this->meta['tableInfo']
397405
);
398406
}
399-
// $this->logEntry['meta'] = $this->meta;
400407
}
401408

402409
/**

‎src/Debug/js/Debug.jquery.js‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -558,13 +558,23 @@
558558
function rowComparator (colIndex, dir, collator) {
559559
var floatRe = /^([+-]?(?:0|[1-9]\d*)(?:\.\d*)?)(?:[eE]([+-]?\d+))?$/;
560560
return function sortFunction (trA, trB) {
561-
var a = trA.cells[colIndex].textContent.trim();
562-
var b = trB.cells[colIndex].textContent.trim();
563-
var aFloatMatches = a.match(floatRe);
564-
var bFloatMatches = b.match(floatRe);
561+
var aCell = trA.cells[colIndex];
562+
var bCell = trB.cells[colIndex];
563+
var aText = aCell.textContent.trim();
564+
var bText = bCell.textContent.trim();
565+
var aTypeMore = aCell.getAttribute('data-type-more');
566+
var bTypeMore = bCell.getAttribute('data-type-more');
567+
var aFloatMatches = aText.match(floatRe);
568+
var bFloatMatches = bText.match(floatRe);
569+
if (['true','false'].indexOf(aTypeMore) > -1) {
570+
aText = aTypeMore;
571+
}
572+
if (['true','false'].indexOf(bTypeMore) > -1) {
573+
bText = bTypeMore;
574+
}
565575
return aFloatMatches && bFloatMatches
566576
? dir * compareFloat(toFixed(aFloatMatches), toFixed(bFloatMatches))
567-
: dir * compare(a, b, collator)
577+
: dir * compare(aText, bText, collator)
568578
}
569579
}
570580

‎src/Debug/js/Debug.jquery.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Debug/js_src/tableSort.js‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,23 @@ function sortTable (table, colIndex, dir) {
5959
function rowComparator (colIndex, dir, collator) {
6060
var floatRe = /^([+-]?(?:0|[1-9]\d*)(?:\.\d*)?)(?:[eE]([+-]?\d+))?$/
6161
return function sortFunction (trA, trB) {
62-
var a = trA.cells[colIndex].textContent.trim()
63-
var b = trB.cells[colIndex].textContent.trim()
64-
var aFloatMatches = a.match(floatRe)
65-
var bFloatMatches = b.match(floatRe)
62+
var aCell = trA.cells[colIndex]
63+
var bCell = trB.cells[colIndex]
64+
var aText = aCell.textContent.trim()
65+
var bText = bCell.textContent.trim()
66+
var aTypeMore = aCell.getAttribute('data-type-more')
67+
var bTypeMore = bCell.getAttribute('data-type-more')
68+
var aFloatMatches = aText.match(floatRe)
69+
var bFloatMatches = bText.match(floatRe)
70+
if (['true','false'].indexOf(aTypeMore) > -1) {
71+
aText = aTypeMore
72+
}
73+
if (['true','false'].indexOf(bTypeMore) > -1) {
74+
bText = bTypeMore
75+
}
6676
return aFloatMatches && bFloatMatches
6777
? dir * compareFloat(toFixed(aFloatMatches), toFixed(bFloatMatches))
68-
: dir * compare(a, b, collator)
78+
: dir * compare(aText, bText, collator)
6979
}
7080
}
7181

‎tests/Debug/Plugin/Method/TableTest.php‎

Lines changed: 62 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ public static function providerTestMethod()
109109
<tr><th>&nbsp;</th><th scope="col">name</th><th scope="col">age</th><th scope="col">sex</th><th scope="col">Naughty</th><th scope="col">extracol</th></tr>
110110
</thead>
111111
<tbody>
112-
<tr><th class="t_int t_key text-right" scope="row">4</th><td class="t_string">Bob</td><td class="t_string" data-type-more="numeric">12</td><td class="t_string">M</td><td class="t_bool" data-type-more="false">false</td><td class="t_undefined"></td></tr>
113-
<tr><th class="t_int t_key text-right" scope="row">2</th><td class="t_string">Sally</td><td class="t_string" data-type-more="numeric">10</td><td class="t_string">F</td><td class="t_bool" data-type-more="true">true</td><td class="t_string">yes</td></tr>
112+
<tr><th class="t_int t_key text-right" scope="row">4</th><td class="t_string">Bob</td><td class="t_string" data-type-more="numeric">12</td><td class="t_string">M</td><td class="t_bool text-center" data-type-more="false"></td><td class="t_undefined"></td></tr>
113+
<tr><th class="t_int t_key text-right" scope="row">2</th><td class="t_string">Sally</td><td class="t_string" data-type-more="numeric">10</td><td class="t_string">F</td><td class="t_bool text-center" data-type-more="true"><i class="fa fa-check"></i></td><td class="t_string">yes</td></tr>
114114
</tbody>
115115
</table>
116116
</li>
@@ -256,7 +256,15 @@ public static function providerTestMethod()
256256

257257
'superfluousArgs' => array(
258258
'table',
259-
array('arg1', 'arg2 is not logged', $rowsA, 'arg4 is not logged'),
259+
array('arg1', 'arg2 is not logged', $rowsA, 'arg4 is not logged', \bdk\Debug::meta('tableInfo', array(
260+
'columns' => array(
261+
'Naughty' => array(
262+
'attribs' => array('class' => ['text-center']),
263+
'falseAs' => '',
264+
'trueAs' => '<i class="fa fa-check"></i>',
265+
),
266+
),
267+
))),
260268
array(
261269
'entry' => array(
262270
'method' => 'table',
@@ -270,7 +278,14 @@ public static function providerTestMethod()
270278
array('key' => 'name'),
271279
array('key' => 'age'),
272280
array('key' => 'sex'),
273-
array('key' => 'Naughty'),
281+
array(
282+
'attribs' => array(
283+
'class' => ['text-center'],
284+
),
285+
'falseAs' => '',
286+
'trueAs' => '<i class="fa fa-check"></i>',
287+
'key' => 'Naughty',
288+
),
274289
array('key' => 'extracol'),
275290
),
276291
'haveObjRow' => false,
@@ -323,7 +338,15 @@ public static function providerTestMethod()
323338
// 5 rowsA
324339
array(
325340
'table',
326-
array('table caption', $rowsA),
341+
array('table caption', $rowsA, \bdk\Debug::meta('tableInfo', array(
342+
'columns' => array(
343+
'Naughty' => array(
344+
'attribs' => array('class' => ['text-center']),
345+
'falseAs' => '',
346+
'trueAs' => '<i class="fa fa-check"></i>',
347+
),
348+
),
349+
))),
327350
array(
328351
'entry' => array(
329352
'method' => 'table',
@@ -337,7 +360,14 @@ public static function providerTestMethod()
337360
array('key' => 'name'),
338361
array('key' => 'age'),
339362
array('key' => 'sex'),
340-
array('key' => 'Naughty'),
363+
array(
364+
'attribs' => array(
365+
'class' => ['text-center'],
366+
),
367+
'falseAs' => '',
368+
'trueAs' => '<i class="fa fa-check"></i>',
369+
'key' => 'Naughty',
370+
),
341371
array('key' => 'extracol'),
342372
),
343373
'haveObjRow' => false,
@@ -515,6 +545,15 @@ public static function providerTestMethod()
515545
array(
516546
'traversable',
517547
new \bdk\Test\Debug\Fixture\TestTraversable($rowsA),
548+
\bdk\Debug::meta('tableInfo', array(
549+
'columns' => array(
550+
'Naughty' => array(
551+
'attribs' => array('class' => ['text-center']),
552+
'falseAs' => '',
553+
'trueAs' => '<i class="fa fa-check"></i>',
554+
),
555+
),
556+
)),
518557
),
519558
array(
520559
'html' => \str_replace('table caption', 'traversable (<span class="classname" title="I implement Traversable!"><span class="namespace">bdk\Test\Debug\Fixture\</span>TestTraversable</span>)', $rowsAHtml),
@@ -689,7 +728,15 @@ public static function providerTestMethod()
689728

690729
'inclContext' => array(
691730
'table',
692-
array('table caption', $rowsA, Debug::meta('inclContext')),
731+
array('table caption', $rowsA, \bdk\Debug::meta('inclContext'), \bdk\Debug::meta('tableInfo', array(
732+
'columns' => array(
733+
'Naughty' => array(
734+
'attribs' => array('class' => ['text-center']),
735+
'falseAs' => '',
736+
'trueAs' => '<i class="fa fa-check"></i>',
737+
),
738+
),
739+
))),
693740
array(
694741
'entry' => array(
695742
'method' => 'table',
@@ -703,7 +750,14 @@ public static function providerTestMethod()
703750
array('key' => 'name'),
704751
array('key' => 'age'),
705752
array('key' => 'sex'),
706-
array('key' => 'Naughty'),
753+
array(
754+
'attribs' => array(
755+
'class' => ['text-center'],
756+
),
757+
'falseAs' => '',
758+
'trueAs' => '<i class="fa fa-check"></i>',
759+
'key' => 'Naughty',
760+
),
707761
array('key' => 'extracol'),
708762
),
709763
'haveObjRow' => false,

0 commit comments

Comments
 (0)