chamilo / chamilo-lms

main/exercice/question_create.php

Indentation +6 added lines, -6 removed lines

@@ -51,17 +51,17 @@
 $result = Database::query($sql);
 $exercises['-'] = '-'.get_lang('SelectExercise').'-';
 while ($row = Database :: fetch_array($result)) {
-	$exercises[$row['id']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE);
+    $exercises[$row['id']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE);
 }
 $form->addElement('select', 'exercise', get_lang('Exercise'), $exercises);
 
 // generate default content
 $form->addElement(
-	'checkbox',
-	'is_content',
-	null,
-	get_lang('GenerateDefaultContent'),
-	array('checked' => true)
+    'checkbox',
+    'is_content',
+    null,
+    get_lang('GenerateDefaultContent'),
+    array('checked' => true)
 );
 
 // the submit button

main/exercice/hotspot_updatescore.inc.php

Indentation +14 added lines, -14 removed lines

@@ -17,25 +17,25 @@
 $hotspotId	  = $_GET['hotspotId'];
 $exerciseId   = $objExcercise->selectId();
 if ($_GET['answerId'] == "0") { // click is NOT on a hotspot
-	$hit = 0;
-	$answerId = $hotspotId;
+    $hit = 0;
+    $answerId = $hotspotId;
 
-	// remove from session
-	unset($_SESSION['exerciseResult'][$questionId][$answerId]);
+    // remove from session
+    unset($_SESSION['exerciseResult'][$questionId][$answerId]);
 
-	// Save clicking order
-	//$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['order'])+1;
-	//$_SESSION['exerciseResult'][$questionId]['order'][$answerOrderId] = $answerId;
+    // Save clicking order
+    //$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['order'])+1;
+    //$_SESSION['exerciseResult'][$questionId]['order'][$answerOrderId] = $answerId;
 } else { // user clicked ON a hotspot
-	$hit = 1;
-	$answerId = $hotspotId;
+    $hit = 1;
+    $answerId = $hotspotId;
 
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 
-	// Save clicking order
-	//$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['order'])+1;
-	//$_SESSION['exerciseResult'][$questionId]['order'][$answerOrderId] = $answerId;
+    // Save clicking order
+    //$answerOrderId = count($_SESSION['exerciseResult'][$questionId]['order'])+1;
+    //$_SESSION['exerciseResult'][$questionId]['order'][$answerOrderId] = $answerId;
 }
 
 //round-up the coordinates

main/exercice/hotspot_admin.inc.php

Indentation +4 added lines, -4 removed lines

@@ -907,10 +907,10 @@
                                         <?php } else { ?>
                                             <input class="form-control" type="text" name="weighting[<?php echo $i; ?>]" value="<?php echo (isset($weighting[$i]) ? $weighting[$i] : 10); ?>" />
                                                    <?php
-                                               }
-                                           }
-                                           if ($answerType == HOT_SPOT) {
-                                               ?>
+                                                }
+                                            }
+                                            if ($answerType == HOT_SPOT) {
+                                                ?>
                                         <input class="form-control" type="text" name="weighting[<?php echo $i; ?>]" value="<?php echo (isset($weighting[$i]) ? $weighting[$i] : 10); ?>" />
                                         <input type="hidden" name="hotspot_coordinates[<?php echo $i; ?>]" value="<?php echo (empty($hotspot_coordinates[$i]) ? '0;0|0|0' : $hotspot_coordinates[$i]); ?>" />
                                         <input type="hidden" name="hotspot_type[<?php echo $i; ?>]" value="<?php echo (empty($hotspot_type[$i]) ? 'square' : $hotspot_type[$i]); ?>" />

main/exercice/hotspot_savescore.inc.php

Indentation +6 added lines, -6 removed lines

@@ -17,15 +17,15 @@
 $answerOrderId = count($_SESSION['exerciseResult'][$questionId]['ids'])+1;
 if ($_GET['answerId'] == "0") // click is NOT on a hotspot
 {
-	$hit = 0;
-	$answerId = NULL;
+    $hit = 0;
+    $answerId = NULL;
 }
 else // user clicked ON a hotspot
 {
-	$hit = 1;
-	$answerId = api_substr($_GET['answerId'],22,2);
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    $hit = 1;
+    $answerId = api_substr($_GET['answerId'],22,2);
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 }
 //round-up the coordinates
 $coords = explode('/',$coordinates);

main/exercice/exercise_submit_modal.php

Indentation +144 added lines, -144 removed lines

@@ -41,13 +41,13 @@ 
 $learnpath_id = 0;
 
 if (empty($learnpath_id)) {
-	$learnpath_id = Security::remove_XSS($_REQUEST['learnpath_id']);
+    $learnpath_id = Security::remove_XSS($_REQUEST['learnpath_id']);
 }
 
 $learnpath_item_id = 0;
 
 if (empty($learnpath_item_id)) {
-	$learnpath_item_id = Security::remove_XSS($_REQUEST['learnpath_item_id']);
+    $learnpath_item_id = Security::remove_XSS($_REQUEST['learnpath_item_id']);
 }
 
 $_SESSION['hotspot_coord']=array();
@@ -68,12 +68,12 @@ 
 $coords = explode('/', $_GET['hotspot']);
 $user_array = '';
 if (is_array($coords) && count($coords) > 0) {
-	foreach ($coords as $coord) {
+    foreach ($coords as $coord) {
         if (!empty($coord)) {
             list($x, $y) = explode(';', $coord);
             $user_array .= round($x).';'.round($y).'/';
         }
-	}
+    }
 }
 
 $choice_value = '';
@@ -87,7 +87,7 @@ 
 // Getting the options by js
 if (empty($choice_value)) {
 
-	echo "<script>
+    echo "<script>
 		// this works for only radio buttons
 		var f = self.parent.window.document.frm_exercise;
 		var choice_js='';
@@ -116,12 +116,12 @@ 
 		}
 
 	";
-	// 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.'";';
+    // 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.'";';
     echo ' url = "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.'";';
     echo "$('#global-modal .modal-body').load(url);";
-	echo '</script>';
+    echo '</script>';
 
     exit;
 }
@@ -174,12 +174,12 @@ 
 
 // creates a temporary Question object
 if (in_array($questionid, $questionList)) {
-	$objQuestionTmp 	= Question :: read($questionid);
-	$questionName		=$objQuestionTmp->selectTitle();
-	$questionDescription=$objQuestionTmp->selectDescription();
-	$questionWeighting	=$objQuestionTmp->selectWeighting();
-	$answerType			=$objQuestionTmp->selectType();
-	$quesId				=$objQuestionTmp->selectId(); //added by priya saini
+    $objQuestionTmp 	= Question :: read($questionid);
+    $questionName		=$objQuestionTmp->selectTitle();
+    $questionDescription=$objQuestionTmp->selectDescription();
+    $questionWeighting	=$objQuestionTmp->selectWeighting();
+    $answerType			=$objQuestionTmp->selectType();
+    $quesId				=$objQuestionTmp->selectId(); //added by priya saini
 }
 
 $objAnswerTmp=new Answer($questionid);
@@ -202,43 +202,43 @@ 
 $totalScore = 0;
 
 if (!empty($choice_value)) {
-	for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
-		$answer            = $objAnswerTmp->selectAnswer($answerId);
-		$answerComment     = $objAnswerTmp->selectComment($answerId);
-		$answerDestination = $objAnswerTmp->selectDestination($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);
+    for ($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+        $answer            = $objAnswerTmp->selectAnswer($answerId);
+        $answerComment     = $objAnswerTmp->selectComment($answerId);
+        $answerDestination = $objAnswerTmp->selectDestination($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) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$newquestionList[]=$questionid;
-				}
-				break;
-			case HOT_SPOT_DELINEATION :
-			    $studentChoice=$choice[$answerId];
-				if ($studentChoice) {
-					$newquestionList[]=$questionid;
-				}
-				if ($answerId===1) {
-					$questionScore	+=$answerWeighting;
-					$totalScore		+=$answerWeighting;
-					$_SESSION['hotspot_coord'][1]	=$delineation_cord;
-					$_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
-				}
-				break;
-		}
+        switch($answerType) {
+            // for unique answer
+            case UNIQUE_ANSWER :
+                $studentChoice = ($choice_value == $numAnswer)?1:0;
+                if ($studentChoice) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $newquestionList[]=$questionid;
+                }
+                break;
+            case HOT_SPOT_DELINEATION :
+                $studentChoice=$choice[$answerId];
+                if ($studentChoice) {
+                    $newquestionList[]=$questionid;
+                }
+                if ($answerId===1) {
+                    $questionScore	+=$answerWeighting;
+                    $totalScore		+=$answerWeighting;
+                    $_SESSION['hotspot_coord'][1]	=$delineation_cord;
+                    $_SESSION['hotspot_dest'][1]	=$answer_delineation_destination;
+                }
+                break;
+        }
 
 
         if ($answerType == UNIQUE_ANSWER || $answerType == MULTIPLE_ANSWER) {
@@ -335,7 +335,7 @@ 
                         $lp_hotspot=$destination_items[2];
                         $select_question_hotspot=$destination_items[3];
                         $url_hotspot=$destination_items[4];
-                         //echo 'show the feedback';
+                            //echo 'show the feedback';
                     }
                 } elseif($answerId>1) {
                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
@@ -392,41 +392,41 @@ 
                 //we send the error
             }
         }
-	}
+    }
 
-	if ($overlap_color) {
-		$overlap_color='green';
+    if ($overlap_color) {
+        $overlap_color='green';
     } else {
-		$overlap_color='red';
+        $overlap_color='red';
     }
-	if ($missing_color) {
-		$missing_color='green';
+    if ($missing_color) {
+        $missing_color='green';
     } else {
-		$missing_color='red';
+        $missing_color='red';
     }
-	if ($excess_color) {
-		$excess_color='green';
+    if ($excess_color) {
+        $excess_color='green';
     } else {
-		$excess_color='red';
+        $excess_color='red';
     }
 
     if (!is_numeric($final_overlap)) {
-    	$final_overlap = 0;
+        $final_overlap = 0;
     }
 
     if (!is_numeric($final_missing)) {
-    	$final_missing = 0;
+        $final_missing = 0;
     }
     if (!is_numeric($final_excess)) {
-    	$final_excess = 0;
+        $final_excess = 0;
     }
 
     if ($final_excess>100) {
-    	$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>
@@ -451,7 +451,7 @@ 
 		<td><div style="color:'.$missing_color.'">'.(($final_missing < 0)?0:intval($final_missing)).'</div></td>
 	</tr>
 	</table>';
-	//var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
+    //var_dump($final_overlap, $threadhold1 , $final_missing, $threadhold2 , $final_excess, $threadhold3);
 }
 $_SESSION['newquestionList'] = $newquestionList;
 
@@ -468,68 +468,68 @@ 
 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];
+        //print_R($item_list);
+        $try = $item_list[0];
+        $lp = $item_list[1];
+        $destinationid= $item_list[2];
+        $url=$item_list[3];
     }
-	$table_resume='';
+    $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 ) {
-		// 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);
-
-		//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;
-	} else {
-		$exerciseResult[$questionid] = 0;
-	}
+        $try = $try_hotspot;
+        $lp = $lp_hotspot;
+        $destinationid= $select_question_hotspot;
+        $url=$url_hotspot;
+    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);
+
+        //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;
+    } else {
+        $exerciseResult[$questionid] = 0;
+    }
 }
 
 // the link to retry the question
 if (isset($try) && $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 />';
+    $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)) {
-	$lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
-	$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 />';
+    $lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
+    $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 />';
 
 // 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 />';
+    $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 />';
 }
 
 // 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 />';
+    $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)) {
-		$objQuestionTmp = Question :: read($destinationid);
-		$questionName=$objQuestionTmp->selectTitle();
-		$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 />';
-	}
+    // the link to other question
+    if (in_array($destinationid,$questionList)) {
+        $objQuestionTmp = Question :: read($destinationid);
+        $questionName=$objQuestionTmp->selectTitle();
+        $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>
@@ -546,43 +546,43 @@ 
 </script>';
 
 if ($links!='') {
-	/*echo '<div id="ModalContent" style="padding-bottom:30px;padding-top:10px;padding-left:20px;padding-right:20px;">
+    /*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>';*/
-	echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
-
-	if ($answerType == HOT_SPOT_DELINEATION) {
-		if ($organs_at_risk_hit > 0) {
-			//$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>';
-		}
-		echo $message;
-	} else {
-		echo '<p>'.$comment.'</p>';
-	}
-	echo '<h3>'.$links.'</h3>';
-	echo '</div>';
-
-	$_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'];
+    echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>';
+
+    if ($answerType == HOT_SPOT_DELINEATION) {
+        if ($organs_at_risk_hit > 0) {
+            //$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>';
+        }
+        echo $message;
+    } else {
+        echo '<p>'.$comment.'</p>';
+    }
+    echo '<h3>'.$links.'</h3>';
+    echo '</div>';
+
+    $_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'];
 } else {
-	$questionNum++;
-	echo '<script>
+    $questionNum++;
+    echo '<script>
 			self.parent.window.location.href = "exercise_submit.php?exerciseId='.$exerciseId.'&num='.$questionNum.'&exerciseType='.$exerciseType.'&origin='.$origin.'";
    			//self.parent.tb_remove();
  	 	</script>';

main/exercice/answer.class.php

Indentation +296 added lines, -296 removed lines

@@ -155,12 +155,12 @@ 
         return [];
     }
 
-     /**
-     * returns all answer ids from this question Id
-     *
-     * @author Yoselyn Castillo
-     * @return array - $id (answer ids)
-     */
+        /**
+         * returns all answer ids from this question Id
+         *
+         * @author Yoselyn Castillo
+         * @return array - $id (answer ids)
+         */
     public function selectAnswerId()
     {
         $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
@@ -180,7 +180,7 @@ 
         }
 
         return $id;
-	}
+    }
 
     /**
      * Reads answer information from the data base ordered by parameter
@@ -190,23 +190,23 @@ 
      */
     public function readOrderedBy($field, $order='ASC')
     {
-		$field = Database::escape_string($field);
-		if (empty($field)) {
-			$field = 'position';
-		}
+        $field = Database::escape_string($field);
+        if (empty($field)) {
+            $field = 'position';
+        }
 
-		if ($order != 'ASC' && $order!='DESC') {
-			$order = 'ASC';
-		}
+        if ($order != 'ASC' && $order!='DESC') {
+            $order = 'ASC';
+        }
 
-		$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
-		$TBL_QUIZ = Database::get_course_table(TABLE_QUIZ_QUESTION);
-		$questionId = intval($this->questionId);
+        $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        $TBL_QUIZ = Database::get_course_table(TABLE_QUIZ_QUESTION);
+        $questionId = intval($this->questionId);
 
-		$sql = "SELECT type FROM $TBL_QUIZ
+        $sql = "SELECT type FROM $TBL_QUIZ
 		        WHERE c_id = {$this->course_id} AND id = $questionId";
-		$result_question = Database::query($sql);
-		$questionType = Database::fetch_array($result_question);
+        $result_question = Database::query($sql);
+        $questionType = Database::fetch_array($result_question);
 
         if ($questionType['type'] == DRAGGABLE) {
             // Random is done by submit.js.tpl
@@ -215,7 +215,7 @@ 
             return true;
         }
 
-		$sql = "SELECT
+        $sql = "SELECT
 		            answer,
 		            correct,
 		            comment,
@@ -230,16 +230,16 @@ 
                     c_id = {$this->course_id} AND
                     question_id='".$questionId."'
                 ORDER BY $field $order";
-		$result=Database::query($sql);
-
-		$i = 1;
-		// while a record is found
-		$doubt_data = null;
-		while ($object = Database::fetch_object($result)) {
-		    if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && $object->position == 666) {
-		        $doubt_data = $object;
+        $result=Database::query($sql);
+
+        $i = 1;
+        // while a record is found
+        $doubt_data = null;
+        while ($object = Database::fetch_object($result)) {
+            if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && $object->position == 666) {
+                $doubt_data = $object;
                 continue;
-		    }
+            }
             $this->answer[$i] = $object->answer;
             $this->correct[$i] = $object->correct;
             $this->comment[$i] = $object->comment;
@@ -248,9 +248,9 @@ 
             $this->destination[$i] = $object->destination;
             $this->autoId[$i] = $object->id_auto;
             $i++;
-		}
+        }
 
-		if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && !empty($doubt_data)) {
+        if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && !empty($doubt_data)) {
             $this->answer[$i] = $doubt_data->answer;
             $this->correct[$i] = $doubt_data->correct;
             $this->comment[$i] = $doubt_data->comment;
@@ -259,86 +259,86 @@ 
             $this->destination[$i] = $doubt_data->destination;
             $this->autoId[$i] = $doubt_data->id_auto;
             $i++;
-	    }
+        }
         $this->nbrAnswers = $i-1;
-	}
-
-	/**
-	 * returns the autoincrement id identificator
-	 *
-	 * @author Juan Carlos Ra�a
-	 * @return integer - answer num
-	 */
+    }
+
+    /**
+     * returns the autoincrement id identificator
+     *
+     * @author Juan Carlos Ra�a
+     * @return integer - answer num
+     */
     public function selectAutoId($id)
     {
-		return isset($this->autoId[$id]) ? $this->autoId[$id] : null;
-	}
-
-	/**
-	 * returns the number of answers in this question
-	 *
-	 * @author Olivier Brouckaert
-	 * @return integer - number of answers
-	 */
-	public function selectNbrAnswers()
+        return isset($this->autoId[$id]) ? $this->autoId[$id] : null;
+    }
+
+    /**
+     * returns the number of answers in this question
+     *
+     * @author Olivier Brouckaert
+     * @return integer - number of answers
+     */
+    public function selectNbrAnswers()
     {
-		return $this->nbrAnswers;
-	}
-
-	/**
-	 * returns the question ID which the answers belong to
-	 *
-	 * @author Olivier Brouckaert
-	 * @return integer - the question ID
-	 */
-	public function selectQuestionId()
+        return $this->nbrAnswers;
+    }
+
+    /**
+     * returns the question ID which the answers belong to
+     *
+     * @author Olivier Brouckaert
+     * @return integer - the question ID
+     */
+    public function selectQuestionId()
     {
-		return $this->questionId;
-	}
-
-	/**
-	 * returns the question ID of the destination question
-	 *
-	 * @author Julio Montoya
-	 * @return integer - the question ID
-	 */
-	public function selectDestination($id)
+        return $this->questionId;
+    }
+
+    /**
+     * returns the question ID of the destination question
+     *
+     * @author Julio Montoya
+     * @return integer - the question ID
+     */
+    public function selectDestination($id)
     {
-		return isset($this->destination[$id]) ? $this->destination[$id] : null;
-	}
+        return isset($this->destination[$id]) ? $this->destination[$id] : null;
+    }
 
     /**
-	 * returns the answer title
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return string - answer title
-	 */
-	public function selectAnswer($id)
-	{
-		return isset($this->answer[$id]) ? $this->answer[$id] : null;
-	}
-
-	/**
-	 * return array answer by id else return a bool
-	 */
-	public function selectAnswerByAutoId($auto_id)
-	{
-		$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
-
-		$auto_id = intval($auto_id);
-		$sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
+     * returns the answer title
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return string - answer title
+     */
+    public function selectAnswer($id)
+    {
+        return isset($this->answer[$id]) ? $this->answer[$id] : null;
+    }
+
+    /**
+     * return array answer by id else return a bool
+     */
+    public function selectAnswerByAutoId($auto_id)
+    {
+        $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
+
+        $auto_id = intval($auto_id);
+        $sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
 				WHERE c_id = {$this->course_id} AND id_auto='$auto_id'";
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		if (Database::num_rows($rs) > 0) {
-			$row = Database::fetch_array($rs, 'ASSOC');
+        if (Database::num_rows($rs) > 0) {
+            $row = Database::fetch_array($rs, 'ASSOC');
 
-			return $row;
-		}
+            return $row;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * returns the answer title from an answer's position
@@ -347,18 +347,18 @@ 
      * @param - integer $id - answer ID
      * @return bool - answer title
      */
-	public function selectAnswerIdByPosition($pos)
-	{
-		foreach ($this->position as $k => $v) {
-			if ($v != $pos) {
-				continue;
-			}
+    public function selectAnswerIdByPosition($pos)
+    {
+        foreach ($this->position as $k => $v) {
+            if ($v != $pos) {
+                continue;
+            }
 
-			return $k;
-		}
+            return $k;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * Returns a list of answers
@@ -367,18 +367,18 @@ 
      * of (id, answer, comment, grade) and grade=weighting
      */
     public function getAnswersList($decode = false)
-     {
-	 	$list = array();
-         for ($i = 1; $i <= $this->nbrAnswers; $i++) {
-             if (!empty($this->answer[$i])) {
-
-	 			//Avoid problems when parsing elements with accents
-	 			if ($decode) {
-	        		$this->answer[$i] 	= api_html_entity_decode($this->answer[$i], ENT_QUOTES, api_get_system_encoding());
-	        		$this->comment[$i]	= api_html_entity_decode($this->comment[$i], ENT_QUOTES, api_get_system_encoding());
-	 			}
-
-	 			$list[] = array(
+        {
+            $list = array();
+            for ($i = 1; $i <= $this->nbrAnswers; $i++) {
+                if (!empty($this->answer[$i])) {
+
+                    //Avoid problems when parsing elements with accents
+                    if ($decode) {
+                    $this->answer[$i] 	= api_html_entity_decode($this->answer[$i], ENT_QUOTES, api_get_system_encoding());
+                    $this->comment[$i]	= api_html_entity_decode($this->comment[$i], ENT_QUOTES, api_get_system_encoding());
+                    }
+
+                    $list[] = array(
                     'id' => $i,
                     'answer' => $this->answer[$i],
                     'comment' => $this->comment[$i],
@@ -387,134 +387,134 @@ 
                     'hotspot_type' => $this->hotspot_type[$i],
                     'correct' => $this->correct[$i],
                     'destination' => $this->destination[$i]
-				);
+                );
+            }
             }
-	 	}
 
-	 	return $list;
-	 }
+            return $list;
+        }
 
-	/**
-	 * Returns a list of grades
-	 * @author Yannick Warnier <ywarnier@beeznest.org>
-	 * @return array	List of grades where grade=weighting (?)
-	 */
+    /**
+     * Returns a list of grades
+     * @author Yannick Warnier <ywarnier@beeznest.org>
+     * @return array	List of grades where grade=weighting (?)
+     */
     public function getGradesList()
-     {
-	 	$list = array();
-	 	for ($i = 0; $i<$this->nbrAnswers;$i++){
-	 		if(!empty($this->answer[$i])){
-	 			$list[$i] = $this->weighting[$i];
-	 		}
-	 	}
-	 	return $list;
-	 }
-
-	 /**
-	  * Returns the question type
-	  * @author	Yannick Warnier <ywarnier@beeznest.org>
-	  * @return	integer	The type of the question this answer is bound to
-	  */
+        {
+            $list = array();
+            for ($i = 0; $i<$this->nbrAnswers;$i++){
+                if(!empty($this->answer[$i])){
+                    $list[$i] = $this->weighting[$i];
+                }
+            }
+            return $list;
+        }
+
+        /**
+         * Returns the question type
+         * @author	Yannick Warnier <ywarnier@beeznest.org>
+         * @return	integer	The type of the question this answer is bound to
+         */
     public function getQuestionType()
-     {
-	 	$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
-	 	$sql = "SELECT type FROM $TBL_QUESTIONS
+        {
+            $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
+            $sql = "SELECT type FROM $TBL_QUESTIONS
 	 	        WHERE c_id = {$this->course_id} AND id = '".$this->questionId."'";
-	 	$res = Database::query($sql);
-	 	if (Database::num_rows($res)<=0){
-	 		return null;
-	 	}
-	 	$row = Database::fetch_array($res);
-
-	 	return $row['type'];
-	 }
-
-
-	/**
-	 * tells if answer is correct or not
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - 0 if bad answer, not 0 if good answer
-	 */
+            $res = Database::query($sql);
+            if (Database::num_rows($res)<=0){
+                return null;
+            }
+            $row = Database::fetch_array($res);
+
+            return $row['type'];
+        }
+
+
+    /**
+     * tells if answer is correct or not
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - 0 if bad answer, not 0 if good answer
+     */
     public function isCorrect($id)
-	{
-		return isset($this->correct[$id]) ? $this->correct[$id] : null;
-	}
-
-	/**
-	 * returns answer comment
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return string - answer comment
-	 */
+    {
+        return isset($this->correct[$id]) ? $this->correct[$id] : null;
+    }
+
+    /**
+     * returns answer comment
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return string - answer comment
+     */
     public function selectComment($id)
-	{
+    {
         return isset($this->comment[$id]) ? $this->comment[$id] : null;
-	}
-
-	/**
-	 * returns answer weighting
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - answer weighting
-	 */
+    }
+
+    /**
+     * returns answer weighting
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - answer weighting
+     */
     public function selectWeighting($id)
-	{
-		return isset($this->weighting[$id]) ? $this->weighting[$id] : null;
-	}
-
-	/**
-	 * returns answer position
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - answer position
-	 */
-	function selectPosition($id)
-	{
-		return isset($this->position[$id]) ? $this->position[$id] : null;
-	}
-
-	/**
-	 * returns answer hotspot coordinates
-	 *
-	 * @author	Olivier Brouckaert
-	 * @param	integer	Answer ID
-	 * @return	integer	Answer position
-	 */
+    {
+        return isset($this->weighting[$id]) ? $this->weighting[$id] : null;
+    }
+
+    /**
+     * returns answer position
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - answer position
+     */
+    function selectPosition($id)
+    {
+        return isset($this->position[$id]) ? $this->position[$id] : null;
+    }
+
+    /**
+     * returns answer hotspot coordinates
+     *
+     * @author	Olivier Brouckaert
+     * @param	integer	Answer ID
+     * @return	integer	Answer position
+     */
     public function selectHotspotCoordinates($id)
-	{
-		return isset($this->hotspot_coordinates[$id]) ? $this->hotspot_coordinates[$id] : null;
-	}
-
-	/**
-	 * returns answer hotspot type
-	 *
-	 * @author	Toon Keppens
-	 * @param	integer		Answer ID
-	 * @return	integer		Answer position
-	 */
+    {
+        return isset($this->hotspot_coordinates[$id]) ? $this->hotspot_coordinates[$id] : null;
+    }
+
+    /**
+     * returns answer hotspot type
+     *
+     * @author	Toon Keppens
+     * @param	integer		Answer ID
+     * @return	integer		Answer position
+     */
     public function selectHotspotType($id)
-	{
-		return isset($this->hotspot_type[$id]) ? $this->hotspot_type[$id] : null;
-	}
-
-	/**
-	 * Creates a new answer
-	 *
-	 * @author Olivier Brouckaert
-	 * @param string 	$answer answer title
-	 * @param integer 	$correct 0 if bad answer, not 0 if good answer
-	 * @param string 	$comment answer comment
-	 * @param integer 	$weighting answer weighting
-	 * @param integer 	$position answer position
-	 * @param array    $new_hotspot_coordinates Coordinates for hotspot exercises (optional)
-	 * @param integer	$new_hotspot_type Type for hotspot exercises (optional)
+    {
+        return isset($this->hotspot_type[$id]) ? $this->hotspot_type[$id] : null;
+    }
+
+    /**
+     * Creates a new answer
+     *
+     * @author Olivier Brouckaert
+     * @param string 	$answer answer title
+     * @param integer 	$correct 0 if bad answer, not 0 if good answer
+     * @param string 	$comment answer comment
+     * @param integer 	$weighting answer weighting
+     * @param integer 	$position answer position
+     * @param array    $new_hotspot_coordinates Coordinates for hotspot exercises (optional)
+     * @param integer	$new_hotspot_type Type for hotspot exercises (optional)
      * @param string   $destination
-	 */
+     */
     public function createAnswer(
         $answer,
         $correct,
@@ -525,7 +525,7 @@ 
         $new_hotspot_type = null,
         $destination = ''
     ) {
-		$this->new_nbrAnswers++;
+        $this->new_nbrAnswers++;
         $id = $this->new_nbrAnswers;
         $this->new_answer[$id] = $answer;
         $this->new_correct[$id] = $correct;
@@ -535,7 +535,7 @@ 
         $this->new_hotspot_coordinates[$id] = $new_hotspot_coordinates;
         $this->new_hotspot_type[$id] = $new_hotspot_type;
         $this->new_destination[$id] = $destination;
-	}
+    }
 
     /**
      * Updates an answer
@@ -577,31 +577,31 @@ 
         ];
 
         Database::update($answerTable, $params, ['id_auto = ?' => $autoId]);
-	}
+    }
 
-	/**
-	 * Records answers into the data base
-	 *
-	 * @author Olivier Brouckaert
-	 */
+    /**
+     * Records answers into the data base
+     *
+     * @author Olivier Brouckaert
+     */
     public function save()
     {
-		$answerTable = Database::get_course_table(TABLE_QUIZ_ANSWER);
-		$questionId = intval($this->questionId);
+        $answerTable = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        $questionId = intval($this->questionId);
 
-		$c_id = $this->course['real_id'];
+        $c_id = $this->course['real_id'];
         $correctList = [];
         $answerList = [];
 
-		for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
-			$answer = $this->new_answer[$i];
-			$correct = $this->new_correct[$i];
-			$comment = $this->new_comment[$i];
-			$weighting = $this->new_weighting[$i];
-			$position = $this->new_position[$i];
-			$hotspot_coordinates = $this->new_hotspot_coordinates[$i];
-			$hotspot_type = $this->new_hotspot_type[$i];
-			$destination = $this->new_destination[$i];
+        for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
+            $answer = $this->new_answer[$i];
+            $correct = $this->new_correct[$i];
+            $comment = $this->new_comment[$i];
+            $weighting = $this->new_weighting[$i];
+            $position = $this->new_position[$i];
+            $hotspot_coordinates = $this->new_hotspot_coordinates[$i];
+            $hotspot_type = $this->new_hotspot_type[$i];
+            $destination = $this->new_destination[$i];
             $autoId = $this->selectAutoId($i);
 
             if (!isset($this->position[$i])) {
@@ -698,36 +698,36 @@ 
             }
         }
 
-		// moves $new_* arrays
-		$this->answer = $this->new_answer;
-		$this->correct = $this->new_correct;
-		$this->comment = $this->new_comment;
-		$this->weighting = $this->new_weighting;
-		$this->position = $this->new_position;
-		$this->hotspot_coordinates = $this->new_hotspot_coordinates;
-		$this->hotspot_type = $this->new_hotspot_type;
-
-		$this->nbrAnswers = $this->new_nbrAnswers;
-		$this->destination = $this->new_destination;
-		// clears $new_* arrays
-
-		$this->cancel();
-	}
-
-	/**
-	 * Duplicates answers by copying them into another question
-	 *
-	 * @author Olivier Brouckaert
-	 * @param  int question id
+        // moves $new_* arrays
+        $this->answer = $this->new_answer;
+        $this->correct = $this->new_correct;
+        $this->comment = $this->new_comment;
+        $this->weighting = $this->new_weighting;
+        $this->position = $this->new_position;
+        $this->hotspot_coordinates = $this->new_hotspot_coordinates;
+        $this->hotspot_type = $this->new_hotspot_type;
+
+        $this->nbrAnswers = $this->new_nbrAnswers;
+        $this->destination = $this->new_destination;
+        // clears $new_* arrays
+
+        $this->cancel();
+    }
+
+    /**
+     * Duplicates answers by copying them into another question
+     *
+     * @author Olivier Brouckaert
+     * @param  int question id
      * @param  array destination course info (result of the function api_get_course_info() )
-	 */
+     */
     public function duplicate($newQuestionId, $course_info = null)
     {
         if (empty($course_info)) {
             $course_info = $this->course;
         }
 
-		$TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
+        $TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
         $fixed_list = array();
 
         if (self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE ||
@@ -741,7 +741,7 @@ 
 
             if (!empty($origin_options)) {
                 foreach ($origin_options as $item) {
-            	   $new_option_list[] = $item['id'];
+                    $new_option_list[] = $item['id'];
                 }
             }
 
@@ -755,12 +755,12 @@ 
             }
         }
 
-		// if at least one answer
-		if ($this->nbrAnswers) {
-			// inserts new answers into data base
-			$c_id = $course_info['real_id'];
+        // if at least one answer
+        if ($this->nbrAnswers) {
+            // inserts new answers into data base
+            $c_id = $course_info['real_id'];
 
-			for ($i=1;$i <= $this->nbrAnswers;$i++) {
+            for ($i=1;$i <= $this->nbrAnswers;$i++) {
                 if ($this->course['id'] != $course_info['id']) {
                     $this->answer[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $this->answer[$i],
@@ -774,8 +774,8 @@ 
                     );
                 }
 
-				$answer = $this->answer[$i];
-				$correct = $this->correct[$i];
+                $answer = $this->answer[$i];
+                $correct = $this->correct[$i];
 
                 if (self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE ||
                     self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE
@@ -783,12 +783,12 @@ 
                     $correct = $fixed_list[intval($correct)];
                 }
 
-				$comment = $this->comment[$i];
-				$weighting = $this->weighting[$i];
-				$position = $this->position[$i];
-				$hotspot_coordinates = $this->hotspot_coordinates[$i];
-				$hotspot_type = $this->hotspot_type[$i];
-				$destination = $this->destination[$i];
+                $comment = $this->comment[$i];
+                $weighting = $this->weighting[$i];
+                $position = $this->position[$i];
+                $hotspot_coordinates = $this->hotspot_coordinates[$i];
+                $hotspot_type = $this->hotspot_type[$i];
+                $destination = $this->destination[$i];
 
                 $params = [
                     'c_id' => $c_id,
@@ -808,9 +808,9 @@ 
                     $sql = "UPDATE $TBL_REPONSES SET id = iid, id_auto = iid WHERE iid = $id";
                     Database::query($sql);
                 }
-			}
+            }
         }
-	}
+    }
 
     /**
      * Get the necessary JavaScript for some answers

main/exercice/fill_blanks.class.php

Indentation +68 added lines, -68 removed lines

@@ -729,43 +729,43 @@ 
     }
     
     /**
-    * Return an array of student state answers for fill the blank questions
-    * for each students that answered the question
-    * -2  : didn't answer
-    * -1  : student answer is wrong
-    *  0  : student answer is correct
-    * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
-    *
-    * @param $testId
-    * @param $questionId
-    * @param $studentsIdList
-    * @param $startDate
-    * @param $endDate
-    * @param bool $useLastAnswerredAttempt
-    * @return array
-    * (
-    *     [student_id] => Array
-    *         (
-    *             [first fill the blank for question] => -1
-    *             [second fill the blank for question] => 2
-    *             [third fill the blank for question] => -1
-    *         )
-    * )
-    */
+     * Return an array of student state answers for fill the blank questions
+     * for each students that answered the question
+     * -2  : didn't answer
+     * -1  : student answer is wrong
+     *  0  : student answer is correct
+     * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
+     *
+     * @param $testId
+     * @param $questionId
+     * @param $studentsIdList
+     * @param $startDate
+     * @param $endDate
+     * @param bool $useLastAnswerredAttempt
+     * @return array
+     * (
+     *     [student_id] => Array
+     *         (
+     *             [first fill the blank for question] => -1
+     *             [second fill the blank for question] => 2
+     *             [third fill the blank for question] => -1
+     *         )
+     * )
+     */
     public static function getFillTheBlankTabResult($testId, $questionId, $studentsIdList, $startDate, $endDate, $useLastAnswerredAttempt = true) {
 
-       $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-       $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-       $courseId = api_get_course_int_id();
+        $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+        $courseId = api_get_course_int_id();
 
-       require_once api_get_path(SYS_PATH).'main/exercice/fill_blanks.class.php';
+        require_once api_get_path(SYS_PATH).'main/exercice/fill_blanks.class.php';
 
-       // request to have all the answers of student for this question
-       // student may have doing it several time
-       // student may have not answered the bracket id, in this case, is result of the answer is empty
+        // request to have all the answers of student for this question
+        // student may have doing it several time
+        // student may have not answered the bracket id, in this case, is result of the answer is empty
 
-       // we got the less recent attempt first
-       $sql = '
+        // we got the less recent attempt first
+        $sql = '
            SELECT * FROM '.$tblTrackEAttempt.' tea
 
            LEFT JOIN '.$tblTrackEExercise.' tee
@@ -781,49 +781,49 @@ 
            ORDER BY user_id, tea.exe_id;
        ';
 
-       $res = Database::query($sql);
-       $tabUserResult = array();
-       $bracketNumber = 0;
-       // foreach attempts for all students starting with his older attempt
-       while ($data = Database::fetch_array($res)) {
-           $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
+        $res = Database::query($sql);
+        $tabUserResult = array();
+        $bracketNumber = 0;
+        // foreach attempts for all students starting with his older attempt
+        while ($data = Database::fetch_array($res)) {
+            $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
 
-           // for each bracket to find in this question
-           foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
+            // for each bracket to find in this question
+            foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
 
-               if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
-                   // student has answered this bracket, cool
-                   switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
-                       case self::FILL_THE_BLANK_MENU :
+                if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
+                    // student has answered this bracket, cool
+                    switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
+                        case self::FILL_THE_BLANK_MENU :
                            // get the indice of the choosen answer in the menu
                            // we know that the right answer is the first entry of the menu, ie 0
                            // (remember, menu entries are shuffled when taking the test)
                            $tabUserResult[$data['user_id']][$bracketNumber] = FillBlanks::getFillTheBlankMenuAnswerNum($tabAnswer['tabwords'][$bracketNumber], $tabAnswer['studentanswer'][$bracketNumber]);
-                           break;
-                       default :
+                            break;
+                        default :
                            if (FillBlanks::isGoodStudentAnswer($tabAnswer['studentanswer'][$bracketNumber], $tabAnswer['tabwords'][$bracketNumber])) {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
-                           } else {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
-                           }
-                   }
-               } else {
-                   // student didn't answer this bracket
-                   if ($useLastAnswerredAttempt) {
-                       // if we take into account the last answered attempt
-                       if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
-                           $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
-                       }
-                   } else {
-                       // we take the last attempt, even if the student answer the question before
-                       $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
-                   }
-               }
-           }
-
-
-       }
-       return $tabUserResult;
+                                $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
+                            } else {
+                                $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
+                            }
+                    }
+                } else {
+                    // student didn't answer this bracket
+                    if ($useLastAnswerredAttempt) {
+                        // if we take into account the last answered attempt
+                        if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
+                            $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                        }
+                    } else {
+                        // we take the last attempt, even if the student answer the question before
+                        $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                    }
+                }
+            }
+
+
+        }
+        return $tabUserResult;
     }
 
 

main/exercice/hotpotatoes.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * Code for HotPotatoes integration.
- * @package chamilo.exercise
- * @author Istvan Mandak (original author)
- */
+     * Code for HotPotatoes integration.
+     * @package chamilo.exercise
+     * @author Istvan Mandak (original author)
+     */
 
 require_once '../inc/global.inc.php';
 require_once 'hotpotatoes.lib.php';

main/exercice/hotspot_answers.as.php

Indentation +18 added lines, -18 removed lines

@@ -28,11 +28,11 @@ 
 $course_id     = api_get_course_int_id();
 
 if ($answer_type == HOT_SPOT_DELINEATION) {
-	// Query db for answers
-	$sql = "SELECT id, answer, hotspot_coordinates, hotspot_type FROM $TBL_ANSWERS
+    // Query db for answers
+    $sql = "SELECT id, answer, hotspot_coordinates, hotspot_type FROM $TBL_ANSWERS
 	        WHERE c_id = $course_id AND question_id = ".intval($questionId)." AND hotspot_type <> 'noerror' ORDER BY id";
 } else {
-	$sql = "SELECT id, answer, hotspot_coordinates, hotspot_type FROM $TBL_ANSWERS
+    $sql = "SELECT id, answer, hotspot_coordinates, hotspot_type FROM $TBL_ANSWERS
 	        WHERE c_id = $course_id AND question_id = ".intval($questionId)." ORDER BY id";
 }
 $result = Database::query($sql);
@@ -69,29 +69,29 @@ 
     $hotSpot['id'] = $hotspot['id'];
     $hotSpot['answer'] = $hotspot['answer'];
 
-	// Square or rectancle
-	if ($hotspot['hotspot_type'] == 'square' ) {
+    // Square or rectancle
+    if ($hotspot['hotspot_type'] == 'square' ) {
         $hotSpot['type'] = 'square';
-	}
+    }
 
-	// Circle or ovale
-	if ($hotspot['hotspot_type'] == 'circle') {
+    // Circle or ovale
+    if ($hotspot['hotspot_type'] == 'circle') {
         $hotSpot['type'] = 'circle';
-	}
+    }
 
-	// Polygon
-	if ($hotspot['hotspot_type'] == 'poly') {
+    // Polygon
+    if ($hotspot['hotspot_type'] == 'poly') {
         $hotSpot['type'] = 'poly';
-	}
+    }
 
-	// Delineation
-	if ($hotspot['hotspot_type'] == 'delineation') {
+    // Delineation
+    if ($hotspot['hotspot_type'] == 'delineation') {
         $hotSpot['type'] = 'delineation';
-	}
-	// oar
-	if ($hotspot['hotspot_type'] == 'oar') {
+    }
+    // oar
+    if ($hotspot['hotspot_type'] == 'oar') {
         $hotSpot['type'] = 'delineation';
-	}
+    }
 
     $hotSpot['coord'] = $hotspot['hotspot_coordinates'];