fixup! MDL-81714 grades: Add regrading progress indicator to grade reports

Author: marxjohnson

grade/report/grader/index.php

@@ -122,14 +122,13 @@
 
 $reportname = get_string('pluginname', 'gradereport_grader');
 $regradetask = \core_course\task\regrade_final_grades::create($courseid);
-$indicatorheader = get_string('recalculatinggrades', 'grades');
+$indicatorheading = get_string('recalculatinggrades', 'grades');
 $indicatormessage = get_string('recalculatinggradesadhoc', 'grades');
-$indictoricon = new pix_icon('i/grades', '');
-$taskindicator = new \core\output\task_indicator($regradetask, $indicatorheader, $indicatormessage, $indictoricon, $PAGE->url);
+$taskindicator = new \core\output\task_indicator($regradetask, $indicatorheading, $indicatormessage, $PAGE->url);
 if (!$taskindicator->has_task_record()) {
     // Do this check just before printing the grade header (and only do it once).
     grade_regrade_final_grades_if_required($course);
-    $taskindicator = new \core\output\task_indicator($regradetask, $indicatorheader, $indicatormessage, $indictoricon, $PAGE->url);
+    $taskindicator = new \core\output\task_indicator($regradetask, $indicatorheading, $indicatormessage, $PAGE->url);
 }
 
 //Initialise the grader report object that produces the table

grade/report/outcomes/index.php

@@ -46,10 +46,11 @@
 // First make sure we have proper final grades.
 $regradetask = \core_course\task\regrade_final_grades::create($courseid);
 $indicatormessage = get_string('recalculatinggradesadhoc', 'grades');
-$taskindicator = new \core\output\task_indicator($regradetask, $indicatormessage);
+$indicatorheading = get_string('recalculatinggrades', 'grades');
+$taskindicator = new \core\output\task_indicator($regradetask, $indicatorheading, $indicatormessage, $PAGE->url);
 if (!$taskindicator->has_task_record()) {
     grade_regrade_final_grades_if_required($course);
-    $taskindicator = new \core\output\task_indicator($regradetask, $indicatormessage);
+    $taskindicator = new \core\output\task_indicator($regradetask, $indicatorheading, $indicatormessage, $PAGE->url);
 }
 
 // Grab all outcomes used in course.

grade/report/overview/index.php

@@ -94,7 +94,6 @@
     \core_course\task\regrade_final_grades::create($courseid),
     get_string('recalculatinggrades', 'grades'),
     get_string('recalculatinggradesadhoc', 'grades'),
-    new \core\output\pix_icon('i/grades', ''),
     $PAGE->url,
 );
 

grade/report/singleview/index.php

@@ -153,7 +153,6 @@
     \core_course\task\regrade_final_grades::create($courseid),
     get_string('recalculatinggrades', 'grades'),
     get_string('recalculatinggradesadhoc', 'grades'),
-    new \core\output\pix_icon('i/grades', ''),
     $PAGE->url,
 );
 

grade/report/summary/index.php

@@ -49,7 +49,6 @@
     \core_course\task\regrade_final_grades::create($courseid),
     get_string('recalculatinggrades', 'grades'),
     get_string('recalculatinggradesadhoc', 'grades'),
-    new \core\output\pix_icon('i/grades', ''),
     $PAGE->url,
 );
 

grade/report/user/index.php

@@ -89,7 +89,6 @@
     \core_course\task\regrade_final_grades::create($courseid),
     get_string('recalculatinggrades', 'grades'),
     get_string('recalculatinggradesadhoc', 'grades'),
-    new \core\output\pix_icon('i/grades', ''),
     $PAGE->url,
 );
 

grade/report/user/lib.php

@@ -180,7 +180,6 @@ function grade_report_user_profilereport(object $course, object $user, bool $vie
         \core_course\task\regrade_final_grades::create($course->id),
         get_string('recalculatinggrades', 'grades'),
         get_string('recalculatinggradesadhoc', 'grades'),
-        new \core\output\pix_icon('i/grades', ''),
         new \core\url('/course/user.php', ['mode' => 'grade', 'id' => $course->id, 'user' => $user->id]),
     );
 

lib/classes/output/task_indicator.php

@@ -45,8 +45,8 @@ class task_indicator implements renderable, templatable {
      * @param adhoc_task $task The task whose progress is being indicated. The task class must use stored_progress_task_trait.
      * @param string $heading The header text for the indicator.
      * @param string $message A message to explain what is happening while the task is running.
-     * @param ?pix_icon $icon An optional icon to display with the heading.
      * @param ?url $redirecturl An optional URL to redirect to when the task completes.
+     * @param ?pix_icon $icon An optional icon to display with the heading.
      * @param array $extraclasses Extra class names to apply to the indicator's container.
      * @throws \coding_exception
      */
@@ -57,10 +57,10 @@ public function __construct(
         protected string $heading,
         /** @var string $message A message to explain what is happening while the task is running. */
         protected string $message,
-        /** @var ?pix_icon $icon An optional icon to display with the heading. */
-        protected ?pix_icon $icon = null,
         /** @var ?url $redirecturl An optional URL to redirect to when the task completes. */
         protected ?url $redirecturl = null,
+        /** @var ?pix_icon $icon An optional icon to display with the heading. */
+        protected ?pix_icon $icon = new pix_icon('i/timer', ''),
         /** @var array $extraclasses Extra class names to apply to the indicator's container. */
         protected array $extraclasses = [],
     ) {
@@ -73,7 +73,6 @@ public function __construct(
             $idnumber = stored_progress_bar::convert_to_idnumber($this->task::class, $this->task->get_id());
             $this->progressbar = stored_progress_bar::get_by_idnumber($idnumber);
         }
-        $this->icon->attributes['class'] .= 'iconsize-big';
     }
 
     /**

lib/templates/task_indicator.mustache

@@ -41,12 +41,10 @@
 <div class="task-indicator {{extraclasses}}">
     {{#icon}}
         <div class="text-center">
-            <div class="icon-circle">
-                {{>core/pix_icon}}
-            </div>
+            {{>core/pix_icon}}
         </div>
     {{/icon}}
-    <h2 class="text-center">{{heading}}</h2>
+    <h3 class="text-center">{{heading}}</h3>
     <p class="text-center">{{message}}</p>
     {{#progress}}
         {{>core/progress_bar}}