Merge pull request #1747 from maths/iss1680

Iss1680 - Tweaks to dashboard

Author: sangwinc

amd/build/dashboard.min.js

@@ -27,6 +27,35 @@ define([], function () {
      *
      */
     function init() {
+        const warningTab = document.getElementById('warning-tab');
+        if (document.querySelectorAll('.var-pane-fail').length) {
+            const varTabWarning = document.getElementById('variants-pane-warning');
+            varTabWarning.style.display = 'inline';
+            warningTab.style.display = 'inline';
+        }
+        if (document.querySelectorAll('.test-pane-fail').length) {
+            const testTab = document.getElementById('test-pane-warning');
+            testTab.style.display = 'inline';
+            warningTab.style.display = 'inline';
+        }
+        const variantCount = document.getElementById('variant-count').textContent;
+        const variantTabLabel = document.getElementById('variants-tab-label');
+        variantTabLabel.textContent = variantTabLabel.textContent + ' ' + variantCount;
+        document.getElementById('dashboard-tab-content').style.display = 'block';
+
+        // Prevent page refresh loading old version.
+        const url = new URL(location);
+        if (url.searchParams.get('historic')) {
+            url.searchParams.delete('historic');
+            history.replaceState(null, null, url);
+        } else {
+            // Page reload will not reset dropdown. We have to do it manually.
+            var options = document.querySelectorAll('.version-dropdown-option');
+            for (var i = 0, l = options.length; i < l; i++) {
+                options[i].selected = options[i].defaultSelected;
+            }
+        }
+
         // Add simple client-side sorting for the first two columns.
         const variantsTable = document.getElementById('deployed-variants-table');
         if (!variantsTable) {
@@ -139,18 +168,6 @@ define([], function () {
                 });
             });
         }
-
-        const warningTab = document.getElementById('warning-tab');
-        if (document.querySelectorAll('.var-pane-fail').length) {
-            const varTab = document.getElementById('variants-pane-warning');
-            varTab.style.display = 'inline';
-            warningTab.style.display = 'inline';
-        }
-        if (document.querySelectorAll('.test-pane-fail').length) {
-            const testTab = document.getElementById('test-pane-warning');
-            testTab.style.display = 'inline';
-            warningTab.style.display = 'inline';
-        }
     }
 
     /** Export our entry point. */

amd/build/dashboard.min.js.map

@@ -48,11 +48,14 @@
 
 // Initialise $PAGE.
 $nexturl = new moodle_url('/question/type/stack/questiontestrun.php', $urlparams, 'variants-pane');
+$nexturl->param('hidetests', 1);
 $PAGE->set_url($nexturl); // Since this script always ends in a redirect.
 $PAGE->set_heading($COURSE->fullname);
 $PAGE->set_pagelayout('popup');
 
 require_login();
+// Deploying lots of variants is time consuming, and we need a progress bar in some cases.
+$numforprogressbar = 10;
 
 /**
  * Run tests on a given seed and stop deployment if a test fails.
@@ -200,13 +203,33 @@ function testseed($question, $seed, $context, $nexturl, $numberdeployed) {
 
     // Deploy all new variants.
     $numberdeployed = 0;
+    $newseeds = array_diff($newseeds, $question->deployedseeds);
+    $deployhalt = optional_param('deployhalt', null, PARAM_TEXT);
+    $newcount = count($newseeds);
+
+    // Output something if we need a progress bar.
+    // (We have 10+ variants and we are running the tests.)
+    if ($newcount >= $numforprogressbar && isset($deployhalt)) {
+        echo $OUTPUT->header();
+        flush();
+        $a = ['total' => $newcount, 'done' => 0];
+        $progressevery = (int) min(max(1, $newcount / 500), 100);
+        $pbar = new progress_bar('deployedprogress', 500, true);
+    }
+
     foreach ($newseeds as $seed) {
-        if (!in_array($seed, $question->deployedseeds)) {
-            testseed($question, $seed, $context, $nexturl, $numberdeployed);
-            $question->deploy_variant($seed);
-            $numberdeployed++;
+        testseed($question, $seed, $context, $nexturl, $numberdeployed);
+        $question->deploy_variant($seed);
+        $numberdeployed++;
+        if ($newcount >= $numforprogressbar && isset($deployhalt)) {
+            $a['done'] += 1;
+            if ($a['done'] % $progressevery == 0 || $a['done'] == $a['total']) {
+                core_php_time_limit::raise(60);
+                $pbar->update($a['done'], $a['total'], get_string('deployedprogress', 'qtype_stack', $a));
+            }
         }
     }
+    $nexturl->param('deployfeedback', stack_string('deploymanysuccess', ['no' => $numberdeployed]));
     redirect($nexturl);
 }
 
@@ -216,8 +239,7 @@ function testseed($question, $seed, $context, $nexturl, $numberdeployed) {
 // The number of seconds we devote to deploying before moving on.  Prevents system hangging.
 // Note, in "safe mode" the set time limit function has no effect.
 $maxtime = 180;
-// Deploying lots of variants is time consuming, and we need a progress bar in some cases.
-$numforprogressbar = 10;
+
 core_php_time_limit::raise($maxtime); // Prevent PHP timeouts.
 gc_collect_cycles(); // Because PHP's default memory management is rubbish.
 

amd/src/dashboard.js

@@ -172,6 +172,7 @@
 $initialdata->general->cmid = $cmid;
 $initialdata->general->questionid = $questionid;
 $initialdata->general->seed = $seed;
+$initialdata->general->hidetests = optional_param('hidetests', '', PARAM_INT);
 
 // Output the progress bars first.
 $dashboard->create_progress_bars();
@@ -265,7 +266,7 @@
 $variantdata->hastests = optional_param('testall', null, PARAM_INT);
 $testalllink = new moodle_url(
     '/question/type/stack/questiontestrun.php',
-    $urlparams + ['testall' => '1', 'sesskey' => $sesskey, 'nocache' => time(), 'historic' => $historic],
+    $urlparams + ['testall' => '1', 'sesskey' => $sesskey, 'nocache' => time(), 'historic' => $historic, 'hidetests' => 1],
     'variants-pane'
 );
 $variantdata->testalllink = $testalllink->out();

deploy.php

@@ -145,7 +145,9 @@ public function create_default_test() {
      */
     public function create_progress_bars() {
         $this->testprogress = new progress_bar('testingquestiontests', 500, true);
-        $this->variantprogress = new progress_bar('testingquestionvariants', 500, true);
+        if (!empty($this->question->deployedseeds)) {
+            $this->variantprogress = new progress_bar('testingquestionvariants', 500, true);
+        }
     }
 
     /**

questiontestrun.php

@@ -74,7 +74,8 @@
           "courseid": 7,
           "cmid": 7,
           "questionid": "6605",
-          "seed": 182397542
+          "seed": 182397542,
+          "hidetests": ""
       },
       "istest": true
     }
@@ -86,7 +87,10 @@
   <p>{{#str}} version, qtype_stack {{/str}}
     <select onChange="window.location.href=this.value;">
       {{#question.versions}}
-        <option value="{{{url}}}" {{#active}} selected="selected" {{/active}}>
+        <option class="version-dropdown-option"
+          value="{{{url}}}"
+          {{#active}} selected=true defaultSelected=true {{/active}}
+          {{^active}} defaultSelected=false {{/active}}>
           {{version}}
         </option>
       {{/question.versions}}
@@ -142,13 +146,16 @@
       <a class="nav-link stack-dash-tab-load disabled" href="#question-pane" id="question-tab" data-bs-toggle="tab" data-toggle="tab" role="tab" aria-controls="question-pane" aria-selected="false">{{#str}} question, core {{/str}}</a>
     </li>
     <li class="nav-item stack-dash-tab-load" role="presentation">
-      <a class="nav-link stack-dash-tab-load disabled" href="#variants-pane" id="variants-tab" data-bs-toggle="tab" data-toggle="tab" role="tab" aria-controls="variants-pane" aria-selected="false"><span id="variants-pane-warning" style="display:none;">{{#pix}}req, core{{/pix}}</span>{{#str}} variants, qtype_stack {{/str}}</a>
+      <a class="nav-link stack-dash-tab-load disabled" href="#variants-pane" id="variants-tab" data-bs-toggle="tab" data-toggle="tab" role="tab" aria-controls="variants-pane" aria-selected="false">
+        <span id="variants-pane-warning" style="display:none;">{{#pix}}req, core{{/pix}}</span>
+        <span id="variants-tab-label">{{#str}} variants, qtype_stack {{/str}}</span>
+      </a>
     </li>
     <li id="warning-tab" class="nav-link stack-dash-tab-load disabled" style="border: none; border-radius: 0; display:none;">{{#pix}}req, core{{/pix}}{{#str}}dashboardissues, qtype_stack{{/str}}</li>
   </ul>
 
   <!-- Tab panes -->
-  <div class="tab-content">
+  <div id="dashboard-tab-content" class="tab-content" {{#general.hidetests}}style="display: none"{{/general.hidetests}}>
     <!-- Question details panes -->
     <div class="tab-pane mt-3" id="question-pane" role="tabpanel" aria-labelledby="question-tab">
       <h3>{{question.name}}</h3>

stack/questiondashboard.class.php

@@ -98,6 +98,10 @@
       {{^hasrandomvariants}}
         <!-- No randomisation -->
         <p>{{#str}} questiondoesnotuserandomisation, qtype_stack {{/str}} <a href="{{{previewurl}}}">{{#pix}}t/preview, core, {{#str}} preview, core {{/str}}{{/pix}}</a></p>
+        <span id="variant-count" hidden>(-)</span>
+      {{/hasrandomvariants}}
+      {{#hasrandomvariants}}
+        <span id="variant-count" hidden>({{deployedcount}})</span>
       {{/hasrandomvariants}}
       {{^notes.0}}
         {{#hasrandomvariants}}