From fc3f67253543bf5d0ae3fdb3b46a891bbda34f4f Mon Sep 17 00:00:00 2001 From: Isaac Flores Date: Thu, 27 Nov 2008 00:17:59 +0100 Subject: [PATCH] [svn r16971] minor - changes in logic - allows correct view view flat(forum,exercises,works) --- main/gradebook/lib/flatview_data_generator.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/gradebook/lib/flatview_data_generator.class.php b/main/gradebook/lib/flatview_data_generator.class.php index 225d481660..a9e20e6c77 100644 --- a/main/gradebook/lib/flatview_data_generator.class.php +++ b/main/gradebook/lib/flatview_data_generator.class.php @@ -138,6 +138,7 @@ class FlatViewDataGenerator if ($ignore_score_color) { $displaytype |= SCORE_IGNORE_SPLIT; } + foreach ($selected_users as $user) { $row = array (); $row[] = $user[0]; // user id @@ -151,9 +152,9 @@ class FlatViewDataGenerator ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) { $item = $this->evals_links [$count + $items_start]; - $score = $item->calc_score($user[0]); - $item_value+=$score[0]; - $item_total+=$score[1]; + $score = $item->calc_score($user[0]); + $item_value+=$score[0]/$score[1]*$item->get_weight(); + $item_total+=$item->get_weight(); $row[] = $scoredisplay->display_score($score,SCORE_DIV_PERCENT); } $total_score=array($item_value,$item_total);