[svn r20231] completing exercises to breadcrumb in gradebook see FS#3696

main/exercice/exercise_result.php

@@ -29,7 +29,7 @@
 *	@author Olivier Brouckaert, main author
 *	@author Roan Embrechts, some refactoring
 * 	@author Julio Montoya Armas switchable fill in blank option added
-* 	@version $Id: exercise_result.php 20089 2009-04-24 21:12:54Z cvargas1 $
+* 	@version $Id: exercise_result.php 20231 2009-04-30 18:08:12Z cvargas1 $
 *
 *	@todo	split more code up in functions, move functions to library?
 */
@@ -172,7 +172,7 @@ if (!empty($gradebook) && $gradebook=='view') {
 
 $nameTools=get_lang('Exercice');
 
-$interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
+$interbreadcrumb[]=array("url" => "exercice.php?gradebook=$gradebook","name" => get_lang('Exercices'));
 $htmlHeadXtra[] = "<script type=\"text/javascript\" src=\"../plugin/hotspot/JavaScriptFlashGateway.js\"></script>
 					<script src=\"../plugin/hotspot/hotspot.js\" type=\"text/javascript\"></script>
 					<script language=\"JavaScript\" type=\"text/javascript\">

main/exercice/exercise_show.php

@@ -4,7 +4,7 @@
 *
 *	@package dokeos.exercise
 * 	@author Julio Montoya Armas Added switchable fill in blank option added
-* 	@version $Id: exercise_show.php 20100 2009-04-24 23:55:22Z iflorespaz $
+* 	@version $Id: exercise_show.php 20231 2009-04-30 18:08:12Z cvargas1 $
 *
 * 	@todo remove the debug code and use the general debug library
 * 	@todo use the Database:: functions
@@ -120,7 +120,7 @@ if($origin=='user_course') {
 	$interbreadcrumb[] = array ("url" => "../auth/my_progress.php?id_session".Security::remove_XSS($_GET['id_session'])."&course=".$_cid, "name" => get_lang('MyProgress'));
 	unset($_cid);
 } else {
-	$interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
+	$interbreadcrumb[]=array("url" => "exercice.php?gradebook=$gradebook","name" => get_lang('Exercices'));
 	$this_section=SECTION_COURSES;
 }
 

main/exercice/exercise_submit_modal.php

@@ -95,7 +95,7 @@ if (empty($choice_value) )
 		//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.'";</script>';
+	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();

main/exercice/export/exercise_import.inc.php

@@ -279,7 +279,7 @@ function import_exercise($file)
             array_push ($backlog_message, 'QUESTION DATA INVALID !!!');
         }
     }
-    $link = "<center><a href=\"../exercise_submit.php?exId=".$exercise_id."\">".get_lang('See the exercise')."</a></center>";
+    $link = "<center><a href=\"../exercise_submit.php?gradebook=$gradebook&exId=".$exercise_id."\">".get_lang('See the exercise')."</a></center>";
     array_push ($backlog_message, $link);
 
     //delete the temp dir where the exercise was unzipped

main/gradebook/lib/be/studentpublicationlink.class.php

@@ -258,7 +258,7 @@ class StudentPublicationLink extends AbstractLink
 			.'main/work/work.php?cidReq='.$this->get_course_code().'&gradebook=view&curdirpath='.substr($this->exercise_data['url'], 1);
 		if (!api_is_allowed_to_create_course()
 			&& $this->calc_score(api_get_user_id()) == null) {
-		$url .= '&curdirpath=/'.$this->get_ref_id();				
+		//$url .= '&curdirpath=/'.$this->get_ref_id();				
 			}
 		return $url;
 	}