Gradebook: Fix default valur for flat view - refs BT#16039

pull/2999/head
Angel Fernando Quiroz Campos 6 years ago
parent fa7e7d5805
commit bd59107d51
  1. 8
      main/gradebook/lib/flatview_data_generator.class.php

@ -591,12 +591,10 @@ class FlatViewDataGenerator
$total_score = [$item_value_total, $item_total]; $total_score = [$item_value_total, $item_total];
$style = api_get_configuration_value('gradebook_report_score_style'); $style = api_get_configuration_value('gradebook_report_score_style');
$defaultStyle = SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS;
if (!empty($style)) {
$defaultStyle = (int) $style;
}
if (!$show_all) { if (!$show_all) {
$defaultStyle = empty($style) ? SCORE_DIV_PERCENT : (int) $style;
$displayScore = $scoreDisplay->display_score($total_score, $defaultStyle); $displayScore = $scoreDisplay->display_score($total_score, $defaultStyle);
if (!empty($model)) { if (!empty($model)) {
$displayScore = ExerciseLib::show_score($total_score[0], $total_score[1]); $displayScore = ExerciseLib::show_score($total_score[0], $total_score[1]);
@ -607,6 +605,8 @@ class FlatViewDataGenerator
$row[] = $displayScore; $row[] = $displayScore;
} }
} else { } else {
$defaultStyle = empty($style) ? SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS : (int) $style;
$displayScore = $scoreDisplay->display_score($total_score, $defaultStyle); $displayScore = $scoreDisplay->display_score($total_score, $defaultStyle);
if (!empty($model)) { if (!empty($model)) {
$displayScore = ExerciseLib::show_score($total_score[0], $total_score[1]); $displayScore = ExerciseLib::show_score($total_score[0], $total_score[1]);

Loading…
Cancel
Save