Adding origin parameter + intval funcionts added

skala
Julio Montoya 16 years ago
parent bc5aa96570
commit 52dfe8f871
  1. 102
      main/exercice/exercise_submit_modal.php

@ -33,7 +33,7 @@ if ( empty ( $origin ) ) {
}
$_SESSION['hotspot_coord']=array();
$newquestionList= $_SESSION['newquestionList'];
$newquestionList=$_SESSION['newquestionList'];
$questionList = $_SESSION['questionList'];
$exerciseId = intval($_GET['exerciseId']);
$exerciseType = intval($_GET['exerciseType']);
@ -49,11 +49,13 @@ foreach ($coords as $coord) {
}
$user_array = substr($user_array,0,-1);
if (isset($_GET['choice'])) {
if ( isset ( $_GET['choice'] ) )
{
$choice_value = $_GET['choice'];
}
// getting the options by js
if (empty($choice_value)) {
if (empty($choice_value) )
{
echo '<script type="text/javascript">'."
// this works for only radio buttons
var f= self.parent.window.document.frm_exercise;
@ -62,15 +64,18 @@ if (empty($choice_value)) {
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) {
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' ) {
if (f.elements[i].type=='hidden' )
{
name = f.elements[i].name;
if (name.substr(0,7)=='hotspot')
@ -78,14 +83,19 @@ if (empty($choice_value)) {
if (name.substr(0,20)=='hotspot_coordinates')
hotspotcoord.push(f.elements[i].value);
//hotspot = f.elements[i].value;
}
//hotspot = f.elements[i].value;
}
}
if (counter==0) {
if (counter==0)
{
choice_js=-1; // this is an error
}
//alert(choice_js);";
echo 'window.location.href = "exercise_submit_modal.php?hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&questionnum='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.Security::remove_XSS($origin).'&gradebook='.$gradebook.'";</script>';
//alert(choice_js);
";
echo 'window.location.href = "exercise_submit_modal.php?hotspotcoord="+ hotspotcoord + "&hotspot="+ hotspot + "&choice="+ choice_js + "&exerciseId='.$exerciseId.'&questionnum='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'&gradebook='.$gradebook.'";</script>';
}
$choice=array();
@ -94,18 +104,23 @@ $questionid= $questionList[$questionNum];
$choice[$questionid]=$choice_value;
// initializing
if(!is_array($exerciseResult)) {
if(!is_array($exerciseResult))
{
$exerciseResult=array();
}
// if the user has answered at least one question
if(is_array($choice)) {
if($exerciseType == 1) {
if(is_array($choice))
{
if($exerciseType == 1)
{
// $exerciseResult receives the content of the form.
// Each choice of the student is stored into the array $choice
$exerciseResult=$choice;
} else {
}
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
@ -136,7 +151,8 @@ if($questionNum >= $nbrQuestions)
//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();
@ -161,7 +177,8 @@ $_SESSION['hotspot_dest']=array();
$overlap_color=$missing_color=$excess_color=false;
$organs_at_risk_hit=0;
if (!empty($choice_value)) {
if (!empty($choice_value))
{
for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
$answer=$objAnswerTmp->selectAnswer($answerId);
$answerComment=$objAnswerTmp->selectComment($answerId);
@ -454,14 +471,16 @@ foreach($pre_list_destination as $value)
//echo '<pre>';print_r($destination);
$links='';
// Try again link
if ($try==1) {
// the link to retry the question
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').$origin.'</a><br /><br />';
$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 />';
}
// Theory link (to a learning path)
if (!empty($lp)) {
// the link to theory (a learning path)
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());
@ -471,17 +490,21 @@ if (!empty($lp)) {
$links.='<br />';
// Go to link - external website or link
// the link to an external website or link
if (!empty($url)) {
$links.= Display :: return_icon('link.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$url.'">'.get_lang('VisitUrl').'</a><br /><br />';
}
// Finish activity - the link to finish the test
if ($destinationid==-1) {
// the link to finish the test
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)) {
}
// the link to other question
else
{
if (in_array($destinationid,$questionList))
{
$objQuestionTmp = Question :: read($destinationid);
$questionName=$objQuestionTmp->selectTitle();
$num_value_array= (array_keys($questionList, $destinationid));
@ -489,12 +512,17 @@ if ($destinationid==-1) {
}
}
echo '<script> function SendEx(num)
{
if (num==-1) {
if (num==-1)
{
self.parent.window.location.href = "exercise_result.php?origin='.$origin.'";
self.parent.tb_remove();
} else {
}
else
{
self.parent.window.location.href = "exercice_submit.php?tryagain=1&exerciseId='.$exerciseId.'&questionNum="+num+"&exerciseType='.$exerciseType.'&origin='.$origin.'";
self.parent.tb_remove();
}
@ -503,13 +531,15 @@ echo '<script> function SendEx(num)
api_protect_course_script();
if ($links!='') {
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;" id="exercise_close_link">'.get_lang('Close').'</a>
<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>
<p style="text-align:center">';
if ($answerType == HOT_SPOT_DELINEATION) {
if ($answerType == HOT_SPOT_DELINEATION)
{
$message='<p>'.get_lang('YourDelineation').'</p>';
$message.=$table_resume;
$message.='<br />'.get_lang('ResultIs').' '.$result_comment.'<br />';
@ -527,11 +557,15 @@ if ($links!='') {
//echo '<a onclick="self.parent.tb_remove();" href="#" style="float:right;">'.get_lang('Close').'</a>';
echo '</div>';
$_SESSION['hot_spot_result']=$message;
} else {
}
else
{
$questionNum++;
echo '<script>
self.parent.window.location.href = "exercice_submit.php?exerciseId='.$exerciseId.'&questionNum='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
//self.parent.tb_remove();
</script>';
</script>';
}
?>
Loading…
Cancel
Save