Merge branch 'app_package' into redirect_result_view

16 files changed, 77 insertions, 181 deletions

diff --git a/testapp/LICENSE b/testapp/LICENSE
deleted file mode 100644
index 8b49593..0000000
--- a/testapp/LICENSE
+++ /dev/null
@@ -1,3 +0,0 @@
-This is distributed under the terms of the BSD license. 
-
-Copyright (c) 2011 Prabhu Ramachandran and FOSSEE (fossee.in)
diff --git a/testapp/MANIFEST.in b/testapp/MANIFEST.in
deleted file mode 100644
index 2c50f50..0000000
--- a/testapp/MANIFEST.in
+++ /dev/null
@@ -1,7 +0,0 @@
-include LICENSE
-include README.rst
-recursive-include exam/static *
-recursive-include exam/templates *
-recursive-include exam/management *
-recursive-include exam/output *
-recursive-include exam/fixtures *
diff --git a/testapp/README.rst b/testapp/README.rst
index 66535ff..f4790a3 100644
--- a/testapp/README.rst
+++ b/testapp/README.rst
@@ -10,42 +10,35 @@ conduct online test and monitor the test.
 Quick start
 ------------
 
-1. Add "exam", "taggit" and "taggit_autocomplete_modified" apps 
-   to your INSTALLED_APPS setting as follows:
+1. In yourterminal run the following command::
+    $ easy_install git+https://github.com/FOSSEE/online_test.git#egg=django_exam-0.1
+
+2. Add "testapp.exam", "taggit" and "taggit_autocomplete_modified" apps 
+   to your INSTALLED_APPS setting as follows::
 
     INSTALLED_APPS =(
-        'exam',
+        'testapp.exam',
         'taggit',
         'taggit_autocomplete_modified',
     )
 
-2. In project settings, add AUTH_PROFILE_MODULE = 'exam.Profile'
-   You can change the exam.Profile to your desired app user profile.
+3. In project settings, add AUTH_PROFILE_MODULE = 'testapp.exam.Profile'
+   You can change the testapp.exam.Profile to your desired app user profile.
 
-3. Include the "exam" and taggit_autocomplete_modified URL configuration
-   in your project urls.py as follows:
+4. Include the "testapp.exam" and taggit_autocomplete_modified URL configuration
+   in your project urls.py as follows::
 
-    url(r'^exam/', include('exam.urls')),
+    url(r'^exam/', include('testapp.exam.urls')),
     url(r'^taggit_autocomplete_modified/', include\
                                         ('taggit_autocomplete_modified.urls'))
 
-4. Since taggit_autocomplete_modified version for django=>1.5 is not available
-   you have to do one change manually. In taggit_autocomplete_modified app url,
-   remove "default" from the import statement as follows:
-
-    Change:  from django.conf.urls.defaults import *
-    to    :  from django.conf.urls import *
-
-    Note: location of the above file will probably be as 
-        ../lib/python2.7/site-packages/taggit_autocomplete_modified/urls.py
 
-5. Run 'python manage.py syncdb' to create "exam" models.
+5. Run 'python manage.py syncdb' to create models for the new installed apps.
 
 6. Start the development server and visit http://localhost:8000/exam/
 
-7. In exam app run code sever as superuser as follows:
+7. In exam app run code_sever command  as superuser as follows::
 
-   sudo python code_server.py
+       $ code_server
 
-   Note: location of the above file will probably be as 
-        ../lib/python2.7/site-packages/exam/code_server.py
+   Note: You must have a sudo access to run the above command.
diff --git a/testapp/dist/django-exam-0.1.tar.gz b/testapp/dist/django-exam-0.1.tar.gz
deleted file mode 100644
index 114a61e..0000000
--- a/testapp/dist/django-exam-0.1.tar.gz
+++ /dev/null
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/admin.py b/testapp/exam/admin.py
index 8482ef9..060859a 100644
--- a/testapp/exam/admin.py
+++ b/testapp/exam/admin.py
@@ -1,4 +1,4 @@
-from exam.models import Question, Quiz
+from testapp.exam.models import Question, Quiz
 from django.contrib import admin
 
 admin.site.register(Question)
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/forms.py b/testapp/exam/forms.py
index 9bfedbe..f04fdb3 100644
--- a/testapp/exam/forms.py
+++ b/testapp/exam/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from exam.models import Profile, Quiz, Question
+from testapp.exam.models import Profile, Quiz, Question
 
 from django.contrib.auth import authenticate
 from django.contrib.auth.models import User
diff --git a/testapp/exam/management/commands/add_group.py b/testapp/exam/management/commands/add_group.py
new file mode 100644
index 0000000..76cc655
--- /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')
diff --git a/testapp/exam/management/commands/dump_user_data.py b/testapp/exam/management/commands/dump_user_data.py
index ec016bb..c5537e5 100644
--- a/testapp/exam/management/commands/dump_user_data.py
+++ b/testapp/exam/management/commands/dump_user_data.py
@@ -5,8 +5,8 @@ from django.core.management.base import BaseCommand
 from django.template import Template, Context
 
 # Local imports.
-from exam.views import get_user_data
-from exam.models import User
+from testapp.exam.views import get_user_data
+from testapp.exam.models import User
 
 data_template = Template('''\
 ===============================================================================
diff --git a/testapp/exam/management/commands/load_exam.py b/testapp/exam/management/commands/load_exam.py
index e3f72da..c4a34a3 100644
--- a/testapp/exam/management/commands/load_exam.py
+++ b/testapp/exam/management/commands/load_exam.py
@@ -5,7 +5,7 @@ from os.path import basename
 from django.core.management.base import BaseCommand
 
 # Local imports.
-from exam.models import Question, Quiz
+from testapp.exam.models import Question, Quiz
 
 def clear_exam():
     """Deactivate all questions from the database."""
diff --git a/testapp/exam/management/commands/load_questions_xml.py b/testapp/exam/management/commands/load_questions_xml.py
index 8bc2701..3e13ae1 100644
--- a/testapp/exam/management/commands/load_questions_xml.py
+++ b/testapp/exam/management/commands/load_questions_xml.py
@@ -8,7 +8,7 @@ import re
 from django.core.management.base import BaseCommand
 
 # Local imports.
-from exam.models import Question
+from testapp.exam.models import Question
 
 def decode_html(html_str):
     """Un-escape or decode HTML strings to more usable Python strings.
diff --git a/testapp/exam/management/commands/results2csv.py b/testapp/exam/management/commands/results2csv.py
index 2993745..1cdf8e3 100644
--- a/testapp/exam/management/commands/results2csv.py
+++ b/testapp/exam/management/commands/results2csv.py
@@ -7,7 +7,7 @@ from django.core.management.base import BaseCommand
 from django.template import Template, Context
 
 # Local imports.
-from exam.models import Quiz, QuestionPaper
+from testapp.exam.models import Quiz, QuestionPaper
 
 result_template = Template('''\
 "name","username","rollno","email","answered","total","attempts","position",\
diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index 37a031d..f8a6cb8 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, include, url
 
-urlpatterns = patterns('exam.views',
+urlpatterns = patterns('testapp.exam.views',
     url(r'^$', 'index'),
     url(r'^login/$', 'user_login'),
     url(r'^quizzes/$','quizlist_user'),
diff --git a/testapp/exam/views.py b/testapp/exam/views.py
index aeb93ca..c6e3024 100644
--- a/testapp/exam/views.py
+++ b/testapp/exam/views.py
@@ -15,11 +15,11 @@ from django.views.decorators.csrf import csrf_exempt
 from taggit.models import Tag
 from itertools import chain
 # Local imports.
-from exam.models import Quiz, Question, QuestionPaper, QuestionSet
-from exam.models import Profile, Answer, AnswerPaper, User
-from exam.forms import UserRegisterForm, UserLoginForm, QuizForm,\
+from testapp.exam.models import Quiz, Question, QuestionPaper, QuestionSet
+from testapp.exam.models import Profile, Answer, AnswerPaper, User
+from testapp.exam.forms import UserRegisterForm, UserLoginForm, QuizForm,\
                 QuestionForm, RandomQuestionForm
-from exam.xmlrpc_clients import code_server
+from testapp.exam.xmlrpc_clients import code_server
 from settings import URL_ROOT
 
 
diff --git a/testapp/setup.py b/testapp/setup.py
deleted file mode 100644
index a5ca067..0000000
--- a/testapp/setup.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import os
-from setuptools import setup
-
-README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
-
-# allow setup.py to be run from any path
-os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
-
-setup(
-    name='django-exam',
-    author='Prabhu Ramachandran',
-    author_email='prabhu.ramachandran@gmail.com',
-    version='0.1',
-    packages=['exam'],
-    include_package_data=True,
-    license='BSD License',
-    description='A django app to conduct online test.',
-    long_description=README,
-    install_requires=[
-        'django',
-        'django-taggit',
-        'django-taggit-autocomplete-modified',
-    ],
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Environment :: Web Environment',
-        'Framework :: Django',
-        'Intended Audience :: Developers',
-        'Intended Audience :: Education',
-        'Intended Audience :: End Users/Desktop',
-        'License :: OSI Approved :: BSD License',
-        'Natural Language :: English',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
-    ],
-)