From c36f227bf0fb57b86f086a920a9ed30071d98d5d Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Wed, 11 Oct 2017 18:45:28 +0300
Subject: [PATCH] Add text field to KaehmyForm

---
 webapp/migrations/0017_kaehmyform_text.py | 20 ++++++++++++++++++++
 webapp/models.py                          |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 webapp/migrations/0017_kaehmyform_text.py

diff --git a/webapp/migrations/0017_kaehmyform_text.py b/webapp/migrations/0017_kaehmyform_text.py
new file mode 100644
index 0000000..bcc7834
--- /dev/null
+++ b/webapp/migrations/0017_kaehmyform_text.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-11 15:45
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0016_auto_20171011_1828'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='kaehmyform',
+            name='text',
+            field=models.TextField(default='', max_length=300, verbose_name='Text'),
+        ),
+    ]
diff --git a/webapp/models.py b/webapp/models.py
index 6ff12c5..2132280 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -92,7 +92,7 @@ class BaseRole(models.Model):
     is_board = models.BooleanField(_('Board member'))
 
     def __str__(self):
-        return self.name.capitalize()
+        return '{} ({})'.format(self.name.capitalize(), _('board member'))
 
 
 class PresetRole(BaseRole):
@@ -143,11 +143,12 @@ class KaehmyForm(MessageParent):
     name = models.CharField(_('Name'), max_length=255)
     email = models.EmailField(_('Email'))
     year = models.IntegerField(_('Year'))
+    text = models.TextField(_('Text'), default="", max_length=300)
     custom_roles = models.ManyToManyField('CustomKaehmyRole', related_name='forms', blank=True)
     preset_roles = models.ManyToManyField('PresetKaehmyRole', related_name='forms', blank=True)
 
     def __str__(self):
-        return _('Hakemus: {}').format(self.name)
+        return _('Kaehmy application: {}').format(self.name)
 
 
 class Role(PresetRole):