Ladebeze66/ft_transcendence
1
0
Fork 0
mirror of https://github.com/AudebertAdrien/ft_transcendence.git synced 2026-02-04 11:40:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Waiting last fonction Chaku, normally, everithing work

Browse Source
This commit is contained in:
Theouche 2024-07-30 16:52:16 +02:00
parent cb14984e03
commit eedf17ddc0
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pong/game/game.py
View File

@ -140,3 +140,4 @@ class Game:
await self.player1.send(end_message) await self.player1.send(end_message)
if not self.botgame: if not self.botgame:
await self.player2.send(end_message) await self.player2.send(end_message)
#endfortheouche(p1, p2, s_p1, s_p2, winner, bt_p1, bt_p2, dur, is_tournoi, name_tournament)

3
pong/game/urls.py
View File

@ -9,9 +9,6 @@ urlpatterns = [
path('check_user_exists/', views.check_user_exists, name='check_user_exists'), path('check_user_exists/', views.check_user_exists, name='check_user_exists'),
path('register_user/', views.register_user, name='register_user'), path('register_user/', views.register_user, name='register_user'),
path('authenticate_user/', views.authenticate_user, name='authenticate_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('players/', player_list, name='player_list'),
path('matches/', match_list, name='match_list'), path('matches/', match_list, name='match_list'),
path('tournois/', tournoi_list, name='tournoi_list'), path('tournois/', tournoi_list, name='tournoi_list'),

27
pong/game/utils.py
View File

@ -4,6 +4,23 @@ from django.shortcuts import get_object_or_404
from django.db.models import Max, Sum, F from django.db.models import Max, Sum, F
from datetime import timedelta 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( def create_player(
name, name,
total_match=0, total_match=0,
@ -67,7 +84,7 @@ def create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_
return match return match
def player_statistics(player_name): def uptdate_player_statistics(player_name):
player = get_object_or_404(Player, name=player_name) player = get_object_or_404(Player, name=player_name)
# Filtrer les matchs où le joueur est joueur 1 ou joueur 2 # 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() total_duration += matches_as_player2.aggregate(Sum('duration'))['duration__sum'] or timedelta()
m_duration = total_duration / total_match 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() total_win_tourn = won_tourn.count()
p_win_tourn = (total_win_tourn / total_tourn_p) * 100 if total_tourn_p else 0 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_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_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) 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.m_nbr_ball_touch = m_nbr_ball_touch
player.total_duration = total_duration player.total_duration = total_duration
player.m_duration = m_duration player.m_duration = m_duration
player.num_participated_tournaments = total_tourn_p """ player.num_participated_tournaments = total_tourn_p
player.num_won_tournaments = total_win_tourn player.num_won_tournaments = total_win_tourn """
player.save() player.save()