Refactor player selection logic to streamline slate handling for DraftKings and FanDuel, consolidating conditions for 'Regular' and 'Showdown' types.

src/streamlit_app.py

@@ -964,51 +964,38 @@ if selected_tab == 'Player ROO':
             elif site_var == 'Fanduel':
                 slate_var2 = st.radio("Which slate data are you loading?", (slate_names_fd if type_var == 'Showdown' else ['Main Slate', 'Secondary Slate', 'Late Slate']), key='slate_var3_radio')
 
-            if slate_var2 == 'Main Slate':
-                if site_var == 'Draftkings':
-                    if type_var == 'Regular':
+            if type_var == 'Regular':
+                if slate_var2 == 'Main Slate':
+                    if site_var == 'Draftkings':
                         site_baselines = dk_roo_raw
                         raw_baselines = site_baselines[site_baselines['slate'] == 'Main Slate']
-                    elif type_var == 'Showdown':
-                        site_baselines = dk_sd_roo_raw
-                        raw_baselines = site_baselines[site_baselines['slate'] == dk_showdown_db_translation[slate_var2]]
-                elif site_var == 'Fanduel':
-                    if type_var == 'Regular':
+                    elif site_var == 'Fanduel':
                         site_baselines = fd_roo_raw
                         raw_baselines = site_baselines[site_baselines['slate'] == 'Main Slate']
-                    elif type_var == 'Showdown':
-                        site_baselines = fd_sd_roo_raw
-                        raw_baselines = site_baselines[site_baselines['slate'] == fd_showdown_db_translation[slate_var2]]
-            elif slate_var2 == 'Secondary Slate':
-                if site_var == 'Draftkings':
-                    if type_var == 'Regular':
+                    
+                elif slate_var2 == 'Secondary Slate':
+                    if site_var == 'Draftkings':
                         site_baselines = dk_roo_raw
                         raw_baselines = site_baselines[site_baselines['slate'] == 'Secondary Slate']
-                    elif type_var == 'Showdown':
-                        site_baselines = dk_sd_roo_raw
-                        raw_baselines = site_baselines[site_baselines['slate'] == dk_showdown_db_translation[slate_var2]]
-                elif site_var == 'Fanduel':
-                    if type_var == 'Regular':
+                    elif site_var == 'Fanduel':
                         site_baselines = fd_roo_raw
                         raw_baselines = site_baselines[site_baselines['slate'] == 'Secondary Slate']
-                    elif type_var == 'Showdown':
-                        site_baselines = fd_sd_roo_raw
-                        raw_baselines = site_baselines[site_baselines['slate'] == fd_showdown_db_translation[slate_var2]]
-            elif slate_var2 == 'Late Slate':
-                if site_var == 'Draftkings':
-                    if type_var == 'Regular':
+
+                elif slate_var2 == 'Late Slate':
+                    if site_var == 'Draftkings':
                         site_baselines = dk_roo_raw
                         raw_baselines = site_baselines[site_baselines['slate'] == 'Late Slate']
-                    elif type_var == 'Showdown':
-                        site_baselines = dk_sd_roo_raw
-                        raw_baselines = site_baselines[site_baselines['slate'] == dk_showdown_db_translation[slate_var2]]
-                elif site_var == 'Fanduel':
-                    if type_var == 'Regular':
+                    elif site_var == 'Fanduel':
                         site_baselines = fd_roo_raw
                         raw_baselines = site_baselines[site_baselines['slate'] == 'Late Slate']
-                    elif type_var == 'Showdown':
-                        site_baselines = fd_sd_roo_raw
-                        raw_baselines = site_baselines[site_baselines['slate'] == fd_showdown_db_translation[slate_var2]]
+                        
+            elif type_var == 'Showdown':
+                if site_var == 'Draftkings':
+                    site_baselines = dk_sd_roo_raw
+                    raw_baselines = site_baselines[site_baselines['slate'] == slate_name_lookup_dk[slate_var2]]
+                elif site_var == 'Fanduel':
+                    site_baselines = fd_sd_roo_raw
+                    raw_baselines = site_baselines[site_baselines['slate'] == slate_name_lookup_fd[slate_var2]]
         
         with col3:
             split_var2 = st.radio("Slate Range", ('Full Slate Run', 'Specific Games'), key='split_var2')