Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
aggrid
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
aggrid
Commits
9b8672af
Commit
9b8672af
authored
4 years ago
by
Mike Feranda
Committed by
Mike Feranda
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#3170915
by mferanda: Complimentary suppression
parent
153e9727
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Plugin/Field/FieldFormatter/HtmlFormatterType.php
+44
-9
44 additions, 9 deletions
src/Plugin/Field/FieldFormatter/HtmlFormatterType.php
with
44 additions
and
9 deletions
src/Plugin/Field/FieldFormatter/HtmlFormatterType.php
+
44
−
9
View file @
9b8672af
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment