Merge pull request #91 from Vauhtijuoksu/feature/2023-submissions

Add priority field, remove discord validator

Author: Uular

marathon/forms.py

@@ -58,4 +58,5 @@ class Meta:
         widgets = {
             'time_constraints': forms.Textarea(attrs=TEXTAREA_ATTRS),
             'description': forms.Textarea(attrs=TEXTAREA_ATTRS),
+            'priority': forms.NumberInput(attrs={'min': '1'}),
         }

marathon/migrations/0007_auto_20240118_1931.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.18 on 2024-01-18 17:31
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('marathon', '0006_submission_updates_2023'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='priority',
+            field=models.IntegerField(default=1, help_text='jos ehdotat useampaa peliä (1=mieluisin)', validators=[django.core.validators.MinValueValidator(1)], verbose_name='tärkeysjärjestys'),
+        ),
+        migrations.AlterField(
+            model_name='submission',
+            name='console',
+            field=models.CharField(max_length=29, verbose_name='laite/konsoli, jolla pelaat'),
+        ),
+        migrations.AlterField(
+            model_name='submission',
+            name='estimate',
+            field=models.CharField(help_text='Arvioi suorituksen kestolle yläraja (tunnit:minuutit) alusta loppuun. Ota arviossa huomioon terveisten lähettämiset ja mahdolliset virheet runissa.', max_length=20, verbose_name='aika-arvio'),
+        ),
+    ]

marathon/models.py

@@ -1,11 +1,10 @@
 from cms.models import CMSPlugin
 from django.db import models
 from django.conf import settings
-from django.core.validators import RegexValidator
+from django.core.validators import MinValueValidator
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
-discord_validator = RegexValidator(r'^.{3,32}#[0-9]{4}$', _('Anna discord-tunnus muodossa <nimi>#<sarjanumero>'))
 
 class Player(models.Model):
     user = models.OneToOneField(
@@ -15,7 +14,7 @@ class Player(models.Model):
     )
 
     nickname = models.CharField(_('nimimerkki'), max_length=30)
-    discord = models.CharField(_('discord-tunnus'), max_length=50, validators=[discord_validator])
+    discord = models.CharField(_('discord-tunnus'), max_length=50)
     twitch = models.CharField(_('twitch-tunnus'), max_length=50, blank=True)
     gmail = models.EmailField(
         _('sähköpostiosoite'),
@@ -81,6 +80,13 @@ class Submission(models.Model):
     # Mandatory
     gdpr = models.BooleanField(default=False)
 
+    priority = models.IntegerField(
+        _('tärkeysjärjestys'),
+        help_text=_('Jos ehdotat useampaa peliä (1=mieluisin)'),
+        default=1,
+        validators=[MinValueValidator(1)],
+    )
+
     # Meta
     hidden = models.BooleanField(default=False)
 

templates/marathon/plugins/submission_form.html

@@ -19,6 +19,7 @@
     {% bootstrap_field form.category placeholder="Any% NMS" layout="horizontal" form_group_class="mb-1" %}
     {% bootstrap_field form.estimate placeholder="10:30" layout="horizontal" form_group_class="mb-1" %}
     {% bootstrap_field form.description placeholder="Miksi tämä runi olisi kiva nähdä Vauhtijuoksussa?" layout="horizontal" form_group_class="mb-1" %}
+    {% bootstrap_field form.priority layout="horizontal" form_group_class="mb-1" %}
     {% bootstrap_field form.time_constraints placeholder="Päivät/kellonajat, jotka EIVÄT käy. Jos kaikki käy, voit jättää kentän tyhjäksi." layout="horizontal" form_group_class="mb-1" %}
     {% comment %}
     {% bootstrap_field form.video_link placeholder="https://www.youtube.com/watch?v=dQw4w9WgXcQ" layout="horizontal" form_group_class="mb-1" %}