|
|
|
@ -157,9 +157,11 @@ class FlatViewDataGenerator |
|
|
|
|
$session_id, |
|
|
|
|
'ORDER BY id' |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$evaluationsAdded = array(); |
|
|
|
|
if ($parent_id == 0 && !empty($allcat)) { |
|
|
|
|
// Means there are any subcategory |
|
|
|
|
|
|
|
|
|
foreach ($allcat as $sub_cat) { |
|
|
|
|
$sub_cat_weight = round(100 * $sub_cat->get_weight() / $main_weight, 1); |
|
|
|
|
$add_weight = " $sub_cat_weight %"; |
|
|
|
@ -216,6 +218,7 @@ class FlatViewDataGenerator |
|
|
|
|
$max = $score[0]; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return $max; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -389,7 +392,12 @@ class FlatViewDataGenerator |
|
|
|
|
|
|
|
|
|
$course_code = api_get_course_id(); |
|
|
|
|
$session_id = api_get_session_id(); |
|
|
|
|
$allcat = $this->category->get_subcategories(null, $course_code, $session_id, 'ORDER BY id'); |
|
|
|
|
$allcat = $this->category->get_subcategories( |
|
|
|
|
null, |
|
|
|
|
$course_code, |
|
|
|
|
$session_id, |
|
|
|
|
'ORDER BY id' |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$evaluationsAdded = array(); |
|
|
|
|
|
|
|
|
@ -400,7 +408,7 @@ class FlatViewDataGenerator |
|
|
|
|
|
|
|
|
|
$real_score = $score; |
|
|
|
|
|
|
|
|
|
$divide = ( ($score[1])==0 ) ? 1 : $score[1]; |
|
|
|
|
$divide = $score[1] == 0 ? 1 : $score[1]; |
|
|
|
|
|
|
|
|
|
$sub_cat_percentage = $sum_categories_weight_array[$sub_cat->get_id()]; |
|
|
|
|
$item_value = $score[0]/$divide*$main_weight; |
|
|
|
@ -427,8 +435,7 @@ class FlatViewDataGenerator |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!isset($this->params['only_total_category']) || |
|
|
|
|
(isset($this->params['only_total_category']) && |
|
|
|
|
$this->params['only_total_category'] == false) |
|
|
|
|
(isset($this->params['only_total_category']) && $this->params['only_total_category'] == false) |
|
|
|
|
) { |
|
|
|
|
if (!$show_all) { |
|
|
|
|
$row[] = $temp_score.' '; |
|
|
|
|