Browse Source

fixed average of resolved exercises in lp for reporting - partial CT#603 (By fasa)

Ricardo Rodriguez 15 years ago
parent
commit
c2ce98995f
2 changed files with 7 additions and 7 deletions
  1. 3 3
      main/inc/lib/tracking.lib.php
  2. 4 4
      main/tracking/courseLog.php

+ 3 - 3
main/inc/lib/tracking.lib.php

@@ -296,7 +296,7 @@ class Tracking {
 			$condition_quiz = "";
 			if(!empty($exercise_id)) {
 				$exercise_id = intval($exercise_id);
-				$condition_lp =" AND id = $exercise_id ";
+				$condition_quiz =" AND id = $exercise_id ";
 			}
 
 			// Compose a filter based on optional session id given
@@ -335,7 +335,7 @@ class Tracking {
 					$quiz_avg_score = $quiz_avg_score / $count_attempt[0];
 		        }
 		        $quiz_avg_total_score = $quiz_avg_score;
-				return $quiz_avg_total_score/$count_quiz[0];
+				return round($quiz_avg_total_score/$count_quiz[0],2);
 			}
 		}
 		return null;
@@ -613,7 +613,7 @@ class Tracking {
 			                        if (!empty($row_max_score_bis['maxscore'])) {
 			                        	$max_score = $row_max_score_bis['maxscore'];
 			                        }
-			                        $lp_scorm_result_score_total += ($score/$max_score);
+			                        $lp_scorm_result_score_total = ($score/$max_score);			                        
 	                                $current_value = $score/$max_score;
 		                        } else {
 		                        	//$lp_scorm_result_score_total += 0;

+ 4 - 4
main/tracking/courseLog.php

@@ -481,14 +481,14 @@ if ($_GET['studentlist'] == 'false') {
 		$table -> set_header(0, get_lang('OfficialCode'), false, 'align="center"');
 		if ($is_western_name_order) {
 			$table -> set_header(1, get_lang('FirstName'), false, 'align="center"');
-			$table -> set_header(2, get_lang('LastName'), true, 'align="center"');
+			$table -> set_header(2, get_lang('LastName'), false, 'align="center"');
 		} else {
-    		$table -> set_header(1, get_lang('LastName'), true, 'align="center"');
+    		$table -> set_header(1, get_lang('LastName'), false, 'align="center"');
 			$table -> set_header(2, get_lang('FirstName'), false, 'align="center"');
 		}
 		$table -> set_header(3, get_lang('TrainingTime'),false);
-		$table -> set_header(4, get_lang('CourseProgress'),false);
-		$table -> set_header(5, get_lang('Score'),false);
+		$table -> set_header(4, get_lang('CourseProgress').' '.Display::return_icon('info3.gif', get_lang('ScormAndLPProgressTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')),false,array('style'=>'width:110px;'));
+		$table -> set_header(5, get_lang('Score').' '.Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')),false,array('style'=>'width:110px;'));
 		$table -> set_header(6, get_lang('Student_publication'),false);
 		$table -> set_header(7, get_lang('Messages'),false);
 		$table -> set_header(8, get_lang('FirstLogin'), false, 'align="center"');