Merging heads
authorAmit Sethi
Thu, 18 Nov 2010 01:29:38 +0530
changeset 238 0149f28a4f74
parent 237 4cff1f43e4e1 (diff)
parent 233 394576ff8a2f (current diff)
child 239 1973bf1a0a5d
child 241 159880292f66
Merging heads
project/scipycon/registration/models.py
project/scipycon/registration/views.py
project/static/img/scipy-poster.png
project/urls.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)
--- 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)
+
+
+
--- 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
+         }))
--- 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
--- 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',
+)
+
--- /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 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+lang="en" xml:lang="en">
+<head>
+<title>Dump</title>
+<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
+<meta name="generator" content="Org-mode"/>
+<meta name="generated" content="2010-11-12 18:35:22 IST"/>
+<meta name="author" content="amit"/>
+<meta name="description" content=""/>
+<meta name="keywords" content=""/>
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+  html { font-family: Times, serif; font-size: 12pt; }
+  .title  { text-align: center; }
+  .todo   { color: red; }
+  .done   { color: green; }
+  .tag    { background-color: #add8e6; font-weight:normal }
+  .target { }
+  .timestamp { color: #bebebe; }
+  .timestamp-kwd { color: #5f9ea0; }
+  p.verse { margin-left: 3% }
+  pre {
+	border: 1pt solid #AEBDCC;
+	background-color: #F3F5F7;
+	padding: 5pt;
+	font-family: courier, monospace;
+        font-size: 90%;
+        overflow:auto;
+  }
+  table { border-collapse: collapse; }
+  td, th { vertical-align: top; }
+  dt { font-weight: bold; }
+  div.figure { padding: 0.5em; }
+  div.figure p { text-align: center; }
+  textarea { overflow-x: auto; }
+  .linenr { font-size:smaller }
+  .code-highlighted {background-color:#ffff00;}
+  .org-info-js_info-navigation { border-style:none; }
+  #org-info-js_console-label { font-size:10px; font-weight:bold;
+                               white-space:nowrap; }
+  .org-info-js_search-highlight {background-color:#ffff00; color:#000000;
+                                 font-weight:bold; }
+  /*]]>*/-->
+</style>
+<script type="text/javascript">
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+</head>
+<body>
+<div id="content">
+
+<h1 class="title">Dump</h1>
+
+
+<div id="table-of-contents">
+<h2>Table of Contents</h2>
+<div id="text-table-of-contents">
+<ul>
+<li><a href="#sec-1">1 Scipy Dump  </a></li>
+</ul>
+</div>
+</div>
+
+<div id="outline-container-1" class="outline-2">
+<h2 id="sec-1"><span class="section-number-2">1</span> Scipy Dump 12 Nov 6:34 </h2>
+<div class="outline-text-2" id="text-1">
+
+
+<ul>
+<li>
+Gender - '&ndash;' in case not specified
+</li>
+<li>
+C - Conference
+</li>
+<li>
+S - Sprints
+</li>
+<li>
+T - Tutorial
+</li>
+<li>
+L - Bring a Laptop
+
+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<caption></caption>
+<colgroup><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="left" /><col align="right" /><col align="right" /><col align="right" /><col align="right" />
+</colgroup>
+<tbody>
+<tr><td>first name</sub></td><td>last name</sub></td><td>Gender</td><td>City</td><td>Organization</td><td>Occupation</td><td>C</td><td>S</td><td>T</td><td>L</td></tr>
+
+{% for row in rows %}
+<tr><td>{{ row.first_name }}</td><td>{{ row.last_name }}</td><td>{{ row.sex }}</td><td>{{ row.city }}</td><td>{{ row.organization }}</td><td>{{ row.occupation }}</td><td>{{ row.conference }}</td><td>{{ row.sprint }}</td><td>{{ row.tutorial }}</td><td>{{ row.wifi }}</td></tr>
+
+{% endfor %}
+</table>
+
+</li>
+</ul>
+</div>
+</div>
+</div>
+</body>
+</html>
--- 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',