Browse Source

Fix invalid HTML

Julio Montoya 6 years ago
parent
commit
4aeef05371
2 changed files with 9 additions and 10 deletions
  1. 3 4
      main/gradebook/gradebook_statistics.php
  2. 6 6
      main/inc/lib/display.lib.php

+ 3 - 4
main/gradebook/gradebook_statistics.php

@@ -89,19 +89,18 @@ if (!$displayScore->is_custom() || empty($displays)) {
     $stattable = '<table class="data_table" cellspacing="0" cellpadding="3">';
     $stattable .= '<tr><th>'.get_lang('ScoringSystem').'</th>';
     $stattable .= '<th>'.get_lang('Percentage').'</th>';
-    $stattable .= '<th>'.get_lang('CountUsers').'</th>';
-    //$stattable .= '<th>' . get_lang('Statistics') . '</th></tr>';
+    $stattable .= '<th>'.get_lang('CountUsers').'</th></tr>';
     $counter = 0;
     foreach ($keys as $key) {
         $bar = ($highest_ratio > 0 ? ($nr_items[$key] / $highest_ratio) * 100 : 0);
         $stattable .= '<tr class="row_'.($counter % 2 == 0 ? 'odd' : 'even').'">';
         $stattable .= '<td width="150">'.$key.'</td>';
-
         $stattable .= '<td width="550">'.Display::bar_progress($bar).'</td>';
         $stattable .= '<td align="right">'.$nr_items[$key].'</td>';
+        $stattable .= '</tr>';
         $counter++;
     }
-    $stattable .= '</tr></table>';
+    $stattable .= '</table>';
     echo $stattable;
 }
 Display :: display_footer();

+ 6 - 6
main/inc/lib/display.lib.php

@@ -1908,15 +1908,15 @@ class Display
     }
 
     /**
-     * @param $percentage
-     * @param bool $show_percentage
-     * @param null $extra_info
+     * @param int    $percentage
+     * @param bool   $show_percentage
+     * @param string $extra_info
      *
      * @return string
      */
-    public static function bar_progress($percentage, $show_percentage = true, $extra_info = null)
+    public static function bar_progress($percentage, $show_percentage = true, $extra_info = '')
     {
-        $percentage = intval($percentage);
+        $percentage = (int) $percentage;
         $div = '<div class="progress">
                 <div
                     class="progress-bar progress-bar-striped"
@@ -1933,7 +1933,7 @@ class Display
                 $div .= $extra_info;
             }
         }
-        $div .= '</div>';
+        $div .= '</div></div>';
 
         return $div;
     }