From 6ee2b972c9a473c9636cb6ea7f63457d1445a249 Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Tue, 21 Aug 2018 15:05:26 +1000
Subject: [PATCH] MDL-63186 quiz_statistics: Remove q number from the summary
 row

Part of MDL-62610
---
 mod/quiz/report/statistics/lang/en/quiz_statistics.php             | 3 ++-
 mod/quiz/report/statistics/statistics_table.php                    | 7 +++++--
 .../statistics/questions/all_calculated_for_qubaid_condition.php   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mod/quiz/report/statistics/lang/en/quiz_statistics.php b/mod/quiz/report/statistics/lang/en/quiz_statistics.php
index 4a7c9b10bb9..25dd619ee5d 100644
--- a/mod/quiz/report/statistics/lang/en/quiz_statistics.php
+++ b/mod/quiz/report/statistics/lang/en/quiz_statistics.php
@@ -115,5 +115,6 @@ $string['statisticsreportgraph'] = 'Statistics for question positions';
 $string['statistics:view'] = 'View statistics report';
 $string['statsfor'] = 'Quiz statistics (for {$a})';
 $string['variant'] = 'Variant';
-$string['viewdisplayedquestions'] = 'View displayed questions';
+$string['viewanalysis'] = 'View analysis of these questions';
+$string['viewanalysishint'] = 'View analysis of the random question(s) above';
 $string['whichtries'] = 'Analyze responses for';
diff --git a/mod/quiz/report/statistics/statistics_table.php b/mod/quiz/report/statistics/statistics_table.php
index 80c97dc40eb..4c221df26ab 100644
--- a/mod/quiz/report/statistics/statistics_table.php
+++ b/mod/quiz/report/statistics/statistics_table.php
@@ -139,6 +139,9 @@ class quiz_statistics_table extends flexible_table {
      * @return string contents of this table cell.
      */
     protected function col_number($questionstat) {
+        if ($this->is_random_question_summary($questionstat)) {
+            return '';
+        }
         if (!isset($questionstat->question->number)) {
             return '';
         }
@@ -245,8 +248,8 @@ class quiz_statistics_table extends flexible_table {
                         // Random question rows will render the name without a link to improve clarity
                         // in the UI.
                         $name = html_writer::link($url,
-                                                  get_string('viewdisplayedquestions', 'quiz_statistics'),
-                                                  array('title' => get_string('slotstructureanalysis', 'quiz_statistics', $number)));
+                                                  get_string('viewanalysis', 'quiz_statistics'),
+                                                  array('title' => get_string('viewanalysishint', 'quiz_statistics', $number)));
                     }
                 } else if ($questionstat->get_variants() || $questionstat->get_sub_question_ids()) {
                     // Question can be broken down into sub-questions or variants. Link will show structural analysis page.
diff --git a/question/classes/statistics/questions/all_calculated_for_qubaid_condition.php b/question/classes/statistics/questions/all_calculated_for_qubaid_condition.php
index 8c664351161..8e538e66fb0 100644
--- a/question/classes/statistics/questions/all_calculated_for_qubaid_condition.php
+++ b/question/classes/statistics/questions/all_calculated_for_qubaid_condition.php
@@ -430,7 +430,7 @@ class all_calculated_for_qubaid_condition {
                 }
 
                 foreach ($toreturn as $index => $calculated) {
-                    $calculated->subqdisplayorder = $index + 1;
+                    $calculated->subqdisplayorder = $index;
                 }
             } else {
                 $displaynumber = 1;
-- 
2.11.4.GIT