chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge

Browse Source
1.9.x
Yannick Warnier 12 years ago
parent 577781f0d9
commit b09b80a479
3 changed files with 199 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 21
      main/newscorm/learnpathItem.class.php
  2. 206
      main/newscorm/lp_ajax_save_item.php
  3. 12
      main/newscorm/scorm_api.php

21
main/newscorm/learnpathItem.class.php
Unescape View File

@ -3240,8 +3240,8 @@ class learnpathItem
/**
* Sets the score value. If the mastery_score is set and the score reaches
* it, then set the status to 'passed'.
* @param float Score
* @return boolean True on success, false otherwise
* @param float Score
* @return boolean True on success, false otherwise
*/
public function set_score($score)
{
@ -3252,21 +3252,23 @@ class learnpathItem
}
if (($this->max_score <= 0 || $score <= $this->max_score) && ($score >= $this->min_score)) {
$this->current_score = $score;
$master = $this->get_mastery_score();
$masteryScore = $this->get_mastery_score();
$current_status = $this->get_status(false);
// Fixes bug when SCORM doesn't send a mastery score even if they sent a score!
if ($master == -1) {
$master = $this->max_score;
if ($masteryScore == -1) {
$masteryScore = $this->max_score;
}
if ($debug > 0) {
error_log('get_mastery_score: ' . $master);
error_log('get_mastery_score: ' . $masteryScore);
error_log('current_status: ' . $current_status);
error_log('current score : ' . $this->current_score);
}
// If mastery_score is set AND the current score reaches the mastery score AND the current status is different from 'completed', then set it to 'passed'.
// If mastery_score is set AND the current score reaches the mastery
// score AND the current status is different from 'completed', then
// set it to 'passed'.
/*
if ($master != -1 && $this->current_score >= $master && $current_status != $this->possible_status[2]) {
if ($debug > 0) error_log('Status changed to: '.$this->possible_status[3]);
@ -3307,10 +3309,9 @@ class learnpathItem
/**
* Sets the status for this item
* @param string $status must be one of the values defined
* in $this->possible_status
* @param string $status Status - must be one of the values defined in $this->possible_status
* (this affects the status setting)
* @return boolean True on success, false on error
* @return boolean True on success, false on error
*/
public function set_status($status)
{

206
main/newscorm/lp_ajax_save_item.php
Unescape View File

@ -27,28 +27,31 @@ require_once 'aiccItem.class.php';
/**
* Writes an item's new values into the database and returns the operation result
* @param integer Learnpath ID
* @param integer User ID
* @param integer View ID
* @param integer Item ID
* @param double Current score
* @param double Maximum score
* @param double Minimum score
* @param string Lesson status
* @param string Session time
* @param string Suspend data
* @param string Lesson location
* @param array Interactions array
* @param string Core exit SCORM string
* @param int $lp_id Learnpath ID
* @param int $user_id User ID
* @param int $view_id View ID
* @param int $item_id Item ID
* @param float $score Current score
* @param float $max Maximum score
* @param float $min Minimum score
* @param string $status Lesson status
* @param int $time Session time
* @param string $suspend Suspend data
* @param string $location Lesson location
* @param array $interactions Interactions array
* @param string $core_exit Core exit SCORM string
* @param int $lmsFinish Whether the call was issued from SCORM's LMSFinish()
* @param int $userNavigatesAway Whether the user is moving to another item
* @return bool|null|string The resulting JS string
*/
function save_item(
$lp_id,
$user_id,
$view_id,
$item_id,
$score = -1,
$max = -1,
$min = -1,
$score = -1.0,
$max = -1.0,
$min = -1.0,
$status = '',
$time = 0,
$suspend = '',
@ -56,9 +59,13 @@ function save_item(
$interactions = array(),
$core_exit = 'none',
$sessionId = null,
$courseId = null
$courseId = null,
$lmsFinish = 0,
$userNavigatesAway = 0,
$statusSignalReceived = 0
) {
global $debug;
//global $debug;
$debug = 0;
$return = null;
if ($debug > 0) {
@ -66,6 +73,7 @@ function save_item(
error_log("item_id: $item_id");
error_log("lp_id: $lp_id - user_id: - $user_id - view_id: $view_id - item_id: $item_id");
error_log("score: $score - max:$max - min: $min - status:$status - time:$time - suspend: $suspend - location: $location - core_exit: $core_exit");
error_log("finish: $lmsFinish - navigatesAway: $userNavigatesAway");
}
$mylp = learnpath::getLpFromSession(api_get_course_id(), $lp_id, $user_id);
@ -87,7 +95,6 @@ function save_item(
if ($debug > 0) {
error_log("item #$item_id not found in the items array: ".print_r($mylp->items, 1));
}
return false;
}
@ -100,7 +107,6 @@ function save_item(
if ($debug) {
error_log("prereq_check: ".intval($prereq_check));
}
return $return;
} else {
if ($debug > 1) { error_log('Prerequisites are OK'); }
@ -116,7 +122,7 @@ function save_item(
if ($debug > 1) { error_log("Setting min_score: $min"); }
}
// set_score function already saves the status
// set_score function used to save the status, but this is not the case anymore
if (isset($score) && $score != -1) {
if ($debug > 1) { error_log('Calling set_score('.$score.')', 0); }
if ($debug > 1) { error_log('set_score changes the status to failed/passed if mastery score is provided', 0); }
@ -128,34 +134,180 @@ function save_item(
if ($debug > 1) { error_log("Score not updated"); }
}
$statusIsSet = false;
// Default behaviour.
if (isset($status) && $status != '' && $status != 'undefined') {
if ($debug > 1) { error_log('Calling set_status('.$status.')', 0); }
$mylpi->set_status($status);
$statusIsSet = true;
if ($debug > 1) { error_log('Done calling set_status: checking from memory: '.$mylpi->get_status(false), 0); }
} else {
if ($debug > 1) { error_log("Status not updated"); }
}
// Hack to set status to completed for hotpotatoes if score > 80%.
$my_type = $mylpi->get_type();
// Set status to completed for hotpotatoes if score > 80%.
if ($my_type == 'hotpotatoes') {
if ((empty($status) || $status == 'undefined' || $status == 'not attempted') && $max > 0) {
if (($score/$max) > 0.8) {
$mystatus = 'completed';
if ($debug > 1) { error_log('Calling set_status('.$mystatus.') for hotpotatoes', 0); }
$mylpi->set_status($mystatus);
$statusIsSet = true;
if ($debug > 1) { error_log('Done calling set_status for hotpotatoes - now '.$mylpi->get_status(false), 0); }
}
} elseif ($status == 'completed' && $max > 0 && ($score/$max) < 0.8) {
$mystatus = 'failed';
if ($debug > 1) { error_log('Calling set_status('.$mystatus.') for hotpotatoes', 0); }
$mylpi->set_status($mystatus);
$statusIsSet = true;
if ($debug > 1) { error_log('Done calling set_status for hotpotatoes - now '.$mylpi->get_status(false), 0); }
}
} elseif ($my_type == 'sco') {
/*
* This is a specific implementation for SCORM 1.2, matching page 26 of SCORM 1.2's RTE
* "Normally the SCO determines its own status and passes it to the LMS.
* 1) If cmi.core.credit is set to “credit” and there is a mastery
* score in the manifest (adlcp:masteryscore), the LMS can change
* the status to either passed or failed depending on the
* student's score compared to the mastery score.
* 2) If there is no mastery score in the manifest
* (adlcp:masteryscore), the LMS cannot override SCO
* determined status.
* 3) If the student is taking the SCO for no-credit, there is no
* change to the lesson_status, with one exception. If the
* lesson_mode is "browse", the lesson_status may change to
* "browsed" even if the cmi.core.credit is set to no-credit.
* "
* Additionally, the LMS behaviour should be:
* If a SCO sets the cmi.core.lesson_status then there is no problem.
* However, the SCORM does not force the SCO to set the cmi.core.lesson_status.
* There is some additional requirements that must be adhered to
* successfully handle these cases:
* Upon initial launch
* the LMS should set the cmi.core.lesson_status to “not attempted”.
* Upon receiving the LMSFinish() call or the user navigates away,
* the LMS should set the cmi.core.lesson_status for the SCO to “completed”.
* After setting the cmi.core.lesson_status to “completed”,
* the LMS should now check to see if a Mastery Score has been
* specified in the cmi.student_data.mastery_score, if supported,
* or the manifest that the SCO is a member of.
* If a Mastery Score is provided and the SCO did set the
* cmi.core.score.raw, the LMS shall compare the cmi.core.score.raw
* to the Mastery Score and set the cmi.core.lesson_status to
* either “passed” or “failed”. If no Mastery Score is provided,
* the LMS will leave the cmi.core.lesson_status as “completed”
*/
$masteryScore = $mylpi->get_mastery_score();
if ($masteryScore == -1 or empty($masteryScore)) {
$masteryScore = false;
}
$credit = $mylpi->get_credit();
/**
* 1) If cmi.core.credit is set to “credit” and there is a mastery
* score in the manifest (adlcp:masteryscore), the LMS can change
* the status to either passed or failed depending on the
* student's score compared to the mastery score.
*/
if ($credit == 'credit' && $masteryScore && (isset($score) && $score != -1) && !$statusIsSet && !$statusSignalReceived) {
if ($score >= $masteryScore) {
$mylpi->set_status('passed');
} else {
$mylpi->set_status('failed');
}
$statusIsSet = true;
}
/**
* 2) If there is no mastery score in the manifest
* (adlcp:masteryscore), the LMS cannot override SCO
* determined status.
*/
if (!$statusIsSet && !$masteryScore && !$statusSignalReceived) {
if (!empty($status)) {
$mylpi->set_status($status);
$statusIsSet = true;
}
//if no status was set directly, we keep the previous one
}
/**
* 3) If the student is taking the SCO for no-credit, there is no
* change to the lesson_status, with one exception. If the
* lesson_mode is "browse", the lesson_status may change to
* "browsed" even if the cmi.core.credit is set to no-credit.
*/
if (!$statusIsSet && $credit == 'no-credit' && !$statusSignalReceived) {
$mode = $mylpi->get_lesson_mode();
if ($mode == 'browse' && $status == 'browsed') {
$mylpi->set_status($status);
$statusIsSet = true;
}
//if no status was set directly, we keep the previous one
}
/**
* If a SCO sets the cmi.core.lesson_status then there is no problem.
* However, the SCORM does not force the SCO to set the
* cmi.core.lesson_status. There is some additional requirements
* that must be adhered to successfully handle these cases:
*/
if (!$statusIsSet && empty($status) && !$statusSignalReceived) {
/**
* Upon initial launch the LMS should set the
* cmi.core.lesson_status to “not attempted”.
*/
// this case should be handled by LMSInitialize() and xajax_switch_item()
/**
* Upon receiving the LMSFinish() call or the user navigates
* away, the LMS should set the cmi.core.lesson_status for the
* SCO to “completed”.
*/
if ($lmsFinish or $userNavigatesAway) {
$myStatus = 'completed';
/**
* After setting the cmi.core.lesson_status to “completed”,
* the LMS should now check to see if a Mastery Score has been
* specified in the cmi.student_data.mastery_score, if supported,
* or the manifest that the SCO is a member of.
* If a Mastery Score is provided and the SCO did set the
* cmi.core.score.raw, the LMS shall compare the cmi.core.score.raw
* to the Mastery Score and set the cmi.core.lesson_status to
* either “passed” or “failed”. If no Mastery Score is provided,
* the LMS will leave the cmi.core.lesson_status as “completed”
*/
if ($masteryScore && (isset($score) && $score != -1)) {
if ($score >= $masteryScore) {
$myStatus = 'passed';
} else {
$myStatus = 'failed';
}
}
$mylpi->set_status($myStatus);
$statusIsSet = true;
}
}
// End of type=='sco'
}
// If no previous condition changed the SCO status, proceed with a
// generic behaviour
if (!$statusIsSet && !$statusSignalReceived) {
// Default behaviour
if (isset($status) && $status != '' && $status != 'undefined') {
if ($debug > 1) {
error_log('Calling set_status('.$status.')', 0);
}
$mylpi->set_status($status);
if ($debug > 1) {
error_log('Done calling set_status: checking from memory: '.$mylpi->get_status(false), 0);
}
} else {
if ($debug > 1) {
error_log("Status not updated");
}
}
}
if (isset($time) && $time != '' && $time != 'undefined') {
@ -303,7 +455,9 @@ echo save_item(
(!empty($_REQUEST['loc'])?$_REQUEST['loc']:null),
$interactions,
(!empty($_REQUEST['core_exit'])?$_REQUEST['core_exit']:''),
'',
(!empty($_REQUEST['session_id'])?$_REQUEST['session_id']:''),
(!empty($_REQUEST['course_id'])?$_REQUEST['course_id']:'')
(!empty($_REQUEST['course_id'])?$_REQUEST['course_id']:''),
(empty($_REQUEST['finish'])?0:1),
(empty($_REQUEST['userNavigatesAway'])?0:1),
(empty($_REQUEST['statusSignalReceived'])?0:1)
);

12
main/newscorm/scorm_api.php
Unescape View File

@ -235,7 +235,7 @@ if (olms.lms_lp_type == 1 || olms.lms_item_type == 'asset' || olms.lms_item_type
function LMSInitialize() {
/* load info for this new item by calling the js_api_refresh command in
* the message frame. The message frame will update the JS variables by
* itself, in JS, by doing things like top.lesson_status = 'not attempted'
* itself, in JS, by doing things like top.lescsson_status = 'not attempted'
* and that kind of stuff, so when the content loads in the content frame
* it will have all the correct variables set
*/
@ -549,7 +549,7 @@ function LMSGetValue(param) {
} else if(param == 'cmi.interactions._children'){
// ---- cmi.interactions._children
result = 'id,time,type,correct_responses,weighting,student_response,result,latency';
} else {
} else{
// ---- anything else
// Invalid argument error
olms.G_LastError = G_InvalidArgumentError ;
@ -1543,13 +1543,17 @@ function xajax_save_item(
* @param int ID of the user
* @param int ID of the view
* @param int ID of the item
* @param bool 1 if this call comes from a "LMSFinish()" call, 0 or nothing otherwise
* @return void
* @uses olms.updatable_vars_list
* @uses lp_ajax_save_item.php through an AJAX call
*/
function xajax_save_item_scorm(lms_lp_id, lms_user_id, lms_view_id, lms_item_id) {
function xajax_save_item_scorm(lms_lp_id, lms_user_id, lms_view_id, lms_item_id, finish) {
if (typeof(finish) == 'undefined') {
finish = 0;
}
var is_interactions='false';
var params = 'lid='+lms_lp_id+'&uid='+lms_user_id+'&vid='+lms_view_id+'&iid='+lms_item_id;
var params = 'lid='+lms_lp_id+'&uid='+lms_user_id+'&vid='+lms_view_id+'&iid='+lms_item_id+'&finish='+finish;
var my_scorm_values = new Array();
my_scorm_values = process_scorm_values();

Write Preview
Loading…
Cancel
Save