EDUCATIC
/
h5p-question-set
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
811 Commits
11 Branches
46 Tags
1 MiB
Commit Graph

213 Commits (48a8e6c669ca630d1cbcc591e10171caef05fa37)

Author SHA1 Message Date
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
thomasmars a601a1014c Implemented save content user state in Question Set. 
Set progress from previousState.
Set subContent data from previousState.
Toggle dots if they have been answered in previous state.
Implemented current state API call.
HFP-9
 2016-09-26 15:19:53 +02:00
thomasmars 49c1da3627 Added option for disabling backward navigation 
HFP-5
 2016-09-26 11:45:15 +02:00
Frode Petterson b7a991fc3c Remove current blue dot on endGame 
HVP-222
 2016-07-26 14:31:29 +02:00
Frode Petterson da540afb82 Announce results when finsihed 
HFJ-2042
 2016-07-05 09:50:41 +02:00
Frode Petterson 587f488276 Bugfix unanswered toggles answered state 
HFJ-2040
 2016-07-04 13:05:38 +02:00
Frode Petterson 71f92ff664 Prevent stealing focus when page loads 
HFJ-2040
 2016-07-04 11:54:28 +02:00
Frode Petterson 5391fec861 Turns out navigation was a better fit 
HFJ-2040
 2016-07-04 11:42:56 +02:00
Frode Petterson 7071366b2d Use menu instead of navigation 
Use keyboard to navigate menu.
HFJ-2040
 2016-07-04 11:29:28 +02:00
Thomas Marstrander 6c82013c84 Improved how navigation dots are read. 
HFJ-2040
 2016-06-30 09:47:24 +02:00
Thomas Marstrander bc5668a4a0 Accessible navigation line. 
Made readspeakers abel to announce all visible elements of the navigation line, i.e. answered/unanswered, current, and number.
HFJ-2040
 2016-06-28 15:07:05 +02:00
Thomas Marstrander 917a8ed3c4 Reset individual questions on retry. 
Remove finish button if a question is reset.
Remove dot styling if a question is reset.
HFJ-2044
 2016-06-28 12:29:15 +02:00
Thomas Marstrander 7bcd2472ba Read feedback when changing question. 
Do not read feedback when showing all solutions.
HFJ-2043
 2016-06-27 15:42:31 +02:00
Thomas Marstrander 45af3ef06e Make sure to show announcer when changing it, since resetTask hides it. 
HFJ-2041
 2016-06-27 11:59:36 +02:00
Thomas Marstrander 653d12a85e Make readspeakers announce current question of total when changing question. 
HFJ-2041
 2016-06-27 11:43:00 +02:00
Paal Joergensen 87a1d722ca Fixed empty aria-label on dots [HFJ-2038] 2016-06-22 09:59:23 +02:00
Frode Petterson 2a5f6c35aa xAPI Context Extensions, use object not array 
HFJ-2029
 2016-06-16 10:15:06 +02:00
Paal Joergensen cf84bcc3f5 Reverted shortening of texts [HFJ-2010] 2016-06-10 13:19:00 +02:00
Paal Joergensen 5431b4b06a Making dot-status to answered only when getAnswerGiven() returns true 2016-05-30 15:04:24 +02:00
Frode Petterson 8f30b1e3a7 Remove buttons when not displaying results 
Also removed empty feedback section to remove space.
HFJ-1935
 2016-05-25 09:51:23 +02:00
Frode Petterson 1a36c88e66 Fix confirm dialog when intro is present 
HFJ-1929
 2016-05-23 10:16:46 +02:00
Paal Joergensen 9380a9ea98 Made disabled show results show a minimalistic end page [HFJ-1935] 2016-05-20 09:33:45 +02:00
Paal Joergensen 510123993a Making end-video using 100% width [HFJ-1875] 2016-05-09 15:30:22 +02:00
Paal Joergensen 11f7a2ba33 Not invoking getAnswerGiven() initially [HFJ-1876] 2016-05-09 09:32:56 +02:00
Paal Joergensen 8dd83f77d8 Merge branch 'confirmation-dialog' into release 2016-05-03 11:15:30 +02:00
Thomas Marstrander e90ef1f831 Added functionality for resizing Question Set if it is too small for confirmation dialog. 
HFJ-1572
 2016-04-25 13:28:02 +02:00
Paal Joergensen 35e8dbd925 Updated english strings in code to match semantics [HFJ-1858] 2016-04-22 10:33:07 +02:00
Thomas Marstrander d441f67b70 Override confirmation dialog parent element for interactions. 
HFJ-1572
 2016-04-21 15:51:43 +02:00
Frode Petterson fa7b05f6fe A case of a forgotten bracket 2016-04-18 13:14:20 +02:00
Frode Petterson e323c4ee3b Merge branch 'master' into unused-semantics 
Conflicts:
	js/questionset.js
	language/ar.json
	language/de.json
	language/fr.json
	language/it.json
	language/nb.json
	language/nn.json
	semantics.json
	upgrades.js
 2016-04-18 12:48:13 +02:00
Thomas Marstrander 0e50523853 Moved copyright question labels inside the common interface texts. 
HFJ-1746
 2016-04-15 12:49:09 +02:00
Frode Petterson 333d3f4161 Show intro when retrying 
HFJ-1816
 2016-04-15 09:49:50 +02:00
Frode Petterson c045d440d9 Set min. height to background image on intro 
Also, made sure that the image always covers the background.
HFJ-1815
 2016-04-15 09:30:27 +02:00
Frode Petterson 63f6162ef2 Updated the default text 2016-04-08 16:07:24 +02:00
Frode Petterson c36e31ebf4 Hooked up the texts for next/prev buttons 
HFJ-1749
 2016-04-08 16:06:36 +02:00
Frode Petterson 93a5efd6e8 Fixed aria-label for progress dots 
HFJ-1750
 2016-04-08 15:58:38 +02:00
Frode Petterson 04003cf303 Made summary buttons into valid buttons 
HFJ-1749
 2016-04-08 15:36:06 +02:00
Frode Petterson ab76075acc Converted progress dots to links + ARIA label 
HFJ-1750
 2016-04-08 14:42:49 +02:00
Frode Petterson 2a26db16f6 Links for navigation + ARIA label 
HFJ-1749
 2016-04-08 12:40:28 +02:00
Thomas Marstrander d8be2e07ad Added unused semantics to Score/summary screen. 
HFJ-1710
 2016-04-07 16:23:15 +02:00
Frode Petterson 40fa6542e6 Show feedback for each question 
Ref. https://h5p.org/node/8730
HFJ-1747
 2016-04-06 15:53:50 +02:00
Frode Petterson bb943bbb3b Easier to use override 2016-04-04 15:50:41 +02:00
Thomas Marstrander 3036f888af Fix unused semantics. 
HFJ-1710
 2016-03-17 14:09:13 +01:00
Paal Joergensen 1e4ec27ae3 currentQuestion had to be set earlier [HFJ-1400] 2015-12-01 14:42:04 +01:00
Svein-Tore Griff With db69bc60a3 Add question number to interactions - HFJ-1400 2015-11-28 21:00:16 +01:00
Svein-Tore Griff With 370c5c8803 Trigger attempted event the first time a user sees a question - HFJ-1397 2015-11-27 20:40:48 +01:00
Frode Petterson fcbcfc951e Only pause is needed in Question Set 
(questions only have pause)
HFJ-1218
 2015-11-18 10:00:44 +01:00
Frode Petterson a36014c1e0 Stop video when finished 
HFJ-1218
 2015-11-18 10:00:19 +01:00
Frode Petterson 2d9a7cccda Added missing semi colon 
HFJ-1218
 2015-11-18 09:59:45 +01:00
Thomas Marstrander 3a038ea027 Fixed stopping media when changing question.[HFJ-1218] 2015-11-18 09:38:44 +01:00
Paal Joergensen 3423fabc15 Revert "Added wysiwyg support to title field." 
This reverts commit b00490bbe6.
 2015-11-06 14:24:11 +01:00
Andrew Downes 4a0d548c64 Report quiz set success 
Depends on https://github.com/h5p/h5p-php-library/pull/4
 2015-10-20 11:32:51 +01:00
Frode Petterson 2bc6b0598c Merge branch 'stable' 2015-10-12 09:26:04 +02:00
Frode Petterson 80c6b0678d Resize QS container when Q changes size. 2015-10-12 09:22:37 +02:00
falcon 0b7d2e2b36 Merge branch 'release' 2015-10-01 09:41:34 +02:00
Thomas Marstrander 198ae5fd3e Add 'finish' button as hidden, do not show it before all questions has been answered. [HFJ-1029] 2015-09-26 17:38:07 +02:00
Frode Petterson b00490bbe6 Added wysiwyg support to title field. 2015-09-25 11:13:05 +02:00
Frode Petterson 439f850729 Prevent crashing JS. 2015-09-25 10:57:23 +02:00
Thomas Marstrander e0f8afb3f9 Make sure content is resized after images in content types are laoded. [HFJ-1091] 2015-09-24 13:16:54 +02:00
Thomas Marstrander 9b0844c480 Display error stack as well as useful error message. 
HFJ-946
 2015-08-20 16:16:02 +02:00
Thomas Marstrander 7c6aa504fd Replaced console logs with useful error messages. 
HFJ-946
 2015-08-20 16:14:29 +02:00
Thomas Marstrander fdc91abcf8 Removed debugging lines 
HFJ-946
 2015-08-18 14:02:13 +02:00
Thomas Marstrander 0fb9b8882f Added Question design to QS 
HFJ-946
 2015-08-18 13:58:33 +02:00
Thomas Marstrander ad0acb2898 Changed retry icon for whole task for consistency. 
Accepts answered and attempted xapi verbs as well to mark a question as answered.
HFJ-946
 2015-08-13 10:35:55 +02:00
Thomas Marstrander c4a78bfdcd Use new button design. 
Add navigation buttons to Question, instead of to QS.
Added specific stylings for new button design.
HFJ-946
 2015-08-12 14:46:49 +02:00
Svein-Tore Griff With b399f9530d xAPI update - add duration to xAPI 2015-07-20 13:22:22 +02:00
Svein-Tore Griff With 436b9d572c Sub content is not allowed to generate completed statements 2015-07-10 13:41:16 +02:00
Svein-Tore Griff With cce3af6078 Replace attempted with interacted 2015-07-10 13:15:37 +02:00
Thomas Marstrander 02d3585425 Resize on video loaded and when results are already rendered. 
(cherry picked from commit b02fe7c)
 2015-07-08 15:08:43 +02:00
Frode Petterson 20e133b441 Get generic copyrights from content types that doesnt implement getCopyrights. 2015-06-19 15:40:35 +02:00
Svein-Tore Griff With 3cab3010fa Update call to newRunnable to use update api 2015-04-07 19:16:44 +02:00
Svein-Tore Griff With ab00c5cc94 Experiment with bubble system 2015-03-21 16:48:32 +01:00
Svein-Tore Griff With f064ad59d5 resize when displaying solution 2015-02-18 18:08:57 +01:00
Svein-Tore Griff With 061c15a2d6 Update to video 1.2 api 2015-02-17 11:14:49 +01:00
Svein-Tore Griff With d6ecc1705a xAPI update 2015-02-13 10:37:59 +01:00
Svein-Tore Griff With 00e5e81c0b Resolve conflicts and refine 2015-02-04 16:40:29 +01:00
Thomas Marstrander 41063026b4 Fixed so not all behaviour of subcontent will be overwritten. 2014-12-05 11:55:36 +01:00
Thomas Marstrander 33f9ea3ba1 Added the override settings into the correct subcontent semantics group. 2014-12-04 10:26:52 +01:00
Thomas Marstrander 4897db48fd Semantics description for overrideRetry changed. 2014-11-28 15:39:19 +01:00
Thomas Marstrander 587c593474 changed semantics enableRetryButton to enableRetry. 2014-11-28 13:51:26 +01:00
Thomas Marstrander 5510959615 Added override-buttons branch. 2014-11-27 11:01:47 +01:00
Pål Jørgensen f07bd8dfc3 Changing background-color from black to white when using background image 2014-11-14 15:06:07 +01:00
falcon e2efc849c9 Shorter function names 2014-10-26 22:14:26 +01:00
Svein-Tore Griff With f491786c47 Added xAPI support 2014-10-13 21:51:36 +02:00
Frode Petterson 8a71d3689e Merge branch 'api-1.1' into api-1.2 2014-06-27 11:12:53 +02:00
Frode Petterson 1a6cc9b09d Merge branch 'master' into api-1.1 2014-06-27 11:12:42 +02:00
Frode Petterson 76fb66317c Added back text to finish button. 2014-06-27 11:12:31 +02:00
Frode Petterson cdbcc3ad92 Merge branch 'api-1.1' into api-1.2 2014-06-26 16:23:46 +02:00