diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css
index 6d21856..6df9919 100644
--- a/tournaments/static/tournaments/css/style.css
+++ b/tournaments/static/tournaments/css/style.css
@@ -217,14 +217,14 @@ tr {
}
.my-block {
- padding: 0px 10px;
+ padding: 10px 10px;
}
-@media print, screen and (min-width: 40em) {
+/* @media print, screen and (min-width: 40em) {
.my-block {
padding: 10px 10px;
}
-}
+} */
.red {
background-color: red;
@@ -250,13 +250,13 @@ tr {
vertical-align: middle;
}
-.table-container {
+/* .table-container {
display: table;
}
.table-cell {
display: table-cell;
vertical-align: middle;
-}
+} */
.horizontal-padding {
padding: 0px 20px;
}
@@ -419,3 +419,21 @@ tr {
.w100px {
width: 100px;
}
+
+.table-row {
+ display: grid;
+ grid-template-columns: auto 1fr auto;
+ align-items: center; /* Vertically center the content within each column */
+ padding: 5px 0px;
+}
+
+.table-cell {
+ flex-grow: 1;
+ text-align: center;
+ /* padding: 5px; */
+}
+
+.table-cell-large {
+ grid-column: 2 / span 1; /* Center column spans from column 2 to column 3 */
+ text-align: left;
+}
diff --git a/tournaments/static/tournaments/test.html b/tournaments/static/tournaments/test.html
new file mode 100644
index 0000000..1af9897
--- /dev/null
+++ b/tournaments/static/tournaments/test.html
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+
Padel
+
+
+
+
+
+
+
+
+
+
+
+
Bienvenue !
+ Matchs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Jacky Gun
+
+
+
+ Joe Gun
+
+
+
+
+
+ 4
+
+ 6
+
+ 6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Jolly Jumper Gun
+
+
+
+ Miky mike Miker
+
+
+
+
+
+ 6
+
+ 4
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- {% for team in match.teams %}
-
-
- {% for name in team.names %}
-
- {{ name }}
-
- {% endfor %}
-
-
- {% for score in team.scores %}
- {{ score }}
- {% endfor %}
-
-
- {% endfor %}
-
-
-
-
-
-
-
-
+ {% if matches %}
+ {% for match in matches %}
+ {% include 'tournaments/match_cell.html' %}
+ {% endfor %}
+ {% endif %}
+
+ {% endif %}
{% endblock %}
diff --git a/tournaments/views.py b/tournaments/views.py
index 5a7c9c0..ecacef0 100644
--- a/tournaments/views.py
+++ b/tournaments/views.py
@@ -1,6 +1,6 @@
from django.shortcuts import render, get_object_or_404
from django.http import HttpResponse
-from .serializers import ClubSerializer, TournamentSerializer, UserSerializer, ChangePasswordSerializer, EventSerializer, RoundSerializer, GroupStageSerializer, MatchSerializer, TeamScoreSerializer, TeamRegistrationSerializer, PlayerRegistrationSerializer
+from .serializers import ClubSerializer, TournamentSerializer, UserSerializer, ChangePasswordSerializer, EventSerializer, RoundSerializer, GroupStageSerializer, MatchSerializer, TeamScoreSerializer, TeamRegistrationSerializer, PlayerRegistrationSerializer, LiveMatchSerializer
from .models import Club, Tournament, CustomUser, Event, Round, GroupStage, Match, TeamScore, TeamRegistration, PlayerRegistration
from .models import TeamCall
@@ -13,6 +13,7 @@ from rest_framework.generics import UpdateAPIView
from django.template import loader
from datetime import date
from django.http import JsonResponse
+import json
def index(request):
today = date.today()
@@ -37,23 +38,33 @@ def index(request):
content_type="text/html",
)
-
def tournament(request, tournament_id):
tournament = get_object_or_404(Tournament, pk=tournament_id)
- today = date.today()
+ live_matches = list(tournament.live_matches())
- future_matches = Match.objects.filter(end_date__isnull=True, start_date__gt=today).order_by('start_date')
- live_matches = Match.objects.filter(end_date__isnull=True, start_date__lte=today).order_by('start_date')
- ended_matches = Match.objects.filter(end_date__isnull=False).order_by('start_date')
- template = loader.get_template('tournaments/tournament.html')
+ template = loader.get_template('tournaments/matches.html')
context = {
- 'future': future_matches,
- 'live': live_matches,
- 'ended': ended_matches,
+ 'matches': live_matches,
}
return HttpResponse(template.render(context, request))
+# def tournament(request, tournament_id):
+
+# tournament = get_object_or_404(Tournament, pk=tournament_id)
+# today = date.today()
+
+# future_matches = Match.objects.filter(end_date__isnull=True, start_date__gt=today).order_by('start_date')
+# live_matches = Match.objects.filter(end_date__isnull=True, start_date__lte=today).order_by('start_date')
+# ended_matches = Match.objects.filter(end_date__isnull=False).order_by('start_date')
+# template = loader.get_template('tournaments/tournament.html')
+# context = {
+# 'future': future_matches,
+# 'live': live_matches,
+# 'ended': ended_matches,
+# }
+# return HttpResponse(template.render(context, request))
+
def tournament_planning(request, tournament_id):
tournament = get_object_or_404(Tournament, pk=tournament_id)
@@ -68,9 +79,9 @@ def tournament_planning(request, tournament_id):
def tournament_json(request, tournament_id):
tournament = get_object_or_404(Tournament, pk=tournament_id)
- live_matches = tournament.live_matches()
- return JsonResponse(live_matches.__dict__)
-
+ live_matches = list(tournament.live_matches())
+ data = json.dumps(live_matches, default=vars)
+ return HttpResponse(data, content_type='application/json')
# def index(request):
# club = Club.objects.first()
+