Commit Graph

200 Commits (5699cfc690a2e688f7441e210a48624347c96d20)

Author SHA1 Message Date
Frode Petterson 367b2b3131 Merge branch 'stable' 2017-07-18 12:43:24 +02:00
Frode Petterson aaedd545f7 Fix missing default 2017-07-18 10:08:10 +02:00
Frode Petterson 6a762b8223 Move old feedback into a separate deprecated group
HFP-1174
2017-07-13 15:51:24 +02:00
Paal Joergensen 9401e5abe3 Added overall feedback to question set + bonus fixes [HFP-1174] 2017-07-03 15:09:49 +02:00
Frode Petterson 0f383f775f Merge branch 'HFP-574-remove-override-settings' 2017-06-12 13:50:15 +02:00
Frode Petterson e7e83f43ce Revert "Merge pull request #11 from SergeyYukhnevich/add-override-of-check-button"
This reverts commit 6c86c8ac9d, reversing
changes made to 976e9567c6.
2017-06-12 11:07:31 +02:00
Frode Petterson 6c86c8ac9d Merge pull request #11 from SergeyYukhnevich/add-override-of-check-button
Add ability to override check button
2017-06-12 10:11:31 +02:00
Tom Arild Jakobsen 976e9567c6 Fix bug where Question Set children without media fails. HFP-1181 2017-06-07 14:44:42 +02:00
Tom Arild Jakobsen df11efd681 Merge branch 'master' of github.com:h5p/h5p-question-set into HFP-574-remove-override-settings 2017-06-07 12:46:11 +02:00
Sergey Yuhnevich 00f6e30297 Add ability to override check button 2017-06-02 15:02:27 +03:00
Paal Joergensen b3887c0f56 Merge branch 'HFP-815-QS-multiple-autoplay-issue' 2017-05-10 12:38:42 +02:00
Timothy Lim 9cf00d897d HFP-29 Merge with master 2017-05-10 10:23:49 +02:00
Andreas Nergaard 6374504868 HFP-815 Added function to limit number of auto plays at a time. 2017-05-09 10:27:50 +02:00
Tom Arild Jakobsen 45b00ffc14 Remove deprecated and unneeded reference to 'overrideSettings'. HFP-574 2017-05-08 13:59:38 +02:00
thomasmars 5b0736f0e8 Added score to getXAPIData call
HFP-255
2016-11-24 17:29:47 +01:00
Timothy Lim 29d122be50 Update questionset.js 2016-11-23 14:39:57 +01:00
Timothy Lim 7a3e8d8292 Add function getXAPIData() to allow the creation of a report
HFP-255
2016-11-23 10:29:46 +01:00
Timothy Lim f2bb7e9172 Code formatting 2016-11-23 09:31:54 +01:00
Timothy Lim 163e314059 Make sure styles are not being added twice to questions [HFP-56] 2016-11-14 15:53:27 +01:00
Timothy Lim 568e0992e5 Add comments and ensure questions are created without previous state. [HFP-56] 2016-11-14 15:22:43 +01:00
Timothy Lim a95d0be8e0 Refactor createion of question pools. Refers to [H5P-56] 2016-11-14 11:31:15 +01:00
Tom Arild Jakobsen 1abac682cb Hotfix. Relates to #HFP-200 2016-11-14 10:06:25 +01:00
Paal Joergensen 9e891a0840 Merge branch 'master' of github.com:h5p/h5p-question-set 2016-10-21 14:22:34 +02:00
Paal Joergensen 969526fece Minor refactoring [HFP-57] 2016-10-21 14:21:38 +02:00
Timothy Lim db88833147 Rename variables 2016-10-21 12:56:11 +02:00
Timothy Lim 4f38f4d25b Change ordering of pool size check 2016-10-21 08:38:13 +02:00
Timothy Lim 3ac92b078b Replace 'arrow functions' with 'for loops' [HFP-57] 2016-10-20 15:46:15 +02:00
Timothy Lim 3285a8fa4a Add functionality to create question pools
[HFP-57]
2016-10-20 13:42:30 +02:00
Timothy Lim 06060af419 Add safety check 2016-10-20 08:18:43 +02:00
thomasmars 1b8abad544 Make sure the shuffled question order is properly mapped to the original order.
HFP-56
2016-10-19 15:28:31 +02:00
Timothy Lim 2ebe9ad987 Rename variables in randomize function
[HFP-56]
2016-10-19 08:50:35 +02:00
Timothy Lim 6fdeb26e0d Fix to allow disabling of backwards navigation 2016-10-19 08:22:21 +02:00
Timothy Lim 207914b411 Update retrieval of previous content 2016-10-18 15:32:16 +02:00
Timothy Lim a9d5c9b9a3 Stop multiple classes being added to each question
[HFP-56]
2016-10-18 15:07:12 +02:00
Timothy Lim b3dc56c796 Refactor button creation [HFP-56]
Add comments
2016-10-17 10:54:35 +02:00
Timothy Lim 46753e2b5e Refactor randomizing on initialization 2016-10-16 11:14:52 +02:00
thomasmars 491ed24c0b Tweaks to make randomization work.
HFP-56
2016-10-14 16:48:03 +02:00
thomasmars 6d4a915de1 Merge branch 'master' into randomize-questions
# Conflicts:
#	js/questionset.js
2016-10-14 16:14:37 +02:00
Timothy Lim d19a8d52fc Randomize questions and update buttons [HFP-56]
Show and hide navigational buttons

Add functionality to save content state

Clean up code [HFP-59]

Randomize on initialization

Tidy up [HFP-56]
2016-10-10 11:36:07 +02:00
Tom Arild Jakobsen b2f6dec79d Merge branch 'master' of github.com:h5p/h5p-question-set 2016-10-10 11:21:22 +02:00
Tom Arild Jakobsen 02f98007cc Add getMaxScore and deprecate totalScore 2016-10-10 11:21:06 +02:00
thomasmars e510b662ed Restore at last page if in solution mode
HFP-9
2016-10-07 13:38:39 +02:00
thomasmars 46ca884681 Disable navigation bar visuals and functions when backward navigation is disabled.
HFP-8
2016-10-04 14:18:50 +02:00
thomasmars 55d66eb469 Fixed not setting progress when it is undefined.
HFP-9
2016-10-04 11:59:26 +02:00
thomasmars 751ee5f597 Removed debug line
HFP-8
2016-10-04 11:53:04 +02:00
thomasmars 1cafbf09f4 Added aria-disabled attribute to dots when they are disabled
HFP-8
2016-10-04 11:43:12 +02:00
thomasmars 84c8751238 Fixed undefined answers in previous state.
HFP-9
2016-10-03 13:19:25 +02:00
thomasmars 601ae585e1 Disable backwards navigation.
Show dots, but they have no action when backward navigation is disabled.
Always show/enable full navigation in solution mode.
Only show forward button when a question has been answered.
Remove navigation button if question has been answered, then retried within the question's logic.
HFP-8
2016-10-03 13:06:01 +02:00
Håkon Ellingsen 36c5192c1d HFP-29: Add option to disable solution button 2016-09-28 11:28:53 +02:00
Håkon Ellingsen d5eb0f50ed HFP-24: Only add skip button when it is wanted 2016-09-28 11:10:32 +02:00