Commit Graph

68 Commits (72790b421d67485b805481d26d9a8205a722d2c8)

Author SHA1 Message Date
eric 72790b421d general renovations 2016-07-26 17:08:23 -04:00
Jamie Campbell 81595b2e04 Merge branch 'master' of file:///home/jamiework/work/GAWork/ed-questionnaire
Conflicts:
	questionnaire/admin.py
	questionnaire/views.py
2016-01-13 03:50:32 -06:00
Jamie Campbell fadcec2fd2 completed work for granular style control 2016-01-13 03:32:55 -06:00
Jamie Campbell 2b43514b95 Merge commit 'e5ba454' 2015-12-21 12:22:42 -06:00
Jamie Campbell 5ea374d060 work towards more granular style control 2015-12-21 11:43:02 -06:00
Sara Arenson e5ba4547c7 choice-multiple-values: Checkboxes align with text
Put checkbox and choice text inside the same SPAN, so they now line up.
2015-12-17 10:23:53 -06:00
Jamie Campbell eac8ab5bd5 work towards database drive stylesheet configurability 2015-12-14 01:26:02 -06:00
Jamie Campbell 259e3850c4 added question id to the list of information displayed 2015-12-13 23:29:44 -06:00
Sara Arenson 08d2251f7d Multiple value boxes are now aligned in questionset.js
Now choice-multiple-freeform template calls function in questionset.js,
rather than including the same code for each question.
2015-12-09 12:16:07 -06:00
Sara Arenson ad9b327558 choice-multiple-values questions now align after longest string
Added Javascript to template.

Adjusted CSS so the max width can be a bit wider.
This won't affect Javascript.

Still need to refactor so code is tidier - right now same code included
multiple times on pages.
2015-12-09 12:03:22 -06:00
Jamie Campbell 7721d782d9 changed so that clicking anywhere on the line no longer changes the checkbox, you have to click the checkbox itself 2015-12-07 19:00:58 -06:00
Sara Arenson 5025e26b12 choice-multiple-values now aligns value boxes (shortens choice text)
Note: removed class from span containing value box and put it around span
containing choice's text

Choice text will wrap if necessary.

Currently, width of choice text is 35% - see questionnaire.css
2015-12-02 11:48:18 -06:00
Mark Jenkins 3d06cd5570 Merge Sara and Jamie's work from November 30 and December 1 together 2015-12-01 23:59:17 -06:00
Jamie Campbell b134e26b3a added support to question and questionset for rendering content as html instead of the default which just shows html tags as part of the content 2015-12-01 20:46:28 -06:00
Jamie Campbell 98abcf2196 added support for conditional display of footers, initially used to show the user the answer after they make a guess 2015-12-01 20:06:54 -06:00
Jamie Campbell 4cc490adba extended the framework to actually sort questions the way it claims to sort questions 2015-12-01 15:51:35 -06:00
Sara Arenson 878d453190 Added % sign to choice-multiple-values control - JS also show/hide SPAN
choice-multiple-freeform.html: Text box and % sign wrapped up in the same
SPAN that now has a dependency check instead of the dependency check being
on the text box inside.

questionnaire.css: No need for styling disabled input boxes anymore for
this question type. Span disappears, not box.

questionset.js: Added ability to show/hide spans (with triggers).

choice.py: Had to change jstriggers to set off containing SPAN, not
input box.
2015-12-01 14:50:30 -06:00
Sara Arenson 36d1f2ba9a choice-multiple-values now disappears disabled input boxes 2015-12-01 14:16:38 -06:00
Sara Arenson d6a51aa916 choice-multiple-values: checkboxes now enable and disable input fields
Works both on page load and when user interacts. Remembers to
enable/disable checkbox on returning.

choice.py: Added jstriggers for text fields (so they'd be triggered when
checkboxes are checked/unchecked), and return a new dict item qvalues
which contains string qnum_value for each choice selected.

choice-multiple-freeform.html: Now has a dependency check for each
input box - dependent on associated checkbox being checked.

views.py: show_questionnaire() now processes qdict['qvalues'] to send
to questionset.html to trigger initial valchanged() calls - to make sure
inputs are properly enabled/disabled when page loads.

*** This may also allow display of other questions to be conditional on
values of choice-multiple questions.
2015-11-30 23:17:34 -06:00
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
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
Jamie Campbell da82126ac5 fill data if available 2015-11-29 02:49:33 -06:00
Jamie Campbell dcb0182e93 added proper support for questionset heading 2015-11-29 02:47:33 -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 4f726511eb Fixing missing ul tag 2014-12-09 18:24:17 -06:00
Daniel Rozenberg 0769790c22 Added dropdown (<select>) question type. 2014-11-07 12:18:03 -08:00
matteo.cafarotti e96772542a fixes displaying of sub Questions i.e 1a 2014-10-10 13:15:46 +02:00
Julio C. Menendez 245ae4e15c Fixes returning to previous page when using sessions. 2014-09-14 09:36:08 -06: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 ac530cebda Fixed jquery import in questionset.html (the path did not match the actual file). 2014-07-13 15:51:48 +02:00
Piotr Szachewicz f77421d2ce Added a NUMBER question type.
(Uses the same code as the already implemented RANGE question type).
2014-07-13 15:50:53 +02:00
Adam Hill 186f7a2d8d Remove textile code. Use static. 2013-12-28 22:09:00 -05:00
Denis Krienbühl f432f6b785 Adds extra to all question types 2012-02-21 10:09:21 +01:00
Denis Krienbühl 671a68465e Adds an optional footer text for each question with textile markup 2012-01-31 16:22:00 +01:00
Denis Krienbühl f36c2ce220 Adds extra text to range input 2012-01-31 12:27:40 +01:00
Denis Krienbühl 9d34dcf55f Adds progressbar configurations default, async and none. The configuration values are explained in the example/settings.py file 2012-01-24 11:51:11 +01:00
Denis Krienbühl 7af664cfd7 Adds jquery as dependency and uses it to block and animate the submit button of the quesitonnaire forms 2012-01-17 14:46:44 +01:00
Denis Krienbühl 1f1b097acd Adds extra text to open question and adjusts the top margin slightly 2012-01-17 09:25:50 +01:00
Denis Krienbühl 1d2f5def85 Replaces the existing range drop-down widget with a html5 range input.
* For older browsers there's a javascript fallback which ensures that the values entered into the text input are fall within min-max and are divisable by step.
 * The new widget adds two new checks - step and unit.
 * The unit is displayed next to the input element.
2012-01-16 16:06:43 +01:00
Denis Krienbühl fbd96f9778 Adds tests for the tags and simplifies progress code 2011-12-22 10:22:33 +01:00
Denis Krienbühl ecdb8b2e06 Moves page module from example to questionnaire and adds csrf protection 2011-12-17 11:21:42 +01:00
Denis Krienbühl dd5f94f6bf Merges the css from base and questionset 2011-12-16 10:28:23 +01:00
Denis Krienbühl e60b9c2814 Moves styles to a separate file 2011-12-16 10:23:50 +01:00
Denis Krienbühl e523b67136 Adds css only progressbar 2011-12-15 17:31:50 +01:00
Denis Krienbühl 2eed37c0d6 Changes style to better fit in with bootstrap 2011-12-15 16:21:45 +01:00
Denis Krienbühl b7f997dc10 Gets rid of the newline / nobreak feature.
With the newline / nobreak feature a user could align multiple questions horizontally.

Apart from the fact that I'm not sure if it is even used I would rather implement it by using css instead of <br/> calls in different widgets. As it was it didn't really work well with twitter bootstrap, so I'd rather take it out of the equation for now and concentrate on good default rendering.
2011-12-15 14:13:17 +01:00
Denis Krienbühl 23b943d8bc Adds default comment template to avoid errors if it is not defined by the site 2011-12-15 14:07:51 +01:00