mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-72961' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Ilya Tregubov 2021-11-04 14:40:26 +02:00
commit 6b0b757124
7 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
course/classes/local/entities/course_category.php
View File

@ -99,6 +99,21 @@ class course_category extends base {
->add_fields("{$tablealias}.name")
->set_is_sortable(true);
// Path column.
$columns[] = (new column(
'path',
new lang_string('categorypath'),
$this->get_entity_name()
))
->add_joins($this->get_joins())
->set_type(column::TYPE_TEXT)
->add_fields("{$tablealias}.name, {$tablealias}.id")
->add_callback(static function(string $name, stdClass $category): string {
return core_course_category::get($category->id, MUST_EXIST, true)->get_nested_name(false);
})
->set_disabled_aggregation(['groupconcat', 'groupconcatdistinct'])
->set_is_sortable(true);
// ID number column.
$columns[] = (new column(
'idnumber',

1
lang/en/moodle.php
View File

@ -243,6 +243,7 @@ $string['categoryheader'] = 'Category menu';
$string['categoryhidden'] = '(hidden)';
$string['categorymodifiedcancel'] = 'Category was modified! Please cancel and try again.';
$string['categoryname'] = 'Category name';
$string['categorypath'] = 'Category path';
$string['categorysubcategoryof'] = '{$a->category} - subcategory of {$a->parentcategory}';
$string['idnumbercoursecategory'] = 'Category ID number';
$string['idnumbercoursecategory_help'] = 'The ID number of a course category is only used when matching the category against external systems and is not displayed anywhere on the site. If the category has an official code name it may be entered, otherwise the field can be left blank.';

10
reportbuilder/classes/external/custom_report_columns_sorting_exporter.php vendored
View File

@ -93,11 +93,13 @@ class custom_report_columns_sorting_exporter extends exporter {
$reportid = $report->get_report_persistent()->get('id');
$activecolumns = column::get_records(['reportid' => $reportid], 'sortorder');
$sortablecolumns = array_filter($activecolumns, function(column $persistent) use($report) {
$column = $report->get_column($persistent->get('uniqueidentifier'))
->set_aggregation($persistent->get('aggregation'));
$sortablecolumns = array_filter($activecolumns, function(column $persistent) use($report): bool {
$column = $report->get_column($persistent->get('uniqueidentifier'));
if ($column === null) {
return false;
}
return $column && $column->get_is_sortable();
return $column->set_aggregation($persistent->get('aggregation'))->get_is_sortable();
});
$sortablecolumns = array_map(function(column $persistent) use ($report) {

16
reportbuilder/classes/external/custom_report_filters_exporter.php vendored
View File

@ -103,11 +103,11 @@ class custom_report_filters_exporter extends exporter {
/** @var base $report */
$report = $this->related['report'];
// Current filter instances contained in the report.
$filterinstances = filter::get_filter_records($report->get_report_persistent()->get('id'), 'filterorder');
// Current filters added to the report.
$filters = filter::get_filter_records($report->get_report_persistent()->get('id'), 'filterorder');
$filteridentifiers = array_map(static function(filter $filter): string {
return $filter->get('uniqueidentifier');
}, $filterinstances);
}, $filters);
$availablefilters = $activefilters = [];
@ -134,12 +134,16 @@ class custom_report_filters_exporter extends exporter {
}
// Populate active filters.
foreach ($filterinstances as $filter) {
$editable = new filter_heading_editable($filter->get('id'));
$filterinstances = $report->get_filter_instances();
foreach ($filters as $filter) {
$filterinstance = $filterinstances[$filter->get('uniqueidentifier')] ?? null;
if ($filterinstance === null) {
continue;
}
$filterinstance = $report->get_filter($filter->get('uniqueidentifier'));
$entityname = $filterinstance->get_entity_name();
$displayvalue = $filterinstance->get_header();
$editable = new filter_heading_editable($filter->get('id'));
$activefilters[] = [
'id' => $filter->get('id'),

5
reportbuilder/classes/form/condition.php
View File

@ -124,7 +124,10 @@ class condition extends dynamic_form {
$conditions = filter::get_condition_records($this->get_report()->get_report_persistent()->get('id'), 'filterorder');
foreach ($conditions as $condition) {
$conditioninstance = $conditioninstances[$condition->get('uniqueidentifier')];
$conditioninstance = $conditioninstances[$condition->get('uniqueidentifier')] ?? null;
if ($conditioninstance === null) {
continue;
}
$entityname = $conditioninstance->get_entity_name();
$displayvalue = $conditioninstance->get_header();

12
reportbuilder/classes/local/entities/course.php
View File

@ -20,7 +20,6 @@ namespace core_reportbuilder\local\entities;
use context_course;
use context_helper;
use core_course_category;
use core_reportbuilder\local\filters\boolean_select;
use core_reportbuilder\local\filters\course_selector;
use core_reportbuilder\local\filters\date;
@ -124,7 +123,6 @@ class course extends base {
return [
'fullname' => new lang_string('fullnamecourse'),
'shortname' => new lang_string('shortnamecourse'),
'category' => new lang_string('coursecategory'),
'idnumber' => new lang_string('idnumbercourse'),
'summary' => new lang_string('coursesummary'),
'format' => new lang_string('format'),
@ -177,7 +175,6 @@ class course extends base {
case 'summary':
$fieldtype = column::TYPE_LONGTEXT;
break;
case 'category':
case 'groupmode':
$fieldtype = column::TYPE_INTEGER;
break;
@ -356,15 +353,6 @@ class course extends base {
];
}
/**
* List of options for the field category.
*
* @return array
*/
public static function get_options_for_category(): array {
return core_course_category::make_categories_list('moodle/category:viewcourselist');
}
/**
* List of options for the field format.
*

13
reportbuilder/tests/local/entities/course_test.php
View File

@ -44,7 +44,7 @@ use core_reportbuilder\local\helpers\user_filter_manager;
* @copyright 2021 David Matamoros <davidmc@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class course_testcase extends advanced_testcase {
class course_test extends advanced_testcase {
/**
* Load required classes
@ -142,7 +142,6 @@ class course_testcase extends advanced_testcase {
});
$courserow = reset($courserows);
$this->assertEquals($coursecategory1->name, $courserow['category']);
$this->assertEquals('Course 1', $courserow['fullname']);
$this->assertEquals('C1', $courserow['shortname']);
$this->assertEquals('IDNumber1', $courserow['idnumber']);
@ -227,16 +226,6 @@ class course_testcase extends advanced_testcase {
'Course 1',
], array_column($tablerows, 'fullname'));
// Filter by category field.
$filtervalues = [
'course:category_operator' => select::EQUAL_TO,
'course:category_value' => $coursecategory1->id,
];
$tablerows = $this->get_report_table_rows($filtervalues);
$this->assertEquals([
'Course 1',
], array_column($tablerows, 'fullname'));
// Filter by group mode field.
$filtervalues = [
'course:groupmode_operator' => select::EQUAL_TO,