Merge pull request marcusgreen#13 from mebis-lp/MBS-9817-Prepare_for_…

…merge_with_upstream

MBS-9817: Prepare for merge with upstream

amd/src/spellcheck.js

@@ -29,11 +29,10 @@ import {getString as getString} from 'core/str';
 /**
  * Init the module.
  *
- * @param {int} cmid the course module id of the quiz.
  * @param {string} readonlyareaselector the selector for the readonly area to apply the spellchecking
  * @param {string} spellcheckeditbuttonselector the selector for the spell check edit button
  */
-export const init = (cmid, readonlyareaselector, spellcheckeditbuttonselector) => {
+export const init = (readonlyareaselector, spellcheckeditbuttonselector) => {
     renderDiff(readonlyareaselector);
 
     if (!document.querySelector(spellcheckeditbuttonselector)) {
@@ -42,7 +41,7 @@ export const init = (cmid, readonlyareaselector, spellcheckeditbuttonselector) =
     document.querySelector(spellcheckeditbuttonselector).addEventListener('click',
         async(event) => {
             event.preventDefault();
-            await showModalForm(cmid, readonlyareaselector);
+            await showModalForm(readonlyareaselector);
         });
 };
 
@@ -86,19 +85,17 @@ export const renderDiff = (readonlyareaselector) => {
 /**
  * Show the dynamic spellcheck form.
  *
- * @param {int} cmid the course module id of the quiz
  * @param {string} readonlyareaselector the selector for the readonly area
  */
-export const showModalForm = async(cmid, readonlyareaselector) => {
+export const showModalForm = async(readonlyareaselector) => {
     const attemptstepid = document.querySelector(readonlyareaselector).dataset.spellcheckattemptstepid;
     const answerstepid = document.querySelector(readonlyareaselector).dataset.spellcheckattemptstepanswerid;
     const title = await getString('spellcheckedit', 'qtype_aitext');
     const modalForm = new ModalForm({
-        formClass: "qtype_aitext\\form\\edit_spellchek",
+        formClass: "qtype_aitext\\form\\edit_spellcheck",
         args: {
             attemptstepid,
-            answerstepid,
-            cmid
+            answerstepid
         },
         modalConfig: {title},
     });

changelog.md

@@ -25,6 +25,8 @@ Marks prompt in the editing interface is optional
 
 Translation of the response is now optional
 
+Big thanks to Philipp Memmel for help with the switchable backend settings to work and for testing and many other things.
+
 Thanks to Farah Ahmad of Aga Khan University for reporting an issue with plagiarism plugins.
 
 Thanks to Matt Metzgar for reporting an issue with the tranlation postfix.

classes/external.php

@@ -72,7 +72,7 @@ public static function fetch_ai_grade($response, $defaultmark, $prompt, $markssc
         if (!empty($response) && !empty($prompt) && $defaultmark > 0) {
             $fullaiprompt = $aiquestion->build_full_ai_prompt($response, $prompt, $defaultmark, $marksscheme);
             $feedback = $aiquestion->perform_request($fullaiprompt);
-            $contentobject = json_decode($feedback);
+            $contentobject = $aiquestion->process_feedback($feedback);
         } else {
             $contentobject = (object)["feedback" => get_string('err_parammissing', 'qtype_aitext'), "marks" => 0];
         }