diff --git a/pong/game/game.py b/pong/game/game.py index d7244f9..fc234ec 100644 --- a/pong/game/game.py +++ b/pong/game/game.py @@ -140,3 +140,4 @@ class Game: await self.player1.send(end_message) if not self.botgame: await self.player2.send(end_message) + #endfortheouche(p1, p2, s_p1, s_p2, winner, bt_p1, bt_p2, dur, is_tournoi, name_tournament) diff --git a/pong/game/urls.py b/pong/game/urls.py index 43f7305..570f027 100644 --- a/pong/game/urls.py +++ b/pong/game/urls.py @@ -9,9 +9,6 @@ urlpatterns = [ path('check_user_exists/', views.check_user_exists, name='check_user_exists'), path('register_user/', views.register_user, name='register_user'), path('authenticate_user/', views.authenticate_user, name='authenticate_user'), - path('create_player/', views.create_player_view, name='create_player'), - path('create_tournoi/', views.create_tournoi_view, name='create_tournoi'), - path('create_match/', views.create_match_view, name='create_match'), path('players/', player_list, name='player_list'), path('matches/', match_list, name='match_list'), path('tournois/', tournoi_list, name='tournoi_list'), diff --git a/pong/game/utils.py b/pong/game/utils.py index eeb7107..c6655ee 100644 --- a/pong/game/utils.py +++ b/pong/game/utils.py @@ -4,6 +4,23 @@ from django.shortcuts import get_object_or_404 from django.db.models import Max, Sum, F from datetime import timedelta +def endfortheouche(p1, p2, s_p1, s_p2, winner, bt_p1, bt_p2, dur, is_tournoi, name_tournament) : + #If he doesn't exist, create player p1 + if not Player.objects.filter(name=p1).exist(): + create_player(p1) + + #If he doesn't exist, create player p2 + if not Player.objects.filter(name=p2).exist(): + create_player(p2) + + #create Match + create_match(p1, p2, s_p1, s_p2, bt_p1, bt_p2, dur, is_tournoi, name_tournamenttournoi) + + #Update data p1 et p2 + uptdate_player_statistics(p1) + uptdate_player_statistics(p2) + + def create_player( name, total_match=0, @@ -67,7 +84,7 @@ def create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_ return match -def player_statistics(player_name): +def uptdate_player_statistics(player_name): player = get_object_or_404(Player, name=player_name) # Filtrer les matchs où le joueur est joueur 1 ou joueur 2 @@ -118,10 +135,10 @@ def player_statistics(player_name): total_duration += matches_as_player2.aggregate(Sum('duration'))['duration__sum'] or timedelta() m_duration = total_duration / total_match - total_tourn_p = part_tourn_as_p1.count() + part_tourn_as_p2.count() + """ total_tourn_p = part_tourn_as_p1.count() + part_tourn_as_p2.count() total_win_tourn = won_tourn.count() p_win_tourn = (total_win_tourn / total_tourn_p) * 100 if total_tourn_p else 0 - + """ best_score_as_player1 = matches_as_player1.aggregate(Max('score_player1'))['score_player1__max'] or 0 best_score_as_player2 = matches_as_player2.aggregate(Max('score_player2'))['score_player2__max'] or 0 best_score = max(best_score_as_player1, best_score_as_player2) @@ -136,8 +153,8 @@ def player_statistics(player_name): player.m_nbr_ball_touch = m_nbr_ball_touch player.total_duration = total_duration player.m_duration = m_duration - player.num_participated_tournaments = total_tourn_p - player.num_won_tournaments = total_win_tourn + """ player.num_participated_tournaments = total_tourn_p + player.num_won_tournaments = total_win_tourn """ player.save()