Update app.py

app.py

@@ -337,176 +337,176 @@ def server(input, output, session):
             selected=list(players_list_new[0:10]))
          
 
- 
-@output
-@render.table
-def result():
-    if input.rookie_switch():
-
-        return player_games_df[(player_games_df.date <= pd.to_datetime(input.date()))&(player_games_df.player_id.isin(rookie_list))].groupby(['player_id','Player','Position']).agg(
-            GP = ('GP','count'),
-            Stat = (f'{input.stat()}','sum')
-                ).reset_index().sort_values(by=['Stat','GP'],ascending=[False,True]).reset_index(drop=True)
-        
-    else:
-        return player_games_df[player_games_df.date <= pd.to_datetime(input.date())].groupby(['player_id','Player','Position']).agg(
-            GP = ('GP','count'),
-            Stat = (f'{input.stat()}','sum')
-                ).reset_index().sort_values(by=['Stat','GP'],ascending=[False,True]).reset_index(drop=True)
+     
+    @output
+    @render.table
+    def result():
+        if input.rookie_switch():
     
- 
-@output
-@render.plot(alt="A histogram")
-def plot():
- 
-    team_select_list = [input.team_select()]    
-    position_select_list =  [input.position_select()]    
-
-    if team_select_list[0] == 'All':
-        team_select_title = 'NHL '
-    else:
-        team_select_title = f'{team_abv_nst_dict[team_select_list[0]]} '
+            return player_games_df[(player_games_df.date <= pd.to_datetime(input.date()))&(player_games_df.player_id.isin(rookie_list))].groupby(['player_id','Player','Position']).agg(
+                GP = ('GP','count'),
+                Stat = (f'{input.stat()}','sum')
+                    ).reset_index().sort_values(by=['Stat','GP'],ascending=[False,True]).reset_index(drop=True)
+            
+        else:
+            return player_games_df[player_games_df.date <= pd.to_datetime(input.date())].groupby(['player_id','Player','Position']).agg(
+                GP = ('GP','count'),
+                Stat = (f'{input.stat()}','sum')
+                    ).reset_index().sort_values(by=['Stat','GP'],ascending=[False,True]).reset_index(drop=True)
         
+     
+    @output
+    @render.plot(alt="A histogram")
+    def plot():
+     
+        team_select_list = [input.team_select()]    
+        position_select_list =  [input.position_select()]    
     
-    if position_select_list[0] == 'All':
-        position_select_title = '' 
-
+        if team_select_list[0] == 'All':
+            team_select_title = 'NHL '
+        else:
+            team_select_title = f'{team_abv_nst_dict[team_select_list[0]]} '
+            
+        
+        if position_select_list[0] == 'All':
+            position_select_title = '' 
     
-    elif position_select_list[0] == 'F':
-        position_select_title = 'Forwards '
-
+        
+        elif position_select_list[0] == 'F':
+            position_select_title = 'Forwards '
     
-    else:
-        position_select_title = 'Defense '
-
+        
+        else:
+            position_select_title = 'Defense '
     
-    rookie = ''
-    if input.rookie_switch():
-        rookie = 'Rookie '
         
-    i = 0
-    #rookie = ''
-    current_season = '2023'
-    start_season = '2024'
-
+        rookie = ''
+        if input.rookie_switch():
+            rookie = 'Rookie '
+            
+        i = 0
+        #rookie = ''
+        current_season = '2023'
+        start_season = '2024'
     
-    # player_lookup_list = ['Connor McDavid','David Pastrnak','Nathan MacKinnon']
-
+        
+        # player_lookup_list = ['Connor McDavid','David Pastrnak','Nathan MacKinnon']
     
-    type(input.id())
-    print(input.id())
-    player_lookup_list = list(input.id())[0:10]
-
+        
+        type(input.id())
+        print(input.id())
+        player_lookup_list = list(input.id())[0:10]
     
-    stat = input.stat()
-    sns.set_theme(style="whitegrid", palette="pastel")
-    #print(type([input.date()))
-    date_range_list = [pd.to_datetime(input.date())]
-    for k in range(len(date_range_list)):
-        print(date_range_list[k])
+        
         stat = input.stat()
-        team_schedule_url_merge = []
-        max_games_player = []
-        max_games_team = []
-        max_stat = []
-        per_game = False
-        for i in range(0,len(player_lookup_list)):
-            team_schedule_url_merge.append(player_games_df[(player_games_df.player_id == int(player_lookup_list[i]))&(date_range_list[k] >= player_games_df.date)].reset_index(drop=True))
-            #print('touble',i, player_lookup_list[i],len(player_games_df[(player_games_df.player_id == player_lookup_list[i])]))
-            team_schedule_url_merge[i].index = team_schedule_url_merge[i].team_game
-            team_schedule_url_merge[i] = team_schedule_url_merge[i].reindex(np.arange(team_schedule_url_merge[i].team_game.min(), team_schedule_url_merge[i].team_game.max() + 1)).reset_index(drop=True)
-            #team_schedule_url_merge[0]['team_game'] = team_schedule_url_merge[0]['index']
-            #team_schedule_url_merge[0]['player_game'] = 
-            #schedule_ccount_df[schedule_ccount_df['team'].isin(team_schedule_url_merge[0].Team.unique())].merge(right=team_schedule_url_merge[0],left_on=['date','team'],right_on=['date','Team'],how='left')
-
+        sns.set_theme(style="whitegrid", palette="pastel")
+        #print(type([input.date()))
+        date_range_list = [pd.to_datetime(input.date())]
+        for k in range(len(date_range_list)):
+            print(date_range_list[k])
+            stat = input.stat()
+            team_schedule_url_merge = []
+            max_games_player = []
+            max_games_team = []
+            max_stat = []
+            per_game = False
+            for i in range(0,len(player_lookup_list)):
+                team_schedule_url_merge.append(player_games_df[(player_games_df.player_id == int(player_lookup_list[i]))&(date_range_list[k] >= player_games_df.date)].reset_index(drop=True))
+                #print('touble',i, player_lookup_list[i],len(player_games_df[(player_games_df.player_id == player_lookup_list[i])]))
+                team_schedule_url_merge[i].index = team_schedule_url_merge[i].team_game
+                team_schedule_url_merge[i] = team_schedule_url_merge[i].reindex(np.arange(team_schedule_url_merge[i].team_game.min(), team_schedule_url_merge[i].team_game.max() + 1)).reset_index(drop=True)
+                #team_schedule_url_merge[0]['team_game'] = team_schedule_url_merge[0]['index']
+                #team_schedule_url_merge[0]['player_game'] = 
+                #schedule_ccount_df[schedule_ccount_df['team'].isin(team_schedule_url_merge[0].Team.unique())].merge(right=team_schedule_url_merge[0],left_on=['date','team'],right_on=['date','Team'],how='left')
     
-            team_schedule_url_merge[i]['stat'] = team_schedule_url_merge[i][stat].cumsum()
-
+        
+                team_schedule_url_merge[i]['stat'] = team_schedule_url_merge[i][stat].cumsum()
     
-
+        
     
-            #team_schedule_url_merge[i]['stat'] = team_schedule_url_merge[i][stat_pick]
-            team_schedule_url_merge[i] = team_schedule_url_merge[i].append(team_schedule_url_merge[i]).sort_index()
-            team_schedule_url_merge[i] = team_schedule_url_merge[i].append(team_schedule_url_merge[i].iloc[0]).sort_index().reset_index(drop=True)
-
-            team_schedule_url_merge[i]['team_game'][0] = 0
-            team_schedule_url_merge[i]['player_game'][0] = 0
-            team_schedule_url_merge[i]['stat'][0] = 0
-
+        
+                #team_schedule_url_merge[i]['stat'] = team_schedule_url_merge[i][stat_pick]
+                team_schedule_url_merge[i] = team_schedule_url_merge[i].append(team_schedule_url_merge[i]).sort_index()
+                team_schedule_url_merge[i] = team_schedule_url_merge[i].append(team_schedule_url_merge[i].iloc[0]).sort_index().reset_index(drop=True)
     
-            for j in range(1,len(team_schedule_url_merge[i]),2):
-                team_schedule_url_merge[i]['player_game'][j] = team_schedule_url_merge[i]['player_game'][j]-1
-                team_schedule_url_merge[i]['team_game'][j] = team_schedule_url_merge[i]['team_game'][j]-1
-                team_schedule_url_merge[i]['stat'][j] = team_schedule_url_merge[i]['stat'][j] - team_schedule_url_merge[i][stat][j]
-
-            if len(team_schedule_url_merge[i]) >3:     
-                if pd.isna(team_schedule_url_merge[i].iloc[3]['player_game']) and pd.isna(team_schedule_url_merge[i].iloc[1]['player_game']) == True:
-                    team_schedule_url_merge[i]['player_game'][2] = np.nan
-                    team_schedule_url_merge[i]['stat'][2] = np.nan
-
-            if len(team_schedule_url_merge[i]) >3:   
-                if pd.isna(team_schedule_url_merge[i].iloc[len(team_schedule_url_merge[i])-1]['player_game']) == True:
-                    team_schedule_url_merge[i]['stat'][len(team_schedule_url_merge[i])-1] = np.nanmax(team_schedule_url_merge[i]['stat'])
-
-            if not (team_schedule_url_merge[i]['team_game'].values[1] == team_schedule_url_merge[i]['player_game'].values[0]):   
-                team_schedule_url_merge[i].loc[0,'team_game'] = np.nan
+                team_schedule_url_merge[i]['team_game'][0] = 0
+                team_schedule_url_merge[i]['player_game'][0] = 0
+                team_schedule_url_merge[i]['stat'][0] = 0
     
+        
+                for j in range(1,len(team_schedule_url_merge[i]),2):
+                    team_schedule_url_merge[i]['player_game'][j] = team_schedule_url_merge[i]['player_game'][j]-1
+                    team_schedule_url_merge[i]['team_game'][j] = team_schedule_url_merge[i]['team_game'][j]-1
+                    team_schedule_url_merge[i]['stat'][j] = team_schedule_url_merge[i]['stat'][j] - team_schedule_url_merge[i][stat][j]
     
-            max_games_player.append(np.around(np.nanmax(team_schedule_url_merge[i]['player_game'])))
-            max_games_team.append(np.around(np.nanmax(team_schedule_url_merge[i]['team_game'])))
-            max_stat.append((np.around(np.nanmax(team_schedule_url_merge[i]['stat']))))
-
+                if len(team_schedule_url_merge[i]) >3:     
+                    if pd.isna(team_schedule_url_merge[i].iloc[3]['player_game']) and pd.isna(team_schedule_url_merge[i].iloc[1]['player_game']) == True:
+                        team_schedule_url_merge[i]['player_game'][2] = np.nan
+                        team_schedule_url_merge[i]['stat'][2] = np.nan
     
-        fig, ax = plt.subplots(figsize=(15,15))
-        cgfont = {'fontname':'Century Gothic'}
-        font = font_manager.FontProperties(family='Century Gothic',
-                                            style='normal', size=14)
-
-        ax.axhline(0,color='black',linestyle ="--",linewidth=2,alpha=1.0,label='Missed Games')
-        ax.axhline(0,color='black',linestyle ="-",linewidth=2,alpha=1.0)
-
-        if 'Total' in stat:
-            stat = stat.replace('Total ',"")
-
-
-        colour_scheme = ['#648FFF','#785EF0','#DC267F','#FE6100','#FFB000','#FAEF3B','#861318','#2ED3BC','#341BBF','#B37E2C']
-
+                if len(team_schedule_url_merge[i]) >3:   
+                    if pd.isna(team_schedule_url_merge[i].iloc[len(team_schedule_url_merge[i])-1]['player_game']) == True:
+                        team_schedule_url_merge[i]['stat'][len(team_schedule_url_merge[i])-1] = np.nanmax(team_schedule_url_merge[i]['stat'])
     
-        for i in range(len(team_schedule_url_merge)):
-            sns.lineplot(team_schedule_url_merge[i].reset_index()['team_game'],team_schedule_url_merge[i].reset_index()['stat'],linewidth=3-i*.2,color=colour_scheme[i])
-            plt.plot(team_schedule_url_merge[i]['team_game'],team_schedule_url_merge[i]['stat'],color=ax.lines[i*2+2].get_color(),label=str(i+1)+'. '+team_schedule_url_merge[i]['Player'][0]+', '+str(int(max_stat[i]))+' '+stat+' in '+str(int(max(team_schedule_url_merge[i]['player_game'])))+' Games',linewidth=6)
-            ax.lines[i*2+2].set_linestyle("--")
-
+                if not (team_schedule_url_merge[i]['team_game'].values[1] == team_schedule_url_merge[i]['player_game'].values[0]):   
+                    team_schedule_url_merge[i].loc[0,'team_game'] = np.nan
+        
+        
+                max_games_player.append(np.around(np.nanmax(team_schedule_url_merge[i]['player_game'])))
+                max_games_team.append(np.around(np.nanmax(team_schedule_url_merge[i]['team_game'])))
+                max_stat.append((np.around(np.nanmax(team_schedule_url_merge[i]['stat']))))
+    
+        
+            fig, ax = plt.subplots(figsize=(15,15))
+            cgfont = {'fontname':'Century Gothic'}
+            font = font_manager.FontProperties(family='Century Gothic',
+                                                style='normal', size=14)
+    
+            ax.axhline(0,color='black',linestyle ="--",linewidth=2,alpha=1.0,label='Missed Games')
+            ax.axhline(0,color='black',linestyle ="-",linewidth=2,alpha=1.0)
+    
+            if 'Total' in stat:
+                stat = stat.replace('Total ',"")
     
-        fig.set_facecolor('#ffffff')
-        ax.set(xlim=(0,max([team_schedule_url_merge[x].team_game.max() for x in range(len(team_schedule_url_merge))])))
-        ax.set(ylim=(0,max([team_schedule_url_merge[x].stat.max() for x in range(len(team_schedule_url_merge))])))
-
-        ax.legend_.remove()
-
-        if per_game == False:
-            fig.suptitle(f'{rookie}{team_select_title}{position_select_title}{stat} Race',y=.98,fontsize=32,color='black',**cgfont)
-            ax.set_ylabel(stat,fontsize=20,color='black',**cgfont)
-        # else:
-        # fig.suptitle(stat+' Per Game, All Situations',y=.99,fontsize=48,color='black',**cgfont)
-        # ax.set_ylabel(stat+"/GP",fontsize=20,color='black',**cgfont)
-        ax.set_title(str(current_season)[0:4]+'-'+str(start_season)[-4:]+' Season',y=1.01,fontsize=18,color='black',**cgfont,x=0,ha='left')
-        ax.set_xlabel('Team Game',fontsize=20,color='black',**cgfont)
-        ax.tick_params(axis="x", labelsize=24,colors='black')
-        ax.set_facecolor('#ffffff')
-        ax.xaxis.set_major_locator(MaxNLocator(integer=True))
-        ax.tick_params(axis="y", labelsize=24,colors='black')
-        ax.yaxis.set_major_locator(MaxNLocator(integer=True))
     
-        fig.text(x=0.025,y=0.01,s="Created By: @TJStats",color='black', fontsize=20, horizontalalignment='left',**cgfont)
-        fig.text(x=0.975,y=0.01,s="Data: Natural Stat Trick",color='black', fontsize=20, horizontalalignment='right',**cgfont)
-        fig.text(x=.975,y=0.92,s='Date: '+input.date().strftime('%B %d, %Y'),color='black', fontsize=18, horizontalalignment='right',**cgfont)
-
-        ax.legend(prop=font,bbox_to_anchor=(0.01, 0.99),loc='upper left',framealpha=1,frameon=True)
-        plt.tight_layout()
-        #fig.savefig('gif_race/'+stat+rookie+str(date_range_list[k].date())+'.png', facecolor=fig.get_facecolor(), edgecolor='none',bbox_inches='tight',dpi=100)
-        #plt.close()
-        #fig.legend(prop=font,loc='best',framealpha=1,frameon=True)
+            colour_scheme = ['#648FFF','#785EF0','#DC267F','#FE6100','#FFB000','#FAEF3B','#861318','#2ED3BC','#341BBF','#B37E2C']
+    
+        
+            for i in range(len(team_schedule_url_merge)):
+                sns.lineplot(team_schedule_url_merge[i].reset_index()['team_game'],team_schedule_url_merge[i].reset_index()['stat'],linewidth=3-i*.2,color=colour_scheme[i])
+                plt.plot(team_schedule_url_merge[i]['team_game'],team_schedule_url_merge[i]['stat'],color=ax.lines[i*2+2].get_color(),label=str(i+1)+'. '+team_schedule_url_merge[i]['Player'][0]+', '+str(int(max_stat[i]))+' '+stat+' in '+str(int(max(team_schedule_url_merge[i]['player_game'])))+' Games',linewidth=6)
+                ax.lines[i*2+2].set_linestyle("--")
+    
+        
+            fig.set_facecolor('#ffffff')
+            ax.set(xlim=(0,max([team_schedule_url_merge[x].team_game.max() for x in range(len(team_schedule_url_merge))])))
+            ax.set(ylim=(0,max([team_schedule_url_merge[x].stat.max() for x in range(len(team_schedule_url_merge))])))
+    
+            ax.legend_.remove()
+    
+            if per_game == False:
+                fig.suptitle(f'{rookie}{team_select_title}{position_select_title}{stat} Race',y=.98,fontsize=32,color='black',**cgfont)
+                ax.set_ylabel(stat,fontsize=20,color='black',**cgfont)
+            # else:
+            # fig.suptitle(stat+' Per Game, All Situations',y=.99,fontsize=48,color='black',**cgfont)
+            # ax.set_ylabel(stat+"/GP",fontsize=20,color='black',**cgfont)
+            ax.set_title(str(current_season)[0:4]+'-'+str(start_season)[-4:]+' Season',y=1.01,fontsize=18,color='black',**cgfont,x=0,ha='left')
+            ax.set_xlabel('Team Game',fontsize=20,color='black',**cgfont)
+            ax.tick_params(axis="x", labelsize=24,colors='black')
+            ax.set_facecolor('#ffffff')
+            ax.xaxis.set_major_locator(MaxNLocator(integer=True))
+            ax.tick_params(axis="y", labelsize=24,colors='black')
+            ax.yaxis.set_major_locator(MaxNLocator(integer=True))
+        
+            fig.text(x=0.025,y=0.01,s="Created By: @TJStats",color='black', fontsize=20, horizontalalignment='left',**cgfont)
+            fig.text(x=0.975,y=0.01,s="Data: Natural Stat Trick",color='black', fontsize=20, horizontalalignment='right',**cgfont)
+            fig.text(x=.975,y=0.92,s='Date: '+input.date().strftime('%B %d, %Y'),color='black', fontsize=18, horizontalalignment='right',**cgfont)
+    
+            ax.legend(prop=font,bbox_to_anchor=(0.01, 0.99),loc='upper left',framealpha=1,frameon=True)
+            plt.tight_layout()
+            #fig.savefig('gif_race/'+stat+rookie+str(date_range_list[k].date())+'.png', facecolor=fig.get_facecolor(), edgecolor='none',bbox_inches='tight',dpi=100)
+            #plt.close()
+            #fig.legend(prop=font,loc='best',framealpha=1,frameon=True)
 
  
 app = App(app_ui, server)