Merged heads.
--- a/project/scipycon/user/views.py Thu Nov 18 12:28:06 2010 +0530
+++ b/project/scipycon/user/views.py Thu Nov 18 12:29:07 2010 +0530
@@ -31,6 +31,9 @@
#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"):
@@ -297,7 +300,7 @@
accomodation_require = Accommodation.objects.filter(user__username=obj.registrant.username)[0]
row['sex'] = accomodation_require.sex
except:
- row['sex'] = 'Acco. Unspecified'
+ row['sex'] = '-'
row['city'] = obj.city
row['organization'] = obj.organisation
row['occupation'] = obj.occupation
--- a/project/templates/user/dump.html Thu Nov 18 12:28:06 2010 +0530
+++ b/project/templates/user/dump.html Thu Nov 18 12:29:07 2010 +0530
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
lang="en" xml:lang="en">
<head>
-<title>Dump</title>
+<title>Scipy User 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"/>
@@ -71,20 +71,12 @@
<body>
<div id="content">
-<h1 class="title">Dump</h1>
+<h1 class="title">User 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">
@@ -109,7 +101,7 @@
<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>
+<tr><td><i>first name</i></td><td><i>last name</i></td><td><i>Gender</i></td><td><i>City</i></td><td><i>Organization</i></td><td><i>Occupation</i></td><td></i>C</td><td><i>S</i></td><td><i>T</i></td><td><i>L</i></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>