' +
+ if (root.find('.dropzones .dropzone.group' + place.group + '.place' + i).length === 0) {
+ root.find('.dropzones').append('
' +
'' + label + '
');
+ }
root.find('.dropzone.place' + i).width(maxWidth - 2).height(maxHeight - 2);
}
};
diff --git a/question/type/ddimageortext/rendererbase.php b/question/type/ddimageortext/rendererbase.php
index 640600090a4..cb201cd397d 100644
--- a/question/type/ddimageortext/rendererbase.php
+++ b/question/type/ddimageortext/rendererbase.php
@@ -52,7 +52,6 @@ class qtype_ddtoimage_renderer_base extends qtype_with_combined_feedback_rendere
public function formulation_and_controls(question_attempt $qa,
question_display_options $options) {
-
$question = $qa->get_question();
$response = $qa->get_last_qt_data();
@@ -92,6 +91,7 @@ class qtype_ddtoimage_renderer_base extends qtype_with_combined_feedback_rendere
$classes[] = 'infinite';
}
if ($dragimageurl === null) {
+ $dragimage->text = question_utils::format_question_fragment($dragimage->text, $this->page->context);
$dragimagehomesgroup .= html_writer::div($dragimage->text, join(' ', $classes), ['src' => $dragimageurl]);
} else {
$dragimagehomesgroup .= html_writer::img($dragimageurl, $dragimage->text, ['class' => join(' ', $classes)]);
diff --git a/question/type/ddimageortext/styles.css b/question/type/ddimageortext/styles.css
index 8334a9d00bc..98ff22e892a 100644
--- a/question/type/ddimageortext/styles.css
+++ b/question/type/ddimageortext/styles.css
@@ -85,6 +85,10 @@ form.mform fieldset#id_previewareaheader .droppreview {
display: none;
}
+.que.ddimageortext .MathJax_Display {
+ margin: 0;
+}
+
.que.ddimageortext .draghomes .draghome.dragplaceholder.active {
visibility: hidden;
display: inline-block;
diff --git a/question/type/ddimageortext/tests/behat/preview.feature b/question/type/ddimageortext/tests/behat/preview.feature
index bb5c5c868de..a40b0ef9405 100644
--- a/question/type/ddimageortext/tests/behat/preview.feature
+++ b/question/type/ddimageortext/tests/behat/preview.feature
@@ -18,8 +18,9 @@ Feature: Preview a drag-drop onto image question
| contextlevel | reference | name |
| Course | C1 | Test questions |
And the following "questions" exist:
- | questioncategory | qtype | name | template |
- | Test questions | ddimageortext | Drag onto image | xsection |
+ | questioncategory | qtype | name | template |
+ | Test questions | ddimageortext | Drag onto image | xsection |
+ | Test questions | ddimageortext | Drag to mathjax equation | mathjax |
@javascript @_bug_phantomjs
Scenario: Preview a question using the mouse.
@@ -53,3 +54,12 @@ Feature: Preview a drag-drop onto image question
And I press "Submit and finish"
Then the state of "Identify the features" question is shown as "Correct"
And I should see "Mark 1.00 out of 1.00"
+
+ @javascript
+ Scenario: Preview a drag-drop into image question with mathjax question.
+ Given the "mathjaxloader" filter is "on"
+ And the "mathjaxloader" filter applies to "content and headings"
+ And I am on the "Drag to mathjax equation" "core_question > preview" page logged in as teacher
+ And I press "Fill in correct responses"
+ When I press "Submit and finish"
+ Then ".filter_mathjaxloader_equation" "css_element" should exist in the ".draghome" "css_element"
diff --git a/question/type/ddimageortext/tests/helper.php b/question/type/ddimageortext/tests/helper.php
index 367d2c0d801..8f0ee8810fd 100644
--- a/question/type/ddimageortext/tests/helper.php
+++ b/question/type/ddimageortext/tests/helper.php
@@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die();
*/
class qtype_ddimageortext_test_helper extends question_test_helper {
public function get_test_questions() {
- return array('fox', 'maths', 'xsection', 'mixedlang');
+ return ['fox', 'maths', 'xsection', 'mixedlang', 'mathjax'];
}
/**
@@ -251,6 +251,54 @@ class qtype_ddimageortext_test_helper extends question_test_helper {
return $fromform;
}
+ /**
+ * Get data required to save a drag-drop into text question where the the answer contain equation
+ *
+ *
+ * @return stdClass data to create a ddwtos question.
+ */
+ public function get_ddimageortext_question_form_data_mathjax() {
+ global $CFG, $USER;
+ $fromform = new stdClass();
+
+ $bgdraftitemid = 0;
+ file_prepare_draft_area($bgdraftitemid, null, null, null, null);
+ $fs = get_file_storage();
+ $filerecord = new stdClass();
+ $filerecord->contextid = context_user::instance($USER->id)->id;
+ $filerecord->component = 'user';
+ $filerecord->filearea = 'draft';
+ $filerecord->itemid = $bgdraftitemid;
+ $filerecord->filepath = '/';
+ $filerecord->filename = 'oceanfloorbase.jpg';
+ $fs->create_file_from_pathname($filerecord, $CFG->dirroot .
+ '/question/type/ddimageortext/tests/fixtures/oceanfloorbase.jpg');
+ $fromform->name = 'Drag-and-drop words into image question with equation';
+ $fromform->questiontext = ['text' => 'Fill in the correct mathjax equation: y = 2, x =4', 'format' => FORMAT_HTML];
+ $fromform->defaultmark = 1.0;
+ $fromform->generalfeedback = ['text' => 'The right answer is: "y = x^2"', 'format' => FORMAT_HTML];
+ $fromform->drags = [
+ ['dragitemtype' => 'word', 'draggroup' => '1', 'infinite' => '0'],
+ ['dragitemtype' => 'word', 'draggroup' => '1', 'infinite' => '0'],
+ ];
+ $fromform->bgimage = $bgdraftitemid;
+ $fromform->dragitem = [0, 0];
+ $fromform->draglabel =
+ [
+ '$$ y = x^2 $$',
+ '$$ y = x^5 $$',
+ ];
+ $fromform->drops = [
+ ['xleft' => '53', 'ytop' => '17', 'choice' => '1', 'droplabel' => ''],
+ ['xleft' => '172', 'ytop' => '2', 'choice' => '2', 'droplabel' => ''],
+ ];
+ test_question_maker::set_standard_combined_feedback_form_data($fromform);
+ $fromform->shownumcorrect = 0;
+ $fromform->penalty = 0.3333333;
+ $fromform->status = \core_question\local\bank\question_version_status::QUESTION_STATUS_READY;
+ return $fromform;
+ }
+
/**
* Make a test question where the drag items are a different language than the main question text.
*