Skip to content
Snippets Groups Projects
Commit 9b8672af authored by Mike Feranda's avatar Mike Feranda Committed by Mike Feranda
Browse files

Issue #3170915 by mferanda: Complimentary suppression

parent 153e9727
No related branches found
No related tags found
No related merge requests found
......@@ -182,8 +182,14 @@ class HtmlFormatterType extends FormatterBase {
// Add the current cell to the suppression
$suppCell[$i][] = $field;
// Count it
$suppRowCount[$i]++;
$suppColCount[$field]++;
// Dont add if suppression just happens down the row
if ($rowSettings[$i][$field]['valueSuppression']['complimentary'] !== "row") {
$suppRowCount[$i]++;
}
// Dont add if suppression just happens across the columns
if ($rowSettings[$i][$field]['valueSuppression']['complimentary'] !== "column") {
$suppColCount[$field]++;
}
// Additional Suppression
if (isset($rowSettings[$i][$field]['valueSuppression']['otherRowCol'])) {
......@@ -195,13 +201,27 @@ class HtmlFormatterType extends FormatterBase {
if (is_numeric($otherRow) && !in_array($otherField, $suppCell[$otherRow])) {
// Add for other row/column
$suppCell[$otherRow][] = $otherField;
$suppRowCount[$otherRow]++;
$suppColCount[$otherField]++;
// Dont add if suppression just happens down the row
if ($rowSettings[$otherRow][$otherField]['valueSuppression']['complimentary'] !== "row") {
$suppRowCount[$otherRow]++;
}
// Dont add if suppression just happens across the columns
if ($rowSettings[$otherRow][$otherField]['valueSuppression']['complimentary'] !== "column") {
$suppColCount[$otherField]++;
}
} elseif ($otherRow == 'current' && !in_array($i, $suppCell[$i])) {
// Add for other columns in current row
$suppCell[$i][] = $otherField;
$suppRowCount[$i]++;
$suppColCount[$otherField]++;
// Dont add if suppression just happens down the row
if ($rowSettings[$i][$otherField]['valueSuppression']['complimentary'] !== "row") {
$suppRowCount[$i]++;
}
// Dont add if suppression just happens across the columns
if ($rowSettings[$i][$otherField]['valueSuppression']['complimentary'] !== "column") {
$suppColCount[$otherField]++;
}
}
}
}
......@@ -260,7 +280,10 @@ class HtmlFormatterType extends FormatterBase {
unset($suppSingleCol[$numCol]);
// Add to counts
$suppRowCount[$row]++;
$suppColCount[$col]++;
// Dont add if suppression just happens across the columns
if ($rowSettings[$row][$col]['valueSuppression']['complimentary'] !== "column") {
$suppColCount[$col]++;
}
// Mark row as suppressed
$rowSuppressed = 1;
}
......@@ -291,7 +314,10 @@ class HtmlFormatterType extends FormatterBase {
}
// Add to counts
$suppRowCount[$row]++;
$suppColCount[$col]++;
// Dont add if suppression just happens across the columns
if ($rowSettings[$row][$col]['valueSuppression']['complimentary'] !== "column") {
$suppColCount[$col]++;
}
// Mark row as suppressed
$rowSuppressed = 1;
}
......@@ -323,7 +349,10 @@ class HtmlFormatterType extends FormatterBase {
}
// Add to counts
$suppRowCount[$row]++;
$suppColCount[$col]++;
// Dont add if suppression just happens across the columns
if ($rowSettings[$row][$col]['valueSuppression']['complimentary'] !== "column") {
$suppColCount[$col]++;
}
// Mark row as suppressed
$rowSuppressed = 1;
}
......@@ -357,7 +386,10 @@ class HtmlFormatterType extends FormatterBase {
unset($suppSingleRow[$row]);
unset($suppSingleCol[$numCol]);
// Add to counts
$suppRowCount[$row]++;
// Dont add if suppression just happens down the row
if ($rowSettings[$row][$col]['valueSuppression']['complimentary'] !== "row") {
$suppRowCount[$row]++;
}
$suppColCount[$col]++;
// Mark row as suppressed
$colSuppressed = 1;
......@@ -389,7 +421,10 @@ class HtmlFormatterType extends FormatterBase {
unset($suppSingleCol[$key]);
}
// Add to counts
$suppRowCount[$row]++;
// Dont add if suppression just happens down the row
if ($rowSettings[$row][$col]['valueSuppression']['complimentary'] !== "row") {
$suppRowCount[$row]++;
}
$suppColCount[$col]++;
// Mark row as suppressed
$colSuppressed = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment