mirrored from git://git.moodle.org/moodle.git
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDL-74777 reportbuilder: report filter by category/sub-categories.
AMOS BEGIN CPY [choosecategory,core_grades],[categoryselect,core_reportbuilder] AMOS END
- Loading branch information
1 parent
ceb4158
commit 721f7a0
Showing
7 changed files
with
210 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
<?php | ||
// This file is part of Moodle - http://moodle.org/ | ||
// | ||
// Moodle is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// Moodle is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
declare(strict_types=1); | ||
|
||
namespace core_reportbuilder\local\filters; | ||
|
||
use core_course_category; | ||
use MoodleQuickForm; | ||
use core_reportbuilder\local\helpers\database; | ||
|
||
/** | ||
* Course category report filter | ||
* | ||
* The following optional array property can be passed to the {@see \core_reportbuilder\local\report\filter::set_options} method | ||
* when defining this filter, to define the capabilities passed to {@see \core_course_category::make_categories_list} | ||
* | ||
* ['requiredcapabilities' => '...'] | ||
* | ||
* @package core_reportbuilder | ||
* @copyright 2022 Paul Holden <paulh@moodle.com> | ||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
*/ | ||
class category extends base { | ||
|
||
/** | ||
* Setup form | ||
* | ||
* @param MoodleQuickForm $mform | ||
*/ | ||
public function setup_form(MoodleQuickForm $mform): void { | ||
$label = get_string('filterfieldvalue', 'core_reportbuilder', $this->get_header()); | ||
|
||
// See MDL-74627: in order to set the default value to "No selection" we need to prepend an empty value. | ||
$requiredcapabilities = $this->filter->get_options()['requiredcapabilities'] ?? ''; | ||
$categories = [0 => ''] + core_course_category::make_categories_list($requiredcapabilities); | ||
|
||
$mform->addElement('autocomplete', "{$this->name}_value", $label, $categories)->setHiddenLabel(true); | ||
$mform->addElement('advcheckbox', "{$this->name}_subcategories", get_string('viewallsubcategories')); | ||
} | ||
|
||
/** | ||
* Return filter SQL | ||
* | ||
* @param array $values | ||
* @return array | ||
*/ | ||
public function get_sql_filter(array $values): array { | ||
global $DB; | ||
|
||
$fieldsql = $this->filter->get_field_sql(); | ||
$params = $this->filter->get_field_params(); | ||
|
||
$category = (int) ($values["{$this->name}_value"] ?? 0); | ||
$subcategories = !empty($values["{$this->name}_subcategories"]); | ||
|
||
// Invalid or inactive filter. | ||
if (empty($category)) { | ||
return ['', []]; | ||
} | ||
|
||
// Initial matching on selected category. | ||
$paramcategory = database::generate_param_name(); | ||
$params[$paramcategory] = $category; | ||
$sql = "{$fieldsql} = :{$paramcategory}"; | ||
|
||
// Sub-category matching on path of selected category. | ||
if ($subcategories) { | ||
$paramcategorypath = database::generate_param_name(); | ||
$params[$paramcategorypath] = "%/{$category}/%"; | ||
$sql .= " OR {$fieldsql} IN ( | ||
SELECT id | ||
FROM {course_categories} | ||
WHERE " . $DB->sql_like('path', ":{$paramcategorypath}") . " | ||
)"; | ||
} | ||
|
||
return [$sql, $params]; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
<?php | ||
// This file is part of Moodle - http://moodle.org/ | ||
// | ||
// Moodle is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// Moodle is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
declare(strict_types=1); | ||
|
||
namespace core_reportbuilder\local\filters; | ||
|
||
use advanced_testcase; | ||
use lang_string; | ||
use core_reportbuilder\local\report\filter; | ||
|
||
/** | ||
* Unit tests for course category report filter | ||
* | ||
* @package core_reportbuilder | ||
* @covers \core_reportbuilder\local\filters\category | ||
* @copyright 2022 Paul Holden <paulh@moodle.com> | ||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
*/ | ||
class category_test extends advanced_testcase { | ||
|
||
/** | ||
* Data provider for {@see test_get_sql_filter} | ||
* | ||
* @return array | ||
*/ | ||
public function get_sql_filter_provider(): array { | ||
return [ | ||
['One', false, ['One']], | ||
['One', true, ['One', 'Two', 'Three']], | ||
['Two', true, ['Two', 'Three']], | ||
['Three', true, ['Three']], | ||
[null, false, ['Category 1', 'One', 'Two', 'Three']], | ||
]; | ||
} | ||
|
||
/** | ||
* Test getting filter SQL | ||
* | ||
* @param string|null $categoryname | ||
* @param bool $subcategories | ||
* @param string[] $expectedcategories | ||
* | ||
* @dataProvider get_sql_filter_provider | ||
*/ | ||
public function test_get_sql_filter(?string $categoryname, bool $subcategories, array $expectedcategories): void { | ||
global $DB; | ||
|
||
$this->resetAfterTest(); | ||
|
||
$category1 = $this->getDataGenerator()->create_category(['name' => 'One']); | ||
$category2 = $this->getDataGenerator()->create_category(['name' => 'Two', 'parent' => $category1->id]); | ||
$category3 = $this->getDataGenerator()->create_category(['name' => 'Three', 'parent' => $category2->id]); | ||
|
||
if ($categoryname !== null) { | ||
$categoryid = $DB->get_field('course_categories', 'id', ['name' => $categoryname], MUST_EXIST); | ||
} else { | ||
$categoryid = null; | ||
} | ||
|
||
$filter = new filter( | ||
category::class, | ||
'test', | ||
new lang_string('yes'), | ||
'testentity', | ||
'id' | ||
); | ||
|
||
// Create instance of our filter, passing given operator. | ||
[$select, $params] = category::create($filter)->get_sql_filter([ | ||
$filter->get_unique_identifier() . '_value' => $categoryid, | ||
$filter->get_unique_identifier() . '_subcategories' => $subcategories, | ||
]); | ||
|
||
$categories = $DB->get_fieldset_select('course_categories', 'name', $select, $params); | ||
$this->assertEqualsCanonicalizing($expectedcategories, $categories); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters