Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'm19_MDL-25320' of git://github.com/danmarsden/moodle in…

…to MOODLE_19_STABLE
  • Loading branch information...
commit 490a1862696730acad780e830b156cdc654ce70c 2 parents 251d6f3 + c504285
Sam Hemelryk samhemelryk authored
16 mod/scorm/datamodels/scorm_12.js.php
View
@@ -36,15 +36,15 @@ function SCORMapi1_2() {
CMIResult = '^correct$|^wrong$|^unanticipated$|^neutral$|^([0-9]{0,3})?(\.[0-9]{1,2})?$';
NAVEvent = '^previous$|^continue$';
// Children lists
- cmi_children = 'core, suspend_data, launch_data, comments, objectives, student_data, student_preference, interactions';
- core_children = 'student_id, student_name, lesson_location, credit, lesson_status, entry, score, total_time, lesson_mode, exit, session_time';
- score_children = 'raw, min, max';
- comments_children = 'content, location, time';
- objectives_children = 'id, score, status';
+ cmi_children = 'core,suspend_data,launch_data,comments,objectives,student_data,student_preference,interactions';
+ core_children = 'student_id,student_name,lesson_location,credit,lesson_status,entry,score,total_time,lesson_mode,exit,session_time';
+ score_children = 'raw,min,max';
+ comments_children = 'content,location,time';
+ objectives_children = 'id,score,status';
correct_responses_children = 'pattern';
- student_data_children = 'mastery_score, max_time_allowed, time_limit_action';
- student_preference_children = 'audio, language, speed, text';
- interactions_children = 'id, objectives, time, type, correct_responses, weighting, student_response, result, latency';
+ student_data_children = 'mastery_score,max_time_allowed,time_limit_action';
+ student_preference_children = 'audio,language,speed,text';
+ interactions_children = 'id,objectives,time,type,correct_responses,weighting,student_response,result,latency';
// Data ranges
score_range = '0#100';
audio_range = '-1#100';
16 mod/scorm/datamodels/scorm_13.js.php
View
@@ -88,14 +88,14 @@ function SCORMapi1_3() {
var NAVBoolean = '^unknown$|^true$|^false$';
var NAVTarget = '^previous$|^continue$|^choice.{target=\\S{0,200}[a-zA-Z0-9]}$'
// Children lists
- var cmi_children = '_version, comments_from_learner, comments_from_lms, completion_status, credit, entry, exit, interactions, launch_data, learner_id, learner_name, learner_preference, location, max_time_allowed, mode, objectives, progress_measure, scaled_passing_score, score, session_time, success_status, suspend_data, time_limit_action, total_time';
- var comments_children = 'comment, timestamp, location';
- var score_children = 'max, raw, scaled, min';
- var objectives_children = 'progress_measure, completion_status, success_status, description, score, id';
+ var cmi_children = '_version,comments_from_learner,comments_from_lms,completion_status,credit,entry,exit,interactions,launch_data,learner_id,learner_name,learner_preference,location,max_time_allowed,mode,objectives,progress_measure,scaled_passing_score,score,session_time,success_status,suspend_data,time_limit_action,total_time';
+ var comments_children = 'comment,timestamp,location';
+ var score_children = 'max,raw,scaled,min';
+ var objectives_children = 'progress_measure,completion_status,success_status,description,score,id';
var correct_responses_children = 'pattern';
- var student_data_children = 'mastery_score, max_time_allowed, time_limit_action';
- var student_preference_children = 'audio_level, audio_captioning, delivery_speed, language';
- var interactions_children = 'id, type, objectives, timestamp, correct_responses, weighting, learner_response, result, latency, description';
+ var student_data_children = 'mastery_score,max_time_allowed,time_limit_action';
+ var student_preference_children = 'audio_level,audio_captioning,delivery_speed,language';
+ var interactions_children = 'id,type,objectives,timestamp,correct_responses,weighting,learner_response,result,latency,description';
// Data ranges
var scaled_range = '-1#1';
var audio_range = '0#*';
@@ -1267,4 +1267,4 @@ function StoreData(data,storetotaltime) {
include_once($CFG->dirroot.'/mod/scorm/datamodels/debug.js.php');
echo 'AppendToLog("Moodle SCORM 1.3 API Loaded, Activity: '.$scorm->name.', SCO: '.$sco->identifier.'", 0);';
}
- ?>
+ ?>
Please sign in to comment.
Something went wrong with that request. Please try again.