Improve output of prototype-usage script.

Author: trampgeek

classes/bulk_tester.php

@@ -135,15 +135,21 @@ public function get_categories_for_context($contextid) {
 
 
     /**
-     * Get all the non-prototype coderunner questions in the given context.
-     * Only the latest version of a question is returned.
+     * Get all the coderunner questions in the given context.
      *
-     * @param courseid
+     * @param courseid The id of the course of interest.
+     * @param includeprototypes true to include prototypes in the returned list.
      * @return array qid => question
      */
-    public function get_all_coderunner_questions_in_context($contextid) {
+    public function get_all_coderunner_questions_in_context($contextid, $includeprototypes=0) {
         global $DB;
 
+        if ($includeprototypes) {
+            $exclprototypes = '';
+        } else {
+            $exclprototypes = 'AND prototypetype=0';
+        }
+
         return $DB->get_records_sql("
             SELECT q.id, ctx.id as contextid, qc.id as category, qc.name as categoryname, q.*, opts.*
               FROM {context} ctx
@@ -152,12 +158,12 @@ public function get_all_coderunner_questions_in_context($contextid) {
               JOIN {question_versions} qv ON qv.questionbankentryid = qbe.id
               JOIN {question} q ON q.id = qv.questionid
               JOIN {question_coderunner_options} opts ON opts.questionid = q.id
-              WHERE prototypetype = 0
-              AND (qv.version = (SELECT MAX(v.version)
+              WHERE (qv.version = (SELECT MAX(v.version)
                                 FROM {question_versions} v
                                 JOIN {question_bank_entries} be ON be.id = v.questionbankentryid
                                 WHERE be.id = qbe.id)
                               )
+              $exclprototypes
               AND ctx.id = :contextid
               ORDER BY name", array('contextid' => $contextid));
     }
@@ -357,10 +363,12 @@ public function print_overall_result($numpasses, $failingtests, $missinganswers)
      */
     public static function display_prototypes($courseid, $prototypes, $missingprototypes) {
         global $OUTPUT;
-
+        ksort($prototypes, SORT_STRING | SORT_FLAG_CASE);
         foreach ($prototypes as $prototypename => $prototype) {
             if (isset($prototype->usages)) {
+                $name = isset($prototype->name) ? " ({$prototype->category}/{$prototype->name})" : ' (global)';
                 echo $OUTPUT->heading($prototypename, 4);
+                echo $OUTPUT->heading($name, 6);
                 echo html_writer::start_tag('ul');
                 foreach ($prototype->usages as $question) {
                     echo html_writer::tag('li', self::make_question_link($courseid, $question));

prototypeusage.php

@@ -54,7 +54,7 @@
 if (!has_capability('moodle/question:editall', $coursecontext)) {
     echo html::tag('p', get_string('unauthorisedbulktest', 'qtype_coderunner'));
 } else {
-    $questions = $bulktester->get_all_coderunner_questions_in_context($coursecontextid);
+    $questions = $bulktester->get_all_coderunner_questions_in_context($coursecontextid, true);
     $prototypequestions = qtype_coderunner::get_all_prototypes($courseid);
     $prototypes = [];
     foreach ($prototypequestions as $prototype) {
@@ -73,6 +73,10 @@
                 $missing[$type] = array($question);
             }
         } else {
+            if ($question->prototypetype != 0) {
+                $prototypes[$type]->name = $question->name;
+                $prototypes[$type]->category = $question->categoryname;
+            }
             if (isset($prototypes[$type]->usages)) {
                 $prototypes[$type]->usages[] = $question;
             } else {