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

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
pull/4/merge
thomasmars 2016-09-26 15:19:53 +02:00
parent b50b2518e2
commit a601a1014c
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
js/questionset.js
View File

@ -8,11 +8,12 @@ var H5P = H5P || {};
* *
* @param {Array} options * @param {Array} options
* @param {int} contentId * @param {int} contentId
* @param {Object} contentData
* @returns {H5P.QuestionSet} Instance * @returns {H5P.QuestionSet} Instance
*/ */
H5P.QuestionSet = function (options, contentId) { H5P.QuestionSet = function (options, contentId, contentData) {
if (!(this instanceof H5P.QuestionSet)) { if (!(this instanceof H5P.QuestionSet)) {
return new H5P.QuestionSet(options, contentId); return new H5P.QuestionSet(options, contentId, contentData);
} }
H5P.EventDispatcher.call(this); H5P.EventDispatcher.call(this);
var $ = H5P.jQuery; var $ = H5P.jQuery;
@ -127,6 +128,10 @@ H5P.QuestionSet = function (options, contentId) {
var scoreBar; var scoreBar;
var up; var up;
var renderSolutions = false; var renderSolutions = false;
contentData = contentData || {};
if (contentData.previousState) {
currentQuestion = contentData.previousState.progress;
}
var $template = $(template.render(params)); var $template = $(template.render(params));
// Set overrides for questions // Set overrides for questions
@ -159,8 +164,11 @@ H5P.QuestionSet = function (options, contentId) {
question.params.overrideSettings = question.params.overrideSettings || {}; question.params.overrideSettings = question.params.overrideSettings || {};
question.params.overrideSettings.$confirmationDialogParent = $template.last(); question.params.overrideSettings.$confirmationDialogParent = $template.last();
question.params.overrideSettings.instance = this; question.params.overrideSettings.instance = this;
var questionInstance = H5P.newRunnable(question, contentId, undefined, undefined,
var questionInstance = H5P.newRunnable(question, contentId, undefined, undefined, {parent: self}); {
previousState: contentData.previousState ? contentData.previousState.answers[i] : undefined,
parent: self
});
questionInstance.on('resize', function () { questionInstance.on('resize', function () {
up = true; up = true;
self.trigger('resize'); self.trigger('resize');
@ -624,6 +632,9 @@ H5P.QuestionSet = function (options, contentId) {
} }
event.data.statement.context.extensions['http://id.tincanapi.com/extension/ending-point'] = currentQuestion + 1; event.data.statement.context.extensions['http://id.tincanapi.com/extension/ending-point'] = currentQuestion + 1;
}); });
// Mark question if answered
toggleAnsweredDot(i, question.getAnswerGiven());
} }
// Allow other libraries to add transitions after the questions have been inited // Allow other libraries to add transitions after the questions have been inited
@ -680,12 +691,14 @@ H5P.QuestionSet = function (options, contentId) {
// Hide all but initial Question. // Hide all but current question
_showQuestion(params.initialQuestion, true); _showQuestion(currentQuestion, true);
if (renderSolutions) { if (renderSolutions) {
showSolutions(); showSolutions();
} }
// Update buttons in case they have changed (restored user state)
_updateButtons();
this.trigger('resize'); this.trigger('resize');
@ -800,6 +813,22 @@ H5P.QuestionSet = function (options, contentId) {
H5P.error(err); H5P.error(err);
} }
}; };
/**
* Returns the complete state of question set and sub-content
*
* @returns {Object}
*/
this.getCurrentState = function () {
var state = {
progress: currentQuestion,
answers: questionInstances.map(function (qi) {
return qi.getCurrentState();
})
};
return state;
};
}; };
H5P.QuestionSet.prototype = Object.create(H5P.EventDispatcher.prototype); H5P.QuestionSet.prototype = Object.create(H5P.EventDispatcher.prototype);