X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/9fae328f6c1e7e5c1f4485ddbab71b4000dbd110..c28c059af40c4c99a6d903b96b5651cc5bdfe756:/prawokultury/contact_forms.py

diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py
index 60ef542..5a48c7e 100644
--- a/prawokultury/contact_forms.py
+++ b/prawokultury/contact_forms.py
@@ -30,13 +30,13 @@ class RegistrationForm(ContactForm):
             max_length=256, required=False)
     country = forms.CharField(label=_('Country'), max_length=128)
 
-    # days = forms.ChoiceField(
-    #    label = _("I'm planning to show up on"),
-    #    choices=[
-    #        ('both', _('Both days of the conference')),
-    #        ('only-6th', _('November 6th only')),
-    #        ('only-7th', _('November 7th only')),
-    #    ], widget=forms.RadioSelect())
+    days = forms.ChoiceField(
+       label=_("I'm planning to show up on"),
+       choices=[
+           ('both', _('Both days of the conference')),
+           ('only-27th', _('October 27th only')),
+           ('only-28th', _('October 28th only')),
+       ], widget=forms.RadioSelect())
 
     # ankieta
     times_attended = forms.ChoiceField(
@@ -53,22 +53,22 @@ class RegistrationForm(ContactForm):
         required=False,
         label=_("2. Please indicate your age bracket:"),
         choices=[
-           ('0-19', _('19 or below')),
-           ('20-25', _('20-25')),
-           ('26-35', _('26-35')),
-           ('36-45', _('36-45')),
-           ('46-55', _('46-55')),
-           ('56-65', _('56-65')),
-           ('66+', _('66 or above')),
+            ('0-19', _('19 or below')),
+            ('20-25', _('20-25')),
+            ('26-35', _('26-35')),
+            ('36-45', _('36-45')),
+            ('46-55', _('46-55')),
+            ('56-65', _('56-65')),
+            ('66+', _('66 or above')),
         ], widget=forms.RadioSelect())
     distance = forms.ChoiceField(
         required=False,
         label=_("3. How far will you travel to attend CopyCamp?"),
         choices=[
-           ('0-50', _('0-50 km')),
-           ('51-100', _('51-100 km')),
-           ('101-200', _('101-200 km')),
-           ('200+', _('200 km or more')),
+            ('0-50', _('0-50 km')),
+            ('51-100', _('51-100 km')),
+            ('101-200', _('101-200 km')),
+            ('200+', _('200 km or more')),
         ], widget=forms.RadioSelect())
     areas = forms.MultipleChoiceField(
         required=False,
@@ -97,20 +97,22 @@ class RegistrationForm(ContactForm):
         required=False,
         label=_("5. Please indicate how you received information about the conference:"),
         choices=[
-           ('znajomi', _('through friends sharing on the web')),
-           ('fnp', _('directly through the Foundation\'s facebook or website')),
-           ('www', _('through other websites (please specify below)')),
-           ('other', _('other (please specify below)')),
+            ('znajomi', _('through friends sharing on the web')),
+            ('znajomi2', _('through friends by other means')),
+            ('prasa', _('through press')),
+            ('fnp', _('directly through the Foundation\'s facebook or website')),
+            ('www', _('through other websites (please specify below)')),
+            ('other', _('other (please specify below)')),
         ], widget=forms.RadioSelect())
     source_other = forms.CharField(required=False, label=_('Fill if you selected “other” or “other website” above'))
     motivation = forms.ChoiceField(
         required=False,
         label=_("6. Please indicate the most important factor for your willingness to participate:"),
         choices=[
-           ('idea', _('the main idea of the conference')),
-           ('speaker', _('particular speaker(s)')),
-           ('networking', _('good networking occasion')),
-           ('other', _('other (please specify below)')),
+            ('idea', _('the main idea of the conference')),
+            ('speaker', _('particular speaker(s)')),
+            ('networking', _('good networking occasion')),
+            ('other', _('other (please specify below)')),
         ], widget=forms.RadioSelect())
     motivation_other = forms.CharField(required=False, label=_('Fill if you selected “other” above'))
 
@@ -148,7 +150,7 @@ class RegistrationForm(ContactForm):
         return data
 
     def main_fields(self):
-        return [self[name] for name in ('first_name', 'last_name', 'contact', 'organization', 'country')]
+        return [self[name] for name in ('first_name', 'last_name', 'contact', 'organization', 'country', 'days')]
 
     def survey_fields(self):
         return [self[name] for name in (
@@ -156,7 +158,7 @@ class RegistrationForm(ContactForm):
             'areas', 'areas_other', 'source', 'source_other', 'motivation', 'motivation_other')]
 
     def agreement_fields(self):
-        return [self[name] for name in ('agree_mailing', 'agree_data', 'agree_license')]
+        return [self[name] for name in ('agree_mailing', 'agree_data', 'agree_license', 'agree_toc')]
 
 
 tracks = (
@@ -220,6 +222,7 @@ class RegisterSpeaker(RegistrationForm):
 
     def __init__(self, *args, **kw):
         super(RegisterSpeaker, self).__init__(*args, **kw)
+        self.started = getattr(settings, 'REGISTRATION_SPEAKER_STARTED', False)
         self.closed = getattr(settings, 'REGISTRATION_SPEAKER_CLOSED', False)
         self.fields.keyOrder = [
             'first_name',