Commit Graph

275 Commits (8a63e8e89cbf0aa968adbfcc3e6cc75668ae855e)

Author SHA1 Message Date
Sara Arenson 8a63e8e89c choice-multiple-values template restores saved box values upon reload.
Also saves associated box value even if there is only one item checked.
2015-11-30 19:24:10 -06:00
Jamie Campbell a96c7c142a Merge file:///home/jamiework/work/GAWork/ed-questionnaire-latestmark
pulling in changes supporting functionality for multiple checkbox/percent
2015-11-30 03:37:01 -06:00
Jamie Campbell ac17da206d changed the back button to use fully qualified url instead of simply history.back() 2015-11-30 03:36:00 -06:00
Mark Jenkins 2a022d1a34 Merge from Sara changes
Conflicts:
	questionnaire/qprocessors/choice.py
2015-11-30 01:52:49 -06:00
Sara Arenson 2cc58cb8dd question_multiple type now can also pair input boxes with checkboxes 2015-11-30 00:45:47 -06:00
Sara Arenson ce12d3d470 id field added to answer admin interface for easier debugging 2015-11-30 00:33:33 -06:00
Jamie Campbell da82126ac5 fill data if available 2015-11-29 02:49:33 -06:00
Jamie Campbell 90880bcd5e fill data from database if value not in post 2015-11-29 02:48:53 -06:00
Jamie Campbell dcb0182e93 added proper support for questionset heading 2015-11-29 02:47:33 -06:00
Jamie Campbell cad2bd3cfb shownif is shown if 2015-11-29 02:46:50 -06:00
Jamie Campbell a7088c2586 additional option for 'samechoicesas' 2015-11-29 02:46:08 -06:00
Jamie Campbell 667752d60b don't listify a non-list 2015-11-29 02:45:23 -06:00
Jamie Campbell ef649d9b31 migration to english fields 2015-11-29 01:35:45 -06:00
Griffin Caprio d41aaf8f37 Merge pull request #11 from eugena/master
All problems with commit and rollback were solved.
2015-08-23 18:28:12 -05:00
eugena 4df2cc6c7c Solving problem of compatibility (commit, rollback & Django > 1.6) 2015-08-15 22:36:18 +05:00
eugena 00b937176f Solving problem of compatibility (commit, rollback & Django > 1.6) 2015-08-15 22:34:03 +05:00
Griffin Caprio 706319320e Merge pull request #10 from eugena/master
Solving problem of compatibility (commit_on_success & Django > 1.6)
2015-08-09 15:42:04 -05:00
eugena 5c32cc574f Solving problem of compatibility (commit_on_success & Django > 1.6) 2015-08-04 10:28:20 +05:00
gcaprio 692ed44cb3 Merge pull request #9 from gabivoicu/add-comment-about-django1.7-issue
add comment about issue with Django 1.7
2015-07-18 15:09:51 -05:00
Gabriela Voicu 72bc32e6a1 add comment about issue with Django 1.7 2015-07-18 13:33:22 -05:00
gcaprio b165aa8f73 Merge pull request #7 from gabivoicu/complete-setup-of-project
Complete setup of project
2015-06-14 19:49:39 -05:00
Gabriela Voicu c2dc2cf4e7 fix link & formatting 2015-06-13 20:34:53 -05:00
Gabriela Voicu ad5cdabeea remove ls folder 2015-06-13 20:27:42 -05:00
Gabriela Voicu e61a6190b6 add new neede steps to installation in README 2015-06-13 19:51:14 -05:00
gcaprio b1ce6a8e5c Merge pull request #6 from gabivoicu/improve-readme-take-one
fix typos
2015-06-04 21:38:01 -05:00
Gabriela Voicu e7994436d0 fix typos
improve wording in a couple places
fix formatting
2015-06-04 21:03:41 -05:00
Griffin Caprio dea7907b14 Forgot one revert 2015-04-15 07:44:52 -05:00
Griffin Caprio 3f0c65a2cf Reverting change 2015-04-15 07:38:30 -05:00
Griffin Caprio 3b752628ba Fixing crash when not debugging questionanires; 2015-04-13 22:13:15 -05:00
Griffin Caprio 5b5b54e139 Fixing case where there is a nagative check for a quesiton that has not been asked 2015-04-13 19:55:29 -05:00
Griffin Caprio 245e7436de Typo 2015-04-03 12:00:15 -05:00
Griffin Caprio e9c5f7d1dd Updating code of conduct 2015-04-03 11:47:21 -05:00
Griffin Caprio 3068791744 Adding sort id to question display within questionset 2015-03-10 17:47:13 -05:00
Griffin Caprio c8b1a91875 Rolling back comment changes 2015-02-27 07:08:26 -06:00
Griffin Caprio 81136d8ac3 Adding property to Question to determine if it's a comment 2015-02-27 07:01:39 -06:00
Griffin Caprio bf964b9930 Reformatting & updating to process comment question 2015-02-26 20:09:39 -06:00
Griffin Caprio 552104d075 Whitespace & cleanup 2015-02-13 17:42:41 -06:00
Griffin Caprio f4dd65429e Fixing typo 2015-02-13 17:40:38 -06:00
Griffin Caprio 829ad54b5e Fixing html tag 2015-01-16 09:21:39 -06:00
Griffin Caprio 4bbe456c79 Moving previous answers below form 2015-01-13 16:26:17 -06:00
Griffin Caprio 76b3791bee Adding previous answers display 2015-01-09 09:13:25 -06:00
Griffin Caprio 4e24bbd336 Adding debug processing for including current questionnaire answers when rendering questionsets 2015-01-08 19:24:23 -06:00
Griffin Caprio db21e0871d Adding context processor to include settings. 2015-01-08 19:23:57 -06:00
Griffin Caprio 978bae6e97 Increase column size 2015-01-07 17:52:12 -06:00
Griffin Caprio f30492472a Adding extra check for negative checks where question wasn't asked 2015-01-07 14:34:47 -06:00
Griffin Caprio 22a8f7e214 Fixing case for freeform answers 2015-01-06 18:53:58 -06:00
Griffin Caprio 7ad30322b2 Updating dependency checker for multiple choice questions 2015-01-06 17:44:41 -06:00
Griffin Caprio 7cb9dbbb2e Starting to add new functioning tests, beginning with dependency checker 2015-01-06 16:45:49 -06:00
Griffin Caprio b2face2680 Adding Code of Conduct 2015-01-04 18:33:55 -06:00
Griffin Caprio 1d4608ff40 Rolling back 2015-01-03 22:15:23 -06:00