|
@@ -57,7 +57,7 @@ $nbrQuestions = intval($_GET['nbrQuestions']);
|
|
|
Session::erase('objExerciseExtra'.$exerciseId);
|
|
|
Session::erase('exerciseResultExtra'.$exerciseId);
|
|
|
Session::erase('questionListExtra'.$exerciseId);
|
|
|
-
|
|
|
+
|
|
|
//round-up the coordinates
|
|
|
$coords = explode('/',$_GET['hotspot']);
|
|
|
$user_array = '';
|
|
@@ -70,43 +70,43 @@ if (is_array($coords) && count($coords)>0){
|
|
|
|
|
|
$user_array = substr($user_array,0,-1);
|
|
|
|
|
|
-if (isset($_GET['choice'])){
|
|
|
- $choice_value = intval($_GET['choice']);
|
|
|
+if (isset($_GET['choice'])){
|
|
|
+ $choice_value = intval($_GET['choice']);
|
|
|
}
|
|
|
|
|
|
// Getting the options by js
|
|
|
if (empty($choice_value)) {
|
|
|
-
|
|
|
- echo "<script>
|
|
|
- // this works for only radio buttons
|
|
|
+
|
|
|
+ echo "<script>
|
|
|
+ // this works for only radio buttons
|
|
|
var f= self.parent.window.document.frm_exercise;
|
|
|
- var choice_js='';
|
|
|
-
|
|
|
+ var choice_js='';
|
|
|
+
|
|
|
var hotspot = new Array();
|
|
|
var hotspotcoord = new Array();
|
|
|
var counter=0;
|
|
|
- for( var i = 0; i < f.elements.length; i++ ) {
|
|
|
- if (f.elements[i].type=='radio' && f.elements[i].checked) {
|
|
|
- //alert( f.elements[i].name);
|
|
|
+ for( var i = 0; i < f.elements.length; i++ ) {
|
|
|
+ if (f.elements[i].type=='radio' && f.elements[i].checked) {
|
|
|
+ //alert( f.elements[i].name);
|
|
|
choice_js = f.elements[i].value;
|
|
|
- counter ++;
|
|
|
- }
|
|
|
-
|
|
|
- if (f.elements[i].type=='hidden' ) {
|
|
|
- name = f.elements[i].name;
|
|
|
+ counter ++;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (f.elements[i].type=='hidden' ) {
|
|
|
+ name = f.elements[i].name;
|
|
|
if (name.substr(0,7)=='hotspot')
|
|
|
- hotspot.push(f.elements[i].value);
|
|
|
-
|
|
|
+ hotspot.push(f.elements[i].value);
|
|
|
+
|
|
|
if (name.substr(0,20)=='hotspot_coordinates')
|
|
|
- hotspotcoord.push(f.elements[i].value);
|
|
|
- //hotspot = f.elements[i].value;
|
|
|
- }
|
|
|
- }
|
|
|
+ hotspotcoord.push(f.elements[i].value);
|
|
|
+ //hotspot = f.elements[i].value;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (counter==0) {
|
|
|
- choice_js=-1; // this is an error
|
|
|
- }
|
|
|
+ choice_js=-1; // this is an error
|
|
|
+ }
|
|
|
//alert(choice_js);
|
|
|
- ";
|
|
|
+ ";
|
|
|
// IMPORTANT
|
|
|
//this is the real redirect function
|
|
|
echo 'window.location.href = "exercise_submit_modal.php?learnpath_id='.$learnpath_id.'&learnpath_item_id='.$learnpath_item_id.'&hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";</script>';
|
|
@@ -116,7 +116,7 @@ $choice = array();
|
|
|
$questionid= $questionList[$questionNum];
|
|
|
// $choice_value => value of the user selection
|
|
|
$choice[$questionid] = $choice_value;
|
|
|
-
|
|
|
+
|
|
|
// initializing
|
|
|
if(!is_array($exerciseResult)) {
|
|
|
$exerciseResult = array();
|
|
@@ -127,39 +127,39 @@ if (is_array($choice)) {
|
|
|
if ($exerciseType == EXERCISE_FEEDBACK_TYPE_DIRECT) {
|
|
|
// $exerciseResult receives the content of the form.
|
|
|
// Each choice of the student is stored into the array $choice
|
|
|
- $exerciseResult = $choice;
|
|
|
+ $exerciseResult = $choice;
|
|
|
} else {
|
|
|
// gets the question ID from $choice. It is the key of the array
|
|
|
list($key)=array_keys($choice);
|
|
|
// if the user didn't already answer this question
|
|
|
if(!isset($exerciseResult[$key])) {
|
|
|
// stores the user answer into the array
|
|
|
- $exerciseResult[$key]=$choice[$key];
|
|
|
+ $exerciseResult[$key]=$choice[$key];
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// the script "exercise_result.php" will take the variable $exerciseResult from the session
|
|
|
|
|
|
Session::write('exerciseResult', $exerciseResult);
|
|
|
-Session::write('exerciseResultCoordinates', $exerciseResultCoordinates);
|
|
|
+Session::write('exerciseResultCoordinates', $exerciseResultCoordinates);
|
|
|
|
|
|
-/*
|
|
|
+/*
|
|
|
// if it is the last question (only for a sequential exercise)
|
|
|
if($questionNum >= $nbrQuestions)
|
|
|
-{
|
|
|
+{
|
|
|
if($debug>0){echo str_repeat(' ',0).'Redirecting to exercise_result.php - Remove debug option to let this happen'."<br />\n";}
|
|
|
// goes to the script that will show the result of the exercise
|
|
|
// header("Location: exercise_result.php?origin=$origin&learnpath_id=$learnpath_id&learnpath_item_id=$learnpath_item_id");
|
|
|
- // echo 'location result';
|
|
|
+ // echo 'location result';
|
|
|
}*/
|
|
|
|
|
|
-// gets the student choice for this question
|
|
|
+// gets the student choice for this question
|
|
|
//print_r($choice); echo "<br>";
|
|
|
|
|
|
|
|
|
// creates a temporary Question object
|
|
|
-if (in_array($questionid, $questionList)) {
|
|
|
+if (in_array($questionid, $questionList)) {
|
|
|
$objQuestionTmp = Question :: read($questionid);
|
|
|
$questionName =$objQuestionTmp->selectTitle();
|
|
|
$questionDescription=$objQuestionTmp->selectDescription();
|
|
@@ -188,70 +188,70 @@ $hot_spot_load = false;
|
|
|
if (!empty($choice_value)) {
|
|
|
for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
|
|
|
$answer = $objAnswerTmp->selectAnswer($answerId);
|
|
|
- $answerComment = $objAnswerTmp->selectComment($answerId);
|
|
|
+ $answerComment = $objAnswerTmp->selectComment($answerId);
|
|
|
$answerDestination = $objAnswerTmp->selectDestination($answerId);
|
|
|
-
|
|
|
- $answerCorrect = $objAnswerTmp->isCorrect($answerId);
|
|
|
+
|
|
|
+ $answerCorrect = $objAnswerTmp->isCorrect($answerId);
|
|
|
$answerWeighting = $objAnswerTmp->selectWeighting($answerId);
|
|
|
$numAnswer = $objAnswerTmp->selectAutoId($answerId);
|
|
|
-
|
|
|
+
|
|
|
//delineation
|
|
|
$delineation_cord = $objAnswerTmp->selectHotspotCoordinates(1);
|
|
|
$answer_delineation_destination=$objAnswerTmp->selectDestination(1);
|
|
|
if ($dbg_local>0) { error_log(__LINE__.' answerId: '.$answerId.'('.$answerType.') - user delineation_cord: '.$delineation_cord.' - $answer_delineation_destination: '.$answer_delineation_destination,0);}
|
|
|
-
|
|
|
+
|
|
|
switch($answerType) {
|
|
|
// for unique answer
|
|
|
case UNIQUE_ANSWER :
|
|
|
- $studentChoice = ($choice_value == $numAnswer)?1:0;
|
|
|
- if ($studentChoice) {
|
|
|
+ $studentChoice = ($choice_value == $numAnswer)?1:0;
|
|
|
+ if ($studentChoice) {
|
|
|
$questionScore +=$answerWeighting;
|
|
|
$totalScore +=$answerWeighting;
|
|
|
- $newquestionList[]=$questionid;
|
|
|
+ $newquestionList[]=$questionid;
|
|
|
}
|
|
|
break;
|
|
|
- case HOT_SPOT_DELINEATION :
|
|
|
+ case HOT_SPOT_DELINEATION :
|
|
|
$studentChoice=$choice[$answerId];
|
|
|
- if ($studentChoice) {
|
|
|
- $newquestionList[]=$questionid;
|
|
|
- }
|
|
|
- if ($answerId===1) {
|
|
|
+ if ($studentChoice) {
|
|
|
+ $newquestionList[]=$questionid;
|
|
|
+ }
|
|
|
+ if ($answerId===1) {
|
|
|
$questionScore +=$answerWeighting;
|
|
|
- $totalScore +=$answerWeighting;
|
|
|
+ $totalScore +=$answerWeighting;
|
|
|
$_SESSION['hotspot_coord'][1] =$delineation_cord;
|
|
|
$_SESSION['hotspot_dest'][1] =$answer_delineation_destination;
|
|
|
- }
|
|
|
- break;
|
|
|
+ }
|
|
|
+ break;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- if ($answerType == UNIQUE_ANSWER || $answerType == MULTIPLE_ANSWER) {
|
|
|
+
|
|
|
+
|
|
|
+ if ($answerType == UNIQUE_ANSWER || $answerType == MULTIPLE_ANSWER) {
|
|
|
//display_unique_or_multiple_answer($answerType, $studentChoice, $answer, $answerComment, $answerCorrect);
|
|
|
//echo $questionScore;
|
|
|
if ($studentChoice) {
|
|
|
$destination = $answerDestination;
|
|
|
- $comment = $answerComment;
|
|
|
+ $comment = $answerComment;
|
|
|
}
|
|
|
} elseif($answerType == HOT_SPOT_DELINEATION) {
|
|
|
- if ($next) {
|
|
|
+ if ($next) {
|
|
|
if ($dbg_local>0) { error_log(__LINE__.' - next',0);}
|
|
|
$hot_spot_load = true; //apparently the script is called twice
|
|
|
- $user_answer = $user_array;
|
|
|
+ $user_answer = $user_array;
|
|
|
$_SESSION['exerciseResultCoordinates'][$questionid]=$user_answer; //needed for exercise_result.php
|
|
|
|
|
|
// we compare only the delineation not the other points
|
|
|
- $answer_question = $_SESSION['hotspot_coord'][1];
|
|
|
+ $answer_question = $_SESSION['hotspot_coord'][1];
|
|
|
$answerDestination = $_SESSION['hotspot_dest'][1];
|
|
|
|
|
|
$poly_user = convert_coordinates($user_answer,'/');
|
|
|
- $poly_answer = convert_coordinates($answer_question,'|');
|
|
|
+ $poly_answer = convert_coordinates($answer_question,'|');
|
|
|
$max_coord = poly_get_max($poly_user,$poly_answer);
|
|
|
|
|
|
if (empty($_GET['hotspot'])) { //no user response
|
|
|
$overlap = -2;
|
|
|
} else {
|
|
|
$poly_user_compiled = poly_compile($poly_user,$max_coord);
|
|
|
- $poly_answer_compiled = poly_compile($poly_answer,$max_coord);
|
|
|
+ $poly_answer_compiled = poly_compile($poly_answer,$max_coord);
|
|
|
$poly_results = poly_result($poly_answer_compiled,$poly_user_compiled,$max_coord);
|
|
|
|
|
|
$overlap = $poly_results['both'];
|
|
@@ -280,46 +280,46 @@ if (!empty($choice_value)) {
|
|
|
if ($dbg_local>1) { error_log(__LINE__.' - Final excess is '.$final_excess,0);}
|
|
|
}
|
|
|
|
|
|
- $destination_items= explode('@@', $answerDestination);
|
|
|
- $threadhold_total = $destination_items[0];
|
|
|
- $threadhold_items=explode(';',$threadhold_total);
|
|
|
+ $destination_items= explode('@@', $answerDestination);
|
|
|
+ $threadhold_total = $destination_items[0];
|
|
|
+ $threadhold_items=explode(';',$threadhold_total);
|
|
|
$threadhold1 = $threadhold_items[0]; // overlap
|
|
|
$threadhold2 = $threadhold_items[1]; // excess
|
|
|
- $threadhold3 = $threadhold_items[2]; //missing
|
|
|
+ $threadhold3 = $threadhold_items[2]; //missing
|
|
|
|
|
|
// echo $final_overlap.' '.$threadhold1 .' - '. $final_missing.' '. $threadhold2 .' - '. $final_excess.' '. $threadhold3;
|
|
|
|
|
|
// if is delineation
|
|
|
- if ($answerId===1) {
|
|
|
+ if ($answerId===1) {
|
|
|
//setting colors
|
|
|
- if ($final_overlap>=$threadhold1) {
|
|
|
+ if ($final_overlap>=$threadhold1) {
|
|
|
$overlap_color=true; //echo 'a';
|
|
|
}
|
|
|
//echo $excess.'-'.$threadhold2;
|
|
|
- if ($final_excess<=$threadhold2) {
|
|
|
+ if ($final_excess<=$threadhold2) {
|
|
|
$excess_color=true; //echo 'b';
|
|
|
}
|
|
|
//echo '--------'.$missing.'-'.$threadhold3;
|
|
|
- if ($final_missing<=$threadhold3) {
|
|
|
+ if ($final_missing<=$threadhold3) {
|
|
|
$missing_color=true; //echo 'c';
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
- // if pass
|
|
|
+ // if pass
|
|
|
//if ($final_overlap>=$threadhold1 && $final_missing<=$threadhold2 && $final_excess<=$threadhold3) {
|
|
|
- if ($final_overlap>=$threadhold1 && $final_missing<=$threadhold3 && $final_excess<=$threadhold2) {
|
|
|
- $next=1; //go to the oars
|
|
|
- $result_comment=get_lang('Acceptable');
|
|
|
+ if ($final_overlap>=$threadhold1 && $final_missing<=$threadhold3 && $final_excess<=$threadhold2) {
|
|
|
+ $next=1; //go to the oars
|
|
|
+ $result_comment=get_lang('Acceptable');
|
|
|
} else {
|
|
|
$next=1; //Go to the oars. If $next = 0 we will show this message: "One (or more) area at risk has been hit" instead of the table resume with the results
|
|
|
$wrong_results = true;
|
|
|
- $result_comment=get_lang('Unacceptable');
|
|
|
- $special_comment = $comment=$answerDestination=$objAnswerTmp->selectComment(1);
|
|
|
+ $result_comment=get_lang('Unacceptable');
|
|
|
+ $special_comment = $comment=$answerDestination=$objAnswerTmp->selectComment(1);
|
|
|
$answerDestination=$objAnswerTmp->selectDestination(1);
|
|
|
$destination_items= explode('@@', $answerDestination);
|
|
|
$try_hotspot=$destination_items[1];
|
|
|
$lp_hotspot=$destination_items[2];
|
|
|
$select_question_hotspot=$destination_items[3];
|
|
|
- $url_hotspot=$destination_items[4];
|
|
|
+ $url_hotspot=$destination_items[4];
|
|
|
//echo 'show the feedback';
|
|
|
}
|
|
|
} elseif($answerId>1) {
|
|
@@ -330,9 +330,9 @@ if (!empty($choice_value)) {
|
|
|
continue;
|
|
|
}
|
|
|
if ($dbg_local>0) { error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR',0);}
|
|
|
- //check the intersection between the oar and the user
|
|
|
+ //check the intersection between the oar and the user
|
|
|
//echo 'user'; print_r($x_user_list); print_r($y_user_list);
|
|
|
- //echo 'official';print_r($x_list);print_r($y_list);
|
|
|
+ //echo 'official';print_r($x_list);print_r($y_list);
|
|
|
//$result = get_intersection_data($x_list,$y_list,$x_user_list,$y_user_list);
|
|
|
|
|
|
//$delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
|
|
@@ -340,14 +340,14 @@ if (!empty($choice_value)) {
|
|
|
|
|
|
$poly_answer = convert_coordinates($delineation_cord,'|');
|
|
|
$max_coord = poly_get_max($poly_user,$poly_answer); //getting max coordinates
|
|
|
- $test = false;
|
|
|
+ $test = false;
|
|
|
// if ($answerId == 2 ){$test = true;} for test oars
|
|
|
|
|
|
if (empty($_GET['hotspot'])) { //no user response
|
|
|
$overlap = false;
|
|
|
} else {
|
|
|
- // poly_compile really works tested with gnuplot
|
|
|
- $poly_user_compiled = poly_compile($poly_user,$max_coord,$test);//$poly_user is already set when answerid = 1
|
|
|
+ // poly_compile really works tested with gnuplot
|
|
|
+ $poly_user_compiled = poly_compile($poly_user,$max_coord,$test);//$poly_user is already set when answerid = 1
|
|
|
$poly_answer_compiled = poly_compile($poly_answer,$max_coord,$test);
|
|
|
$overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
|
|
|
}
|
|
@@ -359,26 +359,26 @@ if (!empty($choice_value)) {
|
|
|
} else {
|
|
|
if ($dbg_local>0) { error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit',0);}
|
|
|
|
|
|
- $organs_at_risk_hit++;
|
|
|
+ $organs_at_risk_hit++;
|
|
|
//show the feedback
|
|
|
$next=1;
|
|
|
- $comment=$answerDestination=$objAnswerTmp->selectComment($answerId);
|
|
|
- $answerDestination=$objAnswerTmp->selectDestination($answerId);
|
|
|
+ $comment=$answerDestination=$objAnswerTmp->selectComment($answerId);
|
|
|
+ $answerDestination=$objAnswerTmp->selectDestination($answerId);
|
|
|
$destination_items= explode('@@', $answerDestination);
|
|
|
$try_hotspot=$destination_items[1];
|
|
|
$lp_hotspot=$destination_items[2];
|
|
|
$select_question_hotspot=$destination_items[3];
|
|
|
- $url_hotspot=$destination_items[4];
|
|
|
+ $url_hotspot=$destination_items[4];
|
|
|
}
|
|
|
}
|
|
|
- } else {
|
|
|
- // the first delineation feedback
|
|
|
- if ($dbg_local>0) { error_log(__LINE__.' first',0);}
|
|
|
+ } else {
|
|
|
+ // the first delineation feedback
|
|
|
+ if ($dbg_local>0) { error_log(__LINE__.' first',0);}
|
|
|
//we send the error
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if ($overlap_color) {
|
|
|
$overlap_color='green';
|
|
|
} else {
|
|
@@ -394,89 +394,89 @@ if (!empty($choice_value)) {
|
|
|
} else {
|
|
|
$excess_color='red';
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!is_numeric($final_overlap)) {
|
|
|
$final_overlap = 0;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!is_numeric($final_missing)) {
|
|
|
$final_missing = 0;
|
|
|
}
|
|
|
if (!is_numeric($final_excess)) {
|
|
|
$final_excess = 0;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if ($final_excess>100) {
|
|
|
$final_excess = 100;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- $table_resume = '<table class="data_table" >
|
|
|
+
|
|
|
+
|
|
|
+ $table_resume = '<table class="data_table" >
|
|
|
<tr class="row_odd" >
|
|
|
<td></td>
|
|
|
<td ><b>'.get_lang('Requirements').'</b></td>
|
|
|
<td><b>'.get_lang('YourAnswer').'</b></td>
|
|
|
</tr>
|
|
|
-
|
|
|
+
|
|
|
<tr class="row_even">
|
|
|
<td><b>'.get_lang('Overlap').'</b></td>
|
|
|
<td>'.get_lang('Min').' '.$threadhold1.'</td>
|
|
|
<td><div style="color:'.$overlap_color.'">'.(($final_overlap < 0)?0:intval($final_overlap)).'</div></td>
|
|
|
</tr>
|
|
|
-
|
|
|
+
|
|
|
<tr>
|
|
|
<td><b>'.get_lang('Excess').'</b></td>
|
|
|
<td>'.get_lang('Max').' '.$threadhold2.'</td>
|
|
|
<td><div style="color:'.$excess_color.'">'.(($final_excess < 0)?0:intval($final_excess)).'</div></td>
|
|
|
</tr>
|
|
|
-
|
|
|
+
|
|
|
<tr class="row_even">
|
|
|
<td><b>'.get_lang('Missing').'</b></td>
|
|
|
<td>'.get_lang('Max').' '.$threadhold3.'</td>
|
|
|
<td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
|
|
|
- </tr>
|
|
|
+ </tr>
|
|
|
</table>';
|
|
|
- //var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
|
|
|
-}
|
|
|
+}
|
|
|
+
|
|
|
$_SESSION['newquestionList'] = $newquestionList;
|
|
|
|
|
|
$links='';
|
|
|
|
|
|
-if ($choice_value == -1) {
|
|
|
+if ($choice_value == -1) {
|
|
|
if ($answerType != HOT_SPOT_DELINEATION) {
|
|
|
$links .= '<a href="#" onclick="self.parent.tb_remove();">'.get_lang('ChooseAnAnswer').'</a><br />';
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-if ($answerType != HOT_SPOT_DELINEATION) {
|
|
|
+if ($answerType != HOT_SPOT_DELINEATION) {
|
|
|
if (!empty($destination)) {
|
|
|
$item_list = explode('@@',$destination);
|
|
|
//print_R($item_list);
|
|
|
$try = $item_list[0];
|
|
|
$lp = $item_list[1];
|
|
|
$destinationid= $item_list[2];
|
|
|
- $url=$item_list[3];
|
|
|
- }
|
|
|
+ $url=$item_list[3];
|
|
|
+ }
|
|
|
$table_resume='';
|
|
|
} else {
|
|
|
$try = $try_hotspot;
|
|
|
$lp = $lp_hotspot;
|
|
|
$destinationid= $select_question_hotspot;
|
|
|
$url=$url_hotspot;
|
|
|
- if ($organs_at_risk_hit==0 && $wrong_results==false ) {
|
|
|
+ if ($organs_at_risk_hit==0 && $wrong_results==false ) {
|
|
|
// no error = no oar and no wrong result for delineation
|
|
|
//show if no error
|
|
|
//echo 'no error';
|
|
|
- $comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
|
|
|
- $answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
|
|
|
+ $comment= $answerComment = $objAnswerTmp->selectComment($nbrAnswers);
|
|
|
+ $answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
|
|
|
|
|
|
//we send the error
|
|
|
$destination_items= explode('@@', $answerDestination);
|
|
|
$try=$destination_items[1];
|
|
|
$lp=$destination_items[2];
|
|
|
$destinationid=$destination_items[3];
|
|
|
- $url=$destination_items[4];
|
|
|
- $exerciseResult[$questionid] = 1;
|
|
|
+ $url=$destination_items[4];
|
|
|
+ $exerciseResult[$questionid] = 1;
|
|
|
} else {
|
|
|
$exerciseResult[$questionid] = 0;
|
|
|
}
|
|
@@ -484,17 +484,17 @@ if ($answerType != HOT_SPOT_DELINEATION) {
|
|
|
|
|
|
|
|
|
// the link to retry the question
|
|
|
-if ($try==1) {
|
|
|
- $num_value_array= (array_keys($questionList, $questionid));
|
|
|
+if ($try==1) {
|
|
|
+ $num_value_array= (array_keys($questionList, $questionid));
|
|
|
$links.= Display :: return_icon('reload.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('TryAgain').'</a><br /><br />';
|
|
|
}
|
|
|
|
|
|
// the link to theory (a learning path)
|
|
|
-if (!empty($lp)) {
|
|
|
+if (!empty($lp)) {
|
|
|
$lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
|
|
|
require_once('../newscorm/learnpathList.class.php');
|
|
|
- $list = new LearnpathList(api_get_user_id());
|
|
|
- $flat_list = $list->get_flat_list();
|
|
|
+ $list = new LearnpathList(api_get_user_id());
|
|
|
+ $flat_list = $list->get_flat_list();
|
|
|
$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';
|
|
|
}
|
|
|
$links.='<br />';
|
|
@@ -509,23 +509,23 @@ if ($destinationid==-1) {
|
|
|
$links.= Display :: return_icon('finish.gif', '', array ('style' => 'width:22px; height:22px; padding-left:0px;padding-right:5px;')).'<a onclick="SendEx(-1);" href="#">'.get_lang('EndActivity').'</a><br /><br />';
|
|
|
} else {
|
|
|
// the link to other question
|
|
|
- if (in_array($destinationid,$questionList)) {
|
|
|
+ if (in_array($destinationid,$questionList)) {
|
|
|
$objQuestionTmp = Question :: read($destinationid);
|
|
|
$questionName=$objQuestionTmp->selectTitle();
|
|
|
- $num_value_array= (array_keys($questionList, $destinationid));
|
|
|
+ $num_value_array= (array_keys($questionList, $destinationid));
|
|
|
$links.= Display :: return_icon('quiz.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a onclick="SendEx('.$num_value_array[0].');" href="#">'.get_lang('GoToQuestion').' '.$num_value_array[0].'</a><br /><br />';
|
|
|
}
|
|
|
}
|
|
|
|
|
|
echo '<script>
|
|
|
- function SendEx(num) {
|
|
|
-
|
|
|
- if (num == -1) {
|
|
|
- self.parent.window.location.href = "exercise_result.php?take_session=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'";
|
|
|
- self.parent.tb_remove();
|
|
|
+ function SendEx(num) {
|
|
|
+
|
|
|
+ if (num == -1) {
|
|
|
+ self.parent.window.location.href = "exercise_result.php?take_session=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'";
|
|
|
+ self.parent.tb_remove();
|
|
|
} else {
|
|
|
num -= 1;
|
|
|
- self.parent.window.location.href = "exercise_submit.php?tryagain=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'";
|
|
|
+ self.parent.window.location.href = "exercise_submit.php?tryagain=1&exerciseId='.$exerciseId.'&num="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'&learnpath_item_id='.$learnpath_item_id.'&learnpath_id='.$learnpath_id.'";
|
|
|
self.parent.tb_remove();
|
|
|
}
|
|
|
}
|
|
@@ -535,41 +535,41 @@ if ($links!='') {
|
|
|
echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
|
|
|
<a onclick="self.parent.tb_remove();" href="#" style="float:right; margin-top:-10px;">'.api_ucfirst(get_lang('Close')).'</a>
|
|
|
<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
|
|
|
-
|
|
|
- if ($answerType == HOT_SPOT_DELINEATION) {
|
|
|
+
|
|
|
+ if ($answerType == HOT_SPOT_DELINEATION) {
|
|
|
if ($organs_at_risk_hit > 0) {
|
|
|
- //$message='<p>'.get_lang('YourDelineation').'</p>';
|
|
|
- //$message.=$table_resume;
|
|
|
+ //$message='<p>'.get_lang('YourDelineation').'</p>';
|
|
|
+ //$message.=$table_resume;
|
|
|
$message.='<br />'.get_lang('ResultIs').' <b>'.get_lang('Unacceptable').'</b><br />';
|
|
|
//if ($wrong_results) { }
|
|
|
$message.='<p style="color:#DC0A0A;"><b>'.get_lang('OARHit').'</b></p>';
|
|
|
- $message.='<p>'.$comment.'</p>';
|
|
|
- } else {
|
|
|
- $message='<p>'.get_lang('YourDelineation').'</p>';
|
|
|
- $message.=$table_resume;
|
|
|
- $message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
|
|
|
- $message.='<p>'.$comment.'</p>';
|
|
|
+ $message.='<p>'.$comment.'</p>';
|
|
|
+ } else {
|
|
|
+ $message='<p>'.get_lang('YourDelineation').'</p>';
|
|
|
+ $message.=$table_resume;
|
|
|
+ $message.='<br />'.get_lang('ResultIs').' <b>'.$result_comment.'</b><br />';
|
|
|
+ $message.='<p>'.$comment.'</p>';
|
|
|
}
|
|
|
echo $message;
|
|
|
} else {
|
|
|
echo '<p>'.$comment.'</p>';
|
|
|
- }
|
|
|
+ }
|
|
|
echo '<h3>'.$links.'</h3>';
|
|
|
echo '</div>';
|
|
|
-
|
|
|
- $_SESSION['hot_spot_result']=$message;
|
|
|
+
|
|
|
+ $_SESSION['hot_spot_result']=$message;
|
|
|
$_SESSION['hotspot_delineation_result'][$exerciseId][$questionid] = array($message, $exerciseResult[$questionid]);
|
|
|
//reseting the exerciseResult variable
|
|
|
Session::write('exerciseResult',$exerciseResult);
|
|
|
-
|
|
|
+
|
|
|
//save this variables just in case the exercise loads an LP with other exercise
|
|
|
$_SESSION['objExerciseExtra'.$exerciseId] = $_SESSION['objExercise'];
|
|
|
$_SESSION['exerciseResultExtra'.$exerciseId] = $_SESSION['exerciseResult'];
|
|
|
- $_SESSION['questionListExtra'.$exerciseId] = $_SESSION['questionList'];
|
|
|
+ $_SESSION['questionListExtra'.$exerciseId] = $_SESSION['questionList'];
|
|
|
} else {
|
|
|
$questionNum++;
|
|
|
echo '<script>
|
|
|
- self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
|
|
|
- //self.parent.tb_remove();
|
|
|
- </script>';
|
|
|
+ self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
|
|
|
+ //self.parent.tb_remove();
|
|
|
+ </script>';
|
|
|
}
|