More fine grained min/max filters in macro

app.py

@@ -1196,11 +1196,22 @@ if selected_tab == 'Manage Portfolio':
             with st.expander('Macro Filter Options'):
                 # recent changes for showdown included
                 with st.form(key='macro_filter_form'):
-                    max_dupes = st.number_input("Max acceptable dupes?", value=1000, min_value=1, step=1)
-                    min_salary = st.number_input("Min acceptable salary?", value=1000, min_value=1000, step=100)
-                    max_salary = st.number_input("Max acceptable salary?", value=100000, min_value=1000, step=100)
-                    max_finish_percentile = st.number_input("Max acceptable finish percentile?", value=.50, min_value=0.005, step=.001)
-                    min_lineup_edge = st.number_input("Min acceptable Lineup Edge?", value=-.5, min_value=-1.00, step=.001)
+                    macro_min_col, macro_max_col = st.columns(2)
+                    with macro_min_col:
+                        min_salary = st.number_input("Min acceptable salary?", value=0, min_value=0, step=100)
+                        min_proj = st.number_input("Min acceptable projection?", value=0.0, min_value=0.0, step=1.0)
+                        min_own = st.number_input("Min acceptable ownership?", value=0.0, min_value=0.0, step=1.0)
+                        min_dupes = st.number_input("Min acceptable dupes?", value=0, min_value=0, step=1)
+                        min_finish_percentile = st.number_input("Min acceptable finish percentile?", value=-1.00, min_value=0.00, step=.001)
+                        min_lineup_edge = st.number_input("Min acceptable Lineup Edge?", value=-1.00, min_value=-1.00, step=.001)
+                    with macro_max_col:
+                        max_salary = st.number_input("Max acceptable salary?", value=salary_max, min_value=0, step=100)
+                        max_proj = st.number_input("Max acceptable projection?", value=500.0, min_value=0.0, step=1.0)
+                        max_own = st.number_input("Max acceptable ownership?", value=500.0, min_value=0.0, step=1.0)
+                        max_dupes = st.number_input("Max acceptable dupes?", value=1000, min_value=1, step=1)
+                        max_finish_percentile = st.number_input("Max acceptable finish percentile?", value=1.00, min_value=0.00, step=.001)
+                        max_lineup_edge = st.number_input("Max acceptable Lineup Edge?", value=1.00, min_value=0.00, step=.001)
+
                     if sport_var in stacking_sports:
                         stack_include_toggle = st.selectbox("Include specific stacks?", options=['All Stacks', 'Specific Stacks'], index=0)
                         stack_selections = st.multiselect("If Specific Stacks, Which to include?", options=sorted(list(set(st.session_state['stack_dict'].values()))), default=[])
@@ -1218,11 +1229,21 @@ if selected_tab == 'Manage Portfolio':
                     if reg_submitted:
                         st.session_state['settings_base'] = False
                         parsed_frame = st.session_state['working_frame'].copy()
-                        parsed_frame = parsed_frame[parsed_frame['Dupes'] <= max_dupes]
+                        
                         parsed_frame = parsed_frame[parsed_frame['salary'] >= min_salary]
                         parsed_frame = parsed_frame[parsed_frame['salary'] <= max_salary]
+                        parsed_frame = parsed_frame[parsed_frame['median'] >= min_proj]
+                        parsed_frame = parsed_frame[parsed_frame['median'] <= max_proj]
+                        parsed_frame = parsed_frame[parsed_frame['Own'] >= min_own]
+                        parsed_frame = parsed_frame[parsed_frame['Own'] <= max_own]
+                        parsed_frame = parsed_frame[parsed_frame['Dupes'] >= min_dupes]
+                        parsed_frame = parsed_frame[parsed_frame['Dupes'] <= max_dupes]
+                        parsed_frame = parsed_frame[parsed_frame['Finish_percentile'] >= min_finish_percentile]
                         parsed_frame = parsed_frame[parsed_frame['Finish_percentile'] <= max_finish_percentile]
                         parsed_frame = parsed_frame[parsed_frame['Lineup Edge'] >= min_lineup_edge]
+                        parsed_frame = parsed_frame[parsed_frame['Lineup Edge'] <= max_lineup_edge]
+                        
+                        
                         if 'Stack' in parsed_frame.columns:
                             if stack_include_toggle == 'All Stacks':
                                 parsed_frame = parsed_frame
@@ -1237,11 +1258,20 @@ if selected_tab == 'Manage Portfolio':
                     if exp_submitted:
                         st.session_state['settings_base'] = False
                         parsed_frame = st.session_state['export_base'].copy()
-                        parsed_frame = parsed_frame[parsed_frame['Dupes'] <= max_dupes]
+
                         parsed_frame = parsed_frame[parsed_frame['salary'] >= min_salary]
                         parsed_frame = parsed_frame[parsed_frame['salary'] <= max_salary]
+                        parsed_frame = parsed_frame[parsed_frame['median'] >= min_proj]
+                        parsed_frame = parsed_frame[parsed_frame['median'] <= max_proj]
+                        parsed_frame = parsed_frame[parsed_frame['Own'] >= min_own]
+                        parsed_frame = parsed_frame[parsed_frame['Own'] <= max_own]
+                        parsed_frame = parsed_frame[parsed_frame['Dupes'] >= min_dupes]
+                        parsed_frame = parsed_frame[parsed_frame['Dupes'] <= max_dupes]
+                        parsed_frame = parsed_frame[parsed_frame['Finish_percentile'] >= min_finish_percentile]
                         parsed_frame = parsed_frame[parsed_frame['Finish_percentile'] <= max_finish_percentile]
                         parsed_frame = parsed_frame[parsed_frame['Lineup Edge'] >= min_lineup_edge]
+                        parsed_frame = parsed_frame[parsed_frame['Lineup Edge'] <= max_lineup_edge]
+
                         if 'Stack' in parsed_frame.columns:
                             if stack_include_toggle == 'All Stacks':
                                 parsed_frame = parsed_frame