diff options
author | Nico Geyso <nico.geyso@fu-berlin.de> | 2014-12-09 23:59:54 +0100 |
---|---|---|
committer | Nico Geyso <nico.geyso@fu-berlin.de> | 2014-12-09 23:59:54 +0100 |
commit | 274d1790239f52440137cc922018a87af32a4ab7 (patch) | |
tree | 43149197b724f95af49c483194f2498b13f10ae2 /app/forms.py | |
parent | 79788b3590aba6384611a2c29012bbd821c290ee (diff) | |
download | klausuren-274d1790239f52440137cc922018a87af32a4ab7.tar.gz klausuren-274d1790239f52440137cc922018a87af32a4ab7.tar.bz2 klausuren-274d1790239f52440137cc922018a87af32a4ab7.zip |
Refactoring
Diffstat (limited to 'app/forms.py')
-rw-r--r-- | app/forms.py | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/app/forms.py b/app/forms.py index e562df2..2332179 100644 --- a/app/forms.py +++ b/app/forms.py @@ -6,36 +6,32 @@ from flask.ext.wtf import Form from wtforms import TextField, FileField, SelectField, validators from wtforms.validators import ValidationError +year_start = date.today().year +year_end = current_app.config['FORM_START_YEAR']-1 +choices = [(str(x),x) for x in xrange(year_start, year_end, -1)] class UploadForm(Form): """ Upload Form class for validation """ study = TextField('Studiengang') exam = FileField('Klausur') - module = SelectField('Kurs') - module_new = TextField('Modulname', validators=[validators.Optional(), - validators.Length(min=5)]) - year = SelectField( - 'Jahr', - validators=[validators.Required()], - choices = [ (str(x),x) for x in - #xrange(date.today().year, current_app.config['FORM_START_YEAR']-1, -1) - xrange(date.today().year, 2000, -1) - ] - ) + course = SelectField('Kurs') + course_new = TextField('Modulname', validators=[validators.Optional(), + validators.Length(min=5)]) + year = SelectField('Jahr', validators=[validators.Required()], + choices = choices) def validate_exam(form, field): exts = current_app.config['ALLOWED_EXTENSIONS'] ext = map(field.data.filename.endswith, exts) - if not any(ext): raise ValidationError(u'Ungültiger Dateityp') if field.data.content_length > current_app.config['MAX_CONTENT_LENGTH']: raise ValidationError(u'Zu große Datei') - def validate_module(form, field): - modules = dict(current_app.config['STUDIES'][form.study.data]) - data = form.module.data - if data not in modules or data == '': - raise ValidationError(u'Bitte wähle ein Modul!') + def validate_course(form, field): + courses = dict(current_app.config['STUDIES'][form.study.data]) + data = form.course.data + if data not in courses or data == '': + raise ValidationError(u'Bitte wähle einen Kurs!') |