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

Minor - Code style

Browse Source
1.9.x
Yannick Warnier 11 years ago
parent db87668f86
commit 828a4014ca
2 changed files with 25 additions and 27 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. 24
      main/newscorm/lp_ajax_save_item.php
  2. 28
      main/newscorm/scorm_api.php

24
main/newscorm/lp_ajax_save_item.php
Unescape View File

@ -98,10 +98,17 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1,
// This functions sets the $this->db_item_view_id variable needed in get_status() see BT#5069
$mylpi->set_lp_view($view_id);
if ($prereq_check === true) {
if ($debug > 1) { error_log('Prereq are check'); }
// Launch the prerequisites check and set error if needed
if ($prereq_check !== true) {
// If prerequisites were not matched, don't update any item info
if ($debug) {
error_log("prereq_check: ".intval($prereq_check));
}
return $return;
} else {
if ($debug > 1) { error_log('Prerequisites are OK'); }
// Launch the prerequisites check and set error if needed
if (isset($max) && $max != -1) {
$mylpi->max_score = $max;
$mylpi->set_max_score($max);
@ -117,7 +124,9 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1,
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); }
$mylpi->set_score($score);
if ($debug > 1) { error_log('Done calling set_score '.$mylpi->get_score(), 0); }
} else {
if ($debug > 1) { error_log("Score not updated"); }
@ -125,7 +134,9 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1,
// 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"); }
@ -192,11 +203,6 @@ function save_item($lp_id, $user_id, $view_id, $item_id, $score = -1, $max = -1,
$mylpi->set_core_exit($core_exit);
}
$mylp->save_item($item_id, false);
} else {
if ($debug) {
error_log("prereq_check: ".intval($prereq_check));
}
return $return;
}
$mystatus_in_db = $mylpi->get_status(true);
@ -278,7 +284,7 @@ $interactions = array();
if (isset($_REQUEST['interact'])) {
if (is_array($_REQUEST['interact'])) {
foreach ($_REQUEST['interact'] as $idx => $interac) {
$interactions[$idx] = split(',', substr($interac, 1, -1));
$interactions[$idx] = preg_split('/,/', substr($interac, 1, -1));
if (!isset($interactions[$idx][7])) { // Make sure there are 7 elements.
$interactions[$idx][7] = '';
}

28
main/newscorm/scorm_api.php
Unescape View File

@ -1367,30 +1367,22 @@ function switch_item(current_item, next_item){
if (orig_item_type != 'sco') {
if (next_item_type != 'sco' ) {
//case 1
logit_lms('Case 1');
xajax_save_item(olms.lms_lp_id, olms.lms_user_id, olms.lms_view_id, olms.lms_item_id, olms.score, olms.max, olms.min, olms.lesson_status, olms.asset_timer, olms.suspend_data, olms.lesson_location,olms.interactions, olms.lms_item_core_exit, orig_item_type);
xajax_switch_item_details(olms.lms_lp_id, olms.lms_user_id, olms.lms_view_id, olms.lms_item_id, next_item);
logit_lms('Case 1 - current != sco and next != sco');
} else {
logit_lms('Case 2');
//case 2
xajax_save_item(olms.lms_lp_id, olms.lms_user_id, olms.lms_view_id, olms.lms_item_id, olms.score, olms.max, olms.min, olms.lesson_status, olms.asset_timer, olms.suspend_data, olms.lesson_location,olms.interactions, olms.lms_item_core_exit, orig_item_type);
xajax_switch_item_details(olms.lms_lp_id,olms.lms_user_id,olms.lms_view_id,olms.lms_item_id,next_item);
logit_lms('Case 2 - current != sco but next == sco');
}
xajax_save_item(olms.lms_lp_id, olms.lms_user_id, olms.lms_view_id, olms.lms_item_id, olms.score, olms.max, olms.min, olms.lesson_status, olms.asset_timer, olms.suspend_data, olms.lesson_location,olms.interactions, olms.lms_item_core_exit, orig_item_type);
xajax_switch_item_details(olms.lms_lp_id, olms.lms_user_id, olms.lms_view_id, olms.lms_item_id, next_item);
} else {
if (next_item_type != 'sco') {
logit_lms('Case 3');
//case 3
xajax_save_item_scorm(olms.lms_lp_id, olms.lms_user_id, olms.lms_view_id, olms.lms_item_id);
reinit_updatable_vars_list();
xajax_switch_item_toc(olms.lms_lp_id,olms.lms_user_id,olms.lms_view_id,olms.lms_item_id,next_item);
logit_lms('Case 3 - current == sco but next != sco');
} else {
logit_lms('Case 4');
//case 4
xajax_save_item_scorm(olms.lms_lp_id, olms.lms_user_id, olms.lms_view_id, olms.lms_item_id);
reinit_updatable_vars_list();
xajax_switch_item_toc(olms.lms_lp_id,olms.lms_user_id,olms.lms_view_id,olms.lms_item_id,next_item);
logit_lms('Case 4 - current == sco and next == sco');
}
xajax_save_item_scorm(olms.lms_lp_id, olms.lms_user_id, olms.lms_view_id, olms.lms_item_id);
reinit_updatable_vars_list();
xajax_switch_item_toc(olms.lms_lp_id,olms.lms_user_id,olms.lms_view_id,olms.lms_item_id,next_item);
if (olms.item_objectives.length>0) {
xajax_save_objectives(olms.lms_lp_id,olms.lms_user_id,olms.lms_view_id,olms.lms_item_id,olms.item_objectives);
}

Write Preview
Loading…
Cancel
Save