]>
git.parisson.com Git - django_quiz.git/log
Рустам Кашапов [Fri, 3 Oct 2014 13:36:42 +0000 (17:36 +0400)]
forgotten essay app translation
Рустам Кашапов [Fri, 3 Oct 2014 05:41:37 +0000 (09:41 +0400)]
egg building and installation is added to travis.yml
Рустам Кашапов [Fri, 3 Oct 2014 04:05:44 +0000 (08:05 +0400)]
fix manifest
Рустам Кашапов [Thu, 2 Oct 2014 18:06:42 +0000 (22:06 +0400)]
cleaned up my garbage
Рустам Кашапов [Thu, 2 Oct 2014 17:59:07 +0000 (21:59 +0400)]
fix base template.
Рустам Кашапов [Thu, 2 Oct 2014 16:40:46 +0000 (20:40 +0400)]
i18n support and Russian language translation is added.
Рустам Кашапов [Thu, 2 Oct 2014 05:10:55 +0000 (09:10 +0400)]
some code improvements
tomwalker [Thu, 25 Sep 2014 15:31:11 +0000 (16:31 +0100)]
cleaned up an 'any()' check, extending tests for quiz/models.progress.update_score()
Tom Walker [Sun, 21 Sep 2014 14:42:03 +0000 (15:42 +0100)]
pep8
Tom Walker [Sun, 21 Sep 2014 14:26:31 +0000 (15:26 +0100)]
added tests for the new 'draft' option kindly added by richardmansfield
Tom Walker [Fri, 19 Sep 2014 11:02:54 +0000 (12:02 +0100)]
Merge pull request #19 from trident-systems/master
Allow quizzes to be marked as draft and hidden from the public quiz list
Richard Mansfield [Fri, 19 Sep 2014 01:25:28 +0000 (13:25 +1200)]
Allow quizzes to be marked as draft and hidden from the public quiz list
tomwalker [Wed, 20 Aug 2014 16:30:12 +0000 (17:30 +0100)]
pep8
tomwalker [Wed, 20 Aug 2014 16:17:59 +0000 (17:17 +0100)]
Merge: Allow the display order of multichoice options to be specified #17
tomwalker [Tue, 12 Aug 2014 11:57:07 +0000 (12:57 +0100)]
mostly pep8
Tom Walker [Mon, 11 Aug 2014 18:46:53 +0000 (19:46 +0100)]
Merge pull request #16 from trident-systems/master
Display user answers on the results page
Richard Mansfield [Sun, 10 Aug 2014 23:15:46 +0000 (11:15 +1200)]
Display user answers on the results page
Richard Mansfield [Sun, 10 Aug 2014 23:06:14 +0000 (11:06 +1200)]
Display questions in order on the marking page
Richard Mansfield [Sun, 10 Aug 2014 22:54:49 +0000 (10:54 +1200)]
Incorporate user answers in Sitting.get_questions
Richard Mansfield [Sun, 10 Aug 2014 22:34:26 +0000 (10:34 +1200)]
Display question figure on marking page
tomwalker [Thu, 7 Aug 2014 18:31:50 +0000 (19:31 +0100)]
tests for sitting.progress in user and anon views
tomwalker [Thu, 7 Aug 2014 09:07:37 +0000 (10:07 +0100)]
Merge branch 'master' of https://github.com/tomwalker/django-quiz
Conflicts:
quiz/views.py
Tom Walker [Thu, 7 Aug 2014 09:05:53 +0000 (10:05 +0100)]
Merge pull request #15 from trident-systems/master
Completion indicator
tomwalker [Thu, 7 Aug 2014 09:02:04 +0000 (10:02 +0100)]
changed request.POST object to empty dict rather than empty string before GET redirect. This prevents answer of previous question being preselected, mostly for T/F questions
Richard Mansfield [Thu, 7 Aug 2014 05:12:17 +0000 (17:12 +1200)]
Display the number of questions answered so far & the number remaining
Richard Mansfield [Wed, 6 Aug 2014 23:28:23 +0000 (11:28 +1200)]
Install templatetags
Richard Mansfield [Wed, 6 Aug 2014 22:25:34 +0000 (10:25 +1200)]
Don't wipe post data during form validation
tomwalker [Wed, 6 Aug 2014 18:50:08 +0000 (19:50 +0100)]
tests for the new features
tomwalker [Wed, 6 Aug 2014 15:04:47 +0000 (16:04 +0100)]
missed a bracket
tomwalker [Wed, 6 Aug 2014 14:53:41 +0000 (15:53 +0100)]
updated feature list
tomwalker [Wed, 6 Aug 2014 14:49:56 +0000 (15:49 +0100)]
updated contributors
tomwalker [Wed, 6 Aug 2014 14:49:05 +0000 (15:49 +0100)]
updated tests to work alongside pull request from Richard Mansfield
Tom Walker [Wed, 6 Aug 2014 13:44:34 +0000 (14:44 +0100)]
Merge pull request #14 from trident-systems/max_questions
Max questions
Richard Mansfield [Wed, 6 Aug 2014 02:37:30 +0000 (14:37 +1200)]
Display answer in readable format on marking detail page
Richard Mansfield [Wed, 6 Aug 2014 02:36:54 +0000 (14:36 +1200)]
Show completed date on marking detail page
Richard Mansfield [Wed, 6 Aug 2014 02:06:29 +0000 (14:06 +1200)]
Add start, end times to a sitting; display completion date on marking page
Richard Mansfield [Wed, 6 Aug 2014 01:34:15 +0000 (13:34 +1200)]
Handle incorrect question toggle via post
Richard Mansfield [Wed, 6 Aug 2014 00:15:06 +0000 (12:15 +1200)]
Show max_score for each attempt in progress template
Richard Mansfield [Tue, 5 Aug 2014 23:10:54 +0000 (11:10 +1200)]
Store session info for anonymous users taking max_questions quiz
Keep track of the question subset and incorrect questions to allow
anonymous users to sit quizzes with max_questions set.
Richard Mansfield [Tue, 5 Aug 2014 22:55:56 +0000 (10:55 +1200)]
Add option to take a subset of the questions in a quiz
Adds a "max_questions" field to a quiz, indicating the number of
questions to be answered on each attempt. This is useful when the
quiz has a large pool of questions, and students are expected to take
multiple attempts and answer a different random subset of questions
each time.
Each Sitting stores a list of all the questions chosen for the
attempt, and the order in which they are presented to the user, so
that results can be displayed at the end for the question subset,
instead of for the whole quiz.
tomwalker [Mon, 4 Aug 2014 19:39:45 +0000 (20:39 +0100)]
made quiz.progress.list_all_cat_scores a property, changed quiz.progress.update_score use a question rather than a category as its calling arguement. This is to allow easier integration of tracking subcategory scores (which has not been implemented yet)
tomwalker [Fri, 1 Aug 2014 10:08:02 +0000 (11:08 +0100)]
small fix for errors in admin, also added ability to filter subcategories by their parent categories
tomwalker [Thu, 31 Jul 2014 16:44:48 +0000 (17:44 +0100)]
Merge branch 'master' of https://github.com/tomwalker/django-quiz
tomwalker [Thu, 31 Jul 2014 16:42:32 +0000 (17:42 +0100)]
unit test that image with the question content as its alt is shown when viewing a question
tomwalker [Thu, 31 Jul 2014 15:46:04 +0000 (16:46 +0100)]
tests for image field
tomwalker [Thu, 31 Jul 2014 15:04:28 +0000 (16:04 +0100)]
Merge branch 'dev' of https://github.com/tomwalker/django-quiz into dev
tomwalker [Thu, 31 Jul 2014 15:03:34 +0000 (16:03 +0100)]
updated readme with contributors section and updated features certifiedclouds commits
Tom Walker [Thu, 31 Jul 2014 14:55:58 +0000 (15:55 +0100)]
Merge pull request #11 from certifiedloud/dev
fixed invalid html in question.html template
tomwalker [Thu, 31 Jul 2014 14:55:20 +0000 (15:55 +0100)]
adjusted Sub_Category class to SubCategory, included some basic tests for subcategory
Cody Heimberger [Thu, 31 Jul 2014 14:46:31 +0000 (08:46 -0600)]
fixed invalid html in question.html template
Tom Walker [Thu, 31 Jul 2014 13:30:43 +0000 (14:30 +0100)]
Merge pull request #10 from certifiedloud/dev
Added support for Sub-Categories
certifiedloud [Thu, 31 Jul 2014 12:11:52 +0000 (06:11 -0600)]
Merge pull request #1 from certifiedloud/master
merging master and dev branches
Cody Heimberger [Thu, 31 Jul 2014 12:07:31 +0000 (06:07 -0600)]
added sub_categories to questions
Tom Walker [Thu, 31 Jul 2014 09:52:55 +0000 (10:52 +0100)]
Merge pull request #7 from certifiedloud/master
Added support for figures
certifiedloud [Wed, 30 Jul 2014 22:25:56 +0000 (16:25 -0600)]
white space change
Cody Heimberger [Wed, 30 Jul 2014 22:04:50 +0000 (16:04 -0600)]
Merge branch 'master' of https://github.com/certifiedloud/django_quiz
Cody Heimberger [Wed, 30 Jul 2014 22:03:16 +0000 (16:03 -0600)]
added pillow to the requirements.txt file for image uploads
certifiedloud [Wed, 30 Jul 2014 21:49:37 +0000 (15:49 -0600)]
Update models.py
Cody Heimberger [Wed, 30 Jul 2014 21:44:21 +0000 (15:44 -0600)]
added support for figures in true_false and multiple choice questions
tomwalker [Wed, 30 Jul 2014 09:20:54 +0000 (10:20 +0100)]
update to 0.5.0
tomwalker [Tue, 29 Jul 2014 20:19:49 +0000 (21:19 +0100)]
more cleaning up of the main view
Tom Walker [Mon, 28 Jul 2014 20:46:18 +0000 (21:46 +0100)]
more slimming down of the views
Tom Walker [Mon, 28 Jul 2014 18:02:21 +0000 (19:02 +0100)]
slimming down the views
Tom Walker [Mon, 28 Jul 2014 17:18:33 +0000 (18:18 +0100)]
Added a new manager for the sitting object to load sitting for a user
doing a quiz. Allows me to thin the views a bit more.
Tom Walker [Sun, 27 Jul 2014 21:14:57 +0000 (22:14 +0100)]
cleaning up code, improving the default template
Tom Walker [Sun, 27 Jul 2014 17:30:15 +0000 (18:30 +0100)]
removing unused files
Tom Walker [Sun, 27 Jul 2014 16:35:14 +0000 (17:35 +0100)]
readme readme
Tom Walker [Sun, 27 Jul 2014 16:33:27 +0000 (17:33 +0100)]
added travis build image to readme
Tom Walker [Sun, 27 Jul 2014 16:30:53 +0000 (17:30 +0100)]
setup, not manage
Tom Walker [Sun, 27 Jul 2014 16:29:24 +0000 (17:29 +0100)]
trying to get travis to work....
Tom Walker [Sun, 27 Jul 2014 15:50:13 +0000 (16:50 +0100)]
travis...
Tom Walker [Sun, 27 Jul 2014 15:46:09 +0000 (16:46 +0100)]
small update to readme
Tom Walker [Sun, 27 Jul 2014 15:42:52 +0000 (16:42 +0100)]
added travis file
Tom Walker [Sun, 27 Jul 2014 15:23:49 +0000 (16:23 +0100)]
lining up a bracker in urls.py
Tom Walker [Sun, 27 Jul 2014 15:20:52 +0000 (16:20 +0100)]
code cleanup and extra tests
Tom Walker [Sun, 27 Jul 2014 13:15:58 +0000 (14:15 +0100)]
finalised essay question type, added it to admin and readme, adjusted
sitting detail view to allow a marker to decide whether a question is
correct, added supporting methods to the sitting model
Tom Walker [Fri, 25 Jul 2014 22:25:34 +0000 (23:25 +0100)]
removing commented out line
Tom Walker [Fri, 25 Jul 2014 22:23:13 +0000 (23:23 +0100)]
added Essay question to admin, changed templates so they dont show
previous question if it was an essay question since it is not marked
automatically, updated sitting_detail view to show the answers that the
user gave for each question. next up - allow teacher to mark questions
in this view, resulting in updated score etc
tomwalker [Fri, 25 Jul 2014 17:20:46 +0000 (18:20 +0100)]
big commit, added a new method to questions to return guess as string, added sitting method to return questions with players guess for each
tomwalker [Thu, 24 Jul 2014 21:16:42 +0000 (22:16 +0100)]
add_user_answer added to the sitting model
tomwalker [Thu, 24 Jul 2014 20:49:59 +0000 (21:49 +0100)]
starting on new field in Sitting model to store all user answers in a sitting. This is necessary for essay type questions as they will need to be manually marked.
tomwalker [Thu, 24 Jul 2014 16:25:56 +0000 (17:25 +0100)]
small code cleanup
tomwalker [Thu, 24 Jul 2014 16:22:47 +0000 (17:22 +0100)]
added a new app called essay, which allows essay style questions
tomwalker [Thu, 24 Jul 2014 14:40:37 +0000 (15:40 +0100)]
template changed to show quiz score as percentage rather than score
Tom Walker [Thu, 24 Jul 2014 14:14:50 +0000 (15:14 +0100)]
removed a check to see if matching user or quiz existed when filtering completed exams on the marking page - just shows an empty set if none found
Tom Walker [Wed, 23 Jul 2014 16:00:16 +0000 (17:00 +0100)]
removed unused class from admin, added in filter for quiz marking list to filter by user or quiz title
Tom Walker [Tue, 22 Jul 2014 16:07:18 +0000 (17:07 +0100)]
added a permission (view_sittings) which allows users with that permission to view completed quizzes of other users - could be used for marking
Tom Walker [Mon, 21 Jul 2014 21:12:40 +0000 (22:12 +0100)]
added a new view which lists all completed exams, to allow an admin to view results
Tom Walker [Mon, 21 Jul 2014 14:46:48 +0000 (15:46 +0100)]
added two new fields to the quiz model which are used to customise the success message - one is displayed if you pass the exam, the other is shown if you fail
Tom Walker [Sun, 20 Jul 2014 16:41:21 +0000 (17:41 +0100)]
unused import
Tom Walker [Sun, 20 Jul 2014 16:39:05 +0000 (17:39 +0100)]
allowed ability to set pass mark
Tom Walker [Sun, 20 Jul 2014 15:21:09 +0000 (16:21 +0100)]
cleaning up templates
Tom Walker [Sat, 19 Jul 2014 18:43:13 +0000 (19:43 +0100)]
fixed small bug that meant selected questions were not saved when
creating a new quiz, meaning that the questions would have to be
reselected after the quiz was created.
Tom Walker [Fri, 18 Jul 2014 16:48:34 +0000 (17:48 +0100)]
cleaning up tests for all CBV based version
Tom Walker [Thu, 17 Jul 2014 12:01:35 +0000 (13:01 +0100)]
rejigged the quiz processing view - now its class based!
Tom Walker [Tue, 15 Jul 2014 21:05:11 +0000 (22:05 +0100)]
finally getting round to properly implementing forms with CBVs for the main portion of the quiz rather than hacking request objects :S
Tom Walker [Mon, 14 Jul 2014 20:40:50 +0000 (21:40 +0100)]
removing unused imports
Tom Walker [Mon, 14 Jul 2014 20:39:04 +0000 (21:39 +0100)]
tests for quiz.views.anon_session_score which were missing
Tom Walker [Sun, 13 Jul 2014 20:09:07 +0000 (21:09 +0100)]
pep8 related clean ups, updated for new push to pypi
Tom Walker [Sun, 13 Jul 2014 19:43:56 +0000 (20:43 +0100)]
cleaning up quiz/models to remove cruft!