diff --git a/public/main/exercise/question_pool.php b/public/main/exercise/question_pool.php index 4b61348062..03b921c864 100644 --- a/public/main/exercise/question_pool.php +++ b/public/main/exercise/question_pool.php @@ -921,7 +921,9 @@ echo ''; $tableId = 'question_pool_id'; echo '
'; echo ''; -echo ''; +echo ''; +echo ''; +echo ''; echo ''; echo ''; echo ''; diff --git a/public/main/gradebook/lib/fe/displaygradebook.php b/public/main/gradebook/lib/fe/displaygradebook.php index 91537fe504..32778037e5 100644 --- a/public/main/gradebook/lib/fe/displaygradebook.php +++ b/public/main/gradebook/lib/fe/displaygradebook.php @@ -592,7 +592,7 @@ class DisplayGradebook $alllinks = $catcourse[0]->get_links( $userId, true, - api_get_course_id() + api_get_course_int_id() ); $evals_links = array_merge($allevals, $alllinks); $item_value = 0; diff --git a/public/main/inc/lib/exercise.lib.php b/public/main/inc/lib/exercise.lib.php index 97972a5152..44efadc199 100644 --- a/public/main/inc/lib/exercise.lib.php +++ b/public/main/inc/lib/exercise.lib.php @@ -2722,7 +2722,7 @@ HOTSPOT; */ public static function getModelStyle($model, $percentage) { - return '      '; + return ''.$model['name'].''; } /** @@ -2756,13 +2756,16 @@ HOTSPOT; public static function getCourseScoreModel() { $modelList = self::getScoreModels(); + + + if (empty($modelList)) { return []; } $courseInfo = api_get_course_info(); if (!empty($courseInfo)) { - $scoreModelId = api_get_course_setting('score_model_id'); + $scoreModelId = 1; //api_get_course_setting('score_model_id'); if (-1 != $scoreModelId) { $modelIdList = array_column($modelList['models'], 'id'); if (in_array($scoreModelId, $modelIdList)) {