From b7a031945a14057912d14a8f67301b3ee3241723 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 16 Feb 2017 22:19:30 +0100 Subject: [PATCH] hotfix emtpy field on user form --- rowers/models.py | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/rowers/models.py b/rowers/models.py index f4b842be..cc8883d9 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -19,7 +19,7 @@ import sqlalchemy as sa from sqlite3 import OperationalError from django.utils import timezone import datetime - +from django.core.exceptions import ValidationError from rowers.rows import validate_file_extension from rowsandall_app.settings import ( @@ -574,24 +574,35 @@ class RowerPowerZonesForm(ModelForm): def clean(self): cleaned_data = super(RowerPowerZonesForm, self).clean() + try: pw_ut2 = cleaned_data['pw_ut2'] + except KeyError: + raise ValidationError("Value cannot be empty") except: pw_ut2 = int(self.data['pw_ut2']) try: pw_ut1 = cleaned_data['pw_ut1'] + except KeyError: + raise ValidationError("Value cannot be empty") except: pw_ut1 = int(self.data['pw_ut1']) try: pw_at = cleaned_data['pw_at'] + except KeyError: + raise ValidationError("Value cannot be empty") except: pw_at = int(self.data['pw_at']) try: pw_tr = cleaned_data['pw_tr'] + except KeyError: + raise ValidationError("Value cannot be empty") except: pw_tr = int(self.data['pw_tr']) try: pw_an = cleaned_data['pw_an'] + except KeyError: + raise ValidationError("Value cannot be empty") except: pw_an = int(self.data['pw_an']) @@ -627,6 +638,38 @@ class RowerPowerZonesForm(ModelForm): cleaned_data['ut1name'] = 'AN' + try: + ut3name = cleaned_data['ut3name'] + except: + ut2name = 'UT3' + cleaned_data['ut3name'] = 'UT3' + try: + ut2name = cleaned_data['ut2name'] + except: + ut2name = 'UT2' + cleaned_data['ut2name'] = 'UT2' + try: + ut1name = cleaned_data['ut1name'] + except: + ut1name = 'UT1' + cleaned_data['ut1name'] = 'UT1' + try: + atname = cleaned_data['atname'] + except: + atname = 'AT' + cleaned_data['atname'] = 'AT' + try: + trname = cleaned_data['trname'] + except: + trname = 'TR' + cleaned_data['ut1name'] = 'TR' + try: + anname = cleaned_data['anname'] + except: + anname = 'AN' + cleaned_data['ut1name'] = 'AN' + + if pw_ut1 <= pw_ut2: e = "{ut1name} should be higher than {ut2name}".format( ut1name = ut1name,