]> git.parisson.com Git - django_quiz.git/log
django_quiz.git
10 years agochanged request.POST object to empty dict rather than empty string before GET redirec...
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

10 years agotests for the new features
tomwalker [Wed, 6 Aug 2014 18:50:08 +0000 (19:50 +0100)]
tests for the new features

10 years agomissed a bracket
tomwalker [Wed, 6 Aug 2014 15:04:47 +0000 (16:04 +0100)]
missed a bracket

10 years agoupdated feature list
tomwalker [Wed, 6 Aug 2014 14:53:41 +0000 (15:53 +0100)]
updated feature list

10 years agoupdated contributors
tomwalker [Wed, 6 Aug 2014 14:49:56 +0000 (15:49 +0100)]
updated contributors

10 years agoupdated tests to work alongside pull request from Richard Mansfield
tomwalker [Wed, 6 Aug 2014 14:49:05 +0000 (15:49 +0100)]
updated tests to work alongside pull request from Richard Mansfield

10 years agoMerge pull request #14 from trident-systems/max_questions
Tom Walker [Wed, 6 Aug 2014 13:44:34 +0000 (14:44 +0100)]
Merge pull request #14 from trident-systems/max_questions

Max questions

10 years agoDisplay answer in readable format on marking detail page
Richard Mansfield [Wed, 6 Aug 2014 02:37:30 +0000 (14:37 +1200)]
Display answer in readable format on marking detail page

10 years agoShow completed date on marking detail page
Richard Mansfield [Wed, 6 Aug 2014 02:36:54 +0000 (14:36 +1200)]
Show completed date on marking detail page

10 years agoAdd start, end times to a sitting; display completion date on marking 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

10 years agoHandle incorrect question toggle via post
Richard Mansfield [Wed, 6 Aug 2014 01:34:15 +0000 (13:34 +1200)]
Handle incorrect question toggle via post

10 years agoShow max_score for each attempt in progress template
Richard Mansfield [Wed, 6 Aug 2014 00:15:06 +0000 (12:15 +1200)]
Show max_score for each attempt in progress template

10 years agoStore session info for anonymous users taking max_questions quiz
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.

10 years agoAdd option to take a subset of the questions in a quiz
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.

10 years agomade quiz.progress.list_all_cat_scores a property, changed quiz.progress.update_score...
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)

10 years agosmall fix for errors in admin, also added ability to filter subcategories by their...
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

10 years agoMerge branch 'master' of https://github.com/tomwalker/django-quiz
tomwalker [Thu, 31 Jul 2014 16:44:48 +0000 (17:44 +0100)]
Merge branch 'master' of https://github.com/tomwalker/django-quiz

10 years agounit test that image with the question content as its alt is shown when viewing a...
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

10 years agotests for image field
tomwalker [Thu, 31 Jul 2014 15:46:04 +0000 (16:46 +0100)]
tests for image field

10 years agoMerge branch 'dev' of https://github.com/tomwalker/django-quiz into dev
tomwalker [Thu, 31 Jul 2014 15:04:28 +0000 (16:04 +0100)]
Merge branch 'dev' of https://github.com/tomwalker/django-quiz into dev

10 years agoupdated readme with contributors section and updated features certifiedclouds commits
tomwalker [Thu, 31 Jul 2014 15:03:34 +0000 (16:03 +0100)]
updated readme with contributors section and updated features certifiedclouds commits

10 years agoMerge pull request #11 from certifiedloud/dev
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

10 years agoadjusted Sub_Category class to SubCategory, included some basic tests for subcategory
tomwalker [Thu, 31 Jul 2014 14:55:20 +0000 (15:55 +0100)]
adjusted Sub_Category class to SubCategory, included some basic tests for subcategory

10 years agofixed invalid html in question.html template
Cody Heimberger [Thu, 31 Jul 2014 14:46:31 +0000 (08:46 -0600)]
fixed invalid html in question.html template

10 years agoMerge pull request #10 from certifiedloud/dev
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

10 years agoMerge pull request #1 from certifiedloud/master
certifiedloud [Thu, 31 Jul 2014 12:11:52 +0000 (06:11 -0600)]
Merge pull request #1 from certifiedloud/master

merging master and dev branches

10 years agoadded sub_categories to questions
Cody Heimberger [Thu, 31 Jul 2014 12:07:31 +0000 (06:07 -0600)]
added sub_categories to questions

10 years agoMerge pull request #7 from certifiedloud/master
Tom Walker [Thu, 31 Jul 2014 09:52:55 +0000 (10:52 +0100)]
Merge pull request #7 from certifiedloud/master

Added support for figures

10 years agowhite space change
certifiedloud [Wed, 30 Jul 2014 22:25:56 +0000 (16:25 -0600)]
white space change

10 years agoMerge branch 'master' of https://github.com/certifiedloud/django_quiz
Cody Heimberger [Wed, 30 Jul 2014 22:04:50 +0000 (16:04 -0600)]
Merge branch 'master' of https://github.com/certifiedloud/django_quiz

10 years agoadded pillow to the requirements.txt file for image uploads
Cody Heimberger [Wed, 30 Jul 2014 22:03:16 +0000 (16:03 -0600)]
added pillow to the requirements.txt file for image uploads

10 years agoUpdate models.py
certifiedloud [Wed, 30 Jul 2014 21:49:37 +0000 (15:49 -0600)]
Update models.py

10 years agoadded support for figures in true_false and multiple choice questions
Cody Heimberger [Wed, 30 Jul 2014 21:44:21 +0000 (15:44 -0600)]
added support for figures in true_false and multiple choice questions

10 years agoupdate to 0.5.0
tomwalker [Wed, 30 Jul 2014 09:20:54 +0000 (10:20 +0100)]
update to 0.5.0

10 years agomore cleaning up of the main view
tomwalker [Tue, 29 Jul 2014 20:19:49 +0000 (21:19 +0100)]
more cleaning up of the main view

10 years agomore slimming down of the views
Tom Walker [Mon, 28 Jul 2014 20:46:18 +0000 (21:46 +0100)]
more slimming down of the views

10 years agoslimming down the views
Tom Walker [Mon, 28 Jul 2014 18:02:21 +0000 (19:02 +0100)]
slimming down the views

10 years agoAdded a new manager for the sitting object to load sitting for a user
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.

10 years agocleaning up code, improving the default template
Tom Walker [Sun, 27 Jul 2014 21:14:57 +0000 (22:14 +0100)]
cleaning up code, improving the default template

10 years agoremoving unused files
Tom Walker [Sun, 27 Jul 2014 17:30:15 +0000 (18:30 +0100)]
removing unused files

10 years agoreadme readme
Tom Walker [Sun, 27 Jul 2014 16:35:14 +0000 (17:35 +0100)]
readme readme

10 years agoadded travis build image to readme
Tom Walker [Sun, 27 Jul 2014 16:33:27 +0000 (17:33 +0100)]
added travis build image to readme

10 years agosetup, not manage
Tom Walker [Sun, 27 Jul 2014 16:30:53 +0000 (17:30 +0100)]
setup, not manage

10 years agotrying to get travis to work....
Tom Walker [Sun, 27 Jul 2014 16:29:24 +0000 (17:29 +0100)]
trying to get travis to work....

10 years agotravis...
Tom Walker [Sun, 27 Jul 2014 15:50:13 +0000 (16:50 +0100)]
travis...

10 years agosmall update to readme
Tom Walker [Sun, 27 Jul 2014 15:46:09 +0000 (16:46 +0100)]
small update to readme

10 years agoadded travis file
Tom Walker [Sun, 27 Jul 2014 15:42:52 +0000 (16:42 +0100)]
added travis file

10 years agolining up a bracker in urls.py
Tom Walker [Sun, 27 Jul 2014 15:23:49 +0000 (16:23 +0100)]
lining up a bracker in urls.py

10 years agocode cleanup and extra tests
Tom Walker [Sun, 27 Jul 2014 15:20:52 +0000 (16:20 +0100)]
code cleanup and extra tests

10 years agofinalised essay question type, added it to admin and readme, adjusted
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

10 years agoremoving commented out line
Tom Walker [Fri, 25 Jul 2014 22:25:34 +0000 (23:25 +0100)]
removing commented out line

10 years agoadded Essay question to admin, changed templates so they dont show
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

10 years agobig commit, added a new method to questions to return guess as string, added sitting...
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

10 years agoadd_user_answer added to the sitting model
tomwalker [Thu, 24 Jul 2014 21:16:42 +0000 (22:16 +0100)]
add_user_answer added to the sitting model

10 years agostarting on new field in Sitting model to store all user answers in a sitting. This...
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.

10 years agosmall code cleanup
tomwalker [Thu, 24 Jul 2014 16:25:56 +0000 (17:25 +0100)]
small code cleanup

10 years agoadded a new app called essay, which allows essay style questions
tomwalker [Thu, 24 Jul 2014 16:22:47 +0000 (17:22 +0100)]
added a new app called essay, which allows essay style questions

10 years agotemplate changed to show quiz score as percentage rather than score
tomwalker [Thu, 24 Jul 2014 14:40:37 +0000 (15:40 +0100)]
template changed to show quiz score as percentage rather than score

10 years agoremoved a check to see if matching user or quiz existed when filtering completed...
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

10 years agoremoved unused class from admin, added in filter for quiz marking list to filter...
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

10 years agoadded a permission (view_sittings) which allows users with that permission to view...
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

10 years agoadded a new view which lists all completed exams, to allow an admin to view results
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

10 years agoadded two new fields to the quiz model which are used to customise the success messag...
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

10 years agounused import
Tom Walker [Sun, 20 Jul 2014 16:41:21 +0000 (17:41 +0100)]
unused import

10 years agoallowed ability to set pass mark
Tom Walker [Sun, 20 Jul 2014 16:39:05 +0000 (17:39 +0100)]
allowed ability to set pass mark

10 years agocleaning up templates
Tom Walker [Sun, 20 Jul 2014 15:21:09 +0000 (16:21 +0100)]
cleaning up templates

10 years agofixed small bug that meant selected questions were not saved when
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.

10 years agocleaning up tests for all CBV based version
Tom Walker [Fri, 18 Jul 2014 16:48:34 +0000 (17:48 +0100)]
cleaning up tests for all CBV based version

10 years agorejigged the quiz processing view - now its class based!
Tom Walker [Thu, 17 Jul 2014 12:01:35 +0000 (13:01 +0100)]
rejigged the quiz processing view - now its class based!

10 years agofinally getting round to properly implementing forms with CBVs for the main portion...
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

10 years agoremoving unused imports
Tom Walker [Mon, 14 Jul 2014 20:40:50 +0000 (21:40 +0100)]
removing unused imports

10 years agotests for quiz.views.anon_session_score which were missing
Tom Walker [Mon, 14 Jul 2014 20:39:04 +0000 (21:39 +0100)]
tests for quiz.views.anon_session_score which were missing

10 years agopep8 related clean ups, updated for new push to pypi
Tom Walker [Sun, 13 Jul 2014 20:09:07 +0000 (21:09 +0100)]
pep8 related clean ups, updated for new push to pypi

10 years agocleaning up quiz/models to remove cruft!
Tom Walker [Sun, 13 Jul 2014 19:43:56 +0000 (20:43 +0100)]
cleaning up quiz/models to remove cruft!

10 years agoremoved the template tag user_previous_exam
Tom Walker [Sun, 13 Jul 2014 18:48:46 +0000 (19:48 +0100)]
removed the template tag user_previous_exam

10 years agoRemoving everything I can from template tags, putting them into models or views....
Tom Walker [Sat, 12 Jul 2014 21:23:56 +0000 (22:23 +0100)]
Removing everything I can from template tags, putting them into models or views. Found a useful little hack when comparing integers and strings in templates: http://victorelu.com/blog/comparing-string-with-integer-in-djangos-template/

10 years agoworking to improve code for processing of anon users.
Tom Walker [Fri, 11 Jul 2014 15:56:21 +0000 (16:56 +0100)]
working to improve code for processing of anon users.

10 years agoslimming down template tags, moved another function from template tags to model metho...
Tom Walker [Thu, 10 Jul 2014 19:26:36 +0000 (20:26 +0100)]
slimming down template tags, moved another function from template tags to model method, simplified a few templates

10 years agomoved another function from templatetags by adding a new method to
Tom Walker [Wed, 9 Jul 2014 22:22:54 +0000 (23:22 +0100)]
moved another function from templatetags by adding a new method to
question models

10 years agoremoving logic from templates, reducing the complexity of template tags
Tom Walker [Wed, 9 Jul 2014 21:44:48 +0000 (22:44 +0100)]
removing logic from templates, reducing the complexity of template tags

10 years agochanged order of view functions to see user and anon related views
Tom Walker [Tue, 8 Jul 2014 16:58:55 +0000 (17:58 +0100)]
changed order of view functions to see user and anon related views
easier. Cleaned up question template. Return a question instead of ID in
sitting.get_first_question().

10 years agoremoved some unnecessary view functions, removed page counter which was
Tom Walker [Tue, 8 Jul 2014 15:15:55 +0000 (16:15 +0100)]
removed some unnecessary view functions, removed page counter which was
used to display an advert every X number of pages

10 years agotrimming down bloat from quiz/views.py, used CBV as the starting page
Tom Walker [Mon, 7 Jul 2014 22:05:23 +0000 (23:05 +0100)]
trimming down bloat from quiz/views.py, used CBV as the starting page
for a quiz

10 years agoforgot a file
Tom Walker [Fri, 4 Jul 2014 14:40:47 +0000 (15:40 +0100)]
forgot a file

10 years agomoved towards CBVs for simples views, next step is to convert complicated views into...
Tom Walker [Fri, 4 Jul 2014 14:33:25 +0000 (15:33 +0100)]
moved towards CBVs for simples views, next step is to convert complicated views into mix of CBVs and forms with custom validation

10 years agoreading 2scoops of django, making changes! Relative explicit imports
Tom Walker [Wed, 2 Jul 2014 21:10:17 +0000 (22:10 +0100)]
reading 2scoops of django, making changes! Relative explicit imports

10 years agopep8 everything
Tom Walker [Wed, 2 Jul 2014 16:03:49 +0000 (17:03 +0100)]
pep8 everything

10 years agofiddles...
Tom Walker [Tue, 1 Jul 2014 15:50:55 +0000 (16:50 +0100)]
fiddles...

10 years agoadded readme.rst for Pypi
Tom Walker [Tue, 1 Jul 2014 12:02:14 +0000 (13:02 +0100)]
added readme.rst for Pypi

10 years ago.gitignore updates
Tom Walker [Tue, 1 Jul 2014 11:41:58 +0000 (12:41 +0100)]
.gitignore updates

10 years agofiddling really
Tom Walker [Mon, 30 Jun 2014 20:23:15 +0000 (21:23 +0100)]
fiddling really

10 years agoMerge branch 'dev'
Tom Walker [Mon, 30 Jun 2014 19:22:31 +0000 (20:22 +0100)]
Merge branch 'dev'

Conflicts:
.gitignore

10 years agochanges to readme
Tom Walker [Mon, 30 Jun 2014 19:18:42 +0000 (20:18 +0100)]
changes to readme

10 years agopreparing for release
Tom Walker [Mon, 30 Jun 2014 18:49:46 +0000 (19:49 +0100)]
preparing for release

10 years agoadded the option to allow a quiz to be only sat once by registered users, not at...
Tom Walker [Mon, 30 Jun 2014 16:45:33 +0000 (17:45 +0100)]
added the option to allow a quiz to be only sat once by registered users, not at all by anonymous users.

10 years agochanged quiz/models fields to CommaSeparatedIntegerField when appropriate
Tom Walker [Sun, 29 Jun 2014 17:54:20 +0000 (18:54 +0100)]
changed quiz/models fields to CommaSeparatedIntegerField when appropriate

10 years agofinished template tag tests
Tom Walker [Fri, 27 Jun 2014 18:00:47 +0000 (19:00 +0100)]
finished template tag tests

10 years agoWorking on the tests for the template tags. Updated to show which selection you chose...
Tom Walker [Thu, 26 Jun 2014 21:49:09 +0000 (22:49 +0100)]
Working on the tests for the template tags. Updated to show which selection you chose if you got a question wrong, rather than just seeing the correct answer.

10 years agomoved templates around, fiddled with a few, some changes to template tags and tests
Tom Walker [Wed, 25 Jun 2014 21:40:19 +0000 (22:40 +0100)]
moved templates around, fiddled with a few, some changes to template tags and tests

10 years agofinal tests for the quiz/views of logged in users
Tom Walker [Wed, 25 Jun 2014 18:45:44 +0000 (19:45 +0100)]
final tests for the quiz/views of logged in users