From 9797d144b5bbdd98d2d1a1d635de67c010092e45 Mon Sep 17 00:00:00 2001
From: piers <piers>
Date: Wed, 27 Aug 2008 02:41:13 +0000
Subject: [PATCH] MDL-4746 - Course 01 of the ADL SCORM 1.2 test suite fails on
point 4. Fix cmi.comments, and mastery_score checking.
---
lang/en_utf8/scorm.php | 2 +-
mod/scorm/datamodels/scorm_12.js.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/en_utf8/scorm.php b/lang/en_utf8/scorm.php
index 5e6fdaf58d..19008261eb 100644
--- a/lang/en_utf8/scorm.php
+++ b/lang/en_utf8/scorm.php
@@ -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.';
diff --git a/mod/scorm/datamodels/scorm_12.js.php b/mod/scorm/datamodels/scorm_12.js.php
index 75b9418a84..6c98d34bf1 100644
--- a/mod/scorm/datamodels/scorm_12.js.php
+++ b/mod/scorm/datamodels/scorm_12.js.php
@@ -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 {
--
2.39.5