Ladebeze66/ft_transcendence
1
0
Fork 0
mirror of https://github.com/AudebertAdrien/ft_transcendence.git synced 2025-12-18 06:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
CHIBOUB Chakib 2024-07-31 15:35:48 +02:00
parent 78965de13d
commit 638b5284f4
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pong/game/utils.py
View File

@ -3,7 +3,6 @@ from django.core.exceptions import ValidationError
from django.shortcuts import get_object_or_404 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
<<<<<<< HEAD
from channels.db import database_sync_to_async from channels.db import database_sync_to_async
async def endfortheouche(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament): async def endfortheouche(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament):
@ -27,26 +26,6 @@ async def endfortheouche(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_
await uptdate_player_statistics(p2) await uptdate_player_statistics(p2)
@database_sync_to_async @database_sync_to_async
=======
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)
>>>>>>> f31331d344927dfd9bca940943bdba9a4d79a2b4
def create_player( def create_player(
name, name,
total_match=0, total_match=0,
@ -81,19 +60,13 @@ def create_player(
player.save() player.save()
return player return player
<<<<<<< HEAD
@database_sync_to_async @database_sync_to_async
=======
>>>>>>> f31331d344927dfd9bca940943bdba9a4d79a2b4
def create_tournoi(name, nbr_player, date, winner): def create_tournoi(name, nbr_player, date, winner):
tournoi = Tournoi(name=name, nbr_player=nbr_player, date=date, winner=winner) tournoi = Tournoi(name=name, nbr_player=nbr_player, date=date, winner=winner)
tournoi.save() tournoi.save()
return tournoi return tournoi
<<<<<<< HEAD
@database_sync_to_async @database_sync_to_async
=======
>>>>>>> f31331d344927dfd9bca940943bdba9a4d79a2b4
def create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration, is_tournoi, tournoi): def create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_p1, nbr_ball_touch_p2, duration, is_tournoi, tournoi):
match = Match( match = Match(
player1=player1, player1=player1,