Browse Source

[svn r17269] logic changes - added cidReq in my gradebook tool - (partial FS#3249)

Isaac Flores 16 years ago
parent
commit
1e2c1c089d

+ 7 - 0
main/gradebook/gradebook.php

@@ -59,6 +59,11 @@ $filter_warning_msg = true;
 // -                                  ACTIONS                                     -
 // --------------------------------------------------------------------------------
 
+$my_selectcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
+$my_db_name   = name_database_by_link($my_selectcat);
+$tbl_forum_thread =  Database :: get_course_table(TABLE_FORUM_THREAD,$my_db_name);
+$tbl_grade_links  =  Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
 //this is called when there is no data for the course admin
 if (isset ($_GET['createallcategories'])) {
 	block_students();
@@ -248,6 +253,8 @@ if (isset ($_GET['deletelink'])) {
 	block_students();
 	$link= LinkFactory :: load($_GET['deletelink']);
 	if ($link[0] != null) {
+		$sql='UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify="" WHERE thread_id=(SELECT ref_id FROM '.$tbl_grade_links.' where id='.$_GET['deletelink'].');';
+		api_sql_query($sql);
 		$link[0]->delete();		
 	}
 	unset ($link);

+ 13 - 4
main/gradebook/gradebook_edit_all.php

@@ -74,7 +74,8 @@ if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
 $table_link = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 $table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
 //$table_forum_thread=Database::get_course_table(TABLE_FORUM_THREAD);
-$my_db_name=name_database_by_link($_GET['selectcat']);
+$my_selectcat=isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
+$my_db_name=name_database_by_link($my_selectcat);
 $table_forum_thread = Database :: get_course_table(TABLE_FORUM_THREAD,$my_db_name);
 /*
 if($_SERVER['REQUEST_METHOD']=='POST'):
@@ -152,10 +153,18 @@ $result = api_sql_query($sql,__FILE__,__LINE__);
 	$type_evaluated = isset($row['type']) ? $table_evaluated[$type_evaluated][3] : null;
 	$output.= '<tr><td> [ '.get_lang('Evaluation').$type_evaluated.' ] '.$row['name'].'</td><td><input type="text" size="10" name="evaluation['.$row['id'].']" value="'.$row['weight'].'"/></td></tr>';	
 }
+//by iflorespaz
+$my_category=array();
+$cat=new Category();
+$my_category   = $cat->shows_all_information_an_category($my_selectcat);
+$my_api_cidreq = api_get_cidreq();
+if ($my_api_cidreq=='') {
+	$my_api_cidreq='cidReq='.$my_category['course_code'];
+}
 ?>
-<a href="/main/gradebook/index.php?<?php echo api_get_cidreq() ?>&selectcat=<?php echo $category_id ?>"><< <?php echo get_lang('Back') ?>
-<!--<a href="/main/gradebook/index.php?<?php echo api_get_cidreq() ?>&selectcat=<?php echo $category_id ?>"><< <?php echo get_lang('Back') ?></a>-->
-<form method="post" action="gradebook_edit_all.php?<?php echo api_get_cidreq() ?>&selectcat=<?php echo $category_id?>">
+<a href="/main/gradebook/index.php?<?php echo $my_api_cidreq ?>&selectcat=<?php echo $category_id ?>"><< <?php echo get_lang('Back') ?>
+<!--<a href="/main/gradebook/index.php?<?php echo $my_api_cidreq ?>&selectcat=<?php echo $category_id ?>"><< <?php echo get_lang('Back') ?></a>-->
+<form method="post" action="gradebook_edit_all.php?<?php echo $my_api_cidreq ?>&selectcat=<?php echo $category_id?>">
 <table class="data_table">
 		 <tr class="row_odd">
 		  <th><?php echo get_lang('Resource'); ?></th>

+ 16 - 3
main/gradebook/lib/be/category.class.php

@@ -346,7 +346,7 @@ class Category implements GradebookItem
 		api_sql_query($sql, __FILE__, __LINE__);
 	}
 	/**
-	 * Show message 
+	 * Show message resource delete 
 	 */
 	public function show_message_resource_delete($course_id) {
 		$tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
@@ -358,9 +358,22 @@ class Category implements GradebookItem
 		} else {
 			return false;
 		}
-
 	}
-
+	
+	/**
+	 * Shows all information of an category  
+	 */
+	 public function shows_all_information_an_category ($selectcat='') {
+	 	if($selectcat=='') {
+	 		return null;
+	 	} else {
+		 	$tbl_category=Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
+		 	$sql='SELECT name,description,user_id,course_code,parent_id,weight,visible,certif_min_score,session_id FROM '.$tbl_category.' c WHERE c.id='.$selectcat;
+		 	$result=api_sql_query($sql,__FILE__,__LINE__);
+		 	$row=Database::fetch_array($result,'ASSOC');
+		 	return $row;	
+	 	}
+	 }
 // OTHER FUNCTIONS
 
 	/**

+ 12 - 6
main/gradebook/lib/fe/displaygradebook.php

@@ -293,24 +293,30 @@ class DisplayGradebook
                 if ($show_add_qualification === true && $message_resource===false) {
     				//$header .= '<a href="gradebook_add_cat.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '" ><img src="../img/folder_new.gif" alt="' . get_lang('NewSubCategory') . '" align="absmiddle" /> ' . get_lang('NewSubCategory') . '</a></td>';
                 }
+               $my_category=$catobj->shows_all_information_an_category($catobj->get_id());
+				$my_api_cidreq = api_get_cidreq();
+				if ($my_api_cidreq=='') {
+					$my_api_cidreq='cidReq='.$my_category['course_code'];
+				}
                 if ($show_add_link === true && $message_resource==false) {
-    				$header .= '<td><a href="gradebook_add_eval.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '" ><img src="../img/filenew.gif" alt="' . get_lang('NewEvaluation') . '" align="absmiddle" /> ' . get_lang('NewEvaluation') . '</a>&nbsp;';
+    				$header .= '<td><a href="gradebook_add_eval.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '" ><img src="../img/filenew.gif" alt="' . get_lang('NewEvaluation') . '" align="absmiddle" /> ' . get_lang('NewEvaluation') . '</a>&nbsp;';
                     $cats= Category :: load($selectcat);
                     if ($cats[0]->get_course_code() != null && $message_resource===false) {
                         //$header .= '<td><a href="gradebook_add_link.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>';
-                        $header .= '<td><a href="gradebook_add_link.php?course_code='.$cats[0]->get_course_code().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>&nbsp;';
+                        $header .= '<td><a href="gradebook_add_link.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>&nbsp;';
                         
                     } else {
-                        $header .= '<td><a href="gradebook_add_link_select_course.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>&nbsp;';
+                        $header .= '<td><a href="gradebook_add_link_select_course.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>&nbsp;';
                     }
                 }
                 if ($message_resource===false ) {
-                 	$header .= '<td><a href="gradebook_edit_all.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/quiz.gif" alt="' . get_lang('EditAllWeights') . '" align="absmiddle"/> ' . get_lang('EditAllWeights') . '</a>';
+                	$myname=$catobj->shows_all_information_an_category($catobj->get_id());
+                 	$header .= '<td><a href="gradebook_edit_all.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '"><img src="../img/quiz.gif" alt="' . get_lang('EditAllWeights') . '" align="absmiddle"/> ' . get_lang('EditAllWeights') . '</a>';
                 	$my_course_id=api_get_course_id();
                 	if (!isset($my_course_id)) {
-	                	$header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/stats_access.gif" alt="' . get_lang('FlatView') . '" align="absmiddle"/> ' . get_lang('FlatView') . '</a>';
+	                	$header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '"><img src="../img/stats_access.gif" alt="' . get_lang('FlatView') . '" align="absmiddle"/> ' . get_lang('FlatView') . '</a>';
 						if ($is_course_admin && $message_resource===false) {
-							$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() .'"><img src="../img/acces_tool.gif" alt="' . get_lang('ScoreEdit') . '" align="absmiddle"/> ' . get_lang('ScoreEdit') . '</a>';
+							$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() .'"><img src="../img/acces_tool.gif" alt="' . get_lang('ScoreEdit') . '" align="absmiddle"/> ' . get_lang('ScoreEdit') . '</a>';
 						}
 					}
                 }