Exercise: Improve score model display and styling in quiz results - refs #3530

public/main/exercise/question_pool.php

@@ -921,7 +921,9 @@ echo '</div>';
 $tableId = 'question_pool_id';
 echo '<form id="'.$tableId.'" method="get" action="'.$url.'">';
 echo '<input type="hidden" name="fromExercise" value="'.$fromExercise.'">';
-echo '<input type="hidden" name="cidReq" value="'.$_course['code'].'">';
+echo '<input type="hidden" name="cidReq" value="'.$_course['real_id'].'">';
+echo '<input type="hidden" name="cid" value="'.api_get_course_int_id().'">';
+echo '<input type="hidden" name="sid" value="'.api_get_session_id().'">';
 echo '<input type="hidden" name="selected_course" value="'.$selected_course.'">';
 echo '<input type="hidden" name="course_id" value="'.$selected_course.'">';
 echo '<input type="hidden" name="action">';

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;

public/main/inc/lib/exercise.lib.php

@@ -2722,7 +2722,7 @@ HOTSPOT;
      */
     public static function getModelStyle($model, $percentage)
     {
-        return '<span class="'.$model['css_class'].'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>';
+        return '<span class="'.$model['css_class'].' p-2">'.$model['name'].'</span>';
     }
 
     /**
@@ -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)) {