Browse Source

[svn r20089] The breadcrumb run ok in exercise see FS#3696

Carlos Vargas 16 years ago
parent
commit
e725b9b09f

+ 9 - 0
main/exercice/addlimits.php

@@ -137,7 +137,16 @@ if ( empty ( $objExercise ) )
 $exercise_id = $_GET['exercise_id'];
 $is_allowedToEdit=$is_courseAdmin;
 
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
 
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
 $nameTools=get_lang('Exercice');
 
 $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));

+ 13 - 2
main/exercice/admin.php

@@ -1,4 +1,4 @@
-<?php // $Id: admin.php 19675 2009-04-09 08:46:51Z pcool $
+<?php // $Id: admin.php 20089 2009-04-24 21:12:54Z cvargas1 $
  
 /*
 ==============================================================================
@@ -67,7 +67,7 @@
 *
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: admin.php 19675 2009-04-09 08:46:51Z pcool $
+* 	@version $Id: admin.php 20089 2009-04-24 21:12:54Z cvargas1 $
 */
 
 
@@ -308,6 +308,17 @@ if($editQuestion || $modifyQuestion || $newQuestion || $modifyAnswers) {
 	$nameTools=get_lang('QuestionManagement');
 }
 
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
+
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
+
 $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
 $interbreadcrumb[]=array("url" => "admin.php?exerciseId=".$objExercise->id,"name" => $objExercise->exercise);
 

+ 12 - 1
main/exercice/adminhp.php

@@ -22,7 +22,7 @@
 *	HotPotatoes administration.
 *	@package dokeos.exercise
 * 	@author Istvan Mandak
-* 	@version $Id: adminhp.php 19471 2009-03-31 23:28:53Z cvargas1 $
+* 	@version $Id: adminhp.php 20089 2009-04-24 21:12:54Z cvargas1 $
 */
 
 
@@ -87,6 +87,17 @@ if(!$is_allowedToEdit)
 	api_not_allowed(true);
 }
 
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
+
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
+
 $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
 
 $nameTools = get_lang('adminHP');

+ 15 - 6
main/exercice/exercice.php

@@ -1,5 +1,5 @@
 <?php
-// $Id: exercice.php 20087 2009-04-24 20:44:55Z juliomontoya $
+// $Id: exercice.php 20089 2009-04-24 21:12:54Z cvargas1 $
 
 /*
 ==============================================================================
@@ -332,7 +332,16 @@ if ($show == 'result' && $_REQUEST['comments'] == 'update' && ($is_allowedToEdit
 		}
 	}
 }
-if ($_GET['gradebook'] && $_GET['exerciseId']) {
+
+if (!empty($_GET['gradebook']) && $_GET['gradebook']=='view' ) {
+	$_SESSION['gradebook']=$_GET['gradebook'];
+	$gradebook=	$_SESSION['gradebook'];
+} elseif (empty($_GET['gradebook'])) {
+	unset($_SESSION['gradebook']);
+	$gradebook=	'';
+} 
+
+if (!empty($gradebook) && $gradebook=='view') {	
 	$interbreadcrumb[] = array (
 		'url' => '../gradebook/' . $_SESSION['gradebook_dest'],
 		'name' => get_lang('Gradebook')
@@ -345,13 +354,13 @@ if ($show != 'result') {
 	if ($is_allowedToEdit || $is_tutor) {
 		$nameTools = get_lang('StudentScore');
 		$interbreadcrumb[] = array (
-			"url" => "exercice.php",
+			"url" => "exercice.php?gradebook=$gradebook",
 			"name" => get_lang('Exercices')
 		);
 	} else {
 		$nameTools = get_lang('YourScore');
 		$interbreadcrumb[] = array (
-			"url" => "exercice.php",
+			"url" => "exercice.php?gradebook=$gradebook",
 			"name" => get_lang('Exercices')
 		);
 	}
@@ -676,9 +685,9 @@ if ($_configuration['tracking_enabled']) {
 					null;
 			}
 			if ($_REQUEST['filter'] == '1' or !isset ($_REQUEST['filter'])) {
-				$view_result = '<a href="' . api_get_self() . '?cidReq=' . api_get_course_id() . '&show=result&filter=2' . '" >' . Display :: display_icon('checkbox_on.gif', get_lang('ShowCorrectedOnly')) . get_lang('ShowCorrectedOnly') . '</a>';
+				$view_result = '<a href="' . api_get_self() . '?cidReq=' . api_get_course_id() . '&show=result&gradebook='.$gradebook.'&filter=2' . '" >' . Display :: display_icon('checkbox_on.gif', get_lang('ShowCorrectedOnly')) . get_lang('ShowCorrectedOnly') . '</a>';
 			} else {
-				$view_result = '<a href="' . api_get_self() . '?cidReq=' . api_get_course_id() . '&show=result&filter=1' . '" >' . Display :: display_icon('checkbox_off.gif', get_lang('ShowUnCorrectedOnly')) . get_lang('ShowUnCorrectedOnly') . '</a>';
+				$view_result = '<a href="' . api_get_self() . '?cidReq=' . api_get_course_id() . '&show=result&gradebook='.$gradebook.'&filter=1' . '" >' . Display :: display_icon('checkbox_off.gif', get_lang('ShowUnCorrectedOnly')) . get_lang('ShowUnCorrectedOnly') . '</a>';
 			}
 			//$form_filter = '<form method="post" action="'.api_get_self().'?cidReq='.api_get_course_id().'&show=result">';
 			//$form_filter .= make_select('filter',array(1=>get_lang('FilterByNotRevised'),2=>get_lang('FilterByRevised')),$filter);

+ 11 - 2
main/exercice/exercice_submit.php

@@ -1,4 +1,4 @@
-<?php // $Id: exercice_submit.php 19894 2009-04-20 16:38:00Z cvargas1 $
+<?php // $Id: exercice_submit.php 20089 2009-04-24 21:12:54Z cvargas1 $
 
 /*
 ==============================================================================
@@ -42,7 +42,7 @@
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
 * 	@author Julio Montoya multiple fill in blank option added
-* 	@version $Id: exercice_submit.php 19894 2009-04-20 16:38:00Z cvargas1 $
+* 	@version $Id: exercice_submit.php 20089 2009-04-24 21:12:54Z cvargas1 $
 */
 
 
@@ -702,7 +702,16 @@ if(!$questionNum || $_POST['questionNum']) {
     }
 }
 
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
 
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
 
 //$nameTools=get_lang('Exercice');
 

+ 10 - 0
main/exercice/exercise_admin.php

@@ -127,6 +127,16 @@ if($form -> validate()) {
 	/*********************
 	 * DISPLAY FORM
 	 *********************/
+	if (isset($_SESSION['gradebook'])){
+		$gradebook=	$_SESSION['gradebook'];
+	}
+	
+	if (!empty($gradebook) && $gradebook=='view') {	
+		$interbreadcrumb[]= array (
+				'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+				'name' => get_lang('Gradebook')
+			);
+	}
 	$nameTools=get_lang('ExerciseManagement');
 	$interbreadcrumb[] = array ("url"=>"exercice.php", "name"=> get_lang('Exercices'));
 	Display::display_header($nameTools,"Exercise");	

+ 11 - 1
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 19979 2009-04-22 17:12:35Z cfasanando $
+* 	@version $Id: exercise_result.php 20089 2009-04-24 21:12:54Z cvargas1 $
 *
 *	@todo	split more code up in functions, move functions to library?
 */
@@ -159,6 +159,16 @@ $exerciseTitle=$objExercise->selectTitle();
 $exerciseDescription=$objExercise->selectDescription();
 $exerciseDescription=stripslashes($exerciseDescription);
 
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
+
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
 
 $nameTools=get_lang('Exercice');
 

+ 12 - 1
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 20087 2009-04-24 20:44:55Z juliomontoya $
+* 	@version $Id: exercise_show.php 20089 2009-04-24 21:12:54Z cvargas1 $
 *
 * 	@todo remove the debug code and use the general debug library
 * 	@todo use the Database:: functions
@@ -99,6 +99,17 @@ if ( empty ( $action ) ) {
 $is_allowedToEdit=api_is_allowed_to_edit() || $is_courseTutor;
 $nameTools=get_lang('CorrectTest');
 
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
+
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
+
 if($origin=='user_course') {
 	$interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".Security::remove_XSS($_GET['course']), "name" => get_lang("Users"));
 	$interbreadcrumb[] = array("url" => "../mySpace/myStudents.php?student=".Security::remove_XSS($_GET['student'])."&course=".$_course['id']."&details=true&origin=".Security::remove_XSS($_GET['origin']) , "name" => get_lang("DetailsStudentInCourse"));

+ 12 - 0
main/exercice/feedback.php

@@ -40,6 +40,18 @@ include_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
 include_once(api_get_path(LIBRARY_PATH).'document.lib.php');
 include_once(api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 $nameTools=get_lang('ExerciseManagement');
+
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
+
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
+
 $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
 Display::display_header($nameTools,"Exercise");
 ?>

+ 11 - 1
main/exercice/hotpotatoes.php

@@ -22,7 +22,7 @@
 *	Code for Hotpotatoes integration.
 *	@package dokeos.exercise
 * 	@author Istvan Mandak
-* 	@version $Id: hotpotatoes.php 19675 2009-04-09 08:46:51Z pcool $
+* 	@version $Id: hotpotatoes.php 20089 2009-04-24 21:12:54Z cvargas1 $
 */
 
 
@@ -48,6 +48,16 @@ if(!api_is_allowed_to_edit())
 	api_not_allowed();
 }
 
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
+
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
 // the breadcrumbs
 $interbreadcrumb[]= array ("url"=>"./exercice.php", "name"=> get_lang('Exercices'));
 

+ 11 - 0
main/exercice/mark_free_answer.php

@@ -105,6 +105,17 @@ if(!$is_courseTutor)
 
 $obj_question = Question :: read($my_qst);
 
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
+
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
+
 $nameTools=get_lang('Exercice');
 
 $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));

+ 13 - 2
main/exercice/question_pool.php

@@ -1,4 +1,4 @@
-<?php // $Id: question_pool.php 19786 2009-04-15 14:46:05Z juliomontoya $
+<?php // $Id: question_pool.php 20089 2009-04-24 21:12:54Z cvargas1 $
  
 /*
 ==============================================================================
@@ -30,7 +30,7 @@
 * 	One question can be in several exercises
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: question_pool.php 19786 2009-04-15 14:46:05Z juliomontoya $
+* 	@version $Id: question_pool.php 20089 2009-04-24 21:12:54Z cvargas1 $
 */
 
 // name of the language file that needs to be included
@@ -137,6 +137,17 @@ if($is_allowedToEdit)
 	}
 }
 
+if (isset($_SESSION['gradebook'])){
+	$gradebook=	$_SESSION['gradebook'];
+}
+
+if (!empty($gradebook) && $gradebook=='view') {	
+	$interbreadcrumb[]= array (
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+			'name' => get_lang('Gradebook')
+		);
+}
+
 $nameTools=get_lang('QuestionPool');
 
 $interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));

+ 11 - 1
main/exercice/testheaderpage.php

@@ -22,7 +22,7 @@
 *	Code library for HotPotatoes integration.
 *	@package dokeos.exercise
 * 	@author Istvan Mandak
-* 	@version $Id: testheaderpage.php 10789 2007-01-18 19:18:27Z pcool $
+* 	@version $Id: testheaderpage.php 20089 2009-04-24 21:12:54Z cvargas1 $
 */
 
 // name of the language file that needs to be included
@@ -40,6 +40,16 @@ include('../inc/global.inc.php');
 	}
 	$nameTools = $title;
 	$noPHP_SELF=true;
+	if (isset($_SESSION['gradebook'])){
+		$gradebook=	$_SESSION['gradebook'];
+	}
+	
+	if (!empty($gradebook) && $gradebook=='view') {	
+		$interbreadcrumb[]= array (
+				'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+				'name' => get_lang('Gradebook')
+			);
+	}	
 	$interbreadcrumb[]= array ("url"=>"./exercice.php", "name"=> get_lang('Exercices'));
 	Display::display_header($nameTools,"Exercise");
 	echo "<a name='TOP'></a>";