Refactor pagination and filtering logic in app.py

- Improved the structure of the info and filters section by consolidating pagination controls and filtering options.
- Enhanced user experience with clearer pagination management and streamlined data display for player and stack exposures.
- Maintained functionality while ensuring better readability and maintainability of the code.

app.py

@@ -174,112 +174,112 @@ with tab2:
         st.session_state['field_player_frame'] = create_player_exposures(working_df, player_columns)
         st.session_state['field_stack_frame'] = create_stack_exposures(working_df)
 
-    with st.expander("Info and filters"):
-        if st.button('Clear data', key='reset3'):
-            st.session_state.clear()
-        with st.form(key='filter_form'):
-            entry_parse_var = st.selectbox("Do you want to view a specific player(s) or a group of players?", ['All', 'Specific'])
-            entry_names = st.multiselect("Select players", options=st.session_state['entry_list'], default=[])
-            submitted = st.form_submit_button("Submit")
-            if submitted:
-                if 'player_frame' in st.session_state:
-                    del st.session_state['player_frame']
-                if 'stack_frame' in st.session_state:
-                    del st.session_state['stack_frame']
-                # Apply entry name filter if specific entries are selected
-                if entry_parse_var == 'Specific' and entry_names:
-                    working_df = working_df[working_df['BaseName'].isin(entry_names)]
-        
-    # Initialize pagination in session state if not exists
-    if 'current_page' not in st.session_state:
-        st.session_state.current_page = 1
+        with st.expander("Info and filters"):
+            if st.button('Clear data', key='reset3'):
+                st.session_state.clear()
+            with st.form(key='filter_form'):
+                entry_parse_var = st.selectbox("Do you want to view a specific player(s) or a group of players?", ['All', 'Specific'])
+                entry_names = st.multiselect("Select players", options=st.session_state['entry_list'], default=[])
+                submitted = st.form_submit_button("Submit")
+                if submitted:
+                    if 'player_frame' in st.session_state:
+                        del st.session_state['player_frame']
+                    if 'stack_frame' in st.session_state:
+                        del st.session_state['stack_frame']
+                    # Apply entry name filter if specific entries are selected
+                    if entry_parse_var == 'Specific' and entry_names:
+                        working_df = working_df[working_df['BaseName'].isin(entry_names)]
+            
+        # Initialize pagination in session state if not exists
+        if 'current_page' not in st.session_state:
+            st.session_state.current_page = 1
+
+        # Calculate total pages
+        rows_per_page = 500
+        total_rows = len(working_df)
+        total_pages = (total_rows + rows_per_page - 1) // rows_per_page
 
-    # Calculate total pages
-    rows_per_page = 500
-    total_rows = len(working_df)
-    total_pages = (total_rows + rows_per_page - 1) // rows_per_page
+        # Create pagination controls in a single row
+        pagination_cols = st.columns([4, 1, 1, 1, 4])
+        with pagination_cols[1]:
+            if st.button(f"Previous Page"):
+                if st.session_state['current_page'] > 1:
+                    st.session_state.current_page -= 1
+                else:
+                    st.session_state.current_page = 1
+                    if 'player_frame' in st.session_state:
+                        del st.session_state['player_frame']
+                    if 'stack_frame' in st.session_state:
+                        del st.session_state['stack_frame']
 
-    # Create pagination controls in a single row
-    pagination_cols = st.columns([4, 1, 1, 1, 4])
-    with pagination_cols[1]:
-        if st.button(f"Previous Page"):
-            if st.session_state['current_page'] > 1:
-                st.session_state.current_page -= 1
-            else:
-                st.session_state.current_page = 1
+        with pagination_cols[3]:
+            if st.button(f"Next Page"):
+                st.session_state.current_page += 1
                 if 'player_frame' in st.session_state:
                     del st.session_state['player_frame']
                 if 'stack_frame' in st.session_state:
                     del st.session_state['stack_frame']
 
-    with pagination_cols[3]:
-        if st.button(f"Next Page"):
-            st.session_state.current_page += 1
-            if 'player_frame' in st.session_state:
-                del st.session_state['player_frame']
-            if 'stack_frame' in st.session_state:
-                del st.session_state['stack_frame']
+        # Calculate start and end indices for current page
+        start_idx = (st.session_state.current_page - 1) * rows_per_page
+        end_idx = min((st.session_state.current_page) * rows_per_page, total_rows)
+        st.dataframe(
+            working_df.iloc[start_idx:end_idx].style
+            .background_gradient(axis=0)
+            .background_gradient(cmap='RdYlGn')
+            .format(precision=2), 
+            height=500,
+            use_container_width=True,
+            hide_index=True
+        )
 
-    # Calculate start and end indices for current page
-    start_idx = (st.session_state.current_page - 1) * rows_per_page
-    end_idx = min((st.session_state.current_page) * rows_per_page, total_rows)
-    st.dataframe(
-        working_df.iloc[start_idx:end_idx].style
-        .background_gradient(axis=0)
-        .background_gradient(cmap='RdYlGn')
-        .format(precision=2), 
-        height=500,
-        use_container_width=True,
-        hide_index=True
-    )
+        with st.container():
+            tab1, tab2, tab3 = st.tabs(['Player Used Info', 'Stack Used Info', 'Stack Size Info'])
+            with tab1:
 
-    with st.container():
-        tab1, tab2, tab3 = st.tabs(['Player Used Info', 'Stack Used Info', 'Stack Size Info'])
-        with tab1:
+                if entry_parse_var == 'All':
+                    st.session_state['player_frame'] = create_player_exposures(working_df, player_columns)
+                    st.dataframe(st.session_state['player_frame'].
+                        sort_values(by='Exposure Overall', ascending=False).
+                        style.background_gradient(cmap='RdYlGn').
+                        format(formatter='{:.2%}', subset=st.session_state['player_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
+                        hide_index=True)
+                else:
+                    st.session_state['player_frame'] = create_player_exposures(working_df, player_columns, entry_names)
+                    st.dataframe(st.session_state['player_frame'].
+                        sort_values(by='Exposure Overall', ascending=False).
+                        style.background_gradient(cmap='RdYlGn').
+                        format(formatter='{:.2%}', subset=st.session_state['player_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
+                        hide_index=True)
+            with tab2:
 
-            if entry_parse_var == 'All':
-                st.session_state['player_frame'] = create_player_exposures(working_df, player_columns)
-                st.dataframe(st.session_state['player_frame'].
-                    sort_values(by='Exposure Overall', ascending=False).
-                    style.background_gradient(cmap='RdYlGn').
-                    format(formatter='{:.2%}', subset=st.session_state['player_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
-                    hide_index=True)
-            else:
-                st.session_state['player_frame'] = create_player_exposures(working_df, player_columns, entry_names)
-                st.dataframe(st.session_state['player_frame'].
-                    sort_values(by='Exposure Overall', ascending=False).
-                    style.background_gradient(cmap='RdYlGn').
-                    format(formatter='{:.2%}', subset=st.session_state['player_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
-                    hide_index=True)
-        with tab2:
-
-            if entry_parse_var == 'All':
-                st.session_state['stack_frame'] = create_stack_exposures(working_df)
-                st.dataframe(st.session_state['stack_frame'].
-                    sort_values(by='Exposure Overall', ascending=False).
-                    style.background_gradient(cmap='RdYlGn').
-                    format(formatter='{:.2%}', subset=st.session_state['stack_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
-                    hide_index=True)
-            else:
-                st.session_state['stack_frame'] = create_stack_exposures(working_df, entry_names)
-                st.dataframe(st.session_state['stack_frame'].
-                    sort_values(by='Exposure Overall', ascending=False).
-                    style.background_gradient(cmap='RdYlGn').
-                    format(formatter='{:.2%}', subset=st.session_state['stack_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
-                    hide_index=True)
-        with tab3:
-            
-            if entry_parse_var == 'All':
-                st.session_state['stack_size_frame'] = create_stack_size_exposures(working_df)
-                st.dataframe(st.session_state['stack_size_frame'].
-                    sort_values(by='Exposure Overall', ascending=False).
-                    style.background_gradient(cmap='RdYlGn').
-                    format(formatter='{:.2%}', subset=st.session_state['stack_size_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
-                    hide_index=True)
-            else:
-                st.session_state['stack_size_frame'] = create_stack_size_exposures(working_df, entry_names)
-                st.dataframe(st.session_state['stack_size_frame'].
-                    sort_values(by='Exposure Overall', ascending=False).
-                    style.background_gradient(cmap='RdYlGn').
-                    format(formatter='{:.2%}', subset=st.session_state['stack_size_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
-                    hide_index=True)
+                if entry_parse_var == 'All':
+                    st.session_state['stack_frame'] = create_stack_exposures(working_df)
+                    st.dataframe(st.session_state['stack_frame'].
+                        sort_values(by='Exposure Overall', ascending=False).
+                        style.background_gradient(cmap='RdYlGn').
+                        format(formatter='{:.2%}', subset=st.session_state['stack_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
+                        hide_index=True)
+                else:
+                    st.session_state['stack_frame'] = create_stack_exposures(working_df, entry_names)
+                    st.dataframe(st.session_state['stack_frame'].
+                        sort_values(by='Exposure Overall', ascending=False).
+                        style.background_gradient(cmap='RdYlGn').
+                        format(formatter='{:.2%}', subset=st.session_state['stack_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
+                        hide_index=True)
+            with tab3:
+                
+                if entry_parse_var == 'All':
+                    st.session_state['stack_size_frame'] = create_stack_size_exposures(working_df)
+                    st.dataframe(st.session_state['stack_size_frame'].
+                        sort_values(by='Exposure Overall', ascending=False).
+                        style.background_gradient(cmap='RdYlGn').
+                        format(formatter='{:.2%}', subset=st.session_state['stack_size_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
+                        hide_index=True)
+                else:
+                    st.session_state['stack_size_frame'] = create_stack_size_exposures(working_df, entry_names)
+                    st.dataframe(st.session_state['stack_size_frame'].
+                        sort_values(by='Exposure Overall', ascending=False).
+                        style.background_gradient(cmap='RdYlGn').
+                        format(formatter='{:.2%}', subset=st.session_state['stack_size_frame'].iloc[:, 1:].select_dtypes(include=['number']).columns),
+                        hide_index=True)