# HG changeset patch # User primal primal007@gmail.com # Date 1315993504 -19800 # Node ID 85bbea53523fae88bb4482c9bf1ba2880fd441cf # Parent 9f2a90e36386238956f0d5cac693f3a4c26f2317# Parent f0f04f758f4b982c8aac7dc6f95f3c5801ffcd80 Accomodation days reduced down to 4 diff -r f0f04f758f4b -r 85bbea53523f project/scipycon/registration/forms.py --- a/project/scipycon/registration/forms.py Wed Sep 14 15:06:00 2011 +0530 +++ b/project/scipycon/registration/forms.py Wed Sep 14 15:15:04 2011 +0530 @@ -99,10 +99,9 @@ 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'] + - accommodation_days = [a1, a2, a3, a4, a5, a6].count(True) + accommodation_days = [a1, a2, a3, a4].count(True) acco.sex = sex acco.accommodation_required = accommodation_required @@ -112,8 +111,6 @@ 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() @@ -134,10 +131,8 @@ 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]) + + selected_a_date = any([a1, a2, a3, a4]) if accommodation_required and (not sex or not selected_a_date): #or accommodation_days == 0): @@ -155,8 +150,6 @@ 'accommodation_on_2nd', 'accommodation_on_3rd', 'accommodation_on_4th', - 'accommodation_on_5th', - 'accommodation_on_6th', ) diff -r f0f04f758f4b -r 85bbea53523f project/scipycon/registration/models.py --- a/project/scipycon/registration/models.py Wed Sep 14 15:06:00 2011 +0530 +++ b/project/scipycon/registration/models.py Wed Sep 14 15:15:04 2011 +0530 @@ -81,10 +81,6 @@ default=False, verbose_name="Required for 3rd Night") accommodation_on_4th = models.BooleanField( default=False, verbose_name="Required for 4th Night") - accommodation_on_5th = models.BooleanField( - default=False, verbose_name="Required for 5th Night") - accommodation_on_6th = models.BooleanField( - default=False, verbose_name="Required for 6th Night") accommodation_days = models.IntegerField( default=0, blank=True,