Refactor scoring percentage calculations in app.py to differentiate between DraftKings and FanDuel slate types, updating column names and improving data filtering logic for enhanced accuracy and user experience.

app.py

@@ -276,12 +276,20 @@ with tab1:
             slate_var1 = st.radio("Which data are you loading?", ('Main Slate', 'Secondary Slate', 'Turbo Slate'), key='slate_var1')
             own_var1 = st.radio("How would you like to display team ownership?", ('Sum', 'Average'), key='own_var1')
     
-    if slate_var1 == 'Main Slate':
-        scoring_percentages = scoring_percentages[scoring_percentages['Main Slate'] == 1]
-    elif slate_var1 == 'Secondary Slate':
-        scoring_percentages = scoring_percentages[scoring_percentages['Secondary Slate'] == 1]
-    elif slate_var1 == 'Turbo Slate':
-        scoring_percentages = scoring_percentages[scoring_percentages['Turbo Slate'] == 1]
+    if site_var == 'Draftkings':
+        if slate_var1 == 'Main Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['DK Main Slate'] == 1]
+        elif slate_var1 == 'Secondary Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['DK Secondary Slate'] == 1]
+        elif slate_var1 == 'Turbo Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['DK Turbo Slate'] == 1]
+    elif site_var == 'Fanduel':
+        if slate_var1 == 'Main Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['FD Main Slate'] == 1]
+        elif slate_var1 == 'Secondary Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['FD Secondary Slate'] == 1]
+        elif slate_var1 == 'Turbo Slate':
+            scoring_percentages = scoring_percentages[scoring_percentages['FD Turbo Slate'] == 1]
 
     dk_hitters_only = dk_roo[dk_roo['pos_group'] != 'Pitchers']
     if slate_var1 == 'Main Slate':
@@ -311,10 +319,16 @@ with tab1:
     scoring_percentages['FD LevX'] = scoring_percentages['Top Score'].rank(pct=True).astype(float) - scoring_percentages['FD Own%'].rank(pct=True).astype(float)
 
     scoring_percentages = scoring_percentages.sort_values(by='8+ runs', ascending=False)
-    scoring_percentages = scoring_percentages.drop(['Main Slate', 'Secondary Slate', 'Turbo Slate'], axis=1)
+    scoring_percentages = scoring_percentages.drop(['DK Main Slate', 'DK Secondary Slate', 'DK Turbo Slate', 'FD Main Slate', 'FD Secondary Slate', 'FD Turbo Slate'], axis=1)
+    if site_var == 'Draftkings':
+        scoring_percentages = scoring_percentages.drop(['FD LevX', 'FD Own%'], axis=1)
+        scoring_percentages = scoring_percentages.rename(columns={'DK LevX': 'LevX', 'DK Own%': 'Own%', 'Avg Score': 'Runs', 'Win Percentage': 'Win%', '8+ runs': '8+ Runs'})
+    elif site_var == 'Fanduel':
+        scoring_percentages = scoring_percentages.drop(['DK LevX', 'DK Own%'], axis=1)
+        scoring_percentages = scoring_percentages.rename(columns={'FD LevX': 'LevX', 'FD Own%': 'Own%', 'Avg Score': 'Runs', 'Win Percentage': 'Win%', '8+ runs': '8+ Runs'})
     
     if view_var == "Simple":
-        scoring_percentages = scoring_percentages[['Names', 'Avg Score', '8+ runs', 'Win Percentage']]
+        scoring_percentages = scoring_percentages[['Names', 'Runs', '8+ Runs', 'Win%', 'LevX', 'Own%']]
         st.dataframe(scoring_percentages.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(game_format, precision=2), height=750, use_container_width = True, hide_index=True)
     elif view_var == "Advanced":
         st.dataframe(scoring_percentages.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(game_format, precision=2), height=750, use_container_width = True, hide_index=True)
@@ -390,7 +404,7 @@ with tab2:
 
     if view_var == "Simple":
         try:
-            player_roo_disp = player_roo_disp[['Player', 'Position', 'Salary', 'Median', 'Ceiling', 'Own%']]
+            player_roo_disp = player_roo_disp[['Player', 'Position', 'Team', 'Salary', 'Median', 'Ceiling', 'Own%']]
             st.dataframe(player_roo_disp.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(player_roo_format, precision=2), height=750, use_container_width = True, hide_index=True)
         except:
             st.dataframe(player_roo_disp.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(player_roo_format, precision=2), height=750, use_container_width = True, hide_index=True)