Merge pull request #199 from AI-SDC/fixing_crosstab_suppression

fixing suppression when margins is true
AI-SDC · Mar 8, 2024 · 4aa84d6 · 4aa84d6
2 parents 2273a3a + bfa6696
commit 4aa84d6
Show file tree

Hide file tree

Showing 3 changed files with 509 additions and 401 deletions.
diff --git a/acro/acro_tables.py b/acro/acro_tables.py
@@ -1500,6 +1500,28 @@ def crosstab_with_totals(  # pylint: disable=too-many-arguments,too-many-locals
                 dropna=dropna,
                 normalize=normalize,
             )
+
+            table, _ = delete_empty_rows_columns(table)
+            masks = create_crosstab_masks(
+                index_new,
+                columns_new,
+                values,
+                rownames,
+                colnames,
+                aggfunc,
+                margins,
+                margins_name,
+                dropna,
+                normalize,
+            )
+
+            # Force the apply_suppression not to display the outcome dataframe
+            previous_level = logger.getEffectiveLevel()
+            logger.setLevel(logging.WARNING)
+            # apply the suppression
+            table, _ = apply_suppression(table, masks)
+            logger.setLevel(previous_level)
+
         else:
             table = pd.pivot_table(  # type: ignore
                 data=data,