fix inaccurate data calculation with adata rolling and contribution (a…

…pache#7035)
lyft · Mar 14, 2019 · 0782e83 · 0782e83
1 parent cc58f0e
commit 0782e83
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/superset/viz.py b/superset/viz.py
@@ -1184,10 +1184,6 @@ def process_data(self, df, aggregate=False):
             dfs.sort_values(ascending=False, inplace=True)
             df = df[dfs.index]
 
-        if fd.get('contribution'):
-            dft = df.T
-            df = (dft / dft.sum()).T
-
         rolling_type = fd.get('rolling_type')
         rolling_periods = int(fd.get('rolling_periods') or 0)
         min_periods = int(fd.get('min_periods') or 0)
@@ -1207,6 +1203,10 @@ def process_data(self, df, aggregate=False):
         if min_periods:
             df = df[min_periods:]
 
+        if fd.get('contribution'):
+            dft = df.T
+            df = (dft / dft.sum()).T
+
         return df
 
     def run_extra_queries(self):