# HG changeset patch # User nishanth # Date 1271786384 -19800 # Node ID f57c30096b51a2d0307a781701f653d325728b1f # Parent fe197c0c9903795648f486ac1092810b6b74c69c added the link on home to attempt quiz diff -r fe197c0c9903 -r f57c30096b51 event/models.py --- a/event/models.py Tue Apr 20 23:12:15 2010 +0530 +++ b/event/models.py Tue Apr 20 23:29:44 2010 +0530 @@ -1,5 +1,11 @@ from django.db import models + +QUIZ_CHOICES = (("11", "Day 1 Quiz 1"), + ("12", "Day 1 Quiz 2"), + ("21", "Day 2 Quiz 1"), + ) + class Event(models.Model): """ An event. """ @@ -8,4 +14,4 @@ start_date = models.DateField() stop_date = models.DateField() feedback_status = models.CharField(max_length=1, default='0') - quiz_status = models.CharField(max_length=2, default='00') + quiz_status = models.CharField(max_length=2, default='00', choices=QUIZ_CHOICES) diff -r fe197c0c9903 -r f57c30096b51 event/views.py --- a/event/views.py Tue Apr 20 23:12:15 2010 +0530 +++ b/event/views.py Tue Apr 20 23:29:44 2010 +0530 @@ -18,7 +18,7 @@ can_submit_feedback = True if event.feedback_status != '0' and \ not event.feedback.filter(day=event.feedback_status,user_ip=ip) else False - can_take_quiz = False + can_take_quiz = True if event.quiz_status != "00" else False return render_to_response('home.html', {'event':event, 'can_submit_feedback':can_submit_feedback, 'can_take_quiz':can_take_quiz}) @@ -61,3 +61,7 @@ else: form = EventCreateForm() return render_to_response('create_event.html',{'form':form}) + +def open_quiz(request, admin_key): + pass + diff -r fe197c0c9903 -r f57c30096b51 quiz/models.py --- a/quiz/models.py Tue Apr 20 23:12:15 2010 +0530 +++ b/quiz/models.py Tue Apr 20 23:29:44 2010 +0530 @@ -34,7 +34,7 @@ """ user = models.ForeignKey(User) - event = models.ForeignKey(Event) + event = models.ForeignKey(Event, related_name="%(class)s") user_ip = models.CharField(max_length=15) key = models.CharField(max_length=10) diff -r fe197c0c9903 -r f57c30096b51 settings.py --- a/settings.py Tue Apr 20 23:12:15 2010 +0530 +++ b/settings.py Tue Apr 20 23:29:44 2010 +0530 @@ -10,7 +10,7 @@ MANAGERS = ADMINS DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = 'tmp.db' # Or path to database file if using sqlite3. +DATABASE_NAME = 'offline.db' # Or path to database file if using sqlite3. DATABASE_USER = '' # Not used with sqlite3. DATABASE_PASSWORD = '' # Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. diff -r fe197c0c9903 -r f57c30096b51 templates/admin.html --- a/templates/admin.html Tue Apr 20 23:12:15 2010 +0530 +++ b/templates/admin.html Tue Apr 20 23:29:44 2010 +0530 @@ -7,6 +7,12 @@ Close feedback for day{{event.feedback_status}} {% endifequal %}

+{% ifequal event.quiz_status "00" %} +Open quiz +{% else %} +Close quiz +{% endifequal %} +

View the feedbacks submitted
View report of feedbacks submitted
{% endblock %} diff -r fe197c0c9903 -r f57c30096b51 templates/home.html --- a/templates/home.html Tue Apr 20 23:12:15 2010 +0530 +++ b/templates/home.html Tue Apr 20 23:29:44 2010 +0530 @@ -5,6 +5,6 @@ Submit Feedback
{% endif %} {% if can_take_quiz %} -Attempt {{quiz_name}}
+Attempt quiz
{% endif %} {% endblock %} diff -r fe197c0c9903 -r f57c30096b51 urls.py --- a/urls.py Tue Apr 20 23:12:15 2010 +0530 +++ b/urls.py Tue Apr 20 23:29:44 2010 +0530 @@ -27,6 +27,7 @@ (r'^feedback/close/(\w+)$', feed_views.close_feedback), (r'^feedback/list/(\w+)$', feed_views.list_feedbacks), (r'^feedback/report/(\w+)$', feed_views.view_report), + (r'^quiz/open/(\w+)$', event_views.open_quiz), (r'^quiz$', quiz_views.start_page), (r'^quiz/start/$', quiz_views.start_quiz), (r'^quiz/answer/(\w+)$', quiz_views.answer),