EDUCATIC
/
h5p-question-set
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HJ-14: Added H5P.setFinished to all libraries. 

Fixed bug in dragquestion causing boardgame to not show results.
pull/1/head
Frode Petterson 2013-09-19 14:51:17 +02:00
parent aff85ef896
commit 84e83b6a8f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/questionset.js
View File

@ -105,7 +105,8 @@ H5P.QuestionSet = function (options, contentId) {
showAnimations: false, showAnimations: false,
successVideo: undefined, successVideo: undefined,
failVideo: undefined failVideo: undefined
} },
postUserStatistics: (H5P.postUserStatistics === true)
}; };
var template = new EJS({text: texttemplate}); var template = new EJS({text: texttemplate});
@ -127,6 +128,10 @@ H5P.QuestionSet = function (options, contentId) {
// TODO: Render on init, inject in template. // TODO: Render on init, inject in template.
var libraryObject = H5P.libraryFromString(question.library); var libraryObject = H5P.libraryFromString(question.library);
$.extend(question.params, {
displaySolutionsButton: false,
postUserStatistics: false
});
var tmp = new (H5P.classFromName(libraryObject.machineName))(question.params, contentId); var tmp = new (H5P.classFromName(libraryObject.machineName))(question.params, contentId);
questionInstances.push(tmp); questionInstances.push(tmp);
} }
@ -167,7 +172,7 @@ H5P.QuestionSet = function (options, contentId) {
$('.question-container', $myDom).hide().eq(questionNumber).show(); $('.question-container', $myDom).hide().eq(questionNumber).show();
// Trigger resize on question in case the size of the QS has changed. // Trigger resize on question in case the size of the QS has changed.
if (questionInstances[questionNumber].resize) { if (questionInstances[questionNumber].resize !== undefined) {
questionInstances[questionNumber].resize(); questionInstances[questionNumber].resize();
} }
@ -217,6 +222,10 @@ H5P.QuestionSet = function (options, contentId) {
passed: success passed: success
}; };
var displayResults = function () { var displayResults = function () {
if (params.postUserStatistics === true) {
H5P.setFinished(contentId, getScore(), totalScore());
}
if (!params.endGame.showResultPage) { if (!params.endGame.showResultPage) {
$(returnObject).trigger('h5pQuestionSetFinished', eventData); $(returnObject).trigger('h5pQuestionSetFinished', eventData);
return; return;
@ -302,7 +311,6 @@ H5P.QuestionSet = function (options, contentId) {
var question = questionInstances[i]; var question = questionInstances[i];
question.attach($('.question-container:eq(' + i + ')', $myDom)); question.attach($('.question-container:eq(' + i + ')', $myDom));
question.$solutionButton.hide();
$(question).on('h5pQuestionAnswered', function () { $(question).on('h5pQuestionAnswered', function () {
$('.progress-dot:eq(' + currentQuestion +')', $myDom).removeClass('unanswered').addClass('answered'); $('.progress-dot:eq(' + currentQuestion +')', $myDom).removeClass('unanswered').addClass('answered');
_updateButtons(); _updateButtons();

2
library.json
View File

@ -3,7 +3,7 @@
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 0, "minorVersion": 0,
"patchVersion": 27, "patchVersion": 28,
"runnable": 1, "runnable": 1,
"fullscreen": 0, "fullscreen": 0,
"machineName": "H5P.QuestionSet", "machineName": "H5P.QuestionSet",