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

Change ordering of pool size check

pull/4/head^2
Timothy Lim 2016-10-21 08:38:13 +02:00
parent 3ac92b078b
commit 4f38f4d25b
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/questionset.js
View File

@ -181,17 +181,24 @@ H5P.QuestionSet = function (options, contentId, contentData) {
} }
} }
// Return the questions in their new order *with* their new order // Return the questions in their new order *with* their new order
return { return {
questions:questions, questions:questions,
questionOrder:newOrder questionOrder:newOrder
}; };
} }
// Create a pool (a subset) of questions if necessary // Create a pool (a subset) of questions if necessary
if (params.poolSize) { if (params.poolSize) {
// Sanitize input
if (params.poolSize > params.questions.length) {
poolSize = params.questions.length;
}
else {
poolSize = params.poolSize;
}
// If a previous pool exists, recreate it // If a previous pool exists, recreate it
if(contentData.previousState && contentData.previousState.poolOrder) { if(contentData.previousState && contentData.previousState.poolOrder) {
poolOrder = contentData.previousState.poolOrder; poolOrder = contentData.previousState.poolOrder;
@ -209,14 +216,6 @@ H5P.QuestionSet = function (options, contentId, contentData) {
// Otherwise create a new pool // Otherwise create a new pool
else { else {
// Sanitize input
if (params.poolSize > params.questions.length) {
poolSize = params.questions.length;
}
else {
poolSize = params.poolSize;
}
// Randomize and get the results // Randomize and get the results
var poolResult = randomizeQuestionOrdering(params.questions, poolOrder); var poolResult = randomizeQuestionOrdering(params.questions, poolOrder);
poolQuestions = poolResult.questions; poolQuestions = poolResult.questions;
@ -229,7 +228,6 @@ H5P.QuestionSet = function (options, contentId, contentData) {
// Replace original questions with just the ones in the pool // Replace original questions with just the ones in the pool
params.questions = poolQuestions; params.questions = poolQuestions;
} }
} }
// Create the html template for the question container // Create the html template for the question container