Fix phone number field

webapp/forms.py

@@ -1,21 +1,38 @@
+"""File containing webapp forms."""
+
 from django import forms
 from django.utils.translation import ugettext_lazy as _
+from django.core.exceptions import ValidationError
 
 from webapp.models import OhlhafvChallenge, KaehmyForm
 
 
 class KaehmyForm_Form(forms.ModelForm):
+    """Class representing Kaehmy form."""
 
     class Meta:
+        """Meta for class KaehmyForm."""
+
         model = KaehmyForm
         fields = ['name', 'email', 'phone_number', 'year',
                   'preset_roles', 'custom_roles', 'custom_role_name',
                   'custom_role_is_board', 'text']
 
+    def clean_phone_number(self):
+        """Clean phone number field."""
+        number = self.cleaned_data.get('phone_number')
+        if number.isdigit():
+            return number
+        else:
+            raise ValidationError(_('Invalid value'))
+
 
 class OhlhafvForm(forms.ModelForm):
+    """Class representing Ohlhafv form."""
 
     class Meta:
+        """Meta class for Ohlhafv form."""
+
         model = OhlhafvChallenge
         fields = ['challenger', 'challenger_email',
                   'victim', 'victim_email', 'series', 'message']

webapp/migrations/0021_merge_20171011_2033.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-11 17:33
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0020_kaehmyform_phone_number'),
+        ('webapp', '0020_auto_20171011_2020'),
+    ]
+
+    operations = [
+    ]

webapp/migrations/0022_auto_20171011_2050.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-11 17:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0021_merge_20171011_2033'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='kaehmyform',
+            name='custom_role_is_board',
+            field=models.BooleanField(verbose_name='Board member'),
+        ),
+        migrations.AlterField(
+            model_name='kaehmyform',
+            name='custom_role_name',
+            field=models.CharField(blank=True, max_length=255, verbose_name='Custom role name'),
+        ),
+    ]

webapp/migrations/0023_remove_kaehmyform_phone_number.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-11 18:02
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0022_auto_20171011_2050'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='kaehmyform',
+            name='phone_number',
+        ),
+    ]

webapp/migrations/0024_kaehmyform_phone_number.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-11 18:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0023_remove_kaehmyform_phone_number'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='kaehmyform',
+            name='phone_number',
+            field=models.CharField(default='', max_length=10, verbose_name='Phone number'),
+        ),
+    ]

webapp/models.py

@@ -154,17 +154,18 @@ class KaehmyForm(MessageParent):
 
     name = models.CharField(_('Name'), max_length=255)
     email = models.EmailField(_('Email'))
-    phone_number = PhoneNumberField(_('Phone number'))
+    phone_number = models.CharField(
+        _('Phone number'), max_length=10, default="")
     year = models.IntegerField(_('Year'), choices=YEAR_CHOICES)
     text = models.TextField(_('Text'), default="", max_length=300)
+    custom_role_name = models.CharField(
+        _('Custom role name'), max_length=255, blank=True)
+    custom_role_is_board = models.BooleanField(
+        _('Board member'), blank=True)
     custom_roles = models.ManyToManyField(
         'CustomKaehmyRole', related_name='forms', blank=True)
     preset_roles = models.ManyToManyField(
         'PresetKaehmyRole', related_name='forms', blank=True)
-    custom_role_name = models.CharField(
-        _('Custom role name'), max_length=255, default="")
-    custom_role_is_board = models.BooleanField(
-        _('Board member'), default=False)
 
     def __str__(self):
         """Return model info."""

webapp/views.py

@@ -120,14 +120,15 @@ def kaehmy_submit(request, *args, **kwargs):
     """Submit Kaehmy form."""
     form = KaehmyForm_Form(request.POST)
     if form.is_valid():
+        print("Formi oli validi")
         form.save()
-        custom_name = form.cleaned_data.get('custom_role_name')
-        custom_is_board = form.cleaned_data.get('custom_role_is_board')
-        custom_role = CustomKaehmyRole(
-            name=custom_name, is_board=custom_is_board)
-        custom_role.save()
+        # custom_name = form.cleaned_data.get('custom_role_name')
+        # custom_is_board = form.cleaned_data.get('custom_role_is_board')
+        # custom_role = CustomKaehmyRole(
+        #     name=custom_name, is_board=custom_is_board)
+        # custom_role.save()
     else:
-        pass
+        return HttpResponseRedirect('/')
         # return render(request, 'error.html', {'error': form.errors})
     return HttpResponseRedirect('/kaehmy')