# HG changeset patch
# User Amit Sethi
# Date 1290023978 -19800
# Node ID 0149f28a4f74b5be793552169e172910d99559bc
# Parent 4cff1f43e4e1b7eb8b924fddef4a316ecdc3f161# Parent 394576ff8a2f4cd486a697cb1ca2bd3b656aab59
Merging heads
diff -r 394576ff8a2f -r 0149f28a4f74 project/scipycon/base/models.py
--- a/project/scipycon/base/models.py Tue Nov 16 18:09:55 2010 +0530
+++ b/project/scipycon/base/models.py Thu Nov 18 01:29:38 2010 +0530
@@ -75,3 +75,7 @@
class Meta:
abstract = True
+
+
+class Paid(models.Model):
+ event_start = models.DateTimeField(blank=True, null=True)
diff -r 394576ff8a2f -r 0149f28a4f74 project/scipycon/registration/models.py
--- a/project/scipycon/registration/models.py Tue Nov 16 18:09:55 2010 +0530
+++ b/project/scipycon/registration/models.py Thu Nov 18 01:29:38 2010 +0530
@@ -103,3 +103,6 @@
return 'Registration for user: <%s %s> %s' % (
self.registrant.first_name,
self.registrant.last_name, self.registrant.email)
+
+
+
diff -r 394576ff8a2f -r 0149f28a4f74 project/scipycon/registration/views.py
--- a/project/scipycon/registration/views.py Tue Nov 16 18:09:55 2010 +0530
+++ b/project/scipycon/registration/views.py Thu Nov 18 01:29:38 2010 +0530
@@ -246,9 +246,7 @@
wifi = wifi_form.save(registrant, scope_entity)
acco = acco_form.save(registrant, scope_entity)
-
send_confirmation(registrant, scope_entity, password=passwd)
-
redirect_to = reverse('scipycon_registrations',
kwargs={'scope': scope})
return set_message_cookie(redirect_to,
@@ -296,4 +294,4 @@
'conf_num': conf_num,
'tut_num': tut_num,
'sprint_num': sprint_num,
- }))
\ No newline at end of file
+ }))
diff -r 394576ff8a2f -r 0149f28a4f74 project/scipycon/user/views.py
--- a/project/scipycon/user/views.py Tue Nov 16 18:09:55 2010 +0530
+++ b/project/scipycon/user/views.py Thu Nov 18 01:29:38 2010 +0530
@@ -29,6 +29,8 @@
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
@login_required
def account(request, scope, template_name="user/account.html"):
@@ -277,3 +279,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'] = 'Acco. Unspecified'
+ 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 394576ff8a2f -r 0149f28a4f74 project/settings.py
--- a/project/settings.py Tue Nov 16 18:09:55 2010 +0530
+++ b/project/settings.py Thu Nov 18 01:29:38 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 394576ff8a2f -r 0149f28a4f74 project/templates/user/dump.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project/templates/user/dump.html Thu Nov 18 01:29:38 2010 +0530
@@ -0,0 +1,126 @@
+
+
+
+
+Dump
+
+
+
+
+
+
+
+
+
+
+
+
+
Dump
+
+
+
+
+
+
1 Scipy Dump 12 Nov 6:34
+
+
+
+
+-
+Gender - '–' in case not specified
+
+-
+C - Conference
+
+-
+S - Sprints
+
+-
+T - Tutorial
+
+-
+L - Bring a Laptop
+
+
+
+
+
+
+first name | last name | Gender | City | Organization | Occupation | C | S | T | L |
+
+{% for row in rows %}
+{{ row.first_name }} | {{ row.last_name }} | {{ row.sex }} | {{ row.city }} | {{ row.organization }} | {{ row.occupation }} | {{ row.conference }} | {{ row.sprint }} | {{ row.tutorial }} | {{ row.wifi }} |
+
+{% endfor %}
+
+
+
+
+
+
+
+
+
diff -r 394576ff8a2f -r 0149f28a4f74 project/urls.py
--- a/project/urls.py Tue Nov 16 18:09:55 2010 +0530
+++ b/project/urls.py Thu Nov 18 01:29:38 2010 +0530
@@ -71,7 +71,9 @@
'edit_profile', name='scipycon_edit_profile'),
url(r'^%s/get-usernames/$' % (SCOPE_ARG_PATTERN),
'get_usernames', name='scipycon_get_usernames'),
- )
+ url(r'^%s/get-user-dump/$' % (SCOPE_ARG_PATTERN),
+ 'get_user_dump', name='scipycon_get_usernames'))
+
# Proceedings
urlpatterns += patterns('project.scipycon.proceedings.views',