WebSVN – Moodle – Diff – /grade/report/singleview/index.php

+        }
         // If the item id (user id) cannot be defined or the user id is not part of the list of gradable users,
         // display the user select zero state.
         if (is_null($itemid) || !array_key_exists($itemid, grade_report::get_gradable_users($courseid, $currentgroup))) {
             $itemtype = 'user_select';
+            unset($SESSION->gradereport_singleview["useritem-{$context->id}"]);
+        }
         break;
     case 'grade_select':
         // If there is a stored grade item (last viewed) in a session variable, bypass the grade item select zero state
         // and display this grade item.
         $gtree = new grade_tree($courseid, false, false, null, !$CFG->enableoutcomes);
         $gradeableitems = $gtree->get_items();
         // The item id (grade item id) cannot be defined, display the grade select zero state.
         if (is_null($itemid) || !array_key_exists($itemid, $gtree->get_items())) {
             $itemtype = 'grade_select';
+            unset($SESSION->gradereport_singleview["gradeitem-{$context->id}"]);
+        }
         break;
+}
-$report = new gradereport_singleview\report\singleview($courseid, $gpr, $context, $itemtype, $itemid);
 $pageparams = [
     'id'        => $courseid,
     'userid'    => $userid,
     'itemid'    => $itemid,
     $pageparams['group'] = $groupid;
+}
+$PAGE->set_url(new moodle_url('/grade/report/singleview/index.php', $pageparams));
+// Make sure we have proper final grades.
+$taskindicator = new \core\output\task_indicator(
+    \core_course\task\regrade_final_grades::create($courseid),
+    get_string('recalculatinggrades', 'grades'),
+    get_string('recalculatinggradesadhoc', 'grades'),
+    $PAGE->url,
+);
+if ($taskindicator->has_task_record()) {
+    // We need to bail out early as the report requires recalculations to be complete, so just display a basic header
+    // with navigation, and the indicator.
+    $actionbar = new \core_grades\output\general_action_bar(
+        $context,
+        new moodle_url('/grade/report/singleview/index.php', ['id' => $courseid]),
+        'report',
+        'singleview'
+    );
+    print_grade_page_head($course->id, 'report', 'singleview', actionbar: $actionbar);
+    echo $OUTPUT->render($taskindicator);
+    echo $OUTPUT->footer();
+    exit;
+}
-$PAGE->set_url(new moodle_url('/grade/report/singleview/index.php', $pageparams));
+$report = new gradereport_singleview\report\singleview($courseid, $gpr, $context, $itemtype, $itemid);
 // Build editing on/off button for themes that need it.
 $button = '';
 if ($PAGE->user_allowed_editing() && !$PAGE->theme->haseditswitch) {
     $button = $OUTPUT->edit_button(new moodle_url($PAGE->url, $options), 'get');
+}
+$reportname = $report->screen->heading();
 $reportname = $report->screen->heading();
+$baseurl = new moodle_url('/grade/report/singleview/index.php', ['id' => $courseid, 'item' => $itemtype]);
 if ($itemtype == 'user' || $itemtype == 'user_select') {
-    $PAGE->requires->js_call_amd('gradereport_singleview/user', 'init');
+    $PAGE->requires->js_call_amd('gradereport_singleview/user', 'init', [$baseurl->out(false)]);
     $actionbar = new \gradereport_singleview\output\action_bar($context, $report, 'user');
 } else if ($itemtype == 'grade' || $itemtype == 'grade_select') {
-    $PAGE->requires->js_call_amd('gradereport_singleview/grade', 'init');
+    $PAGE->requires->js_call_amd('gradereport_singleview/grade', 'init', [$baseurl->out(false)]);
     $actionbar = new \gradereport_singleview\output\action_bar($context, $report, 'grade');
 } else {
     $actionbar = new \core_grades\output\general_action_bar($context, new moodle_url('/grade/report/singleview/index.php',
         ['id' => $courseid]), 'report', 'singleview');
 }
 if ($course->groupmode && $itemtype !== 'select') {
-    $PAGE->requires->js_call_amd('gradereport_singleview/group', 'init', [$itemtype]);
+    $PAGE->requires->js_call_amd('core_course/actionbar/group', 'init', [$baseurl->out(false)]);
+}
+}
 // Make sure we have proper final grades.
+grade_regrade_final_grades_if_required($course);
+if ($taskindicator->has_task_record()) {
+    echo $OUTPUT->render($taskindicator);
+    echo $OUTPUT->footer();
+    exit;
 grade_regrade_final_grades_if_required($course);
 // Save the screen state in a session variable as last viewed state.
 $SESSION->gradereport_singleview["itemtype-{$context->id}"] = $itemtype;
 if ($itemid) {

Proyectos de Subversion Moodle

(root)/grade/report/singleview/index.php – Rev 1 → 1441