diff options
| author | Madhusudan.C.S | 2010-11-30 16:17:05 +0530 |
|---|---|---|
| committer | Madhusudan.C.S | 2010-11-30 16:17:05 +0530 |
| commit | b789ae20d77d6ce62b96af2885f0bbceb7d5646e (patch) | |
| tree | e3390751287082a97e7e99fb61e0b5c1696efee8 | |
| parent | f5ea59683b05596b01ee2ad2491ea8227beff519 (diff) | |
| download | scipycon-b789ae20d77d6ce62b96af2885f0bbceb7d5646e.tar.gz scipycon-b789ae20d77d6ce62b96af2885f0bbceb7d5646e.tar.bz2 scipycon-b789ae20d77d6ce62b96af2885f0bbceb7d5646e.zip | |
Fix preceding accommodation which were stolen away by magic.
| -rw-r--r-- | project/scipycon/registration/forms.py | 41 | ||||
| -rw-r--r-- | project/scipycon/registration/views.py | 7 |
2 files changed, 27 insertions, 21 deletions
diff --git a/project/scipycon/registration/forms.py b/project/scipycon/registration/forms.py index 501b6cb..53d128e 100644 --- a/project/scipycon/registration/forms.py +++ b/project/scipycon/registration/forms.py @@ -94,7 +94,6 @@ class AccommodationForm(forms.ModelForm): sex = self.cleaned_data['sex'] accommodation_required = self.cleaned_data['accommodation_required'] - accommodation_days = sum(filter([a1, a2, a3, a4, a5, a6])) a1 = self.cleaned_data['accommodation_on_1st'] a2 = self.cleaned_data['accommodation_on_2nd'] @@ -103,16 +102,18 @@ class AccommodationForm(forms.ModelForm): a5 = self.cleaned_data['accommodation_on_5th'] a6 = self.cleaned_data['accommodation_on_6th'] + accommodation_days = [a1, a2, a3, a4, a5, a6].count(True) + acco.sex = sex acco.accommodation_required = accommodation_required - acco.accommodation_days = _days + acco.accommodation_days = accommodation_days - acco._on_1st = a1 - acco._on_2nd = a2 - acco._on_3rd = a3 - acco._on_4th = a4 - acco._on_5th = a5 - acco._on_6th = a6 + acco.accommodation_on_1st = a1 + acco.accommodation_on_2nd = a2 + acco.accommodation_on_3rd = a3 + acco.accommodation_on_4th = a4 + acco.accommodation_on_5th = a5 + acco.accommodation_on_6th = a6 acco.save() @@ -129,12 +130,12 @@ class AccommodationForm(forms.ModelForm): sex = self.cleaned_data['sex'] accommodation_required = self.cleaned_data['accommodation_required'] - a1 = self.cleaned_data['_on_1st'] - a2 = self.cleaned_data['_on_2nd'] - a3 = self.cleaned_data['_on_3rd'] - a4 = self.cleaned_data['_on_4th'] - a5 = self.cleaned_data['_on_5th'] - a6 = self.cleaned_data['_on_6th'] + a1 = self.cleaned_data['accommodation_on_1st'] + a2 = self.cleaned_data['accommodation_on_2nd'] + a3 = self.cleaned_data['accommodation_on_3rd'] + a4 = self.cleaned_data['accommodation_on_4th'] + a5 = self.cleaned_data['accommodation_on_5th'] + a6 = self.cleaned_data['accommodation_on_6th'] selected_a_date = any([a1, a2, a3, a4, a5, a6]) @@ -150,12 +151,12 @@ class AccommodationForm(forms.ModelForm): model = Accommodation fields = ('accommodation_required', 'sex', - '_on_1st', - '_on_2nd', - '_on_3rd', - '_on_4th', - '_on_5th', - '_on_6th', + 'accommodation_on_1st', + 'accommodation_on_2nd', + 'accommodation_on_3rd', + 'accommodation_on_4th', + 'accommodation_on_5th', + 'accommodation_on_6th', ) diff --git a/project/scipycon/registration/views.py b/project/scipycon/registration/views.py index 2744c7f..93a6233 100644 --- a/project/scipycon/registration/views.py +++ b/project/scipycon/registration/views.py @@ -139,7 +139,12 @@ def edit_registration(request, scope, id, 'scope': acco.scope, 'sex': acco.sex, 'accommodation_required': acco.accommodation_required, - 'accommodation_days': acco.accommodation_days, + 'accommodation_on_1st': acco.accommodation_on_1st, + 'accommodation_on_2nd': acco.accommodation_on_2nd, + 'accommodation_on_3rd': acco.accommodation_on_3rd, + 'accommodation_on_4th': acco.accommodation_on_4th, + 'accommodation_on_5th': acco.accommodation_on_5th, + 'accommodation_on_6th': acco.accommodation_on_6th, }) payment_form = PaymentForm(initial={ 'user': payment.user, |