Merge branch 'initial_fixtures' into packaging_app

3 files changed, 50 insertions, 98 deletions

diff --git a/testapp/docs/sample_questions.py b/testapp/docs/sample_questions.py
index 45bb8a8..60f32cb 100644
--- a/testapp/docs/sample_questions.py
+++ b/testapp/docs/sample_questions.py
@@ -4,7 +4,8 @@ questions = [
 [Question(
     summary='Factorial',
     points=2,
-    type="python",
+    language='python',
+    type='code',
     description='''
 Write a function called <code>fact</code> which takes a single integer argument
 (say <code>n</code>) and returns the factorial of the number. 
@@ -14,7 +15,9 @@ For example:<br/>
     test='''
 assert fact(0) == 1
 assert fact(5) == 120
-'''),
+''',
+    snippet="def fact(num):"
+    ),
 #Add tags here as a list of string.
 ['Python','function','factorial'],
 ],
@@ -22,7 +25,8 @@ assert fact(5) == 120
 [Question(
     summary='Simple function',
     points=1,
-    type="python",
+    language='python',
+    type='code',
     description='''Create a simple function called <code>sqr</code> which takes a single 
 argument and returns the square of the argument. For example: <br/>
 <code>sqr(3) -> 9</code>.''',
@@ -30,7 +34,9 @@ argument and returns the square of the argument. For example: <br/>
 import math
 assert sqr(3) == 9
 assert abs(sqr(math.sqrt(2)) - 2.0) < 1e-14 
-    '''),
+    ''',
+    snippet="def sqr(num):"
+    ),
 #Add tags here as a list of string.
 ['Python','function'],
 ],
@@ -38,13 +44,16 @@ assert abs(sqr(math.sqrt(2)) - 2.0) < 1e-14
 [Question(
     summary='Bash addition',
     points=2,
-    type="bash",
+    language='bash',
+    type='code',
     description='''Write a shell script which takes two arguments on the
     command line and prints the sum of the two on the output.''',
     test='''\
 docs/sample.sh
 docs/sample.args
-'''),
+''',
+    snippet="#!/bin/bash"
+    ),
 #Add tags here as a list of string.
 [''],
 ],
@@ -52,7 +61,8 @@ docs/sample.args
 [Question(
     summary='Size of integer in Python',
     points=0.5,
-    type="mcq",
+    language='python',
+    type='mcq',
     description='''What is the largest integer value that can be represented
 in Python?''',
     options='''No Limit
diff --git a/testapp/exam/fixtures/initial_fixture.json b/testapp/exam/fixtures/initial_fixture.json
deleted file mode 100644
index da3cf18..0000000
--- a/testapp/exam/fixtures/initial_fixture.json
+++ /dev/null
@@ -1,91 +0,0 @@
-[
-    {
-        "fields": {
-            "active": true,
-            "description": "\nWrite a function called <code>fact</code> which takes a single integer argument\n(say <code>n</code>) and returns the factorial of the number. \nFor example:<br/>\n<code>fact(3) -> 6</code>\n",
-            "options": "",
-            "points": 2.0,
-            "summary": "Factorial",
-            "test": "\nassert fact(0) == 1\nassert fact(5) == 120\n",
-            "type": "python"
-        },
-        "model": "exam.question",
-        "pk": 1
-    },
-    {
-        "fields": {
-            "active": true,
-            "description": "Create a simple function called <code>sqr</code> which takes a single \nargument and returns the square of the argument. For example: <br/>\n<code>sqr(3) -> 9</code>.",
-            "options": "",
-            "points": 1.0,
-            "summary": "Simple function",
-            "test": "\nimport math\nassert sqr(3) == 9\nassert abs(sqr(math.sqrt(2)) - 2.0) < 1e-14 \n    ",
-            "type": "python"
-        },
-        "model": "exam.question",
-        "pk": 2
-    },
-    {
-        "fields": {
-            "active": true,
-            "description": "Write a shell script which takes two arguments on the\ncommand line and prints the sum of the two on the output.",
-            "options": "",
-            "points": 2.0,
-            "summary": "Bash addition",
-            "test": "docs/sample.sh\ndocs/sample.args\n",
-            "type": "bash"
-        },
-        "model": "exam.question",
-        "pk": 3
-    },
-    {
-        "fields": {
-            "active": true,
-            "description": "What is the largest integer value that can be represented\nin Python?",
-            "options": "No Limit\n2**32\n2**32 - 1\nNone of the above\n",
-            "points": 0.5,
-            "summary": "Size of integer in Python",
-            "test": "No Limit",
-            "type": "mcq"
-        },
-        "model": "exam.question",
-        "pk": 4
-    },
-    {
-        "fields": {
-            "active": true,
-            "description": "Basic Python Quiz 1",
-            "duration": 10,
-            "start_date": "2012-03-29"
-        },
-        "model": "exam.quiz",
-        "pk": 1
-    },
-    {
-        "fields": {
-            "name": "moderator",
-            "permissions": [
-                31,
-                37,
-                43,
-                32,
-                38,
-                44,
-                33,
-                39,
-                45,
-                34,
-                40,
-                46,
-                35,
-                41,
-                47,
-                36,
-                42,
-                48
-            ]
-        },
-        "model": "auth.group",
-        "pk": 1
-    }
-]
diff --git a/testapp/exam/management/commands/add_group.py b/testapp/exam/management/commands/add_group.py
new file mode 100644
index 0000000..e6ac888
--- /dev/null
+++ b/testapp/exam/management/commands/add_group.py
@@ -0,0 +1,33 @@
+'''
+   This command adds moderator group with permissions to add, change and delete
+   the objects in the exam app.
+   We can modify this command to add more groups by providing arguments.
+   Arguments like group-name, app-name can be passed.
+
+'''
+# django imports
+from django.core.management.base import BaseCommand, CommandError
+from django.contrib.auth.models import Group, Permission
+from django.contrib.contenttypes.models import ContentType
+from django.db.utils import IntegrityError
+
+class Command(BaseCommand):
+    help = 'Adds the moderator group'
+
+    def handle(self, *args, **options):
+        app = 'exam'
+        group = Group(name='moderator')
+        try:
+            group.save()
+        except IntegrityError:
+            raise CommandError("The group already exits")
+        else:
+            # Get the models for the given app
+            content_types = ContentType.objects.filter(app_label=app)
+            # Get list of permissions for the models
+            permission_list = Permission.objects.filter(content_type=content_types)
+            for permission in permission_list:
+                group.permissions.add(permission)
+                group.save()
+
+        self.stdout.write('Moderator group added successfully')