Update app.py

app.py

@@ -623,17 +623,30 @@ with tab3:
                         player_freq['Team'] = player_freq['Player'].map(player_team)
                         
                         final_outcomes_export = pd.DataFrame()
+                        split_portfolio = pd.DataFrame()
                         
                         if site_var1 == 'Draftkings':
-                            final_outcomes_export['CPT'] = final_outcomes['CPT']
-                            final_outcomes_export['FLEX1'] = final_outcomes['FLEX1']
-                            final_outcomes_export['FLEX2'] = final_outcomes['FLEX2']
-                            final_outcomes_export['FLEX3'] = final_outcomes['FLEX3']
-                            final_outcomes_export['FLEX4'] = final_outcomes['FLEX4']
-                            final_outcomes_export['FLEX5'] = final_outcomes['FLEX5']
-                            final_outcomes_export['Salary'] = final_outcomes['Cost']
-                            final_outcomes_export['Own'] = final_outcomes['Own']
-                            final_outcomes_export['Proj'] = final_outcomes['Proj']
+                            
+                            split_portfolio[['CPT', 'CPT_ID']] = final_outcomes.CPT.str.split("-", n=1, expand = True)
+                            split_portfolio[['FLEX1', 'FLEX1_ID']] = final_outcomes.FLEX1.str.split("-", n=1, expand = True)
+                            split_portfolio[['FLEX2', 'FLEX2_ID']] = final_outcomes.FLEX2.str.split("-", n=1, expand = True)
+                            split_portfolio[['FLEX3', 'FLEX3_ID']] = final_outcomes.FLEX3.str.split("-", n=1, expand = True)
+                            split_portfolio[['FLEX4', 'FLEX4_ID']] = final_outcomes.FLEX4.str.split("-", n=1, expand = True)
+                            split_portfolio[['FLEX5', 'FLEX5_ID']] = final_outcomes.FLEX5.str.split("-", n=1, expand = True)
+  
+                            split_portfolio['CPT'] = split_portfolio['CPT'].str.strip()
+                            split_portfolio['FLEX1'] = split_portfolio['FLEX1'].str.strip()
+                            split_portfolio['FLEX2'] = split_portfolio['FLEX2'].str.strip()
+                            split_portfolio['FLEX3'] = split_portfolio['FLEX3'].str.strip()
+                            split_portfolio['FLEX4'] = split_portfolio['FLEX4'].str.strip()
+                            split_portfolio['FLEX5'] = split_portfolio['FLEX5'].str.strip()
+                            
+                            final_outcomes_export['CPT'] = split_portfolio['CPT']
+                            final_outcomes_export['FLEX1'] = split_portfolio['FLEX1']
+                            final_outcomes_export['FLEX2'] = split_portfolio['FLEX2']
+                            final_outcomes_export['FLEX3'] = split_portfolio['FLEX3']
+                            final_outcomes_export['FLEX4'] = split_portfolio['FLEX4']
+                            final_outcomes_export['FLEX5'] = split_portfolio['FLEX5']
                             
                             final_outcomes_export['CPT'].replace(dkid_dict, inplace=True)
                             final_outcomes_export['FLEX1'].replace(dkid_dict, inplace=True)
@@ -641,27 +654,43 @@ with tab3:
                             final_outcomes_export['FLEX3'].replace(dkid_dict, inplace=True)
                             final_outcomes_export['FLEX4'].replace(dkid_dict, inplace=True)
                             final_outcomes_export['FLEX5'].replace(dkid_dict, inplace=True)
+                            final_outcomes_export['Salary'] = final_outcomes['Cost']
+                            final_outcomes_export['Own'] = final_outcomes['Own']
+                            final_outcomes_export['Proj'] = final_outcomes['Proj']
+                            
                         elif site_var1 == 'Fanduel':
+                            
+                            split_portfolio[['CPT', 'CPT_ID']] = final_outcomes.CPT.str.split("-", n=1, expand = True)
+                            split_portfolio[['FLEX1', 'FLEX1_ID']] = final_outcomes.FLEX1.str.split("-", n=1, expand = True)
+                            split_portfolio[['FLEX2', 'FLEX2_ID']] = final_outcomes.FLEX2.str.split("-", n=1, expand = True)
+                            split_portfolio[['FLEX3', 'FLEX3_ID']] = final_outcomes.FLEX3.str.split("-", n=1, expand = True)
+                            split_portfolio[['FLEX4', 'FLEX4_ID']] = final_outcomes.FLEX4.str.split("-", n=1, expand = True)
+  
+                            split_portfolio['CPT'] = split_portfolio['CPT'].str.strip()
+                            split_portfolio['FLEX1'] = split_portfolio['FLEX1'].str.strip()
+                            split_portfolio['FLEX2'] = split_portfolio['FLEX2'].str.strip()
+                            split_portfolio['FLEX3'] = split_portfolio['FLEX3'].str.strip()
+                            split_portfolio['FLEX4'] = split_portfolio['FLEX4'].str.strip()
+                            
                             final_outcomes_export['CPT'] = final_outcomes['CPT']
                             final_outcomes_export['FLEX1'] = final_outcomes['FLEX1']
                             final_outcomes_export['FLEX2'] = final_outcomes['FLEX2']
                             final_outcomes_export['FLEX3'] = final_outcomes['FLEX3']
                             final_outcomes_export['FLEX4'] = final_outcomes['FLEX4']
-                            final_outcomes_export['Salary'] = final_outcomes['Cost']
-                            final_outcomes_export['Own'] = final_outcomes['Own']
-                            final_outcomes_export['Proj'] = final_outcomes['Proj']
                             
                             final_outcomes_export['MVP'].replace(fdid_dict, inplace=True)
                             final_outcomes_export['FLEX1'].replace(fdid_dict, inplace=True)
                             final_outcomes_export['FLEX2'].replace(fdid_dict, inplace=True)
                             final_outcomes_export['FLEX3'].replace(fdid_dict, inplace=True)
                             final_outcomes_export['FLEX4'].replace(fdid_dict, inplace=True)
+                            final_outcomes_export['Salary'] = final_outcomes['Cost']
+                            final_outcomes_export['Own'] = final_outcomes['Own']
+                            final_outcomes_export['Proj'] = final_outcomes['Proj']
           
                         player_freq = player_freq[['Player', 'Position', 'Team', 'Salary', 'Proj Own', 'Exposure']]
                         player_freq = player_freq.set_index('Player')
     
-                with optimize_container:
-                    optimize_container = st.empty()
+                with st.container():
                     st.dataframe(portfolio.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(precision=2), use_container_width = True)
     
                 st.download_button(
@@ -672,5 +701,4 @@ with tab3:
                 )
                 
                 with st.container():
-                    freq_container = st.empty()
                     st.dataframe(player_freq.style.background_gradient(axis=0).background_gradient(cmap='RdYlGn').format(expose_format, precision=2), use_container_width = True)