@@ -61,10 +61,11 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public function groupingEvalNext(string $val1, string $val2) |
| 63 | 63 | { |
| 64 | - if ($val1 != $val2) |
|
| 65 | - return TRUE; |
|
| 66 | - else |
|
| 67 | - return FALSE; |
|
| 64 | + if ($val1 != $val2) { |
|
| 65 | + return TRUE; |
|
| 66 | + } else { |
|
| 67 | + return FALSE; |
|
| 68 | + } |
|
| 68 | 69 | } |
| 69 | 70 | |
| 70 | 71 | /** |
@@ -74,10 +75,15 @@ discard block |
||
| 74 | 75 | */ |
| 75 | 76 | public function groupingNextLine( $values) |
| 76 | 77 | { |
| 77 | - if ($this->grouppingActive === FALSE) return ''; |
|
| 78 | + if ($this->grouppingActive === FALSE) { |
|
| 79 | + return ''; |
|
| 80 | + } |
|
| 78 | 81 | |
| 79 | 82 | $dbcol = $this->groupingColumn; |
| 80 | - if ($values->$dbcol === NULL) $values->$dbcol = 0; // Set default to 0 |
|
| 83 | + if ($values->$dbcol === NULL) { |
|
| 84 | + $values->$dbcol = 0; |
|
| 85 | + } |
|
| 86 | + // Set default to 0 |
|
| 81 | 87 | if ($this->groupingVal == '' || $this->groupingEvalNext($this->groupingVal ,$values->$dbcol) === TRUE ) |
| 82 | 88 | { |
| 83 | 89 | $this->groupingVal = $values->$dbcol; |