Merge pull request #1471 from maths/api-solutions

API - Use better 'can be typed as' solution. Update Debian.

Author: sangwinc

api/controller/RenderController.php

@@ -100,8 +100,10 @@ public function __invoke(Request $request, Response $response, array $args): Res
         $inputs = [];
         foreach ($question->inputs as $name => $input) {
             $apiinput = new StackRenderInput();
-
-            $apiinput->samplesolution = $input->get_api_solution($question->get_ta_for_input($name));
+            $correctresponse = (isset($question->get_correct_response()[$name])) ? $question->get_correct_response()[$name] : null;
+            // Deal with matrix questions.
+            $correctresponse = (isset($correctresponse)) ? $correctresponse : $question->get_ta_for_input($name);
+            $apiinput->samplesolution = $input->get_api_solution($correctresponse);
             $apiinput->samplesolutionrender = $input->get_api_solution_render(
                 $question->get_ta_render_for_input($name), $question->get_ta_for_input($name));
 

api/docker/Dockerfile

@@ -9,7 +9,7 @@ RUN composer install
 RUN composer dump-autoload --optimize
 
 #Base Image
-FROM php:8.2-apache-bullseye AS base
+FROM php:8.4.5-apache-bookworm AS base
 
 #Install required php extensions
 RUN apt-get update && \

api/public/stackshared.php

@@ -111,7 +111,7 @@ function send() {
                                 correctAnswers += `, <?php echo stack_string('api_which_typed') ?>: `;
                                 for (const [name, solution] of Object.entries(input.samplesolution)) {
                                     if (name.indexOf('_val') === -1) {
-                                        correctAnswers += `<span class='correct-answer'>${solution}</span>`;
+                                        correctAnswers += `<span class='correct-answer'>${solution.replace(/\n/g, '<br>')}</span>`;
                                     }
                                 }
                             }

stack/input/equiv/equiv.class.php

@@ -588,9 +588,4 @@ protected function ajax_to_response_array($in) {
         $in = implode("\n", $in);
         return [$this->name => $in];
     }
-
-    // phpcs:ignore moodle.Commenting.MissingDocblock.Function
-    public function get_api_solution($tavalue) {
-        return ['' => $this->maxima_to_raw_input($tavalue)];
-    }
 }

stack/input/notes/notes.class.php

@@ -229,11 +229,6 @@ public function summarise_response($name, $state, $response) {
         return $name . ': ' . $val . ' [' . $state->status . ']';
     }
 
-    // phpcs:ignore moodle.Commenting.MissingDocblock.Function
-    public function get_api_solution($tavalue) {
-        return new stdClass();
-    }
-
     // phpcs:ignore moodle.Commenting.MissingDocblock.Function
     public function get_api_solution_render($tadisplay, $ta) {
         return '';

stack/input/textarea/textarea.class.php

@@ -342,21 +342,4 @@ public function get_teacher_answer_display($value, $display) {
 
         return stack_string('teacheranswershow', ['value' => $value, 'display' => $display]);
     }
-
-    // phpcs:ignore moodle.Commenting.MissingDocblock.Function
-    public function get_api_solution($tavalue) {
-        $values = stack_utils::list_to_array($tavalue, false);
-        foreach ($values as $key => $val) {
-            if (trim($val) !== '' ) {
-                $cs = stack_ast_container::make_from_teacher_source($val);
-                $cs->get_valid();
-                $val = $cs->get_inputform(true, 0, true);
-            }
-            $values[$key] = $val;
-        }
-
-        return ['' => implode("\n", $values)];
-    }
-
-
 }

stack/input/varmatrix/varmatrix.class.php

@@ -457,16 +457,4 @@ public function internal_validate_parameter($parameter, $value) {
         }
         return $valid;
     }
-
-    // phpcs:ignore moodle.Commenting.MissingDocblock.Function
-    public function get_api_solution($tavalue) {
-        // We clear the name, and then restore its original value,
-        // to not include the prefix in the api solution.
-        $name = $this->name;
-        $this->name = '';
-        $sol = $this->maxima_to_response_array($tavalue);
-        $this->name = $name;
-        return $sol;
-    }
-
 }