From 69c1b2dcb29dbedfee43763a315287f4db75d8f2 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Wed, 24 Jan 2018 17:20:55 +0200 Subject: [PATCH] Add team challenge option --- webapp/migrations/0036_auto_20180124_1712.py | 49 ++++++++++++++++++++ webapp/models.py | 17 ++++--- 2 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 webapp/migrations/0036_auto_20180124_1712.py diff --git a/webapp/migrations/0036_auto_20180124_1712.py b/webapp/migrations/0036_auto_20180124_1712.py new file mode 100644 index 0000000..0647108 --- /dev/null +++ b/webapp/migrations/0036_auto_20180124_1712.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2018-01-24 15:12 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('webapp', '0035_auto_20171019_1413'), + ] + + operations = [ + migrations.AlterModelOptions( + name='ohlhafvchallenge', + options={'verbose_name': 'Ohlhafv challenge', 'verbose_name_plural': 'Ohlhafv challenges'}, + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='challenger', + field=models.CharField(max_length=255, verbose_name='Challenger'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='challenger_email', + field=models.EmailField(max_length=254, verbose_name='Challenger email'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='message', + field=models.TextField(verbose_name='Message'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='series', + field=models.CharField(choices=[('0.33 L', '0.33 L'), ('0.5 L', '0.5 L'), ('1.0 L', '1.0 L'), ('Team', 'Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)')], max_length=10, verbose_name='Series'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='victim', + field=models.CharField(max_length=255, verbose_name='Victim'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='victim_email', + field=models.EmailField(max_length=254, verbose_name='Victim Email'), + ), + ] diff --git a/webapp/models.py b/webapp/models.py index c6cea6b..a3aa9dc 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -271,18 +271,23 @@ class Official(User): class OhlhafvChallenge(models.Model): """Model containing all info about ohlhafv challenge.""" + class Meta: + verbose_name = _('Ohlhafv challenge') + verbose_name_plural = _('Ohlhafv challenges') + SERIES_CHOICES = ( ('0.33 L', '0.33 L'), ('0.5 L', '0.5 L'), ('1.0 L', '1.0 L'), + (_('Team'), _('Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0L)')) ) - challenger = models.CharField(max_length=255) - victim = models.CharField(max_length=255) - challenger_email = models.EmailField() - victim_email = models.EmailField() - series = models.CharField(choices=SERIES_CHOICES, max_length=10) - message = models.TextField() + challenger = models.CharField(_('Challenger'), max_length=255) + victim = models.CharField(_('Victim'), max_length=255) + challenger_email = models.EmailField(_('Challenger email')) + victim_email = models.EmailField(_('Victim Email')) + series = models.CharField(_('Series'), choices=SERIES_CHOICES, max_length=10) + message = models.TextField(_('Message')) # Telegram channel entry for Kaehmys