added location to registration

huntserver/forms.py

@@ -16,6 +16,7 @@ class RegistrationForm(forms.Form):
     username = forms.CharField(label='Team Username', required=False)
     password = forms.CharField(label='Team Password', widget=forms.PasswordInput())
     confirm_password = forms.CharField(label='Confirm Password', required=False, widget=forms.PasswordInput())
+    location = forms.ChoiceField(label="Do you want to be provided a room on campus close to the hunt?", choices=([(1, "Yes"), (2, "No, we have a room"), (3, "No, we are a remote team")])) 
     first_name = forms.CharField(label='First Name')
     last_name =  forms.CharField(label='Last Name')
     phone = forms.CharField(label='Phone Number', required=False)

huntserver/migrations/0029_team_location.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('huntserver', '0028_hunt_team_size'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='team',
+            name='location',
+            field=models.CharField(default='N/A', max_length=80),
+            preserve_default=False,
+        ),
+    ]

huntserver/migrations/0030_auto_20151016_1021.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('huntserver', '0029_team_location'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='team',
+            name='location',
+            field=models.CharField(max_length=80, blank=True),
+        ),
+    ]

huntserver/models.py

@@ -51,6 +51,7 @@ class Team(models.Model):
     unlockables = models.ManyToManyField("Unlockable", blank=True)
     login_info = models.OneToOneField(User)
     hunt = models.ForeignKey(Hunt)
+    location = models.CharField(max_length=80, blank=True)
 
     def __unicode__(self):
         return self.team_name

huntserver/templates/registration.html

@@ -62,6 +62,10 @@ <h1 class="title">Registration</h1>
               <td>{{ form.confirm_password.label_tag }}</td>
               <td>{{ form.confirm_password }}</td>
             </tr>
+	    <tr>
+	      <td>{{ form.location.label_tag }}</td>
+	      <td>{{ form.location }}</td>
+	    </tr>
           </table>
           <input type="button" class="back2to1" value="Back" />
           <input type="submit" id="next2to3New" value="Next" /> 

huntserver/views.py

@@ -79,10 +79,11 @@ def registration(request):
             if (form.is_valid()):
                 # Make sure their passwords matched
                 if(form.cleaned_data['password'] == form.cleaned_data['confirm_password']):
+                    loc = ["NAR", "Has a room", "offcampus"][int(form.cleaned_data['location'])-1]
                     u = User.objects.create_user(form.cleaned_data['username'], 
                         password=form.cleaned_data['password'])
                     t = Team.objects.create(team_name = form.cleaned_data['team_name'], 
-                        login_info = u, hunt = curr_hunt)
+                        login_info = u, hunt = curr_hunt, location=loc)
                     p = Person.objects.create(first_name = form.cleaned_data['first_name'], 
                         last_name = form.cleaned_data['last_name'], 
                         email = form.cleaned_data['email'],