Update app.py

app.py

@@ -138,8 +138,8 @@ with tab2:
             min_sal1 = st.number_input('Min Salary', min_value = 35000, max_value = 49900, value = 49000, step = 100, key='min_sal1')
             max_sal1 = st.number_input('Max Salary', min_value = 35000, max_value = 50000, value = 50000, step = 100, key='max_sal1')
         elif site_var1 == 'Fanduel':
-            min_sal1 = st.number_input('Min Salary', min_value = 45000, max_value = 59900, value = 59000, step = 100, key='min_sal1')
-            max_sal1 = st.number_input('Max Salary', min_value = 45000, max_value = 60000, value = 60000, step = 100, key='max_sal1')
+            min_sal1 = st.number_input('Min Salary', min_value = 45000, max_value = 54900, value = 54000, step = 100, key='min_sal1')
+            max_sal1 = st.number_input('Max Salary', min_value = 45000, max_value = 55000, value = 55000, step = 100, key='max_sal1')
     with col2:
         raw_baselines = raw_baselines[raw_baselines['Team'].isin(team_var1)]
         raw_baselines = raw_baselines[~raw_baselines['Player'].isin(avoid_var1)]
@@ -394,13 +394,13 @@ with tab2:
                             p_used.extend(sorted_lineup)
                             
                             for pname in range(0,len(line_hold)):
-                                if line_hold.iat[pname,1] != 'G':
+                                if line_hold.iat[pname,1] == 'G':
                                     if line_hold.iat[pname,0] not in p_used:
                                         sorted_lineup.append(line_hold.iat[pname,0])
                             p_used.extend(sorted_lineup)
                             
                             for pname in range(0,len(line_hold)):
-                                if line_hold.iat[pname,1] == 'G':
+                                if line_hold.iat[pname,1] != 'G':
                                     if line_hold.iat[pname,0] not in p_used:
                                         sorted_lineup.append(line_hold.iat[pname,0])
                             p_used.extend(sorted_lineup)
@@ -491,7 +491,7 @@ with tab2:
                         x += 1
     
                     if site_var1 == 'Draftkings':
-                        portfolio.rename(columns={0: "C1", 1: "C2", 2: "W1", 3: "W2", 4: "W3", 5: "D1", 6: "D2", 7: "UTIL", 8: "G"}, inplace = True)
+                        portfolio.rename(columns={0: "C1", 1: "C2", 2: "W1", 3: "W2", 4: "W3", 5: "D1", 6: "D2", 7: "G", 8: "UTIL"}, inplace = True)
                     elif site_var1 == 'Fanduel':
                         portfolio.rename(columns={0: "C1", 1: "C2", 2: "W1", 3: "W2", 4: "D1", 5: "D2", 6: "UTIL1", 7: "UTIL2", 8: "G"}, inplace = True)
                     portfolio = portfolio.dropna()
@@ -502,7 +502,7 @@ with tab2:
                     portfolio = portfolio.drop(columns=['index'])
                     
                     if site_var1 == 'Draftkings':
-                        final_outcomes = portfolio[['C1', 'C2', 'W1', 'W2', 'W3', 'D1', 'D2', 'UTIL', 'G', 'Cost', 'Proj', 'Own']]
+                        final_outcomes = portfolio[['C1', 'C2', 'W1', 'W2', 'W3', 'D1', 'D2', 'G', 'UTIL', 'Cost', 'Proj', 'Own']]
                         
                         final_outcomes_export = pd.DataFrame()
                         final_outcomes_export['C1'] = final_outcomes['C1']
@@ -512,8 +512,8 @@ with tab2:
                         final_outcomes_export['W3'] = final_outcomes['W3']
                         final_outcomes_export['D1'] = final_outcomes['D1']
                         final_outcomes_export['D2'] = final_outcomes['D2']
-                        final_outcomes_export['UTIL'] = final_outcomes['UTIL']
                         final_outcomes_export['G'] = final_outcomes['G']
+                        final_outcomes_export['UTIL'] = final_outcomes['UTIL']
                         final_outcomes_export['Salary'] = final_outcomes['Cost']
                         final_outcomes_export['Own'] = final_outcomes['Own']
                         final_outcomes_export['Proj'] = final_outcomes['Proj']
@@ -525,8 +525,8 @@ with tab2:
                         final_outcomes_export['W3'].replace(dkid_dict, inplace=True)
                         final_outcomes_export['D1'].replace(dkid_dict, inplace=True)
                         final_outcomes_export['D2'].replace(dkid_dict, inplace=True)
-                        final_outcomes_export['UTIL'].replace(dkid_dict, inplace=True)
                         final_outcomes_export['G'].replace(dkid_dict, inplace=True)
+                        final_outcomes_export['UTIL'].replace(dkid_dict, inplace=True)
                     elif site_var1 == 'Fanduel':
                         final_outcomes = portfolio[['C1', 'C2', 'W1', 'W2', 'D1', 'D2', 'UTIL1', 'UTIL2', 'G', 'Cost', 'Proj', 'Own']]