Refactor Quick Fill Options in app.py by reintroducing the feature with improved layout and logic for auto-filling players based on team selection and size. This enhances user experience in lineup management.

app.py

@@ -831,61 +831,6 @@ with tab4:
         st.markdown("**Toggle teams to include:**")
         team_cols = st.columns(len(all_teams) // 2 + 1)
     
-    with st.expander("Quick Fill Options"):
-        col1, col2, col3, col4 = st.columns(4)
-        with col1:
-            auto_team_var = st.selectbox("Auto Fill Team", options=all_teams)
-        with col2:
-            auto_size_var = st.selectbox("Auto Fill Size", options=[3, 4, 5])
-        with col3:
-            auto_range_var = st.selectbox("Auto Fill Order", options=['Top', 'Mid', 'Wrap'])
-        with col4:
-            # --- QUICK FILL LOGIC ---
-            if st.button("Quick Fill", key="quick_fill"):
-                # 1. Get all eligible players from the selected team, not already in the lineup
-                current_players = set(st.session_state['handbuilder_lineup']['Player'])
-                team_players = player_select_df[
-                    (player_select_df['Team'] == auto_team_var) &
-                    (~player_select_df['Player'].isin(current_players))
-                ].copy()
-
-                # 2. Sort by Order
-                team_players = team_players.sort_values(by='Order')
-
-                # 3. Select the order range
-                if auto_range_var == 'Top':
-                    selected_players = team_players.head(auto_size_var)
-                elif auto_range_var == 'Mid':
-                    mid_start = max(0, (len(team_players) - auto_size_var) // 2)
-                    selected_players = team_players.iloc[mid_start:mid_start + auto_size_var]
-                elif auto_range_var == 'Wrap':
-                    selected_players = team_players.tail(auto_size_var)
-                else:
-                    selected_players = team_players.head(auto_size_var)
-
-                # 4. Add each player to the lineup, filling the first available eligible slot
-                for _, player_row in selected_players.iterrows():
-                    eligible_positions = re.split(r'[/, ]+', player_row['Position'])
-                    slot_to_fill = None
-                    for pos in eligible_positions:
-                        if slot_counts.get(pos, 0) < position_limits.get(pos, 0):
-                            slot_to_fill = pos
-                            break
-                    if slot_to_fill is not None:
-                        # Avoid duplicates
-                        if player_row['Player'] not in st.session_state['handbuilder_lineup']['Player'].values:
-                            add_row = player_row.copy()
-                            add_row['Slot'] = slot_to_fill
-                            st.session_state['handbuilder_lineup'] = pd.concat(
-                                [st.session_state['handbuilder_lineup'], pd.DataFrame([add_row[[
-                                    'Player', 'Order', 'Position', 'Team', 'Salary', 'Median', '2x%', 'Own%', 'Slot'
-                                ]]])],
-                                ignore_index=True
-                            )
-                            # Update slot_counts for next player
-                            slot_counts[slot_to_fill] = slot_counts.get(slot_to_fill, 0) + 1
-                st.rerun()
-    
     selected_teams = []
     for idx, team in enumerate(all_teams):
         col = team_cols[idx % len(team_cols)]
@@ -926,6 +871,61 @@ with tab4:
             hide_index=True
         )
 
+        with st.expander("Quick Fill Options"):
+            col1, col2, col3, col4 = st.columns(4)
+            with col1:
+                auto_team_var = st.selectbox("Auto Fill Team", options=all_teams)
+            with col2:
+                auto_size_var = st.selectbox("Auto Fill Size", options=[3, 4, 5])
+            with col3:
+                auto_range_var = st.selectbox("Auto Fill Order", options=['Top', 'Mid', 'Wrap'])
+            with col4:
+                # --- QUICK FILL LOGIC ---
+                if st.button("Quick Fill", key="quick_fill"):
+                    # 1. Get all eligible players from the selected team, not already in the lineup
+                    current_players = set(st.session_state['handbuilder_lineup']['Player'])
+                    team_players = player_select_df[
+                        (player_select_df['Team'] == auto_team_var) &
+                        (~player_select_df['Player'].isin(current_players))
+                    ].copy()
+
+                    # 2. Sort by Order
+                    team_players = team_players.sort_values(by='Order')
+
+                    # 3. Select the order range
+                    if auto_range_var == 'Top':
+                        selected_players = team_players.head(auto_size_var)
+                    elif auto_range_var == 'Mid':
+                        mid_start = max(0, (len(team_players) - auto_size_var) // 2)
+                        selected_players = team_players.iloc[mid_start:mid_start + auto_size_var]
+                    elif auto_range_var == 'Wrap':
+                        selected_players = team_players.tail(auto_size_var)
+                    else:
+                        selected_players = team_players.head(auto_size_var)
+
+                    # 4. Add each player to the lineup, filling the first available eligible slot
+                    for _, player_row in selected_players.iterrows():
+                        eligible_positions = re.split(r'[/, ]+', player_row['Position'])
+                        slot_to_fill = None
+                        for pos in eligible_positions:
+                            if slot_counts.get(pos, 0) < position_limits.get(pos, 0):
+                                slot_to_fill = pos
+                                break
+                        if slot_to_fill is not None:
+                            # Avoid duplicates
+                            if player_row['Player'] not in st.session_state['handbuilder_lineup']['Player'].values:
+                                add_row = player_row.copy()
+                                add_row['Slot'] = slot_to_fill
+                                st.session_state['handbuilder_lineup'] = pd.concat(
+                                    [st.session_state['handbuilder_lineup'], pd.DataFrame([add_row[[
+                                        'Player', 'Order', 'Position', 'Team', 'Salary', 'Median', '2x%', 'Own%', 'Slot'
+                                    ]]])],
+                                    ignore_index=True
+                                )
+                                # Update slot_counts for next player
+                                slot_counts[slot_to_fill] = slot_counts.get(slot_to_fill, 0) + 1
+                    st.rerun()
+
         # If a row is selected, add that player to the lineup and reset selection
         if event and "rows" in event.selection and len(event.selection["rows"]) > 0:
             idx = event.selection["rows"][0]