Merge branch 'MDL-70536-reset-page-cli' of https://github.com/brendanheywood/moodle

admin/cli/dashboard_reset.php

@@ -0,0 +1,65 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * CLI script to reset dashboards.
+ *
+ * @package    core
+ * @subpackage cli
+ * @copyright  2021 Brendan Heywood (brendan@catalyst-au.net)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define('CLI_SCRIPT', true);
+
+require(__DIR__.'/../../config.php');
+require_once($CFG->libdir.'/clilib.php');
+require_once($CFG->dirroot.'/my/lib.php');
+
+list($options, $unrecognized) = cli_get_params([
+    'help'    => false,
+    'execute' => false,
+], [
+    'h' => 'help',
+    'e' => 'execute',
+]);
+
+if ($unrecognized) {
+    $unrecognized = implode("\n  ", $unrecognized);
+    cli_error(get_string('cliunknowoption', 'admin', $unrecognized), 2);
+}
+
+if (!$options['execute']) {
+    $help = <<<EOF
+Resets Moodle dashboards for all users
+
+Options:
+-h, --help          Print out this help
+-e, --execute       Actually run the reset
+
+Example:
+\$ sudo -u www-data /usr/bin/php admin/cli/dashboard_reset.php -e
+
+EOF;
+
+    echo $help;
+    exit(0);
+}
+
+$progressbar = new progress_bar();
+$progressbar->create();
+my_reset_page_for_all_users(MY_PAGE_PRIVATE, 'my-index', $progressbar);
+

lib/outputrenderers.php

@@ -4940,9 +4940,6 @@ class core_renderer_cli extends core_renderer {
             $ascii .= '<cursor:up>';
             $ascii .= sprintf("[$bar] %3.1f%% %-22s\n", $percent, $estimate);
             $ascii .= sprintf("%-80s\n", $msg);
-            if ($percent == 100) {
-                $ascii .= "\n";
-            }
             return cli_ansi_format($ascii);
         }
 
@@ -4951,12 +4948,12 @@ class core_renderer_cli extends core_renderer {
         // which can only ever go forwards.
         $done = round($percent * $size * 0.01);
         $delta = max(0, $done - $this->progressmaximums[$id]);
-        $this->progressmaximums[$id] += $delta;
 
         $ascii .= str_repeat('#', $delta);
-        if ($percent >= 100) {
+        if ($percent >= 100 && $delta > 0) {
             $ascii .= sprintf("] %3.1f%%\n$msg\n", $percent);
         }
+        $this->progressmaximums[$id] += $delta;
         return $ascii;
     }