Fixes WO layour

tournaments/models/match.py

@@ -125,7 +125,8 @@ class Match(models.Model):
             scores = team_score.scores_array()
             weight = team_score.team_registration.weight()
             is_winner = team_score.team_registration.id == self.winning_team_id
-            team = Team(image, names, scores, weight, is_winner)
+            walk_out = team_score.walk_out
+            team = Team(image, names, scores, weight, is_winner, walk_out)
             livematch.add_team(team)
 
         return livematch
@@ -147,13 +148,14 @@ class Match(models.Model):
     #     return sort_score
 
 class Team:
-    def __init__(self, image, names, scores, weight, is_winner):
+    def __init__(self, image, names, scores, weight, is_winner, walk_out):
         # print(f"image = {image}, names= {names}, scores ={scores}, weight={weight}, win={is_winner}")
         self.image = image
         self.names = names
         self.scores = scores
         self.weight = weight
         self.is_winner = is_winner
+        self.walk_out = walk_out
 
     def to_dict(self):
         return {
@@ -162,6 +164,7 @@ class Team:
             "scores": self.scores,
             "weight": self.weight,
             "is_winner": self.is_winner,
+            "walk_out": self.walk_out,
         }
 
 class LiveMatch:

tournaments/models/team_score.py

@@ -36,9 +36,13 @@ class TeamScore(models.Model):
             return []
 
     def scores_array(self):
-        scores = []
         if self.score:
-            scores = [x for x in self.score.split(',')]
-        if self.walk_out == 1:
-            scores.insert(0, 'WO')
-        return scores
+            return [x for x in self.score.split(',')]
+        else:
+            return []
+        # scores = []
+        # if self.score:
+        #     scores = [x for x in self.score.split(',')]
+        # if self.walk_out == 1:
+        #     scores.insert(0, 'WO')
+        # return scores

tournaments/models/tournament.py

@@ -42,6 +42,12 @@ class Tournament(models.Model):
         else:
             return '--'
 
+    def display_name(self):
+        if self.name:
+            return self.name
+        else:
+            return f"{self.level()} {self.category()}"
+
     def level(self):
         return self.get_federal_level_category_display()
 

tournaments/static/tournaments/css/style.css

@@ -223,7 +223,7 @@ tr {
 
 .scores span {
     width: 30px; /* Fixed width for each score cell */
-    text-align: center; /* Center-align the score text */
+    text-align: center;
 }
 
 .separator {
@@ -237,8 +237,6 @@ tr {
     vertical-align: middle;
     text-align: center;
     padding: 0px 5px;
-    /* width: 40px; */
-    /* justify-content: space-between; */
 }
 
 .winner {

tournaments/templates/tournaments/match_cell.html

@@ -20,44 +20,23 @@
                         </div>
                         {% endfor %}
                     </div>
-                                    <div class="scores">
+                    <!-- <div class="scores"> -->
                         {% if match.started %}
-                                            {% for score in team.scores %}
-                                            <div class="scores">
-                                                <span class="score ws {% if team.is_winner %}winner{% endif %}">{{ score }}</span>
-                                            </div>
-                                            {% endfor %}
+                            {% if team.walk_out %}
+                            <span class="score ws">WO</span>
                             {% else %}
-                                            <span class="score ws">{{ team.weight }}</span>
-                                        {% endif %}
-                                    </div>
-                                </div>
-
-
-
-
-                                <!-- <div class="table-row-3-colums team-names-box {% cycle 'bottom-border' '' %} padding-bottom-small">
-                                    <div class="table-cell table-cell-large">
-                                        {% for name in team.names %}
-                                        <div class="semibold {% if team.is_winner %}winner{% endif %}">
-                                            {{ name }}
-                                        </div>
-                                        {% endfor %}
-                                    </div>
-                                    <div class=" alignright left-margin">
-
-                                        {% if match.started %}
                             {% for score in team.scores %}
                             <div class="scores">
                                 <span class="score ws{% if team.is_winner %} winner{% endif %}">{{ score }}</span>
                             </div>
                             {% endfor %}
+                            {% endif %}
                         {% else %}
                             <span class="score ws">{{ team.weight }}</span>
                         {% endif %}
-
+                    <!-- </div> -->
                 </div>
-                                </div> -->
+
                 {% endfor %}
 
                 </div>

tournaments/templates/tournaments/matches.html

@@ -2,7 +2,7 @@
 
 {% block head_title %}Matchs{% endblock %}
 {% block first_title %}{{ tournament.event.display_name }}{% endblock %}
-{% block second_title %}{{ tournament.name }}{% endblock %}
+{% block second_title %}{{ tournament.display_name }}{% endblock %}
 
 {% block content %}