]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-4746 - Course 01 of the ADL SCORM 1.2 test suite fails on point 4. Fix cmi.comme...
authorpiers <piers>
Wed, 27 Aug 2008 02:41:13 +0000 (02:41 +0000)
committerpiers <piers>
Wed, 27 Aug 2008 02:41:13 +0000 (02:41 +0000)
lang/en_utf8/scorm.php
mod/scorm/datamodels/scorm_12.js.php

index 5e6fdaf58db4e25c0ff3676bab93c6b26b4ea6ac..19008261eb1bcfb09a7b7c4b8f4142a6f8329fa4 100644 (file)
@@ -90,7 +90,7 @@ $string['no_children'] = 'Tag $a->tag must have children';
 $string['noactivity'] = 'Nothing to report';
 $string['nolimit'] = 'Unlimited attempts';
 $string['nomanifest'] = 'Manifest not found';
-$string['noprerequisites'] = 'Sorry but you don\'t reach enough prerequisites to access this learning object';
+$string['noprerequisites'] = 'Sorry but you haven\'t reach enough prerequisites to access this learning object';
 $string['noreports'] = 'No report to display';
 $string['normal'] = 'Normal';
 $string['noscriptnoscorm'] = 'Your browser does not support javascript or it has javascript support disabled. No tracks will recorded.';
index 75b9418a84535168605b2b798944c7ed282add62..6c98d34bf1093687339cf78a0d357aaa420134d3 100644 (file)
@@ -377,7 +377,7 @@ function SCORMapi1_2() {
                                     }
                                 } else {
                                     if (element == 'cmi.comments') {
-                                        eval(element+'=value;');
+                                        cmi.comments = cmi.comments + value;
                                     } else {
                                         eval(element+'=value;');
                                     }
@@ -580,7 +580,7 @@ function SCORMapi1_2() {
             if (cmi.core.lesson_mode == 'normal') {
                 if (cmi.core.credit == 'credit') {
                     if (cmi.core.lesson_status == 'completed') {
-                        if (cmi.student_data.mastery_score != '') {
+                        if (cmi.student_data.mastery_score != '' && cmi.core.score.raw != '') {
                             if (parseFloat(cmi.core.score.raw) >= parseFloat(cmi.student_data.mastery_score)) {
                                 cmi.core.lesson_status = 'passed';
                             } else {