Merge branch 'master' into quizzes

Conflicts:
	karmaworld/settings/dev.py

diff --git a/karmaworld/apps/quizzes/__init__.py b/karmaworld/apps/quizzes/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/karmaworld/apps/quizzes/admin.py b/karmaworld/apps/quizzes/admin.py
new file mode 100644 (file)
index 0000000..99c588b
--- /dev/null
+++ b/karmaworld/apps/quizzes/admin.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding:utf8 -*-
+# Copyright (C) 2014  FinalsClub Foundation
+from django.contrib import admin
+from karmaworld.apps.quizzes.models import MultipleChoiceQuestion, FlashCardQuestion, MultipleChoiceOption, Quiz
+from nested_inlines.admin import NestedTabularInline, NestedModelAdmin, NestedStackedInline
+
+
+class MultipleChoiceOptionInlineAdmin(NestedTabularInline):
+    model = MultipleChoiceOption
+
+
+class MultipleChoiceQuestionAdmin(NestedModelAdmin):
+    model = MultipleChoiceQuestion
+    inlines = [MultipleChoiceOptionInlineAdmin]
+    list_display = ('question_text', 'quiz')
+
+
+class FlashCardQuestionInlineAdmin(NestedStackedInline):
+    model = FlashCardQuestion
+    list_display = ('sideA', 'sideB', 'quiz')
+
+
+class QuizAdmin(NestedModelAdmin):
+    search_fields = ['name', 'note__name']
+    list_display = ('name', 'note')
+
+
+admin.site.register(Quiz, QuizAdmin)
+admin.site.register(MultipleChoiceQuestion, MultipleChoiceQuestionAdmin)
+admin.site.register(MultipleChoiceOption)
+admin.site.register(FlashCardQuestion)

diff --git a/karmaworld/apps/quizzes/migrations/0001_initial.py b/karmaworld/apps/quizzes/migrations/0001_initial.py
new file mode 100644 (file)
index 0000000..2d89c5b
--- /dev/null
+++ b/karmaworld/apps/quizzes/migrations/0001_initial.py
@@ -0,0 +1,220 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Quiz'
+        db.create_table(u'quizzes_quiz', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=512)),
+            ('note', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['notes.Note'], null=True, blank=True)),
+            ('timestamp', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.utcnow)),
+        ))
+        db.send_create_signal(u'quizzes', ['Quiz'])
+
+        # Adding model 'MultipleChoiceQuestion'
+        db.create_table(u'quizzes_multiplechoicequestion', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('quiz', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['quizzes.Quiz'])),
+            ('timestamp', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.utcnow)),
+            ('question_text', self.gf('django.db.models.fields.CharField')(max_length=2048)),
+            ('explanation', self.gf('django.db.models.fields.CharField')(max_length=2048)),
+            ('difficulty', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('category', self.gf('django.db.models.fields.CharField')(max_length=50)),
+        ))
+        db.send_create_signal(u'quizzes', ['MultipleChoiceQuestion'])
+
+        # Adding model 'MultipleChoiceOption'
+        db.create_table(u'quizzes_multiplechoiceoption', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('text', self.gf('django.db.models.fields.CharField')(max_length=2048)),
+            ('correct', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('question', self.gf('django.db.models.fields.related.ForeignKey')(related_name='choices', to=orm['quizzes.MultipleChoiceQuestion'])),
+        ))
+        db.send_create_signal(u'quizzes', ['MultipleChoiceOption'])
+
+        # Adding model 'FlashCardQuestion'
+        db.create_table(u'quizzes_flashcardquestion', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('quiz', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['quizzes.Quiz'])),
+            ('timestamp', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.utcnow)),
+            ('sideA', self.gf('django.db.models.fields.CharField')(max_length=2048)),
+            ('sideB', self.gf('django.db.models.fields.CharField')(max_length=2048)),
+        ))
+        db.send_create_signal(u'quizzes', ['FlashCardQuestion'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Quiz'
+        db.delete_table(u'quizzes_quiz')
+
+        # Deleting model 'MultipleChoiceQuestion'
+        db.delete_table(u'quizzes_multiplechoicequestion')
+
+        # Deleting model 'MultipleChoiceOption'
+        db.delete_table(u'quizzes_multiplechoiceoption')
+
+        # Deleting model 'FlashCardQuestion'
+        db.delete_table(u'quizzes_flashcardquestion')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'courses.course': {
+            'Meta': {'ordering': "['-file_count', 'school', 'name']", 'unique_together': "(('name', 'department'),)", 'object_name': 'Course'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.Department']", 'null': 'True', 'blank': 'True'}),
+            'desc': ('django.db.models.fields.TextField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'}),
+            'file_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'flags': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'instructor_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'instructor_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'school': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.School']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'})
+        },
+        u'courses.department': {
+            'Meta': {'unique_together': "(('name', 'school'),)", 'object_name': 'Department'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'school': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.School']"}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'null': 'True', 'blank': 'True'})
+        },
+        u'courses.school': {
+            'Meta': {'ordering': "['-file_count', '-priority', 'name']", 'object_name': 'School'},
+            'alias': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'facebook_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'file_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '16', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'priority': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '150', 'null': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '511', 'blank': 'True'}),
+            'usde_id': ('django.db.models.fields.BigIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        u'licenses.license': {
+            'Meta': {'object_name': 'License'},
+            'html': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'})
+        },
+        u'notes.note': {
+            'Meta': {'ordering': "['-uploaded_at']", 'unique_together': "(('fp_file', 'upstream_link'),)", 'object_name': 'Note'},
+            'course': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['courses.Course']"}),
+            'file_type': ('django.db.models.fields.CharField', [], {'default': "'???'", 'max_length': '15', 'null': 'True', 'blank': 'True'}),
+            'flags': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'fp_file': ('django_filepicker.models.FPFileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'gdrive_url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'html': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'is_hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'license': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['licenses.License']", 'null': 'True', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'pdf_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}),
+            'static_html': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'text': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'thanks': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'tweeted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow', 'null': 'True'}),
+            'upstream_link': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
+            'year': ('django.db.models.fields.IntegerField', [], {'default': '2014', 'null': 'True', 'blank': 'True'})
+        },
+        u'quizzes.flashcardquestion': {
+            'Meta': {'object_name': 'FlashCardQuestion'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'quiz': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['quizzes.Quiz']"}),
+            'sideA': ('django.db.models.fields.CharField', [], {'max_length': '2048'}),
+            'sideB': ('django.db.models.fields.CharField', [], {'max_length': '2048'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        u'quizzes.multiplechoiceoption': {
+            'Meta': {'object_name': 'MultipleChoiceOption'},
+            'correct': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'choices'", 'to': u"orm['quizzes.MultipleChoiceQuestion']"}),
+            'text': ('django.db.models.fields.CharField', [], {'max_length': '2048'})
+        },
+        u'quizzes.multiplechoicequestion': {
+            'Meta': {'object_name': 'MultipleChoiceQuestion'},
+            'category': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'difficulty': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'explanation': ('django.db.models.fields.CharField', [], {'max_length': '2048'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'question_text': ('django.db.models.fields.CharField', [], {'max_length': '2048'}),
+            'quiz': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['quizzes.Quiz']"}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        u'quizzes.quiz': {
+            'Meta': {'object_name': 'Quiz'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'note': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['notes.Note']", 'null': 'True', 'blank': 'True'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        },
+        u'taggit.tag': {
+            'Meta': {'ordering': "['namespace', 'name']", 'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+            'namespace': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        u'taggit.taggeditem': {
+            'Meta': {'object_name': 'TaggedItem'},
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'taggit_taggeditem_tagged_items'", 'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+            'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'taggit_taggeditem_items'", 'to': u"orm['taggit.Tag']"})
+        }
+    }
+
+    complete_apps = ['quizzes']
\ No newline at end of file

diff --git a/karmaworld/apps/quizzes/migrations/__init__.py b/karmaworld/apps/quizzes/migrations/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/karmaworld/apps/quizzes/models.py b/karmaworld/apps/quizzes/models.py
new file mode 100644 (file)
index 0000000..6348436
--- /dev/null
+++ b/karmaworld/apps/quizzes/models.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+# -*- coding:utf8 -*-
+# Copyright (C) 2014  FinalsClub Foundation
+import datetime
+from django.db import models
+
+
+class Quiz(models.Model):
+    name = models.CharField(max_length=512)
+    note = models.ForeignKey('notes.Note', blank=True, null=True)
+    timestamp = models.DateTimeField(default=datetime.datetime.utcnow)
+
+    class Meta:
+        verbose_name_plural = 'quizzes'
+
+    def __unicode__(self):
+        return self.name
+
+
+class BaseQuizQuestion(models.Model):
+    quiz = models.ForeignKey(Quiz)
+    timestamp = models.DateTimeField(default=datetime.datetime.utcnow)
+
+    class Meta:
+        abstract = True
+
+
+class MultipleChoiceQuestion(BaseQuizQuestion):
+    question_text = models.CharField(max_length=2048)
+    explanation = models.CharField(max_length=2048)
+
+    EASY = 'EASY'
+    MEDIUM = 'MEDIUM'
+    HARD = 'HARD'
+    DIFFICULTY_CHOICES = (
+        (EASY, 'Easy'),
+        (MEDIUM, 'Medium'),
+        (HARD, 'Hard'),
+    )
+
+    difficulty = models.CharField(max_length=50, choices=DIFFICULTY_CHOICES)
+
+    UNDERSTAND = 'UNDERSTAND'
+    REMEMBER = 'REMEMBER'
+    ANALYZE = 'ANALYZE'
+    CATEGORY_CHOICES = (
+        (UNDERSTAND, 'Understand'),
+        (REMEMBER, 'Remember'),
+        (ANALYZE, 'Analyze'),
+    )
+
+    category = models.CharField(max_length=50, choices=CATEGORY_CHOICES)
+
+    def __unicode__(self):
+        return self.question_text
+
+
+class MultipleChoiceOption(models.Model):
+    text = models.CharField(max_length=2048)
+    correct = models.BooleanField()
+    question = models.ForeignKey(MultipleChoiceQuestion, related_name="choices")
+
+    def __unicode__(self):
+        return self.text
+
+
+class FlashCardQuestion(BaseQuizQuestion):
+    sideA = models.CharField(max_length=2048)
+    sideB = models.CharField(max_length=2048)
+
+    def __unicode__(self):
+        return self.sideA + ' / ' + self.sideB
+
+ALL_QUESTION_CLASSES = (MultipleChoiceQuestion, FlashCardQuestion)
+

diff --git a/karmaworld/apps/quizzes/views.py b/karmaworld/apps/quizzes/views.py
new file mode 100644 (file)
index 0000000..f3e8702
--- /dev/null
+++ b/karmaworld/apps/quizzes/views.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding:utf8 -*-
+# Copyright (C) 2014  FinalsClub Foundation
+from itertools import chain
+
+from django.views.generic import DetailView
+from karmaworld.apps.quizzes.models import Quiz, ALL_QUESTION_CLASSES
+
+
+class QuizView(DetailView):
+
+    queryset = Quiz.objects.all()
+
+    model = Quiz
+    context_object_name = 'quiz' # name passed to template
+    template_name = 'quizzes/quiz.html'
+
+    def get_context_data(self, **kwargs):
+        all_questions = []
+        for cls in ALL_QUESTION_CLASSES:
+            all_questions.append(
+                [(cls.__name__, o) for o in cls.objects.filter(quiz=self.object)]
+            )
+
+        result_list = sorted(chain.from_iterable(all_questions),
+                             key=lambda o: o[1].timestamp,
+                             reverse=True)
+
+        kwargs['questions'] = result_list
+
+        return super(QuizView, self).get_context_data(**kwargs)
+

diff --git a/karmaworld/settings/common.py b/karmaworld/settings/common.py
index eb8b18dba1bfa9d67acdc8af80ab473b9e86cfb5..80f30128d0d9d1b3ad2733d14f3d5c1bf04ce013 100644 (file)
--- a/karmaworld/settings/common.py
+++ b/karmaworld/settings/common.py
@@ -241,6 +241,9 @@ THIRD_PARTY_APPS = (
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.google',
     'allauth.socialaccount.providers.twitter',
+
+    # Added to make quizzes moderation nicer
+    'nested_inlines',
 )
 
 LOCAL_APPS = (
@@ -251,6 +254,7 @@ LOCAL_APPS = (
     'karmaworld.apps.users',
     'karmaworld.apps.moderation',
     'karmaworld.apps.licenses',
+    'karmaworld.apps.quizzes',
 )
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps

diff --git a/karmaworld/templates/quizzes/quiz.html b/karmaworld/templates/quizzes/quiz.html
new file mode 100644 (file)
index 0000000..000ff20
--- /dev/null
+++ b/karmaworld/templates/quizzes/quiz.html
@@ -0,0 +1,94 @@
+{% extends "base.html" %}
+{% load url from future %}
+{% load account %}
+
+{% block pagescripts %}
+  <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/dashboard.css">
+{% endblock %}
+
+{% block title %}
+  {{ quiz.name }}
+{% endblock %}
+
+{% block content %}
+  <section id="dashboard_content">
+    <div id="stats_container" class="hero_gradient_bar">
+      <div class="row">
+        <div class="small-10 columns small-centered center header_title">
+          {{ quiz.name }}
+      </div>
+        </div>
+      <div class="row">
+        <div class="small-12 medium-8 large-4 columns small-centered">
+          <div class="row">
+            <div class="small-6 columns center  stat_lead_in">
+              you've had
+            </div>
+            <div class="small-6 columns center  stat_lead_in">
+              out of
+            </div>
+          </div>
+          <div class="row">
+            <div class="small-6 columns center  stat_number stat_earned">
+             3
+            </div>
+            <div class="small-6 columns  center stat_number stat_uploaded">
+              14
+            </div>
+          </div>
+          <div class="row">
+            <div class="small-6 columns center  stat_object stat_earned">
+              correct answers
+            </div>
+            <div class="small-6 columns center  stat_object stat_uploaded">
+              questions
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+
+    <div id="activity_container">
+
+      {% if not questions %}
+        <div class="row">
+          <div id="no_activity" class="small-10 columns small-centered center">
+            <h4>This quiz has no questions.</h4>
+          </div>
+        </div>
+      {% endif %}
+
+      {% for item in questions %}
+
+        <div class="row">
+          <div class="small-10 columns small-centered {% cycle '' 'row_alt_on'%}">
+
+            <div class="activity_item">
+              {% if 'MultipleChoiceQuestion' in item.0 %}
+                {% with question=item.1 %}
+                  <p>{{ question.question_text }}</p>
+                  <ul>
+                    {% for choice in question.choices.all %}
+                      <li>{{ choice.text }}</li>
+                    {% endfor %}
+                  </ul>
+                {% endwith %}
+
+              {% endif %}
+
+
+            </div>
+
+          </div>
+        </div>
+
+      {% endfor %}
+
+    </div>
+
+
+
+  </section>
+
+{% endblock %}

diff --git a/karmaworld/urls.py b/karmaworld/urls.py
index 339bbd50c9829d09770e1c6dd667d92b77b37cad..95d86367b0632835b4810807a80fa60f7c1a06d3 100644 (file)
--- a/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@ -20,6 +20,7 @@ from karmaworld.apps.notes.views import RawNoteDetailView
 from karmaworld.apps.notes.views import PDFView
 from karmaworld.apps.moderation import moderator
 from karmaworld.apps.document_upload.views import save_fp_upload
+from karmaworld.apps.quizzes.views import QuizView
 from karmaworld.apps.users.views import ProfileView
 
 # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf
@@ -66,6 +67,9 @@ urlpatterns = patterns('',
     url(r'^accounts/', include('allauth.urls')),
     url(r'^accounts/profile/', ProfileView.as_view(), name='accounts_profile'),
 
+    # Quizzes
+    url(r'^quiz/(?P<pk>\d+)/$', QuizView.as_view(), name='quiz'),
+
     #url(r'^pdfview$', PDFView.as_view(), name='pdf'),
     url(r'^pdfview/(?P<pk>\d+)$', PDFView.as_view(), name='pdf'),
 

diff --git a/reqs/common.txt b/reqs/common.txt
index 9a058cf9cada881b67628e85a23ecb8e8d92af1e..183d85b4574d0140e198fe09de0a7e96ef687575 100644 (file)
--- a/reqs/common.txt
+++ b/reqs/common.txt
@@ -22,3 +22,4 @@ django-allauth
 boto==2.6.0
 django-storages==1.1.4
 django-reversion
+git+https://github.com/Soaa-/django-nested-inlines.git