# HG changeset patch # User Madhusudan.C.S # Date 1290076838 -19800 # Node ID 679a9cab4bf1e5f148ddf202451d2d674f773408 # Parent 334746111891728c7bdfdf28d4cb1c19c6d699a6# Parent 483641c2a98ab9edf7a66ce5981f83fc590ac663 Merge the south migration branch with an additional field for Laptop registration number with default branch. diff -r 334746111891 -r 679a9cab4bf1 project/scipycon/base/models.py --- a/project/scipycon/base/models.py Thu Nov 18 15:03:21 2010 +0530 +++ b/project/scipycon/base/models.py Thu Nov 18 16:10: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 334746111891 -r 679a9cab4bf1 project/scipycon/registration/models.py --- a/project/scipycon/registration/models.py Thu Nov 18 15:03:21 2010 +0530 +++ b/project/scipycon/registration/models.py Thu Nov 18 16:10:38 2010 +0530 @@ -115,3 +115,6 @@ return 'Registration for user: <%s %s> %s' % ( self.registrant.first_name, self.registrant.last_name, self.registrant.email) + + + diff -r 334746111891 -r 679a9cab4bf1 project/scipycon/registration/views.py --- a/project/scipycon/registration/views.py Thu Nov 18 15:03:21 2010 +0530 +++ b/project/scipycon/registration/views.py Thu Nov 18 16:10:38 2010 +0530 @@ -247,9 +247,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, @@ -297,4 +295,4 @@ 'conf_num': conf_num, 'tut_num': tut_num, 'sprint_num': sprint_num, - })) \ No newline at end of file + })) diff -r 334746111891 -r 679a9cab4bf1 project/scipycon/user/views.py --- a/project/scipycon/user/views.py Thu Nov 18 15:03:21 2010 +0530 +++ b/project/scipycon/user/views.py Thu Nov 18 16:10:38 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 334746111891 -r 679a9cab4bf1 project/settings.py --- a/project/settings.py Thu Nov 18 15:03:21 2010 +0530 +++ b/project/settings.py Thu Nov 18 16:10: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 334746111891 -r 679a9cab4bf1 project/templates/about/fees.html --- a/project/templates/about/fees.html Thu Nov 18 15:03:21 2010 +0530 +++ b/project/templates/about/fees.html Thu Nov 18 16:10:38 2010 +0530 @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block content %} -

Fees

+

Fees

-

Registration fees for outstation students and teachers.

+

Registration fees for outstation students and teachers.

@@ -12,7 +12,6 @@ - @@ -20,10 +19,10 @@
CategoryConferenceAccommodation
+ Tutorials(all 6 days)
StudentsRs. 500Rs. 300
-

Registration fees along with the accommodation charges can be paid either by electronic transfer (account no. - ) or by sending a Demand Draft for the amount of Rs.800 (for all 6 days).

+

Registration fees along with the accommodation charges can be paid either by electronic transfer (details) or by sending a Demand Draft for the amount of Rs.800 (for all 6 days).

-

Registration fees for in-station students and teachers.

+

Registration fees for in-station students and teachers.

@@ -36,15 +35,12 @@ -
StudentsRs. 500
TeachersRs. 500
- +

Registration fees can be paid either by electronic transfer (details) or by sending a Demand Draft for the amount of Rs.500 (for all 6 days).

-

Registration fees can be paid either by electronic transfer (account no. - ) or by sending a Demand Draft for the amount of Rs.500 (for all 6 days).

- -

Registration fees for corporates and others.

+

Registration fees for corporates and others.

@@ -52,7 +48,6 @@ - @@ -60,14 +55,14 @@
CategoryConferenceTutorials + sprints
CorporatesRs. 2000Rs. 1000 per day
-

Registration fees corresponding to the conference +( number of tutorial days * 1000) can be paid either by electronic transfer (account no. - ) or by sending a Demand Draft.

+

Registration fees corresponding to the conference +( number of tutorial days * 1000) can be paid either by electronic transfer (details) or by sending a Demand Draft.

-

Spot registration / late payment(on-spot)

+

Spot registration / late payment(on-spot)

@@ -78,45 +73,47 @@ -
StudentsRs. 750Included in conference fee
TeachersRs. 750Included in conference fee
CorporatesRs. 2500Rs. 1250 per day
-

Note:

+

Note:

-

Accommodation

- +

Accommodation

-

Registration

+

Registration Fees

+ +

Demand Draft

+

Electronic transfer (NEFT)

+ + {% endblock content %} diff -r 334746111891 -r 679a9cab4bf1 project/templates/user/dump.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project/templates/user/dump.html Thu Nov 18 16:10:38 2010 +0530 @@ -0,0 +1,118 @@ + + + + +Scipy User Dump + + + + + + + + + + +
+ +

User Dump

+ + + + +
+
+ + +
    +
  • +Gender - '–' in case not specified +
    • +
  • +C - Conference +
    • +
  • +S - Sprints +
    • +
  • +T - Tutorial +
    • +
  • +L - Bring a Laptop + + + ++ + + + +{% for row in rows %} + + +{% endfor %} +
    first namelast nameGenderCityOrganizationOccupationCSTL
    {{ row.first_name }}{{ row.last_name }}{{ row.sex }}{{ row.city }}{{ row.organization }}{{ row.occupation }}{{ row.conference }}{{ row.sprint }}{{ row.tutorial }}{{ row.wifi }}
    + +
    • +
+
+
+
+ + diff -r 334746111891 -r 679a9cab4bf1 project/urls.py --- a/project/urls.py Thu Nov 18 15:03:21 2010 +0530 +++ b/project/urls.py Thu Nov 18 16:10: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',