WebSVN – Moodle – Diff – /mod/quiz/report/overview/report.php

  */
 use mod_quiz\local\reports\attempts_report;
 use mod_quiz\question\bank\qbank_helper;
-use mod_quiz\quiz_attempt;
-use mod_quiz\quiz_settings;
+use mod_quiz\quiz_attempt;
 defined('MOODLE_INTERNAL') || die();
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class quiz_overview_report extends attempts_report {
     public function display($quiz, $cm, $course) {
-        global $DB, $PAGE;
+        global $DB, $PAGE, $OUTPUT;
         list($currentgroup, $studentsjoins, $groupstudentsjoins, $allowedjoins) = $this->init(
             $hasstudents = $DB->record_exists_sql($sql, $studentsjoins->params);
+        }
         if ($options->attempts == self::ALL_WITH) {
             // This option is only available to users who can access all groups in
             // groups mode, so setting allowed to empty (which means all quiz attempts
-            // are accessible, is not a security porblem.
+            // are accessible, is not a security problem.
             $allowedjoins = new \core\dml\sql_join();
+        }
         $hasstudents = $hasstudents && (!$currentgroup || $this->hasgroupstudents);
         if ($hasquestions && ($hasstudents || $options->attempts == self::ALL_WITH)) {
             // Construct the SQL.
-            $table->setup_sql_queries($allowedjoins);
             $table->setup_sql_queries($allowedjoins);
-            if (!$table->is_downloading()) {
-                // Output the regrade buttons.
-                if (has_capability('mod/quiz:regrade', $this->context)) {
-                    $regradesneeded = $this->count_question_attempts_needing_regrade(
-                            $quiz, $groupstudentsjoins);
-                    if ($currentgroup) {
-                        $a= new stdClass();
-                        $a->groupname = format_string(groups_get_group_name($currentgroup), true, [
-                            'context' => $this->context,
-                        ]);
-                        $a->coursestudents = get_string('participants');
-                        $a->countregradeneeded = $regradesneeded;
-                        $regradealldrydolabel =
-                                get_string('regradealldrydogroup', 'quiz_overview', $a);
-                        $regradealldrylabel =
-                                get_string('regradealldrygroup', 'quiz_overview', $a);
-                        $regradealllabel =
-                                get_string('regradeallgroup', 'quiz_overview', $a);
-                    } else {
-                        $regradealldrydolabel =
-                                get_string('regradealldrydo', 'quiz_overview', $regradesneeded);
-                        $regradealldrylabel =
-                                get_string('regradealldry', 'quiz_overview');
-                        $regradealllabel =
-                                get_string('regradeall', 'quiz_overview');
-                    }
-                    $displayurl = new moodle_url($options->get_url(), ['sesskey' => sesskey()]);
-                    echo '<div class="regradebuttons">';
-                    echo '<form action="'.$displayurl->out_omit_querystring().'">';
-                    echo '<div>';
-                    echo html_writer::input_hidden_params($displayurl);
-                    echo '<input type="submit" class="btn btn-secondary" name="regradeall" value="'.$regradealllabel.'"/>';
-                    echo '<input type="submit" class="btn btn-secondary ml-1" name="regradealldry" value="' .
-                            $regradealldrylabel . '"/>';
-                    if ($regradesneeded) {
-                        echo '<input type="submit" class="btn btn-secondary ml-1" name="regradealldrydo" value="' .
-                                $regradealldrydolabel . '"/>';
-                    }
-                    echo '</div>';
-                    echo '</form>';
-                    echo '</div>';
             if (!$table->is_downloading()) {
                 // Print information on the grading method.
                 if ($strattempthighlight = quiz_report_highlighting_grading_method(
                         $quiz, $this->qmsubselect, $options->onlygraded)) {
                     echo '<div class="quizattemptcounts mt-3">' . $strattempthighlight . '</div>';
             $this->add_time_columns($columns, $headers);
             $this->add_grade_columns($quiz, $options->usercanseegrades, $columns, $headers, false);
             $this->add_grade_item_columns($options->usercanseegrades, $columns, $headers);
             $canregrade = has_capability('mod/quiz:regrade', $this->context);
-            if (!$table->is_downloading() && has_capability('mod/quiz:regrade', $this->context) &&
+            if (!$table->is_downloading() && $canregrade &&
                     $this->has_regraded_questions($table->sql->from, $table->sql->where, $table->sql->params)) {
                 $columns[] = 'regraded';
             $this->set_up_table_columns($table, $columns, $headers, $this->get_base_url(), $options, false);
             $table->set_attribute('class', 'generaltable generalbox grades');
+            $table->out($options->pagesize, true);
+            if ($canregrade && !$table->is_downloading()) {
                 $this->display_commit_regrade_if_required($quiz, $groupstudentsjoins, $options);
             $table->out($options->pagesize, true);
+        }
                 $graphname = get_string('overviewreportgraph', 'quiz_overview');
                 // Numerical range data should display in LTR even for RTL languages.
                 echo $output->chart($chart, $graphname, ['dir' => 'ltr']);
+            }
+        }
         return true;
+    }
+    /**
+     * If a previous dry run regrade had been done, display a message to commit the changes.
+     *
+     * @param stdClass $quiz quiz settings.
+     * @param \core\dml\sql_join $groupstudentsjoins which users' attempts should be considered.
+     * @param quiz_overview_options $options report options.
+     */
+    protected function display_commit_regrade_if_required(
+        stdClass $quiz,
+        \core\dml\sql_join $groupstudentsjoins,
+        quiz_overview_options $options,
+    ) {
+        global $OUTPUT;
+        [$attemptcount, $slotcount] = $this->count_attempts_and_questions_needing_regrade($quiz, $groupstudentsjoins);
+        if (!$attemptcount) {
+            return;
+        }
+        $commitregradeurl = new moodle_url($options->get_url(), ['sesskey' => sesskey(), 'regradealldrydo' => 1]);
+        // We can't use $OUTPUT->notification because is aggressively cleans the message, which strips the button.
+        echo html_writer::div(get_string('regrade_regradeneedednotificationmessage', 'quiz_overview',
+                ['attempts' => $attemptcount, 'questions' => $slotcount]) . ' ' .
+            $OUTPUT->single_button($commitregradeurl, get_string('regrade_commitregrade', 'quiz_overview')),
+            'alert alert-info alert-block fade in');
+    }
+    #[\Override]
+    protected function process_actions($quiz, $cm, $currentgroup, \core\dml\sql_join $groupstudentsjoins,
+            \core\dml\sql_join $allowedjoins, $redirecturl) {
+        parent::process_actions($quiz, $cm, $currentgroup, $groupstudentsjoins, $allowedjoins, $redirecturl);
+        // Process regrade actions.
+        $this->process_regrade_actions($quiz, $cm, $currentgroup, $groupstudentsjoins, $redirecturl);
+    }
     /**
      * Extends parent function processing any submitted actions.
+     *
      * @param stdClass $quiz
      * @param stdClass $cm
      * @param int $currentgroup
-     * @param \core\dml\sql_join $groupstudentsjoins (joins, wheres, params)
-     * @param \core\dml\sql_join $allowedjoins (joins, wheres, params)
+     * @param \core\dml\sql_join $groupstudentsjoins (joins, wheres, params)
      * @param moodle_url $redirecturl
      */
-    protected function process_actions($quiz, $cm, $currentgroup, \core\dml\sql_join $groupstudentsjoins,
+    protected function process_regrade_actions($quiz, $cm, $currentgroup,
-            \core\dml\sql_join $allowedjoins, $redirecturl) {
-        parent::process_actions($quiz, $cm, $currentgroup, $groupstudentsjoins, $allowedjoins, $redirecturl);
+            \core\dml\sql_join $groupstudentsjoins, moodle_url $redirecturl) {
-        if (empty($currentgroup) || $this->hasgroupstudents) {
-            if (optional_param('regrade', 0, PARAM_BOOL) && confirm_sesskey()) {
-                if ($attemptids = optional_param_array('attemptid', [], PARAM_INT)) {
-                    $this->start_regrade($quiz, $cm);
-                    $this->regrade_attempts($quiz, false, $groupstudentsjoins, $attemptids);
+        if ($currentgroup && !$this->hasgroupstudents) {
+            return;
-                    $this->finish_regrade($redirecturl);
+        }
         if (!has_capability('mod/quiz:regrade', $this->context)) {
+            return;
-            }
+        }
-        }
+        $dryrun = optional_param('dryrunregrade', 0, PARAM_BOOL);
+        if ($dryrun || optional_param('regrade', 0, PARAM_BOOL)) {
+            $attemptids = [];
+            if (optional_param('regradeselectedattempts', 0, PARAM_BOOL)) {
-        if (optional_param('regradeall', 0, PARAM_BOOL) && confirm_sesskey()) {
+                $attemptids = optional_param_array('attemptid', [], PARAM_INT);
+            }
+            $slots = null;
-            $this->start_regrade($quiz, $cm);
-            $this->regrade_attempts($quiz, false, $groupstudentsjoins);
+            if (optional_param('regradeselectedquestions', 0, PARAM_BOOL)) {
-            $this->finish_regrade($redirecturl);
+                $slots = optional_param_array('regradeslot', [], PARAM_INT);
+            }
+            $this->start_regrade($quiz, $cm);
-        } else if (optional_param('regradealldry', 0, PARAM_BOOL) && confirm_sesskey()) {
+            $this->regrade_attempts($quiz, $dryrun, $groupstudentsjoins, $attemptids, $slots);
-            $this->start_regrade($quiz, $cm);
+            $this->finish_regrade($redirecturl);
             $this->regrade_attempts($quiz, true, $groupstudentsjoins);
             $this->finish_regrade($redirecturl);
         // Process commit of a previous dry run.
-        } else if (optional_param('regradealldrydo', 0, PARAM_BOOL) && confirm_sesskey()) {
+        if (optional_param('regradealldrydo', 0, PARAM_BOOL) && confirm_sesskey()) {
      * Note, $attempt is not upgraded in the database. The caller needs to do that.
      * However, $attempt->sumgrades is updated, if this is not a dry run.
+     *
      * @param stdClass $attempt the quiz attempt to regrade.
      * @param bool $dryrun if true, do a pretend regrade, otherwise do it for real.
-     * @param array $slots if null, regrade all questions, otherwise, just regrade
+     * @param array|null $slots if null, regrade all questions, otherwise, just regrade
      *      the questions with those slots.
      * @return array messages array with keys slot number, and values reasons why that slot cannot be regraded.
      */
     public function regrade_attempt($attempt, $dryrun = false, $slots = null): array {
         global $DB;
      * @param bool $dryrun if true, do a pretend regrade, otherwise do it for real.
      * @param \core\dml\sql_join|null $groupstudentsjoins empty for all attempts, otherwise regrade attempts
      * for these users.
      * @param array $attemptids blank for all attempts, otherwise only regrade
      * attempts whose id is in this list.
+     * @param array|null $slots if null, regrade all questions, otherwise, just regrade
+     *      the questions with those slots.
      */
     protected function regrade_attempts($quiz, $dryrun = false,
-            core\dml\sql_join $groupstudentsjoins = null, $attemptids = []) {
+            ?\core\dml\sql_join $groupstudentsjoins = null, $attemptids = [], ?array $slots = null) {
         global $DB;
         $this->unlock_session();
         // Get the attempts to regrade.
         $userfieldsapi = \core_user\fields::for_name();
         $sql = "SELECT quiza.*, " . $userfieldsapi->get_sql('u', false, '', '', false)->selects . "
                   FROM {quiz_attempts} quiza
                   JOIN {user} u ON u.id = quiza.userid";
         $attempts = $DB->get_records_sql($sql, $params);
         if (!$attempts) {
             return;
+        }
+        // If only regrading some slots, put that information where regrade_batch_of_attempts expects.
+        if ($slots) {
+            foreach ($attempts as $attempt) {
+                $attempt->regradeonlyslots = $slots;
+            }
+        }
-        $this->regrade_batch_of_attempts($quiz, $attempts, $dryrun, $groupstudentsjoins);
+        $this->regrade_batch_of_attempts($quiz, $attempts, $dryrun, $groupstudentsjoins, $slots);
+    }
     /**
-     * Regrade those questions in those attempts that are marked as needing regrading
+     * Regrade the questions in the attempts that are marked as needing it in quiz_overview_regrades.
      * in the quiz_overview_regrades table.
      * @param stdClass $quiz the quiz settings.
      * @param \core\dml\sql_join $groupstudentsjoins empty for all attempts, otherwise regrade attempts
-     * for these users.
+     *      for these users.
      */
     protected function regrade_attempts_needing_it($quiz, \core\dml\sql_join $groupstudentsjoins) {
         foreach ($attempts as $attempt) {
             $a['done']++;
             $a['attemptnum'] = $attempt->attempt;
             $a['name'] = fullname($attempt);
             $a['attemptid'] = $attempt->id;
-            if (!isset($attempt->regradeonlyslots)) {
-                $attempt->regradeonlyslots = null;
-            }
             $progressbar->update($a['done'], $a['count'],
                     get_string('regradingattemptxofywithdetails', 'quiz_overview', $a));
-            $messages = $this->regrade_attempt($attempt, $dryrun, $attempt->regradeonlyslots);
+            $messages = $this->regrade_attempt($attempt, $dryrun, $attempt->regradeonlyslots ?? null);
             if ($messages) {
                 $items = [];
                 foreach ($messages as $slot => $message) {
                     $items[] = get_string('regradingattemptissue', 'quiz_overview',
                             ['slot' => $slot, 'reason' => $message]);
             $this->update_overall_grades($quiz);
+        }
+    }
     /**
-     * Count the number of attempts in need of a regrade.
+     * Count the number of attempts and questions in need of regrading after the last dry run.
+     *
      * @param stdClass $quiz the quiz settings.
-     * @param \core\dml\sql_join $groupstudentsjoins (joins, wheres, params) If this is given, only data relating
-     * to these users is cleared.
+     * @param \core\dml\sql_join $groupstudentsjoins which users' attempts should be considered.
-     * @return int the number of attempts.
+     * @return array of two elements: the number of different attempts and questions needed to be regraded.
      */
+    protected function count_attempts_and_questions_needing_regrade($quiz,
-    protected function count_question_attempts_needing_regrade($quiz, \core\dml\sql_join $groupstudentsjoins) {
+            \core\dml\sql_join $groupstudentsjoins): array {
         global $DB;
         $userjoin = '';
             $usertest = "{$groupstudentsjoins->wheres} AND u.id = quiza.userid AND ";
             $params = $groupstudentsjoins->params;
+        }
         $params['cquiz'] = $quiz->id;
+        $sql = "SELECT COUNT(DISTINCT quiza.id) AS attemptcount,
-        $sql = "SELECT COUNT(DISTINCT quiza.id)
+                       COUNT(DISTINCT qqr.slot) AS slotcount
                   FROM {quiz_attempts} quiza
                   JOIN {quiz_overview_regrades} qqr ON quiza.uniqueid = qqr.questionusageid
                 $userjoin
                  WHERE
                       $usertest
                       quiza.quiz = :cquiz AND
                       quiza.preview = 0 AND
                       qqr.regraded = 0";
+        $counts = $DB->get_record_sql($sql, $params);
-        return $DB->count_records_sql($sql, $params);
+        return [$counts->attemptcount, $counts->slotcount];
+    }
     /**

Proyectos de Subversion Moodle

(root)/mod/quiz/report/overview/report.php – Rev 11 → 1441