Minor - format code

pull/3782/head
Julio Montoya 5 years ago
parent 0a4cd888fa
commit 216fd1d64a
  1. 2
      main/exercise/exercise_report.php
  2. 2
      main/gradebook/gradebook_flatview.php
  3. 3
      main/gradebook/lib/flatview_data_generator.class.php
  4. 31
      main/gradebook/lib/gradebook_data_generator.class.php
  5. 1
      main/gradebook/lib/scoredisplay.class.php

@ -18,7 +18,7 @@ $htmlHeadXtra[] = api_get_jqgrid_js();
$filter_user = isset($_REQUEST['filter_by_user']) ? (int) $_REQUEST['filter_by_user'] : null;
$isBossOfStudent = false;
if (api_is_student_boss() && !empty($filter_user)) {
if (!empty($filter_user) && api_is_student_boss()) {
// Check if boss has access to user info.
if (UserManager::userIsBossOfStudent(api_get_user_id(), $filter_user)) {
$isBossOfStudent = true;

@ -311,8 +311,6 @@ if (isset($_GET['isStudentView']) && 'false' === $_GET['isStudentView']) {
);
$flatViewTable->display();
} elseif (isset($_GET['selectcat']) && ($_SESSION['studentview'] === 'teacherview')) {
DisplayGradebook::display_header_reduce_flatview(
$cat[0],
$showeval,

@ -472,7 +472,6 @@ class FlatViewDataGenerator
SCORE_SIMPLE,
null,
$ignore_score_color
);
}
@ -694,7 +693,7 @@ class FlatViewDataGenerator
$divide = isset($score[1]) && !empty($score[1]) && $score[1] > 0 ? $score[1] : 1;
// Sub cat weight
$item_value = isset(e[0]) ? $score[0] / $divide : null;
$item_value = isset($score[0]) ? $score[0] / $divide : null;
// Fixing total when using one or multiple gradebooks.
if (empty($parentCategoryIdFilter)) {

@ -774,22 +774,21 @@ class GradebookDataGenerator
false,
true
);
/*$type = $item->get_item_type();
if ('L' === $type && 'ExerciseLink' === get_class($item)) {
$display = ExerciseLib::show_score(
$score[0],
$score[1],
false,
true,
false,
false,
null,
null,
false,
true
);
}*/
/*$type = $item->get_item_type();
if ('L' === $type && 'ExerciseLink' === get_class($item)) {
$display = ExerciseLib::show_score(
$score[0],
$score[1],
false,
true,
false,
false,
null,
null,
false,
true
);
}*/
} else {
$display = ExerciseLib::show_score(
$score[0],

@ -468,6 +468,7 @@ class ScoreDisplay
return $this->display_as_decimal($score).$scoreLabel;
case SCORE_DIV_PERCENT_WITH_CUSTOM: // X / Y (XX %) - Good!
$div = $this->display_as_div($score, false, $removeEmptyDecimals);
return
$this->display_as_percent($score).
' ('.$div.')'.$scoreLabel;

Loading…
Cancel
Save