added sub_categories to questions

diff --git a/quiz/admin.py b/quiz/admin.py
index a0e56ef5ee218f09015095193bbef0aab7f9479f..6fd4965ce760a0ccd0ccae99bf9ebc7fd95b9f16 100644 (file)
--- a/quiz/admin.py
+++ b/quiz/admin.py
@@ -2,7 +2,7 @@ from django import forms
 from django.contrib import admin
 from django.contrib.admin.widgets import FilteredSelectMultiple
 
-from .models import Quiz, Category, Progress, Question
+from .models import Quiz, Category, Sub_Category, Progress, Question
 from multichoice.models import MCQuestion, Answer
 from true_false.models import TF_Question
 from essay.models import Essay_Question
@@ -55,11 +55,13 @@ class QuizAdmin(admin.ModelAdmin):
 class CategoryAdmin(admin.ModelAdmin):
     search_fields = ('category', )
 
+class SubCategoryAdmin(admin.ModelAdmin):
+    search_fields = ('sub_category', )
 
 class MCQuestionAdmin(admin.ModelAdmin):
     list_display = ('content', 'category', )
     list_filter = ('category',)
-    fields = ('content', 'category', 'figure', 'quiz', 'explanation')
+    fields = ('content', 'category', 'sub_category', 'figure', 'quiz', 'explanation')
 
     search_fields = ('content', 'explanation')
     filter_horizontal = ('quiz',)
@@ -78,7 +80,7 @@ class ProgressAdmin(admin.ModelAdmin):
 class TFQuestionAdmin(admin.ModelAdmin):
     list_display = ('content', 'category', )
     list_filter = ('category',)
-    fields = ('content', 'category', 'figure', 'quiz', 'explanation', 'correct',)
+    fields = ('content', 'category', 'sub_category', 'figure', 'quiz', 'explanation', 'correct',)
 
     search_fields = ('content', 'explanation')
     filter_horizontal = ('quiz',)
@@ -87,12 +89,13 @@ class TFQuestionAdmin(admin.ModelAdmin):
 class EssayQuestionAdmin(admin.ModelAdmin):
     list_display = ('content', 'category', )
     list_filter = ('category',)
-    fields = ('content', 'category', 'quiz', 'explanation', )
+    fields = ('content', 'category', 'sub_category', 'quiz', 'explanation', )
     search_fields = ('content', 'explanation')
     filter_horizontal = ('quiz',)
 
 admin.site.register(Quiz, QuizAdmin)
 admin.site.register(Category, CategoryAdmin)
+admin.site.register(Sub_Category, SubCategoryAdmin)
 admin.site.register(MCQuestion, MCQuestionAdmin)
 admin.site.register(Progress, ProgressAdmin)
 admin.site.register(TF_Question, TFQuestionAdmin)

diff --git a/quiz/models.py b/quiz/models.py
index be51c9b1f56b23f0c3a07dacc2d48bac36100fba..f0fc3ca51d12cac3d7082139b50b46d31063487f 100644 (file)
--- a/quiz/models.py
+++ b/quiz/models.py
@@ -34,6 +34,24 @@ class Category(models.Model):
     def __unicode__(self):
         return unicode(self.category)
 
+class Sub_Category(models.Model):
+
+    sub_category = models.CharField(max_length=250,
+                                blank=True,
+                                # choices=CATEGORY_CHOICES,
+                                null=True)
+    
+    category = models.ForeignKey(Category,
+                                 null=True,
+                                 blank=True)
+    objects = CategoryManager()
+
+    class Meta:
+        verbose_name = "Sub-Category"
+        verbose_name_plural = "Sub-Categories"
+
+    def __unicode__(self):
+        return unicode(self.sub_category + " (" + self.category.category + ")" )
 
 class Quiz(models.Model):
 
@@ -463,6 +481,10 @@ class Question(models.Model):
                                  blank=True,
                                  null=True)
 
+    sub_category = models.ForeignKey(Sub_Category,
+                                 blank=True,
+                                 null=True)
+
     figure = models.ImageField(upload_to='uploads/%Y/%m/%d', 
                                  blank=True, 
                                  null=True)