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

Merging

Browse Source
skala
Noël Dieschburg 17 years ago
parent 49fd18af3a fd917b287b
commit fd46436a6a
4 changed files with 52 additions and 54 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. 2
      main/auth/inscription.php
  2. 2
      main/inc/lib/legal.lib.php
  3. 27
      main/newscorm/learnpathItem.class.php
  4. 11
      main/newscorm/scorm_api.php

2
main/auth/inscription.php
Unescape View File

@ -323,7 +323,7 @@ if (get_setting('allow_terms_conditions')=='true') {
$form->addElement('hidden', 'password',$_SESSION['info_current_user'][2]); $form->addElement('hidden', 'password',$_SESSION['info_current_user'][2]);
} }
if($term_preview['type'] == 1) { if($term_preview['type'] == 1) {
$form->addElement('checkbox', 'legal_accept', null, get_lang('IhaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>'); $form->addElement('checkbox', 'legal_accept', null, get_lang('IHaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>');
$form->addRule('extra_legal_accept', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('extra_legal_accept', get_lang('ThisFieldIsRequired'), 'required');
} else { } else {
if (!empty($term_preview['content'])) { if (!empty($term_preview['content'])) {

2
main/inc/lib/legal.lib.php
Unescape View File

@ -101,7 +101,7 @@ class LegalManager {
// html // html
case 0: case 0:
$preview = '<div class="legal-terms"> '.$term_preview['content'].' </div>'; $preview = '<div class="legal-terms"> '.$term_preview['content'].' </div>';
$preview .= '<br/>'.get_lang('ByClickingAccept'); $preview .= '<br/>'.get_lang('ByClickingRegisterYouAgreeTermsAndConditions');
break; break;
// page link // page link
case 1: case 1:

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

@ -2203,7 +2203,7 @@ function get_terms()
//check the row exists //check the row exists
$inserted = false; $inserted = false;
// this a special case for multiple attepmts and Dokeos exercises // this a special case for multiple attempts and Dokeos exercises
if ($this->type == 'quiz' && $this->get_prevent_reinit()==0 && $this->get_status()=='completed') { if ($this->type == 'quiz' && $this->get_prevent_reinit()==0 && $this->get_status()=='completed') {
// we force the item to be restarted // we force the item to be restarted
$this->restart(); $this->restart();
@ -2283,8 +2283,8 @@ function get_terms()
$this->db_item_view_id = Database::get_last_insert_id(); $this->db_item_view_id = Database::get_last_insert_id();
} else { } else {
$sql = ''; $sql = '';
if($this->type=='hotpotatoes') if($this->type=='hotpotatoes') {
{ //make an exception for HotPotatoes, don't update the score //make an exception for HotPotatoes, don't update the score
//because it has been saved outside of this tool //because it has been saved outside of this tool
$sql = "UPDATE $item_view_table " . $sql = "UPDATE $item_view_table " .
"SET total_time = ".$this->get_total_time().", " . "SET total_time = ".$this->get_total_time().", " .
@ -2297,9 +2297,8 @@ function get_terms()
"WHERE lp_item_id = ".$this->db_id." " . "WHERE lp_item_id = ".$this->db_id." " .
"AND lp_view_id = ".$this->view_id." " . "AND lp_view_id = ".$this->view_id." " .
"AND view_count = ".$this->attempt_id; "AND view_count = ".$this->attempt_id;
} } else {
else //for all other content types...
{ //for all other content types...
if ($this->type=='quiz') { if ($this->type=='quiz') {
$my_status = ' '; $my_status = ' ';
$total_time = ' '; $total_time = ' ';
@ -2316,8 +2315,6 @@ function get_terms()
$mytime = ((int)$time_exe_date-(int)$time_start_date); $mytime = ((int)$time_exe_date-(int)$time_start_date);
$total_time =" total_time = ".$mytime.", "; $total_time =" total_time = ".$mytime.", ";
} }
} else { } else {
$my_type_lp=learnpath::get_type_static($this->lp_id); $my_type_lp=learnpath::get_type_static($this->lp_id);
// this is a array containing values finished // this is a array containing values finished
@ -2331,9 +2328,8 @@ function get_terms()
$rs_verified=api_sql_query($sql_verified,__FILE__,__LINE__); $rs_verified=api_sql_query($sql_verified,__FILE__,__LINE__);
$row_verified=Database::fetch_array($rs_verified); $row_verified=Database::fetch_array($rs_verified);
//get type lp i.e 2=scorm and 1=lp dokeos //get type lp: 1=lp dokeos and 2=scorm
// if not is completed or passed or browsed and learnig path is scorm // if not is completed or passed or browsed and learning path is scorm
if(!in_array($this->get_status(false),$case_completed) && $my_type_lp==2 ) {//&& $this->type!='dir' if(!in_array($this->get_status(false),$case_completed) && $my_type_lp==2 ) {//&& $this->type!='dir'
$total_time =" total_time = total_time +".$this->get_total_time().", "; $total_time =" total_time = total_time +".$this->get_total_time().", ";
$my_status = " status = '".$this->get_status(false)."' ,"; $my_status = " status = '".$this->get_status(false)."' ,";
@ -2347,30 +2343,27 @@ function get_terms()
$my_status = " status = '".$this->get_status(false)."' ,"; $my_status = " status = '".$this->get_status(false)."' ,";
}else { }else {
//&& !in_array($row_verified['status'],$case_completed) //&& !in_array($row_verified['status'],$case_completed)
//is lp dokeos //is lp dokeos
if ($my_type_lp==1 && $this->type!='chapter') { if ($my_type_lp==1 && $this->type!='chapter') {
$total_time =" total_time = total_time + ".$this->get_total_time().", "; $total_time =" total_time = total_time + ".$this->get_total_time().", ";
$my_status = " status = '".$this->get_status(false)."' ,"; $my_status = " status = '".$this->get_status(false)."' ,";
} }
} }
} }
} else { } else {
// is multipe attempts // is multiple attempts
if (in_array($this->get_status(false),$case_completed) && $my_type_lp==2) { if (in_array($this->get_status(false),$case_completed) && $my_type_lp==2) {
//reset zero new attempt ? //reset zero new attempt ?
$my_status = " status = '".$this->get_status(false)."' ,";
} elseif (!in_array($this->get_status(false),$case_completed) && $my_type_lp==2){ } elseif (!in_array($this->get_status(false),$case_completed) && $my_type_lp==2){
$total_time =" total_time = ".$this->get_total_time().", "; $total_time =" total_time = ".$this->get_total_time().", ";
$my_status = " status = '".$this->get_status(false)."' ,"; $my_status = " status = '".$this->get_status(false)."' ,";
} else { } else {
//is lp dokeos //is dokeos LP
$total_time =" total_time = total_time +".$this->get_total_time().", "; $total_time =" total_time = total_time +".$this->get_total_time().", ";
$my_status = " status = '".$this->get_status(false)."' ,"; $my_status = " status = '".$this->get_status(false)."' ,";
} }
} }
/*if ($my_type_lp==1 && !in_array($row_verified['status'],$case_completed)) { /*if ($my_type_lp==1 && !in_array($row_verified['status'],$case_completed)) {
$total_time =" total_time = total_time + ".$this->get_total_time().", "; $total_time =" total_time = total_time + ".$this->get_total_time().", ";
}*/ }*/

11
main/newscorm/scorm_api.php
Unescape View File

@ -740,7 +740,6 @@ function reinit_update_table_list () {
} }
function savedata(origin) { function savedata(origin) {
//origin can be 'commit', 'finish' or 'terminate' //origin can be 'commit', 'finish' or 'terminate'
if ((lesson_status != 'completed') && (lesson_status != 'passed') && (mastery_score >=0) && (score >= mastery_score)) { if ((lesson_status != 'completed') && (lesson_status != 'passed') && (mastery_score >=0) && (score >= mastery_score)) {
lesson_status = 'passed'; lesson_status = 'passed';
@ -781,6 +780,7 @@ function savedata(origin) {
logit_lms('saving data (status='+lesson_status+' - interactions: '+ interactions.length +')',1); logit_lms('saving data (status='+lesson_status+' - interactions: '+ interactions.length +')',1);
old_item_id=info_lms_item[0]; old_item_id=info_lms_item[0];
// xajax_save_item is replaced to xajax_save_item_scorm for scorm LP's
//xajax_save_item(lms_lp_id, lms_user_id, lms_view_id, lms_item_id, score, max, min, lesson_status, session_time, suspend_data, lesson_location, interactions, lms_item_core_exit); //xajax_save_item(lms_lp_id, lms_user_id, lms_view_id, lms_item_id, score, max, min, lesson_status, session_time, suspend_data, lesson_location, interactions, lms_item_core_exit);
xajax_save_item_scorm(lms_lp_id, lms_user_id, lms_view_id, old_item_id,my_get_value_scorm); xajax_save_item_scorm(lms_lp_id, lms_user_id, lms_view_id, old_item_id,my_get_value_scorm);
@ -1231,7 +1231,13 @@ function switch_item(current_item, next_item) {
//(1) save the current item //(1) save the current item
logit_lms('Called switch_item with params '+lms_item_id+' and '+next_item+'',0); logit_lms('Called switch_item with params '+lms_item_id+' and '+next_item+'',0);
if (lms_lp_type==1 || lms_item_type=='asset' || session_time == '0' || session_time == '0:00:00'){ if (lms_lp_type==1 || lms_item_type=='asset' || session_time == '0' || session_time == '0:00:00'){
if (lms_lp_type==1) {
xajax_save_item(lms_lp_id, lms_user_id, lms_view_id, lms_item_id, score, max, min, lesson_status, asset_timer, suspend_data, lesson_location,interactions, lms_item_core_exit); xajax_save_item(lms_lp_id, lms_user_id, lms_view_id, lms_item_id, score, max, min, lesson_status, asset_timer, suspend_data, lesson_location,interactions, lms_item_core_exit);
} else {
my_get_value_scorm=new Array();
my_get_value_scorm=ProcessValueScorm();
xajax_save_item_scorm(lms_lp_id, lms_user_id, lms_view_id, lms_item_id,my_get_value_scorm);
}
if(item_objectives.length>0) { if(item_objectives.length>0) {
xajax_save_objectives(lms_lp_id,lms_user_id,lms_view_id,lms_item_id,item_objectives); xajax_save_objectives(lms_lp_id,lms_user_id,lms_view_id,lms_item_id,item_objectives);
} }
@ -1262,6 +1268,7 @@ function switch_item(current_item, next_item) {
//savedata('finish'); //savedata('finish');
//} //}
// xajax_save_item(lms_lp_id, lms_user_id, lms_view_id, lms_item_id, score, max, min, lesson_status, session_time, suspend_data, lesson_location,interactions, lms_item_core_exit); // xajax_save_item(lms_lp_id, lms_user_id, lms_view_id, lms_item_id, score, max, min, lesson_status, session_time, suspend_data, lesson_location,interactions, lms_item_core_exit);
} }
execute_stats=false; execute_stats=false;
//(2) Refresh all the values inside this SCORM API object - use AJAX //(2) Refresh all the values inside this SCORM API object - use AJAX
@ -1410,8 +1417,6 @@ function xajax_save_item(lms_lp_id, lms_user_id, lms_view_id, lms_item_id, score
} }
); );
} }
} }
function xajax_save_item_scorm(lms_lp_id, lms_user_id, lms_view_id, lms_item_id,info_get_lms) { function xajax_save_item_scorm(lms_lp_id, lms_user_id, lms_view_id, lms_item_id,info_get_lms) {

Write Preview
Loading…
Cancel
Save