Commit Graph

369 Commits (master)

Author SHA1 Message Date
Griffin Caprio 2433ec072c Fixing markdown 2014-12-09 16:31:33 -06:00
Griffin Caprio 19fb65533f First cut at repo specific updates 2014-12-09 15:57:51 -06:00
Griffin Caprio df3b1ea088 Fixing case where negative condition is being evaluated for skipped question 2014-12-05 18:32:33 -06:00
Denis Krienbühl 3233f93a49 Document the current state of this project in the README
As requested in #41
2014-12-04 17:37:20 +01:00
Denis Krienbühl 0a680f764e Merge pull request #43 from caffodian/master
fix the null subject case
2014-12-03 08:44:05 +01:00
Alex Tsai 2cc0fea6ab fix the null subject case 2014-12-02 16:28:51 -08:00
Denis Krienbühl 7183cf0430 Merge pull request #38 from gcaprio/master
Adding support for passing subject id into questionnaire run creation
2014-11-11 16:29:40 +01:00
Griffin Caprio e8db551c9e Moving error handling to use get_object_or_404 for more explicit workflow 2014-11-11 09:26:00 -06:00
Griffin Caprio fd4351e693 Adding optional check 2014-11-10 15:58:37 -06:00
Griffin Caprio e7db80b16e Merging latest from master 2014-11-10 15:52:59 -06:00
Denis Krienbühl e640fae36f Merge pull request #37 from daniboy/enable_submit_button_on_browser_back
Enabled submit button when user clicks their browser back button.
2014-11-10 09:04:09 +01:00
Denis Krienbühl 0e10ceca54 Merge pull request #36 from daniboy/dropdown_question_type
Added dropdown (<select>) question type.
2014-11-10 09:03:45 +01:00
Daniel Rozenberg 8acd0a860c Enabled submit button when user clicks their browser back button. 2014-11-07 15:16:13 -08:00
Daniel Rozenberg 0769790c22 Added dropdown (<select>) question type. 2014-11-07 12:18:03 -08:00
Denis Krienbühl 5e3f425271 Merge pull request #33 from daniboy/master
Perform natural sort on question number.
2014-11-06 08:30:10 +01:00
Denis Krienbühl 9241dab2e2 Merge pull request #34 from daniboy/start_signals
Added questionnaire_start and questionset_start signals.
2014-11-05 09:01:00 +01:00
Daniel Rozenberg 223ac4862b Added questionnaire_start and questionset_start signals. 2014-11-04 18:00:10 -08:00
Daniel Rozenberg 5fef81a1ef Perform natural sort on question number using Python instead of relying on DB implementation specifics 2014-11-03 12:01:26 -08:00
Griffin Caprio 17a03ff44e Merging upstream 2014-11-02 17:08:35 -06:00
Daniel Rozenberg f3317badaf Perform natural sort on question number. 2014-11-02 14:01:03 -08:00
Denis Krienbühl 4b0a8c297f Merge pull request #32 from daniboy/master
Replaces mimetype= with content_type= in calls to HttpResponse, updated for Django 1.6+
2014-10-29 08:52:20 +01:00
Daniel Rozenberg 2ee0710a6f Replaces mimetype= with content_type= in calls to HttpResponse, updated for Django 1.6+ 2014-10-28 15:20:41 -07:00
Griffin Caprio a0e0c73f6c Adding optional subject id 2014-10-20 11:52:56 -05:00
Denis Krienbühl 493fd138ed Merge pull request #30 from bugman80/master
fixes missing import into emails module
2014-10-12 12:38:40 +02:00
matteo.cafarotti fe68a20ea5 fixes missing import into emails module 2014-10-12 10:22:55 +02:00
Denis Krienbühl 89b7019a58 Merge pull request #29 from bugman80/master
fixes search for Answer model into admin section
2014-10-10 13:20:50 +02:00
matteo.cafarotti e96772542a fixes displaying of sub Questions i.e 1a 2014-10-10 13:15:46 +02:00
matteo.cafarotti ac6768017a fixes search for Answer into admin section 2014-10-10 12:50:58 +02:00
Denis Krienbühl ad19e90d43 Merge pull request #28 from bugman80/master
fixes bug in questions ordering
2014-10-08 13:01:56 +02:00
matteo.cafarotti b7057b299a fixes bug in questions ordering 2014-10-08 12:28:08 +02:00
Denis Krienbühl 1c69c6577e Merge pull request #27 from bugman80/master
fix for QuestionSet model for broken link to Textile docs and for being correctly displayed into admin
2014-10-07 12:10:55 +02:00
matteo.cafarotti 396e91c564 fixes broken link 2014-10-07 11:37:31 +02:00
matteo.cafarotti 30b83abb42 simple fix for having QuestionSet model correctly displayed into admin 2014-10-07 11:25:23 +02:00
Denis Krienbühl b0434f0eb4 Merge pull request #26 from bugman80/master
fixes for Django 1.6 and other minor fixes
2014-10-06 08:56:57 +02:00
matteo.cafarotti 002f8995b4 fixes inconsistency in finish_questionnaire method 2014-10-04 12:42:21 +02:00
matteo.cafarotti 1b32db573f added entries for pydev development into gitignore 2014-10-04 11:57:44 +02:00
matteo.cafarotti 75bea41678 updated README 2014-10-04 11:43:18 +02:00
matteo.cafarotti aaec14170e fixes for Dj1.6 compatibility 2014-10-04 11:37:06 +02:00
matteo.cafarotti e8347d3815 fixes for Page model translation into admin, fix for Dj1.6 compatibility 2014-10-04 11:22:47 +02:00
Denis Krienbühl 7ef7ad3eff Merge pull request #22 from juliomenendez/clean_urls_with_session
Use sessions instead of putting the run key and page in the URLs.
2014-09-15 15:33:23 +02:00
Julio C. Menendez 0cd67028f9 Sets QUESTIONNAIRE_USE_SESSION in the example.
Includes a brief explanation of how the setting changes the app
behavior.
2014-09-15 07:28:29 -06:00
Julio C. Menendez 245ae4e15c Fixes returning to previous page when using sessions. 2014-09-14 09:36:08 -06:00
Julio C. Menendez e3ee50530e Allows keeping track of current questionnaire and questionnaire set with sessions instead of url args. 2014-09-14 08:51:29 -06:00
Denis Krienbühl 693dd39527 Merge pull request #21 from piotr-szachewicz/master
Some new features and fixes to the seantis-questionnaire app.
2014-07-30 13:49:16 +02:00
Piotr Szachewicz 340d50dee1 Removed unnecessary print statements in the Answer model. 2014-07-18 17:57:21 +02:00
Piotr Szachewicz 20996703f9 Small fixes and updates in the README.md file. 2014-07-13 23:22:42 +02:00
Piotr Szachewicz f8e3744b9e Substitute_answer throwed an exception for empty answer values. 2014-07-13 19:30:45 +02:00
Piotr Szachewicz e61d1e4de2 Bugfix - iftag="" did not work for a question that is in a questionset, in which other questions should be visible.
In that case, even though the question did not fulfill the iftag requirement it was shown.

Conflicts:
	questionnaire/views.py
2014-07-13 16:35:54 +02:00
Piotr Szachewicz fb0e97c03b Made Question#extra field max_length larger (128 -> 512).
Conflicts:
	questionnaire/models.py
2014-07-13 16:30:31 +02:00
Piotr Szachewicz fab1c8b37a It is possible to show all questionniare questions when adding show_all=1 GET parameter.
It is useful for debugging purposes, when you want to see all questions rendered
on one screen.

Conflicts:
	questionnaire/views.py
2014-07-13 16:21:03 +02:00