[svn r10280]

main/exercice/exercice_submit.php

@@ -1,4 +1,4 @@
-<?php // $Id: exercice_submit.php 10276 2006-11-30 15:10:57Z develop-it $
+<?php // $Id: exercice_submit.php 10280 2006-11-30 23:02:34Z develop-it $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -538,7 +538,8 @@ $s="</table>
   {
 	$s.=get_lang('Next').' &gt;';
   }
-  $s.='\'&gt;';
+  //$s.='\'&gt;';
+  $s.= '\' />';
   $s.="</td></tr></form></table>";
 
 $b=2;

main/exercice/exercise_result.php

@@ -1,4 +1,4 @@
-<?php // $Id: exercise_result.php 10278 2006-11-30 15:18:23Z develop-it $
+<?php // $Id: exercise_result.php 10280 2006-11-30 23:02:34Z develop-it $
 /*
 ============================================================================== 
 	Dokeos - elearning and course management software
@@ -55,6 +55,8 @@ define('FILL_IN_BLANKS',	3);
 define('MATCHING',		4);
 define('FREE_ANSWER', 5);
 define('HOT_SPOT', 6);
+define('HOT_SPOT_ORDER', 	7);
+
 global $_cid;
 // name of the language file that needs to be included 
 $language_file='exercice';

main/exercice/question_admin.inc.php

@@ -102,6 +102,18 @@ if($usedInSeveralExercises)
 	<input type="hidden" name="nbrOptions" value="<?php echo $nbrOptions; ?>">
 	<input type="hidden" name="nbrMatches" value="<?php echo $nbrMatches; ?>">
 
+<?php
+		}
+		elseif ( $answerType == HOT_SPOT)
+		{
+?>
+	<input type="hidden" name="nbrAnswers" value="<?php echo $nbrAnswers; ?>">
+	<input type="hidden" name="reponse" value="<?php echo htmlentities(serialize($reponse)); ?>">
+	<input type="hidden" name="comment" value="<?php echo htmlentities(serialize($comment)); ?>">
+	<input type="hidden" name="weighting" value="<?php echo htmlentities(serialize($weighting)); ?>">
+	<input type="hidden" name="hotspot_coordinates" value="<?php echo htmlentities(serialize($hotspot_coordinates)); ?>">
+	<input type="hidden" name="hotspot_type" value="<?php echo htmlentities(serialize($hotspot_type)); ?>">
+
 <?php
 		}
 		elseif ( $answerType == FREE_ANSWER)
@@ -172,7 +184,7 @@ else
 
 <?php
 	// show the picture of the question
-	if($okPicture)
+	if($okPicture && $questionType != HOT_SPOT)
 	{
 ?>