L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-83179 badges: Get type and courseid from context instead of params

Browse Source
This commit is contained in:
David Carrillo
2024-10-03 08:12:10 +08:00
committed by Jun Pataleta
parent a0c341d039
commit ba131ff29d
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
badges/classes/reportbuilder/local/systemreports/course_badges.php
+13 -4
View File
@@ -18,8 +18,10 @@ declare(strict_types=1);
namespace core_badges\reportbuilder\local\systemreports;
use core\context\system;
use core_badges\reportbuilder\local\entities\badge;
use core_badges\reportbuilder\local\entities\badge_issued;
use core_reportbuilder\local\helpers\database;
use core_reportbuilder\system_report;
use lang_string;
use moodle_url;
@@ -52,11 +54,18 @@ class course_badges extends system_report {
$this->set_main_table('badge', $entityalias);
$this->add_entity($badgeentity);
$type = $this->get_parameter('type', 0, PARAM_INT);
$courseid = $this->get_parameter('courseid', 0, PARAM_INT);
$paramtype = database::generate_param_name();
$context = $this->get_context();
if ($context instanceof system) {
$type = BADGE_TYPE_SITE;
$this->add_base_condition_sql("{$entityalias}.type = :$paramtype", [$paramtype => $type]);
} else {
$type = BADGE_TYPE_COURSE;
$paramcourseid = database::generate_param_name();
$this->add_base_condition_sql("{$entityalias}.type = :$paramtype AND {$entityalias}.courseid = :$paramcourseid",
[$paramtype => $type, $paramcourseid => $context->instanceid]);
}
$this->add_base_condition_simple('type', $type);
$this->add_base_condition_simple('courseid', $courseid);
$this->add_base_condition_sql("({$entityalias}.status = " . BADGE_STATUS_ACTIVE .
" OR {$entityalias}.status = " . BADGE_STATUS_ACTIVE_LOCKED . ")");
badges/view.php
+1 -2
View File
@@ -103,8 +103,7 @@ if ($course && $course->startdate > time()) {
echo $OUTPUT->box(get_string('error:notifycoursedate', 'badges'), 'generalbox notifyproblem');
}
$report = system_report_factory::create(course_badges::class, $PAGE->context, '', '', 0,
['type' => $type, 'courseid' => $courseid]);
$report = system_report_factory::create(course_badges::class, $PAGE->context);
echo $report->output();
// Trigger event, badge listing viewed.