Enhance position filtering functionality by separating filter keys for positions and teams, and updating input prompts for clarity. This improves user experience in managing portfolio filters.

app.py

@@ -1033,7 +1033,7 @@ def create_position_export_dict(column_name, csv_file, site_var, type_var, sport
         st.error(f"Error creating position export dict for {column_name}: {str(e)}")
         return {}
 
-def parse_portfolio_on_mapped(portfolio, map_dict, map_key, filter_keys, low_threshold, high_threshold, column_choices):
+def parse_portfolio_on_mapped(portfolio, map_dict, map_key, filter_keys_pos, filter_keys_team, low_threshold, high_threshold, column_choices):
     mapping_port = portfolio[column_choices]
     mapping_port = mapping_port.map(map_dict[map_key])
     
@@ -1044,7 +1044,7 @@ def parse_portfolio_on_mapped(portfolio, map_dict, map_key, filter_keys, low_thr
         mask = low_mask & high_mask
     else:
         # String mapping - filter by inclusion in filter_keys
-        mask = mapping_port.isin(filter_keys)
+        mask = mapping_port.isin(filter_keys_pos) | mapping_port.isin(filter_keys_team)
     
     return portfolio[mask]
 
@@ -2140,34 +2140,10 @@ if selected_tab == 'Manage Portfolio':
                 with st.form(key='position_filtering_form'):
                     position_choice = st.selectbox("Position to filter", options=[col for col in st.session_state['working_frame'].columns if col not in excluded_cols], index=0)
                     position_filter = st.selectbox("Filter on:", options=pos_parse_options)
-                    if position_filter == 'Projection':
-                        position_low_threshold = st.number_input("Low Threshold", value=0.0, min_value=0.0, step=1.0)
-                        position_high_threshold = st.number_input("High Threshold", value=250.0, min_value=0.0, step=1.0)
-                        filter_keys = None
-                    elif position_filter == 'Ownership':
-                        position_low_threshold = st.number_input("Low Threshold", value=0.0, min_value=0.0, step=1.0)
-                        position_high_threshold = st.number_input("High Threshold", value=100.0, min_value=0.0, step=1.0)
-                        filter_keys = None
-                    elif position_filter == 'Salary':
-                        position_low_threshold = st.number_input("Low Threshold", value=0.0, min_value=0.0, step=1000.0)
-                        position_high_threshold = st.number_input("High Threshold", value=20000.0, min_value=0.0, step=1000.0)
-                        filter_keys = None
-                    elif position_filter == 'Position':
-                        filter_keys_choice = st.selectbox("Filter choice:", options=['Position', 'Team'])
-                        if filter_keys_choice == 'Position':
-                            filter_keys = st.multiselect("Position(s) to keep", options=[col for col in st.session_state['working_frame'].columns if col not in excluded_cols], default=[])
-                        else:
-                            filter_keys = st.multiselect("Team(s) to keep", options=st.session_state['map_dict']['team_map'].keys(), default=[])
-                        position_low_threshold = None
-                        position_high_threshold = None
-                    else:
-                        filter_keys_choice = st.selectbox("Filter choice:", options=['Position', 'Team'])
-                        if filter_keys_choice == 'Position':
-                            filter_keys = st.multiselect("Position(s) to keep", options=[col for col in st.session_state['working_frame'].columns if col not in excluded_cols], default=[])
-                        else:
-                            filter_keys = st.multiselect("Team(s) to keep", options=st.session_state['map_dict']['team_map'].keys(), default=[])
-                        position_low_threshold = None
-                        position_high_threshold = None
+                    position_low_threshold = st.number_input("if filtering on Projection/Ownership/Salary, Low Threshold", value=0.0, min_value=0.0, step=1.0)
+                    position_high_threshold = st.number_input("if filtering on Projection/Ownership/Salary, High Threshold", value=20000.0, min_value=0.0, step=1.0)
+                    filter_keys_pos = st.multiselect("if filtering on Position, Position(s) to keep", options=[col for col in st.session_state['working_frame'].columns if col not in excluded_cols], default=[])
+                    filter_keys_team = st.multiselect("if filtering on Team, Team(s) to keep", options=st.session_state['map_dict']['team_map'].keys(), default=[])
                     submitted_col, export_col = st.columns(2)
                     with submitted_col:
                         reg_submitted = st.form_submit_button("Portfolio")
@@ -2176,13 +2152,13 @@ if selected_tab == 'Manage Portfolio':
                     if reg_submitted:
                         st.session_state['settings_base'] = False
                         parsed_frame = st.session_state['working_frame'].copy()
-                        parsed_frame = parse_portfolio_on_mapped(parsed_frame, st.session_state['map_dict'], pos_parse_mapping[position_filter], filter_keys, position_low_threshold, position_high_threshold, position_choice)
+                        parsed_frame = parse_portfolio_on_mapped(parsed_frame, st.session_state['map_dict'], pos_parse_mapping[position_filter], filter_keys_pos, filter_keys_team, position_low_threshold, position_high_threshold, position_choice)
                         st.session_state['working_frame'] = parsed_frame.sort_values(by='median', ascending=False)
                         st.session_state['export_merge'] = st.session_state['working_frame'].copy()
                     elif exp_submitted:
                         st.session_state['settings_base'] = False
                         parsed_frame = st.session_state['export_base'].copy()
-                        parsed_frame = parse_portfolio_on_mapped(parsed_frame, st.session_state['map_dict'], pos_parse_mapping[position_filter], filter_keys, position_low_threshold, position_high_threshold, position_choice)
+                        parsed_frame = parse_portfolio_on_mapped(parsed_frame, st.session_state['map_dict'], pos_parse_mapping[position_filter], filter_keys_pos, filter_keys_team, position_low_threshold, position_high_threshold, position_choice)
                         st.session_state['export_base'] = parsed_frame.sort_values(by='median', ascending=False)
                         st.session_state['export_merge'] = st.session_state['export_base'].copy()
             with st.expander('Trimming Options'):