diff --git a/webapp/forms.py b/webapp/forms.py index 0007eab..a089c78 100644 --- a/webapp/forms.py +++ b/webapp/forms.py @@ -1,7 +1,13 @@ from django import forms from django.utils.translation import ugettext_lazy as _ -from webapp.models import OhlhafvChallenge +from webapp.models import OhlhafvChallenge, KaehmyForm + +class KaehmyForm_Form(forms.ModelForm): + + class Meta: + model = KaehmyForm + fields = ['name', 'email', 'year', 'preset_roles', 'custom_roles', 'text'] class OhlhafvForm(forms.ModelForm): diff --git a/webapp/migrations/0018_auto_20171011_1856.py b/webapp/migrations/0018_auto_20171011_1856.py new file mode 100644 index 0000000..4bcbfad --- /dev/null +++ b/webapp/migrations/0018_auto_20171011_1856.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2017-10-11 15:56 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('webapp', '0017_kaehmyform_text'), + ] + + operations = [ + migrations.AlterField( + model_name='kaehmyform', + name='year', + field=models.IntegerField(choices=[(1, '1'), (2, '2'), (3, '3'), (4, '4'), (5, 'N')], verbose_name='Year'), + ), + ] diff --git a/webapp/models.py b/webapp/models.py index 2132280..687251d 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -139,10 +139,17 @@ class KaehmyForm(MessageParent): Allows user to choose from existing roles or to create custom ones. """ + YEAR_CHOICES = ( + (1, '1'), + (2, '2'), + (3, '3'), + (4, '4'), + (5, 'N'), + ) name = models.CharField(_('Name'), max_length=255) email = models.EmailField(_('Email')) - year = models.IntegerField(_('Year')) + year = models.IntegerField(_('Year'), choices=YEAR_CHOICES) 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) diff --git a/webapp/templates/kaehmy.html b/webapp/templates/kaehmy.html new file mode 100644 index 0000000..b158819 --- /dev/null +++ b/webapp/templates/kaehmy.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} + +{% load bootstrap3 %} +{% load i18n %} + +{% block content %} +