diff options
| -rw-r--r-- | LICENSE (renamed from testapp/LICENSE) | 2 | ||||
| -rw-r--r-- | MANIFEST.in | 13 | ||||
| -rw-r--r-- | dist/django-exam-0.1.tar.gz | bin | 0 -> 88311 bytes | |||
| -rw-r--r-- | setup.py (renamed from testapp/setup.py) | 9 | ||||
| -rw-r--r-- | testapp/MANIFEST.in | 7 | ||||
| -rw-r--r-- | testapp/README.rst | 19 | ||||
| -rw-r--r-- | testapp/dist/django-exam-0.1.tar.gz | bin | 79583 -> 0 bytes | |||
| -rw-r--r-- | testapp/docs/sample_questions.py | 24 | ||||
| -rw-r--r-- | testapp/exam/admin.py | 2 | ||||
| -rw-r--r-- | testapp/exam/fixtures/initial_fixture.json | 91 | ||||
| -rw-r--r-- | testapp/exam/forms.py | 2 | ||||
| -rw-r--r-- | testapp/exam/management/commands/add_group.py | 33 | ||||
| -rw-r--r-- | testapp/exam/urls.py | 2 | ||||
| -rw-r--r-- | testapp/exam/views.py | 8 |
14 files changed, 87 insertions, 125 deletions
diff --git a/testapp/LICENSE b/LICENSE index 8b49593..6d24163 100644 --- a/testapp/LICENSE +++ b/LICENSE @@ -1,3 +1,3 @@ -This is distributed under the terms of the BSD license. +This is distributed under the terms of the BSD license. Copyright (c) 2011 Prabhu Ramachandran and FOSSEE (fossee.in) diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..6775565 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,13 @@ +include LICENSE +include README.rst +exclude testapp/production.py +exclude testapp/settings.py +exclude testapp/urls.py +exclude testapp/test_server.py +exclude testapp/manage.py +recursive-exclude testapp/myauthentication * +recursive-include testapp/exam/static * +recursive-include testapp/exam/templates * +recursive-include testapp/exam/management * +recursive-include testapp/exam/output * +recursive-include testapp/exam/fixtures * diff --git a/dist/django-exam-0.1.tar.gz b/dist/django-exam-0.1.tar.gz Binary files differnew file mode 100644 index 0000000..6a5ef4a --- /dev/null +++ b/dist/django-exam-0.1.tar.gz diff --git a/testapp/setup.py b/setup.py index a5ca067..6aabdc0 100644 --- a/testapp/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ import os -from setuptools import setup +from setuptools import setup, find_packages README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read() @@ -11,9 +11,14 @@ setup( author='Prabhu Ramachandran', author_email='prabhu.ramachandran@gmail.com', version='0.1', - packages=['exam'], + packages=find_packages(), include_package_data=True, license='BSD License', + entry_points = { + 'console_scripts': [ + 'code_server = exam.code_server:main', + ], + }, description='A django app to conduct online test.', long_description=README, install_requires=[ 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..aa0ee81 100644 --- a/testapp/README.rst +++ b/testapp/README.rst @@ -10,22 +10,22 @@ conduct online test and monitor the test. Quick start ------------ -1. Add "exam", "taggit" and "taggit_autocomplete_modified" apps +1. 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. +2. 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 +3. 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')) @@ -43,9 +43,8 @@ Quick start 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 Binary files differdeleted 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 9d68ce2..169632d 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/urls.py b/testapp/exam/urls.py index d553941..d71329c 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 44884fd..8fde7a7 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 |