Gradebook: Improve view for percentage in list view - refs BT#19641

pull/4179/head
Angel Fernando Quiroz Campos 4 years ago
parent d9d5e5c8a3
commit 2d552fffa1
  1. 4
      main/gradebook/lib/flatview_data_generator.class.php
  2. 5
      main/gradebook/lib/scoredisplay.class.php
  3. 7
      main/inc/lib/display.lib.php

@ -545,7 +545,7 @@ class FlatViewDataGenerator
null,
$ignoreScoreColor
);
$temp_score = Display::tip($temp_score, $real_score);
$temp_score = Display::tip($temp_score, $real_score, 'div');
}
if (!isset($this->params['only_total_category']) ||
@ -562,7 +562,7 @@ class FlatViewDataGenerator
// }
// $finalList[] = round($average, 2);
foreach ($finalList as $finalValue) {
$row[] = '<span class="text-center">'.$finalValue.'</span>';
$row[] = $finalValue;
}
// } else {
}

@ -470,8 +470,9 @@ class ScoreDisplay
$div = $this->display_as_div($score, false, $removeEmptyDecimals);
return
$this->display_as_percent($score).
' ('.$div.')'.$scoreLabel;
$this->display_as_percent($score).PHP_EOL
.Display::div("($div)", ['class' => 'small'])
.$scoreLabel;
case SCORE_DIV_SIMPLE_WITH_CUSTOM: // X - Good!
return $this->display_simple_score($score).$scoreLabel;
break;

@ -2086,13 +2086,14 @@ class Display
*
* @return string
*/
public static function tip($text, $tip)
public static function tip($text, $tip, string $tag = 'span')
{
if (empty($tip)) {
return $text;
}
return self::span(
return self::tag(
$tag,
$text,
['class' => 'boot-tooltip', 'title' => strip_tags($tip)]
);

Loading…
Cancel
Save