EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/h5p/h5p-php-library

pull/6/head
Svein-Tore Griff With 2015-11-01 00:32:55 +01:00
parent b077af0981 844883a1cf
commit e29be52de5
2 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
js/h5p-x-api-event.js
View File

@ -18,18 +18,40 @@ H5P.XAPIEvent.prototype.constructor = H5P.XAPIEvent;
* *
* @param {number} score * @param {number} score
* @param {number} maxScore * @param {number} maxScore
* @param {object} instance
* @param {boolean} completion
* @param {boolean} success
*/ */
H5P.XAPIEvent.prototype.setScoredResult = function (score, maxScore, instance) { H5P.XAPIEvent.prototype.setScoredResult = function (score, maxScore, instance, completion, success) {
this.data.statement.result = { this.data.statement.result = {};
'score': {
'min': 0, if (typeof score !== 'undefined') {
'max': maxScore, if (typeof maxScore === 'undefined') {
'raw': score this.data.statement.result.score = {'raw': score};
}
else {
this.data.statement.result.score = {
'min': 0,
'max': maxScore,
'raw': score
};
if (maxScore > 0) {
this.data.statement.result.score.scaled = Math.round(score / maxScore * 10000) / 10000;
}
} }
};
if (maxScore > 0) {
this.data.statement.result.score.scaled = Math.round(score / maxScore * 10000) / 10000;
} }
if (typeof completion === 'undefined') {
this.data.statement.result.completion = (this.getVerb() === 'completed' || this.getVerb() === 'answered');
}
else {
this.data.statement.result.completion = completion;
}
if (typeof success !== 'undefined') {
this.data.statement.result.success = success;
}
if (instance && instance.activityStartTime) { if (instance && instance.activityStartTime) {
var duration = Math.round((Date.now() - instance.activityStartTime ) / 10) / 100; var duration = Math.round((Date.now() - instance.activityStartTime ) / 10) / 100;
// xAPI spec allows a precision of 0.01 seconds // xAPI spec allows a precision of 0.01 seconds

14
js/h5p-x-api.js
View File

@ -65,9 +65,11 @@ H5P.EventDispatcher.prototype.createXAPIEventTemplate = function (verb, extra) {
* Will be set as the 'raw' value of the score object * Will be set as the 'raw' value of the score object
* @param {number} maxScore * @param {number} maxScore
* will be set as the "max" value of the score object * will be set as the "max" value of the score object
* @param {boolean} success
* will be set as the "success" value of the result object
*/ */
H5P.EventDispatcher.prototype.triggerXAPICompleted = function (score, maxScore) { H5P.EventDispatcher.prototype.triggerXAPICompleted = function (score, maxScore, success) {
this.triggerXAPIScored(score, maxScore, 'completed'); this.triggerXAPIScored(score, maxScore, 'completed', true, success);
}; };
/** /**
@ -79,10 +81,14 @@ H5P.EventDispatcher.prototype.triggerXAPICompleted = function (score, maxScore)
* Will be set as the "max" value of the score object * Will be set as the "max" value of the score object
* @param {string} verb * @param {string} verb
* Short form of adl verb * Short form of adl verb
* @param {boolean} completion
* Is this a statement from a completed activity?
* @param {boolean} success
* Is this a statement from an activity that was done successfully?
*/ */
H5P.EventDispatcher.prototype.triggerXAPIScored = function (score, maxScore, verb) { H5P.EventDispatcher.prototype.triggerXAPIScored = function (score, maxScore, verb, completion, success) {
var event = this.createXAPIEventTemplate(verb); var event = this.createXAPIEventTemplate(verb);
event.setScoredResult(score, maxScore, this); event.setScoredResult(score, maxScore, this, completion, success);
this.trigger(event); this.trigger(event);
}; };