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

Merge branch 'theouche' of https://github.com/AudebertAdrien/ft_transcendence into trash

Browse Source
This commit is contained in:
CHIBOUB Chakib 2024-09-11 15:58:19 +02:00
commit 41c15f6621
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pong/game/views.py
View File

@ -92,7 +92,7 @@ def player_list_json(request):
return JsonResponse(data) return JsonResponse(data)
def tournoi_list_json(request): def tournoi_list_json(request):
tournois = Tournoi.objects.all() tournois = Tournoi.objects.select_related('winner').all()
data = { data = {
'tournois': list(tournois.values( 'tournois': list(tournois.values(

19
pong/static/burger.js
View File

@ -103,10 +103,11 @@ document.addEventListener('DOMContentLoaded', () => {
console.log('Displaying matches:'); console.log('Displaying matches:');
const matchListBody = document.querySelector('#match-list tbody'); const matchListBody = document.querySelector('#match-list tbody');
matchListBody.innerHTML = ''; matchListBody.innerHTML = '';
const row = document.createElement('tr');
if (matches.length != 0) { if (matches.length != 0) {
matches.forEach(match => { matches.forEach(match => {
const row = document.createElement('tr');
row.innerHTML = ` row.innerHTML = `
<td>${match.id}</td> <td>${match.id}</td>
<td>${match.player1__name}</td> <td>${match.player1__name}</td>
@ -124,6 +125,7 @@ document.addEventListener('DOMContentLoaded', () => {
matchListBody.appendChild(row); matchListBody.appendChild(row);
}); });
} else { } else {
const row = document.createElement('tr');
row.innerHTML = ` row.innerHTML = `
<td colspan="12">No matches found.</td> <td colspan="12">No matches found.</td>
`; `;
@ -135,10 +137,11 @@ document.addEventListener('DOMContentLoaded', () => {
console.log('Displaying players:'); console.log('Displaying players:');
const playersListBody = document.querySelector('#player-list tbody'); const playersListBody = document.querySelector('#player-list tbody');
playersListBody.innerHTML = ''; playersListBody.innerHTML = '';
const row = document.createElement('tr');
if (players.length != 0) { if (players.length != 0) {
players.forEach(player => { players.forEach(player => {
const row = document.createElement('tr');
row.innerHTML = ` row.innerHTML = `
<td>${player.id}</td> <td>${player.id}</td>
<td>${player.name}</td> <td>${player.name}</td>
@ -157,8 +160,9 @@ document.addEventListener('DOMContentLoaded', () => {
playersListBody.appendChild(row); playersListBody.appendChild(row);
}); });
} else { } else {
const row = document.createElement('tr');
row.innerHTML = ` row.innerHTML = `
<td colspan="12">No matches found.</td> <td colspan="12">No player found.</td>
` `
playersListBody.appendChild(row); playersListBody.appendChild(row);
} }
@ -168,22 +172,25 @@ document.addEventListener('DOMContentLoaded', () => {
console.log('Displaying tournois:'); console.log('Displaying tournois:');
const tournoisListBody = document.querySelector('#tournoi-list tbody'); const tournoisListBody = document.querySelector('#tournoi-list tbody');
tournoisListBody.innerHTML = ''; tournoisListBody.innerHTML = '';
const row = document.createElement('tr');
if (tournois.length != 0) { if (tournois.length != 0) {
tournois.forEach(tournoi => { tournois.forEach(tournoi => {
console.log('Winner:', tournoi.winner); //debug !!!!!!!!!!!!!!!!!
console.log('Winner:', tournoi.winner__name); //debug !!!!!!!!!!!!!!!!!
const row = document.createElement('tr');
row.innerHTML = ` row.innerHTML = `
<td>${tournoi.id}</td> <td>${tournoi.id}</td>
<td>${tournoi.name}</td> <td>${tournoi.name}</td>
<td>${tournoi.nbr_player}</td> <td>${tournoi.nbr_player}</td>
<td>${tournoi.date}</td> <td>${tournoi.date}</td>
<td>${tournoi.winner ? tournoi.winner.name : 'None'}</td> <td>${tournoi.winner ? tournoi.winner__name : 'None'}</td>
`; `;
tournoisListBody.appendChild(row); tournoisListBody.appendChild(row);
}); });
} else { } else {
const row = document.createElement('tr');
row.innerHTML = ` row.innerHTML = `
<td colspan="12">No matches found.</td> <td colspan="12">No tournoi found.</td>
` `
tournoisListBody.appendChild(row); tournoisListBody.appendChild(row);
} }