Merge branch 'main' of https://gitea.staxriver.com/staxriver/padelclub_backend

tournaments/migrations/0093_drawlog_draw_type_and_more.py

@@ -0,0 +1,63 @@
+# Generated by Django 4.2.11 on 2024-11-05 08:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tournaments', '0092_club_timezone'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='drawlog',
+            name='draw_type',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AlterField(
+            model_name='customuser',
+            name='bracket_match_format_preference',
+            field=models.IntegerField(blank=True, choices=[(0, 'Two sets'), (1, 'Two sets super tie'), (2, 'Two sets of four games'), (3, 'Nine games'), (4, 'Super Tie-Break'), (5, 'Mega Tie-Break'), (6, 'Two Sets with decisive point'), (7, 'Two Sets with decisive point and super tie-break'), (8, 'Two sets of four games with decisive point'), (9, 'Nine games with decisive point'), (10, 'Two sets of Super Tie-Break decisive point'), (11, 'Single set'), (12, 'Single set with decisive point')], default=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='customuser',
+            name='group_stage_match_format_preference',
+            field=models.IntegerField(blank=True, choices=[(0, 'Two sets'), (1, 'Two sets super tie'), (2, 'Two sets of four games'), (3, 'Nine games'), (4, 'Super Tie-Break'), (5, 'Mega Tie-Break'), (6, 'Two Sets with decisive point'), (7, 'Two Sets with decisive point and super tie-break'), (8, 'Two sets of four games with decisive point'), (9, 'Nine games with decisive point'), (10, 'Two sets of Super Tie-Break decisive point'), (11, 'Single set'), (12, 'Single set with decisive point')], default=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='customuser',
+            name='loser_bracket_match_format_preference',
+            field=models.IntegerField(blank=True, choices=[(0, 'Two sets'), (1, 'Two sets super tie'), (2, 'Two sets of four games'), (3, 'Nine games'), (4, 'Super Tie-Break'), (5, 'Mega Tie-Break'), (6, 'Two Sets with decisive point'), (7, 'Two Sets with decisive point and super tie-break'), (8, 'Two sets of four games with decisive point'), (9, 'Nine games with decisive point'), (10, 'Two sets of Super Tie-Break decisive point'), (11, 'Single set'), (12, 'Single set with decisive point')], default=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='groupstage',
+            name='format',
+            field=models.IntegerField(blank=True, choices=[(0, 'Two sets'), (1, 'Two sets super tie'), (2, 'Two sets of four games'), (3, 'Nine games'), (4, 'Super Tie-Break'), (5, 'Mega Tie-Break'), (6, 'Two Sets with decisive point'), (7, 'Two Sets with decisive point and super tie-break'), (8, 'Two sets of four games with decisive point'), (9, 'Nine games with decisive point'), (10, 'Two sets of Super Tie-Break decisive point'), (11, 'Single set'), (12, 'Single set with decisive point')], default=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='match',
+            name='format',
+            field=models.IntegerField(blank=True, choices=[(0, 'Two sets'), (1, 'Two sets super tie'), (2, 'Two sets of four games'), (3, 'Nine games'), (4, 'Super Tie-Break'), (5, 'Mega Tie-Break'), (6, 'Two Sets with decisive point'), (7, 'Two Sets with decisive point and super tie-break'), (8, 'Two sets of four games with decisive point'), (9, 'Nine games with decisive point'), (10, 'Two sets of Super Tie-Break decisive point'), (11, 'Single set'), (12, 'Single set with decisive point')], default=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='round',
+            name='format',
+            field=models.IntegerField(blank=True, choices=[(0, 'Two sets'), (1, 'Two sets super tie'), (2, 'Two sets of four games'), (3, 'Nine games'), (4, 'Super Tie-Break'), (5, 'Mega Tie-Break'), (6, 'Two Sets with decisive point'), (7, 'Two Sets with decisive point and super tie-break'), (8, 'Two sets of four games with decisive point'), (9, 'Nine games with decisive point'), (10, 'Two sets of Super Tie-Break decisive point'), (11, 'Single set'), (12, 'Single set with decisive point')], default=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='tournament',
+            name='group_stage_format',
+            field=models.IntegerField(blank=True, choices=[(0, 'Two sets'), (1, 'Two sets super tie'), (2, 'Two sets of four games'), (3, 'Nine games'), (4, 'Super Tie-Break'), (5, 'Mega Tie-Break'), (6, 'Two Sets with decisive point'), (7, 'Two Sets with decisive point and super tie-break'), (8, 'Two sets of four games with decisive point'), (9, 'Nine games with decisive point'), (10, 'Two sets of Super Tie-Break decisive point'), (11, 'Single set'), (12, 'Single set with decisive point')], default=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='tournament',
+            name='loser_round_format',
+            field=models.IntegerField(blank=True, choices=[(0, 'Two sets'), (1, 'Two sets super tie'), (2, 'Two sets of four games'), (3, 'Nine games'), (4, 'Super Tie-Break'), (5, 'Mega Tie-Break'), (6, 'Two Sets with decisive point'), (7, 'Two Sets with decisive point and super tie-break'), (8, 'Two sets of four games with decisive point'), (9, 'Nine games with decisive point'), (10, 'Two sets of Super Tie-Break decisive point'), (11, 'Single set'), (12, 'Single set with decisive point')], default=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='tournament',
+            name='round_format',
+            field=models.IntegerField(blank=True, choices=[(0, 'Two sets'), (1, 'Two sets super tie'), (2, 'Two sets of four games'), (3, 'Nine games'), (4, 'Super Tie-Break'), (5, 'Mega Tie-Break'), (6, 'Two Sets with decisive point'), (7, 'Two Sets with decisive point and super tie-break'), (8, 'Two sets of four games with decisive point'), (9, 'Nine games with decisive point'), (10, 'Two sets of Super Tie-Break decisive point'), (11, 'Single set'), (12, 'Single set with decisive point')], default=3, null=True),
+        ),
+    ]

tournaments/models/draw_log.py

@@ -8,3 +8,4 @@ class DrawLog(models.Model):
     draw_seed = models.IntegerField()
     draw_match_index = models.IntegerField()
     draw_team_position = models.IntegerField()
+    draw_type = models.IntegerField(default=0)

tournaments/templates/tournaments/broadcast/broadcasted_summon.html

@@ -2,17 +2,20 @@
     <template x-for="(summon, index) in column" >
         <div>
             <div class="table-row-3-colums-summons">
-                <div class="table-cell table-cell-large semibold">
-                    <template x-for="i in summon.names.length">
-                        <div x-text="summon.names[i-1]"></div>
-                    </template>
+                <div class="summons-left">
+                    <div class="semibold">
+                        <template x-for="i in summon.names.length">
+                            <div x-text="summon.names[i-1]"></div>
+                        </template>
+                    </div>
                 </div>
-                <!-- <div class="table-cell left numbers"><span x-text=""></span></div> -->
-                <div class="table-cell left">
-                    <div class="table-cell large"><span x-text="summon.date"></span></div>
-                    <div class="table-cell"><span x-text="summon.court"></span></div>
+                <div class="summons-right">
+                    <div class="table-cell left">
+                        <div class="table-cell large"><span x-text="summon.date"></span></div>
+                        <div class="table-cell"><span x-text="summon.court"></span></div>
+                    </div>
+                    <div class="table-cell right"><div class="mybox center"><span x-text="summon.stage"></span></div></div>
                 </div>
-                <div class="table-cell right"><div class="mybox center"><span x-text="summon.stage"></span></div></div>
             </div>
 
             <div x-show="index < column.length - 1">