Refactor Range of Outcomes tab layout and improve data selection workflow

Restructure the first tab's layout using a 5-column grid for more intuitive data selection. Consolidate data loading and view selection logic, simplifying the user interface while maintaining the existing functionality for NBA and NFL projections. Improve spacing and organization of selection options to enhance user experience.

app.py

@@ -115,74 +115,85 @@ def convert_df_to_csv(df):
 tab1, tab2 = st.tabs(['Range of Outcomes', 'Optimizer'])
 
 with tab1:
-    col1, col2 = st.columns([1, 5])
-    with col1:
-        if st.button("Load/Reset Data", key='reset2'):
-              st.cache_data.clear()
-              nba_dk_sd_raw, nba_fd_sd_raw, nfl_dk_sd_raw, nfl_fd_sd_raw, nba_timestamp, nfl_dk_timestamp, nba_dk_id_dict, nfl_dk_id_dict, nba_fd_id_dict, nfl_fd_id_dict = init_baselines()
-        view_var2 = st.radio("What view would you like to load?", ("Simple", "Advanced"), key='view_var2')
-        st.info("Simple view is the default view and better for mobile devices, and Advanced view is the view that shows all the data that is available.")
-        sport_var2 = st.radio("What sport are you loading?", ('NFL', 'NBA'), key='sport_var2')
-        if sport_var2 == 'NBA':
-            dk_roo_raw = nba_dk_sd_raw
-            fd_roo_raw = nba_fd_sd_raw
-        elif sport_var2 == 'NFL':
-            dk_roo_raw = nfl_dk_sd_raw
-            fd_roo_raw = nfl_fd_sd_raw
-        slate_var2 = st.radio("Which data are you loading?", ('Paydirt (Main)', 'Paydirt (Secondary)', 'Paydirt (Auxiliary)'), key='slate_var2')
-        site_var2 = st.radio("What table would you like to display?", ('Draftkings', 'Fanduel'), key='site_var2')
-        if site_var2 == 'Draftkings':
-            if slate_var2 == 'Paydirt (Main)':
-                raw_baselines = dk_roo_raw
-                raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #1']
-            elif slate_var2 == 'Paydirt (Secondary)':
-                raw_baselines = dk_roo_raw
-                raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #2']
-            elif slate_var2 == 'Paydirt (Auxiliary)':
-                raw_baselines = dk_roo_raw
-                raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #3']
-                
-        elif site_var2 == 'Fanduel':
-            if slate_var2 == 'Paydirt (Main)':
-                raw_baselines = fd_roo_raw
-                raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #1']
-            elif slate_var2 == 'Paydirt (Secondary)':
-                raw_baselines = fd_roo_raw
-                raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #2']
-            elif slate_var2 == 'Paydirt (Auxiliary)':
-                raw_baselines = fd_roo_raw
-                raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #3']
+    if st.button("Load/Reset Data", key='reset2'):
+          st.cache_data.clear()
+          nba_dk_sd_raw, nba_fd_sd_raw, nfl_dk_sd_raw, nfl_fd_sd_raw, nba_timestamp, nfl_dk_timestamp, nba_dk_id_dict, nfl_dk_id_dict, nba_fd_id_dict, nfl_fd_id_dict = init_baselines()
     
-    with col2:
-        hold_container = st.empty()
+    options_container = st.container()
+    with options_container:
+        col1, col2, col3, col4, col5 = st.columns(5)
+        
+        with col1:
+            view_var2 = st.radio("View Type", ("Simple", "Advanced"), key='view_var2')
+            st.info("Simple view is better for mobile")
+        
+        with col2:
+            sport_var2 = st.radio("Sport", ('NFL', 'NBA'), key='sport_var2')
+            if sport_var2 == 'NBA':
+                dk_roo_raw = nba_dk_sd_raw
+                fd_roo_raw = nba_fd_sd_raw
+            elif sport_var2 == 'NFL':
+                dk_roo_raw = nfl_dk_sd_raw
+                fd_roo_raw = nfl_fd_sd_raw
+        
+        with col3:
+            slate_var2 = st.radio("Slate", ('Paydirt (Main)', 'Paydirt (Secondary)', 'Paydirt (Auxiliary)'), key='slate_var2')
+        
+        with col4:
+            site_var2 = st.radio("Site", ('Draftkings', 'Fanduel'), key='site_var2')
         
+        with col5:
+            if site_var2 == 'Draftkings':
+                if slate_var2 == 'Paydirt (Main)':
+                    raw_baselines = dk_roo_raw
+                    raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #1']
+                elif slate_var2 == 'Paydirt (Secondary)':
+                    raw_baselines = dk_roo_raw
+                    raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #2']
+                elif slate_var2 == 'Paydirt (Auxiliary)':
+                    raw_baselines = dk_roo_raw
+                    raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #3']
+            
+            elif site_var2 == 'Fanduel':
+                if slate_var2 == 'Paydirt (Main)':
+                    raw_baselines = fd_roo_raw
+                    raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #1']
+                elif slate_var2 == 'Paydirt (Secondary)':
+                    raw_baselines = fd_roo_raw
+                    raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #2']
+                elif slate_var2 == 'Paydirt (Auxiliary)':
+                    raw_baselines = fd_roo_raw
+                    raw_baselines = raw_baselines[raw_baselines['slate'] == 'Showdown #3']
+    
+    hold_container = st.empty()
+    
+    if sport_var2 == 'NBA':
+        if view_var2 == 'Simple':
+            display_Proj = raw_baselines[['Player', 'Position', 'Salary', 'Median', 'GPP%', 'Own']]
+        elif view_var2 == 'Advanced':
+            display_Proj = raw_baselines[['Player', 'Position', 'Team', 'Opp', 'Salary', 'Floor', 'Median', 'Ceiling', 'Top_finish', 'Top_5_finish', 'Top_10_finish', '20+%', '4x%', '5x%', '6x%', 'GPP%', 'Own', 'Small_Own', 'Large_Own', 'Cash_Own', 'CPT_Own', 'LevX', 'ValX', 'site', 'version', 'slate', 'timestamp', 'player_id']]
+    elif sport_var2 == 'NFL':
+        if view_var2 == 'Simple':
+            display_Proj = raw_baselines[['Player', 'Position', 'Salary', 'Median', '20+%', 'Own']]
+        elif view_var2 == 'Advanced':
+            display_Proj = raw_baselines[['Player', 'Position', 'Team', 'Opp', 'Salary', 'Floor', 'Median', 'Ceiling', 'Top_finish', 'Top_5_finish', 'Top_10_finish', '20+%', '2x%', '3x%', '4x%', 'Own', 'Small_Field_Own', 'Large_Field_Own', 'Cash_Field_Own', 'CPT_Own', 'LevX', 'version', 'slate', 'timestamp', 'player_id', 'site']]
+    display_Proj = display_Proj.sort_values(by='Median', ascending=False)
+
+    with hold_container:
+        hold_container = st.empty()
+        display_Proj = display_Proj.drop_duplicates(subset=['Player'])
+
         if sport_var2 == 'NBA':
-            if view_var2 == 'Simple':
-                display_Proj = raw_baselines[['Player', 'Position', 'Salary', 'Median', 'GPP%', 'Own']]
-            elif view_var2 == 'Advanced':
-                display_Proj = raw_baselines[['Player', 'Position', 'Team', 'Opp', 'Salary', 'Floor', 'Median', 'Ceiling', 'Top_finish', 'Top_5_finish', 'Top_10_finish', '20+%', '4x%', '5x%', '6x%', 'GPP%', 'Own', 'Small_Own', 'Large_Own', 'Cash_Own', 'CPT_Own', 'LevX', 'ValX', 'site', 'version', 'slate', 'timestamp', 'player_id']]
+            st.dataframe(display_Proj.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(nba_player_roo_format, precision=2), height=1000, use_container_width = True)
         elif sport_var2 == 'NFL':
-            if view_var2 == 'Simple':
-                display_Proj = raw_baselines[['Player', 'Position', 'Salary', 'Median', '20+%', 'Own']]
-            elif view_var2 == 'Advanced':
-                display_Proj = raw_baselines[['Player', 'Position', 'Team', 'Opp', 'Salary', 'Floor', 'Median', 'Ceiling', 'Top_finish', 'Top_5_finish', 'Top_10_finish', '20+%', '2x%', '3x%', '4x%', 'Own', 'Small_Field_Own', 'Large_Field_Own', 'Cash_Field_Own', 'CPT_Own', 'LevX', 'version', 'slate', 'timestamp', 'player_id', 'site']]
-        display_Proj = display_Proj.sort_values(by='Median', ascending=False)
-  
-        with hold_container:
-            hold_container = st.empty()
-            display_Proj = display_Proj.drop_duplicates(subset=['Player'])
+            st.dataframe(display_Proj.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(nfl_player_roo_format, precision=2), height=1000, use_container_width = True)
 
-            if sport_var2 == 'NBA':
-                st.dataframe(display_Proj.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(nba_player_roo_format, precision=2), height=1000, use_container_width = True)
-            elif sport_var2 == 'NFL':
-                st.dataframe(display_Proj.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(nfl_player_roo_format, precision=2), height=1000, use_container_width = True)
-  
-        st.download_button(
-                label="Export Tables",
-                data=convert_df_to_csv(raw_baselines),
-                file_name='NFL_SD_export.csv',
-                mime='text/csv',
-        )
+    st.download_button(
+            label="Export Tables",
+            data=convert_df_to_csv(raw_baselines),
+            file_name='NFL_SD_export.csv',
+            mime='text/csv',
+    )
 
 with tab2:
     col1, col2 = st.columns([1, 5])