From a40429bd75d3e6356e508e3d33c066c7383a1451 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 20 Jul 2020 10:20:38 +0200 Subject: [PATCH] Minor - flint fixes --- main/exercise/exercise.class.php | 58 +++++++++---------- .../gradebook/lib/fe/gradebooktable.class.php | 1 - 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php index 2d474737d5..f59f04d0b2 100755 --- a/main/exercise/exercise.class.php +++ b/main/exercise/exercise.class.php @@ -10036,6 +10036,35 @@ class Exercise return false; } + public static function getLpListFromExercise($exerciseId, $courseId) + { + $tableLpItem = Database::get_course_table(TABLE_LP_ITEM); + $tblLp = Database::get_course_table(TABLE_LP_MAIN); + + $exerciseId = (int) $exerciseId; + $courseId = (int) $courseId; + + $sql = "SELECT + lp.name, + lpi.lp_id, + lpi.max_score, + lp.session_id + FROM $tableLpItem lpi + INNER JOIN $tblLp lp + ON (lpi.lp_id = lp.iid AND lpi.c_id = lp.c_id) + WHERE + lpi.c_id = $courseId AND + lpi.item_type = '".TOOL_QUIZ."' AND + lpi.path = '$exerciseId'"; + $result = Database::query($sql); + $lpList = []; + if (Database::num_rows($result) > 0) { + $lpList = Database::store_result($result, 'ASSOC'); + } + + return $lpList; + } + /** * Get number of questions in exercise by user attempt. * @@ -10544,33 +10573,4 @@ class Exercise get_lang('ShowResultsToStudents') ); } - - public static function getLpListFromExercise($exerciseId, $courseId) - { - $tableLpItem = Database::get_course_table(TABLE_LP_ITEM); - $tblLp = Database::get_course_table(TABLE_LP_MAIN); - - $exerciseId = (int) $exerciseId; - $courseId = (int) $courseId; - - $sql = "SELECT - lp.name, - lpi.lp_id, - lpi.max_score, - lp.session_id - FROM $tableLpItem lpi - INNER JOIN $tblLp lp - ON (lpi.lp_id = lp.iid AND lpi.c_id = lp.c_id) - WHERE - lpi.c_id = $courseId AND - lpi.item_type = '".TOOL_QUIZ."' AND - lpi.path = '$exerciseId'"; - $result = Database::query($sql); - $lpList = []; - if (Database::num_rows($result) > 0) { - $lpList = Database::store_result($result, 'ASSOC'); - } - - return $lpList; - } } diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php index 2656a652c2..645e7a8b1f 100755 --- a/main/gradebook/lib/fe/gradebooktable.class.php +++ b/main/gradebook/lib/fe/gradebooktable.class.php @@ -1232,7 +1232,6 @@ class GradebookTable extends SortableTable .''; } - $extra = Display::label($item->get_type_name(), 'info'); if ('simple' === $type) { $extra = '';