[svn r17984] Logic changes - Fixed bug in the gradebook when you link an exercice its results weren't correct, changed message by '-' when the students still have not a certificate - see FS#3526

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

@@ -114,15 +114,19 @@ class ExerciseLink extends AbstractLink
     public function calc_score($stud_id = null) {
     	$tbl_stats = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES);
     	$tbl_stats_e_attempt_recording = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
-		// for 1 student
-    	if (isset($stud_id)) {    			
-    		$sql = "SELECT DISTINCT  e.exe_id, exe_result, exe_weighting, exe_user_id
-					FROM $tbl_stats  as e INNER JOIN 
-					$tbl_stats_e_attempt_recording as r
-					ON (e.exe_id =r.exe_id)
-					WHERE e.exe_cours_id = '".$this->get_course_code()."'AND					
-					author != ''  AND exe_user_id = '$stud_id' ORDER BY  e.exe_id DESC ";
+
+		$sql = 'SELECT * FROM '.$tbl_stats.' WHERE exe_exo_id = '.$this->get_ref_id().' AND orig_lp_id = 0 AND orig_lp_item_id = 0';
+		
+		if (isset($stud_id)){
+    		$sql .= ' AND exe_user_id = '."'".$stud_id."'";
+    	}
+		
+		$sql .= ' ORDER BY exe_id DESC';
 		$scores = api_sql_query($sql, __FILE__, __LINE__);
+		
+    	if (isset($stud_id)) {
+    		// for 1 student    			
+
     		if ($data=Database::fetch_array($scores)) {	    			
     			return array ($data['exe_result'], $data['exe_weighting']);
        		} else {
@@ -132,20 +136,10 @@ class ExerciseLink extends AbstractLink
     	} else {// all students -> get average
     		// normal way of getting the info			
 
-			$sql = "SELECT DISTINCT  e.exe_id, exe_result, exe_weighting, exe_user_id
-				FROM $tbl_stats  as e INNER JOIN 
-				$tbl_stats_e_attempt_recording as r
-				ON (e.exe_id =r.exe_id)
-				WHERE e.exe_cours_id = '".$this->get_course_code()."'AND					
-				e.exe_exo_id = '".$this->get_ref_id()."'  AND author != ''  ORDER BY  e.exe_id DESC ";
-				    						
-	    	$scores = api_sql_query($sql, __FILE__, __LINE__);
-
     		$students=array();  // user list, needed to make sure we only
     							// take first attempts into account
 			$rescount = 0;
 			$sum = 0;			
-
 			while ($data=Database::fetch_array($scores)) {
 				if (!(array_key_exists($data['exe_user_id'],$students))) {
 					if ($data['exe_weighting'] != 0) {

main/gradebook/lib/fe/gradebooktable.class.php

@@ -172,7 +172,7 @@ class GradebookTable extends SortableTable
 					$item_value = number_format($item_value, 2, '.', ' ');	
 					$cattotal = Category :: load($id);
 					$scoretotal= $cattotal[0]->calc_score(api_get_user_id());
-					$scoretotal_display = (isset($scoretotal)? $scoretotal[0].'/'.$scoretotal[1].'('.round(($scoretotal[0] / $scoretotal[1]) * 100) . ' %)': get_lang('NoResultsAvailable'));										
+					$scoretotal_display = (isset($scoretotal)? $scoretotal[0].'/'.$scoretotal[1].'('.round(($scoretotal[0] / $scoretotal[1]) * 100) . ' %)': '-');										
 					$row[] = $item_value;
 				} else {
 			   		$row[] = $invisibility_span_open . $data[3] . $invisibility_span_close;	
@@ -200,7 +200,7 @@ class GradebookTable extends SortableTable
 					if (isset($certificate_min_score) && (int)$item_value >= (int)$certificate_min_score) {
 						$certificates = '<a href="'.api_get_path(WEB_CODE_PATH) .'gradebook/index.php?export_certificate=yes&cat_id='.$id.'"><img src="'.api_get_path(WEB_CODE_PATH) . 'img/dokeos.gif" /></a>&nbsp;'.$scoretotal_display; 	
 					} else {
-						$certificates = get_lang('NoResultsAvailable');	
+						$certificates = '-';	
 					}					
 				$row[] = $certificates;
 				}