# HG changeset patch # User Madhusudan.C.S # Date 1290077188 -19800 # Node ID 325ec5a4126975241a1b0bafc94802231f881557 # Parent 2d47a3eb5ec4bb6000c794522c23e6cd2d06e361# Parent 679a9cab4bf1e5f148ddf202451d2d674f773408 Merge payments branch with the default mainline branch. diff -r 2d47a3eb5ec4 -r 325ec5a41269 buildout.cfg --- a/buildout.cfg Thu Nov 18 14:18:33 2010 +0530 +++ b/buildout.cfg Thu Nov 18 16:16:28 2010 +0530 @@ -1,5 +1,5 @@ [buildout] -parts = django tagging django-robots +parts = django tagging django-robots south eggs = Werkzeug PIL @@ -13,6 +13,7 @@ pythonpath = ${tagging:location} ${django-robots:location} + ${south:location} [tagging] recipe = infrae.subversion @@ -21,3 +22,7 @@ [django-robots] recipe = mercurialrecipe repository = http://bitbucket.org/jezdez/django-robots/ + +[south] +recipe = mercurialrecipe +repository = http://bitbucket.org/andrewgodwin/south/ diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/development.py --- a/project/development.py Thu Nov 18 14:18:33 2010 +0530 +++ b/project/development.py Thu Nov 18 16:16:28 2010 +0530 @@ -24,6 +24,7 @@ 'project.scipycon.talk', 'tagging', 'robots', + 'south', ) DATABASE_ENGINE = 'sqlite3' diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/production.py --- a/project/production.py Thu Nov 18 14:18:33 2010 +0530 +++ b/project/production.py Thu Nov 18 16:16:28 2010 +0530 @@ -23,6 +23,7 @@ 'project.scipycon.user', 'tagging', 'robots', + 'south', ) DATABASE_ENGINE = 'mysql' diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/scipycon/base/models.py --- a/project/scipycon/base/models.py Thu Nov 18 14:18:33 2010 +0530 +++ b/project/scipycon/base/models.py Thu Nov 18 16:16:28 2010 +0530 @@ -75,3 +75,7 @@ class Meta: abstract = True + + +class Paid(models.Model): + event_start = models.DateTimeField(blank=True, null=True) diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/scipycon/registration/forms.py --- a/project/scipycon/registration/forms.py Thu Nov 18 14:18:33 2010 +0530 +++ b/project/scipycon/registration/forms.py Thu Nov 18 16:16:28 2010 +0530 @@ -72,13 +72,14 @@ wifi = Wifi(user=user, scope=scope) wifi.wifi = self.cleaned_data['wifi'] + wifi.registration_id = self.cleaned_data['registration_id'] wifi.save() return wifi class Meta: model = Wifi - fields = ('wifi',) + fields = ('wifi', 'registration_id') class AccommodationForm(forms.ModelForm): diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/scipycon/registration/migrations/0001_initial.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project/scipycon/registration/migrations/0001_initial.py Thu Nov 18 16:16:28 2010 +0530 @@ -0,0 +1,153 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding model 'Wifi' + db.create_table('registration_wifi', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('scope', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['base.Event'])), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('wifi', self.gf('django.db.models.fields.CharField')(max_length=50)), + )) + db.send_create_signal('registration', ['Wifi']) + + # Adding model 'Accommodation' + db.create_table('registration_accommodation', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('scope', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['base.Event'])), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('sex', self.gf('django.db.models.fields.CharField')(max_length=50, null=True, blank=True)), + ('accommodation_required', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('accommodation_days', self.gf('django.db.models.fields.IntegerField')(default=0, blank=True)), + )) + db.send_create_signal('registration', ['Accommodation']) + + # Adding model 'Registration' + db.create_table('registration_registration', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('scope', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['base.Event'])), + ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50, db_index=True)), + ('registrant', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('organisation', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('occupation', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('city', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('postcode', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('phone_num', self.gf('django.db.models.fields.CharField')(max_length=14, blank=True)), + ('tshirt', self.gf('django.db.models.fields.CharField')(max_length=3)), + ('conference', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('tutorial', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('sprint', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('final_conference', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('final_tutorial', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('final_sprint', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('allow_contact', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('submitted', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('last_mod', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + )) + db.send_create_signal('registration', ['Registration']) + + + def backwards(self, orm): + + # Deleting model 'Wifi' + db.delete_table('registration_wifi') + + # Deleting model 'Accommodation' + db.delete_table('registration_accommodation') + + # Deleting model 'Registration' + db.delete_table('registration_registration') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'base.event': { + 'Meta': {'object_name': 'Event'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'scope': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'status': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'turn': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'registration.accommodation': { + 'Meta': {'object_name': 'Accommodation'}, + 'accommodation_days': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'accommodation_required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}), + 'sex': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'registration.registration': { + 'Meta': {'object_name': 'Registration'}, + 'allow_contact': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'conference': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'final_conference': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'final_sprint': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'final_tutorial': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_mod': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'occupation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'organisation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'phone_num': ('django.db.models.fields.CharField', [], {'max_length': '14', 'blank': 'True'}), + 'postcode': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'registrant': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'}), + 'sprint': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'submitted': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'tshirt': ('django.db.models.fields.CharField', [], {'max_length': '3'}), + 'tutorial': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'registration.wifi': { + 'Meta': {'object_name': 'Wifi'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'wifi': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + } + } + + complete_apps = ['registration'] diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/scipycon/registration/migrations/0002_auto__add_field_wifi_registration_id.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project/scipycon/registration/migrations/0002_auto__add_field_wifi_registration_id.py Thu Nov 18 16:16:28 2010 +0530 @@ -0,0 +1,107 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding field 'Wifi.registration_id' + db.add_column('registration_wifi', 'registration_id', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False) + + + def backwards(self, orm): + + # Deleting field 'Wifi.registration_id' + db.delete_column('registration_wifi', 'registration_id') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'base.event': { + 'Meta': {'object_name': 'Event'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'scope': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'status': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'turn': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'registration.accommodation': { + 'Meta': {'object_name': 'Accommodation'}, + 'accommodation_days': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'accommodation_required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}), + 'sex': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'registration.registration': { + 'Meta': {'object_name': 'Registration'}, + 'allow_contact': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'conference': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'final_conference': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'final_sprint': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'final_tutorial': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_mod': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'occupation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'organisation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'phone_num': ('django.db.models.fields.CharField', [], {'max_length': '14', 'blank': 'True'}), + 'postcode': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'registrant': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'}), + 'sprint': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'submitted': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'tshirt': ('django.db.models.fields.CharField', [], {'max_length': '3'}), + 'tutorial': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'registration.wifi': { + 'Meta': {'object_name': 'Wifi'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'registration_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'scope': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['base.Event']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'wifi': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + } + } + + complete_apps = ['registration'] diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/scipycon/registration/migrations/__init__.py diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/scipycon/registration/models.py --- a/project/scipycon/registration/models.py Thu Nov 18 14:18:33 2010 +0530 +++ b/project/scipycon/registration/models.py Thu Nov 18 16:16:28 2010 +0530 @@ -28,7 +28,6 @@ SEX_CHOICES = ( ('Male', 'Male'), ('Female', 'Female'), - ('Other', 'Other') ) PAYMENT_MODE_CHOICES = ( @@ -37,6 +36,7 @@ ('Net Banking', 'Net Banking') ) + class Wifi(base_models.ScopedBase): """Defines wifi options at SciPy.in """ @@ -46,6 +46,17 @@ wifi = models.CharField(max_length=50, choices=WIFI_CHOICES, help_text=WIFI_HELP, verbose_name="Laptop") + registration_id = models.CharField( + max_length=255, verbose_name="Identification Number", + help_text="- Provide the serial or identification number at the " + "back of your laptop using which your laptop can be uniquely " + "identified. Ex: 8BDB8FB (Service Tag on Dell Laptops).
- " + "This is for security reasons and will be used while you enter and " + "leave the venue.
- Please don't provide the model number " + "like Dell Inspiron 1545. There may be many laptops of that model " + "and hence your laptop cannot be uniquely identified.", + blank=True, null=True) + class Accommodation(base_models.ScopedBase): """Defines accommodation information for SciPy.in diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/scipycon/registration/views.py --- a/project/scipycon/registration/views.py Thu Nov 18 14:18:33 2010 +0530 +++ b/project/scipycon/registration/views.py Thu Nov 18 16:16:28 2010 +0530 @@ -58,7 +58,7 @@ scope_entity = Event.objects.get(scope=scope) - reg = Registration.objects.get(pk=id) + reg = Registration.objects.get(pk=int(id)) wifi = Wifi.objects.get(user=reg.registrant) # TODO: This is an ugly hack to add accommodation and payment forms @@ -127,7 +127,8 @@ wifi_form = WifiForm(initial={ 'user': wifi.user, 'scope': wifi.scope, - 'wifi': wifi.wifi + 'wifi': wifi.wifi, + 'registration_id': wifi.registration_id }) acco_form = AccommodationForm(initial={ 'user': acco.user, @@ -263,7 +264,7 @@ acco = acco_form.save(registrant, scope_entity) payment = payment_form.save(registrant, scope_entity) - send_confirmation(registrant, scope_entity,password=passwd) + send_confirmation(registrant, scope_entity, password=passwd) redirect_to = reverse('scipycon_registrations', kwargs={'scope': scope}) diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/scipycon/talk/forms.py --- a/project/scipycon/talk/forms.py Thu Nov 18 14:18:33 2010 +0530 +++ b/project/scipycon/talk/forms.py Thu Nov 18 16:16:28 2010 +0530 @@ -47,7 +47,7 @@ required=False, widget=forms.TextInput(attrs={'size':'50'})) duration = forms.ChoiceField(choices=DURATION_CHOICES, required=True, - label=u'Preferred timeslot', help_text=u'Select preferred time slot') + label=u'Preferred time slot', help_text=u'Select preferred time slot') audience = forms.ChoiceField(choices=AUDIENCE_CHOICES, label=u'Intended audience', help_text=u'Select one of the available options or enter other type of intended audience') # audience_other = forms.CharField(label=u'Other intended audience', diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/scipycon/user/views.py --- a/project/scipycon/user/views.py Thu Nov 18 14:18:33 2010 +0530 +++ b/project/scipycon/user/views.py Thu Nov 18 16:16:28 2010 +0530 @@ -29,6 +29,11 @@ from project.scipycon.user.utils import scipycon_createuser from project.scipycon.utils import set_message_cookie +#User_dump Http404 Error +from django.http import Http404 +#for user_dump creation +from project.scipycon.registration.models import Accommodation + @login_required def account(request, scope, template_name="user/account.html"): @@ -277,3 +282,40 @@ json_response = {'results': results} return HttpResponse(json.dumps(json_response)) + + +@login_required +def get_user_dump(request, scope,template_name='user/dump.html'): + """ Gets a general dump of user related info + """ + print request.user.is_staff + if request.user.is_staff: + qs=Registration.objects.all() + rows=[] + for obj in qs: + row = {} + row['first_name'] = obj.registrant.first_name + row['last_name'] = obj.registrant.last_name + try: + accomodation_require = Accommodation.objects.filter(user__username=obj.registrant.username)[0] + row['sex'] = accomodation_require.sex + except: + row['sex'] = '-' + row['city'] = obj.city + row['organization'] = obj.organisation + row['occupation'] = obj.occupation + row['conference'] = obj.conference + row['sprint'] = obj.sprint + row['tutorial'] = obj.tutorial + try: + wifi_require = Wifi.objects.filter(user__username=obj.registrant.username)[0] + row['wifi'] = wifi_require.wifi + except: + row['wifi']='Wifi Unspecified' + rows.append(row) + return render_to_response(template_name, RequestContext(request, { + 'rows': rows})) + + + else: + raise Http404 diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/settings.py --- a/project/settings.py Thu Nov 18 14:18:33 2010 +0530 +++ b/project/settings.py Thu Nov 18 16:16:28 2010 +0530 @@ -7,6 +7,7 @@ MANAGERS = ADMINS +DEBUG=False DATABASE_HOST = '' DATABASE_PORT = '' @@ -77,3 +78,29 @@ CURRENT_SCOPE = 'scipyin/2010' LOGIN_URL = '/%s/login' % (CURRENT_SCOPE) + +DATABASE_ENGINE = 'sqlite3' +DATABASE_NAME = 'scipycon.db' +DATABASE_USER = '' +DATABASE_PASSWORD = '' + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.comments', + 'django.contrib.sessions', + 'django.contrib.admin', + 'django.contrib.sites', + 'django.contrib.flatpages', + 'django.contrib.markup', + 'django.contrib.sitemaps', + 'project.scipycon', + 'project.scipycon.base', + 'project.scipycon.proceedings', + 'project.scipycon.registration', + 'project.scipycon.user', + 'project.scipycon.talk', + 'tagging', + 'robots', +) + diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/static/img/qutubshahi.jpg Binary file project/static/img/qutubshahi.jpg has changed diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/static/img/stefan.jpg Binary file project/static/img/stefan.jpg has changed diff -r 2d47a3eb5ec4 -r 325ec5a41269 project/templates/_menu.html --- a/project/templates/_menu.html Thu Nov 18 14:18:33 2010 +0530 +++ b/project/templates/_menu.html Thu Nov 18 16:16:28 2010 +0530 @@ -10,7 +10,7 @@
  • - Talks & CfP + Conference & CfP