Code clean up

moodleou · Oct 16, 2023 · 7a7b861 · 7a7b861
1 parent ff82354
commit 7a7b861
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/questiontype.php b/questiontype.php
@@ -292,19 +292,15 @@ protected function initialise_question_rows(question_definition $question, $ques
             foreach ($questiondata->rows as $index => $row) {
                 $newrow = $this->make_row($row);
                 $correctanswers = [];
-                $todecode = implode(",", $newrow->correctanswers);
-                $decodedanswers = json_decode($todecode, true);
-                foreach ($questiondata->columns as $key => $column) {
-                    if ($decodedanswers != null && array_key_exists($column->id, $decodedanswers)) {
-                        if ($questiondata->options->inputtype == 'single') {
+                if($questiondata->options->inputtype == 'single') {
+                    foreach ($questiondata->columns as $column) {
+                        if (isset($newrow->correctanswers) && array_key_exists($column->id, $newrow->correctanswers)) {
                             $anslabel = 'a' . ($column->number + 1);
                             $correctanswers[$column->id] = $anslabel;
-                        } else {
-                            $correctanswers[$column->id] = $decodedanswers[$column->id];
                         }
                     }
+                    $newrow->correctanswers = $correctanswers;
                 }
-                $newrow->correctanswers = $correctanswers;
                 $question->rows[$index] = $newrow;
             }
         }

diff --git a/tests/helper.php b/tests/helper.php
@@ -441,8 +441,4 @@ public function get_test_question_data($which) {
     public function get_test_question_form_data($which) {
         return (array)\test_question_maker::get_question_form_data('oumatrix', $which);
     }
-
-    public function get_test_question_form_data($witch) {
-        return (array)\test_question_maker::get_question_form_data('oumatrix', $witch);
-    }
 }