Merge pull request #6702 from christianbeeznest/ofaj-22912

Exercise: Fix open question answer not saved - refs #22912

Author: christianbeeznest

public/main/exercise/exercise_submit.php

@@ -1441,11 +1441,25 @@ function save_question_list(question_list) {
                 var remind_list = $(\'*[name*="remind_list"]\').serialize();
                 var hotspot     = $(\'*[name*="hotspot[\'+qid+\']"]\').serialize();
                 var dc          = $(\'*[name*="choiceDegreeCertainty[\'+qid+\']"]\').serialize();
-                var dataStr     = "'.$params.'&type=simple&question_id="+qid
-                                  +"&"+my_choice
-                                  + (hotspot     ? "&"+hotspot     : "")
-                                  + (remind_list ? "&"+remind_list : "")
-                                  + (dc          ? "&"+dc          : "");
+
+                var editorContent = getContentFromEditor("choice"+qid);
+                var free_choice = "";
+                if (editorContent) {
+                    var obj = {};
+                    obj["choice["+qid+"]"] = editorContent;
+                    my_choice = $.param(obj);
+                    var fo = {};
+                    fo["free_choice["+qid+"]"] = editorContent;
+                    free_choice = $.param(fo);
+                }
+
+                var dataStr = "'.$params.'&type=simple&question_id="+qid
+                              +"&"+my_choice
+                              + (hotspot     ? "&"+hotspot     : "")
+                              + (remind_list ? "&"+remind_list : "")
+                              + (dc          ? "&"+dc          : "")
+                              + (free_choice ? "&"+free_choice : "");
+
                 return $.ajax({
                     type: "POST",
                     url: "'.api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?'.api_get_cidreq().'&a=save_exercise_by_now",

public/main/inc/ajax/exercise.ajax.php

@@ -643,10 +643,15 @@
                 $my_choice = 'assets:' . count($uploadAnswerAssetIds[$my_question_id] ?? []);
             }
             // Getting free choice data.
-            if (in_array($objQuestionTmp->type, [FREE_ANSWER, ORAL_EXPRESSION]) && 'all' == $type) {
-                $my_choice = isset($_REQUEST['free_choice'][$my_question_id]) && !empty($_REQUEST['free_choice'][$my_question_id])
-                    ? $_REQUEST['free_choice'][$my_question_id]
-                    : null;
+            if (in_array($objQuestionTmp->type, [FREE_ANSWER, ORAL_EXPRESSION])) {
+                if ('all' === $type) {
+                    $my_choice = $_REQUEST['free_choice'][$my_question_id] ?? $my_choice;
+                } elseif ('simple' === $type && isset($_REQUEST['free_choice'][$my_question_id]) && $_REQUEST['free_choice'][$my_question_id] !== '') {
+                    $my_choice = $_REQUEST['free_choice'][$my_question_id];
+                }
+                if (is_string($my_choice)) {
+                    $my_choice = trim($my_choice);
+                }
             }
 
             if ('all' === $type) {