q-edit - Add warnings back in, rework missing alt-text, improve dependencies page

Author: EJMFarrow

adminui/dependencies.php

@@ -56,32 +56,22 @@
     '{qtype_stack_options} o, {question_versions} v WHERE q.id = o.questionid AND q.id = v.id ' . '
     AND NOT v.status = "hidden" AND o.compiledcache = ?;';
 
-$notcompiled = $DB->get_recordset_sql($query, ['{}']);
-
-$nnotcompiled = 0;
-$ncompiled = 0;
-foreach ($notcompiled as $item) {
-    $nnotcompiled = $item->notcompiled;
-}
-$notcompiled->close();
+$notcompiled = $DB->get_record_sql($query, ['{}']);
+$nnotcompiled = $notcompiled->notcompiled;
 
 $query = 'SELECT count(*) as compiled FROM {question} q, ' .
     '{qtype_stack_options} o, {question_versions} v WHERE q.id = o.questionid AND q.id = v.id ' . '
-    AND NOT v.status = "hidden" AND o.compiledcache = ?;';
+    AND NOT v.status = "hidden" AND o.compiledcache != ?;';
 
-$compiled = $DB->get_recordset_sql($query, ['{}']);
-
-foreach ($compiled as $item) {
-    $ncompiled = $item->compiled;
-}
-$compiled->close();
+$compiled = $DB->get_record_sql($query, ['{}']);
+$ncompiled = $compiled->compiled;
 
 echo $OUTPUT->header();
 echo $OUTPUT->heading($title);
 
 echo '<p>This tool only acts on succesfully compiled questions, to compile questions run the bulk tester ' .
     'or preview/use those questions.</p><p>';
-if ($ncompiled !== $notcompiled) {
+if ($nnotcompiled) {
     echo stack_string_error('errors') . '. ';
 }
 echo  'Currently there are ' . $ncompiled . ' compiled questions and ' . $nnotcompiled .
@@ -328,7 +318,7 @@
     // Load the whole question, simpler to get the contexts correct that way.
     foreach ($qs as $item) {
         $q = question_bank::load_question($item->questionid);
-        $tags = $q->get_question_todos();
+        list($hastodos, $tags) = $q->get_question_todos();
         list($context, $seed, $urlparams) = qtype_stack_setup_question_test_page($q);
         $qurl = qbank_previewquestion\helper::question_preview_url($item->questionid,
                 null, null, null, null, $context);

edit_stack_form.php

@@ -218,8 +218,13 @@ protected function definition_inner(/* MoodleQuickForm */ $mform) {
 
         // TO-DO: add in warnings here.  See b764b39675 for deleted materials.
         $warnings = '';
+        if (isset($this->question->id)) {
+            $question = question_bank::load_question($this->question->id);
+            $warnings = implode("<br />", $question->validate_warnings());
+        }
         if (get_class(editors_get_preferred_editor()) !== 'textarea_texteditor') {
-            $warnings = '<i class="icon fa fa-exclamation-circle text-danger fa-fw"></i>' . stack_string('usetextarea');
+            $warnings = ($warnings) ? $warnings . '<br />' : $warnings;
+            $warnings .= '<i class="icon fa fa-exclamation-circle text-danger fa-fw"></i>' . stack_string('usetextarea');
         }
 
         // Note that for the editor elements, we are using $mform->getElement('prtincorrect')->setValue(...); instead

question.php

@@ -1750,17 +1750,18 @@ public function validate_warnings($errors = false) {
         // 2. Check alt-text exists.
         // Reminder: previous approach in Oct 2021 tried to use libxml_use_internal_errors, but this was a dead end.
         $tocheck = [];
-        $text = '';
-        if ($this->questiontextinstantiated !== null) {
-            $text = trim($this->questiontextinstantiated->get_rendered());
-        }
-        if ($text !== '') {
-            $tocheck[stack_string('questiontext')] = $text;
-        }
-        $ct = $this->get_generalfeedback_castext();
-        $text = trim($ct->get_rendered($this->castextprocessor));
-        if ($text !== '') {
-            $tocheck[stack_string('generalfeedback')] = $text;
+        $fields = ['questiontext', 'specificfeedback', 'generalfeedback', 'questiondescription'];
+        foreach ($fields as $field) {
+            $text = '';
+            $fieldinstantiated = $field . 'instantiated';
+            if ($this->{$fieldinstantiated} !== null) {
+                $text = trim($this->{$fieldinstantiated}->get_rendered());
+            } else {
+                $text = trim($this->{$field});
+            }
+            if ($text !== '') {
+                $tocheck[stack_string($field)] = $text;
+            }
         }
         // This is a compromise.  We concatinate all nodes and we don't instantiate this!
         foreach ($this->prts as $prt) {