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

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

Browse Source
This commit is contained in:
Ilya Tregubov 2024-01-10 09:00:54 +08:00
commit d27c866dd2
3 changed files with 67 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en/tag.php
View File

@ -65,6 +65,7 @@ $string['eventtagunflagged'] = 'Tag unflagged';
$string['eventtagupdated'] = 'Tag updated';
$string['exclusivemode'] = 'Show only tagged {$a->tagarea}';
$string['flag'] = 'Flag';
$string['flagcount'] = 'Flag count';
$string['flagged'] = 'Tag flagged';
$string['flagasinappropriate'] = 'Flag as inappropriate';
$string['helprelatedtags'] = 'Comma separated related tags';

23
tag/classes/reportbuilder/local/entities/tag.php
View File

@ -24,7 +24,7 @@ use html_writer;
use lang_string;
use stdClass;
use core_reportbuilder\local\entities\base;
use core_reportbuilder\local\filters\{boolean_select, date, tags};
use core_reportbuilder\local\filters\{boolean_select, date, number, tags};
use core_reportbuilder\local\helpers\format;
use core_reportbuilder\local\report\{column, filter};
@ -177,6 +177,17 @@ class tag extends base {
->set_is_sortable(true, ["{$tagalias}.flag"])
->add_callback([format::class, 'boolean_as_text']);
// Flag count.
$columns[] = (new column(
'flagcount',
new lang_string('flagcount', 'core_tag'),
$this->get_entity_name()
))
->add_joins($this->get_joins())
->set_type(column::TYPE_INTEGER)
->add_fields("{$tagalias}.flag")
->set_is_sortable(true);
// Time modified.
$columns[] = (new column(
'timemodified',
@ -230,6 +241,16 @@ class tag extends base {
))
->add_joins($this->get_joins());
// Flag count.
$filters[] = (new filter(
number::class,
'flagcount',
new lang_string('flagcount', 'core_tag'),
$this->get_entity_name(),
"{$tagalias}.flag"
))
->add_joins($this->get_joins());
// Time modified.
$filters[] = (new filter(
date::class,

61
tag/tests/reportbuilder/datasource/tags_test.php
View File

@ -22,7 +22,7 @@ use context_course;
use context_user;
use core_reportbuilder_generator;
use core_reportbuilder_testcase;
use core_reportbuilder\local\filters\{boolean_select, date, select};
use core_reportbuilder\local\filters\{boolean_select, date, number, select};
use core_reportbuilder\local\filters\tags as tags_filter;
defined('MOODLE_INTERNAL') || die();
@ -97,6 +97,7 @@ class tags_test extends core_reportbuilder_testcase {
$generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'tag:name']);
$generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'tag:description']);
$generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'tag:flagged']);
$generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'tag:flagcount']);
$generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'tag:timemodified']);
// Context.
@ -113,29 +114,47 @@ class tags_test extends core_reportbuilder_testcase {
$content = $this->get_custom_report_content($report->get('id'));
$this->assertCount(1, $content);
$courserow = array_values($content[0]);
[
$collectiondefault,
$collectioncomponent,
$collectionsearchable,
$collectioncustomurl,
$tagname,
$tagdescription,
$tagflagged,
$tagflagcount,
$tagtimemodified,
$contextlink,
$instancearea,
$instancecomponent,
$instanceitemtype,
$instanceitemid,
$instancetimecreated,
$instancetimemodified,
] = array_values($content[0]);
// Collection.
$this->assertEquals('Yes', $courserow[0]);
$this->assertEmpty($courserow[1]);
$this->assertEquals('Yes', $courserow[2]);
$this->assertEmpty($courserow[3]);
$this->assertEquals('Yes', $collectiondefault);
$this->assertEmpty($collectioncomponent);
$this->assertEquals('Yes', $collectionsearchable);
$this->assertEmpty($collectioncustomurl);
// Tag.
$this->assertEquals('Horses', $courserow[4]);
$this->assertEquals('<div class="text_to_html">Neigh</div>', $courserow[5]);
$this->assertEquals('Yes', $courserow[6]);
$this->assertNotEmpty($courserow[7]);
$this->assertEquals('Horses', $tagname);
$this->assertEquals('<div class="text_to_html">Neigh</div>', $tagdescription);
$this->assertEquals('Yes', $tagflagged);
$this->assertEquals(2, $tagflagcount);
$this->assertNotEmpty($tagtimemodified);
// Instance.
$this->assertEquals('<a href="' . $coursecontext->get_url() . '">' . $coursecontext->get_context_name() . '</a>',
$courserow[8]);
$this->assertEquals('Courses', $courserow[9]);
$this->assertEquals('core', $courserow[10]);
$this->assertEquals('course', $courserow[11]);
$this->assertEquals($course->id, $courserow[12]);
$this->assertNotEmpty($courserow[13]);
$this->assertNotEmpty($courserow[14]);
$contextlink);
$this->assertEquals('Courses', $instancearea);
$this->assertEquals('core', $instancecomponent);
$this->assertEquals('course', $instanceitemtype);
$this->assertEquals($course->id, $instanceitemid);
$this->assertNotEmpty($instancetimecreated);
$this->assertNotEmpty($instancetimemodified);
}
/**
@ -190,6 +209,14 @@ class tags_test extends core_reportbuilder_testcase {
'Filter tag flagged (no match)' => ['tag:flagged', [
'tag:flagged_operator' => boolean_select::NOT_CHECKED,
], false],
'Filter tag flag count' => ['tag:flagcount', [
'tag:flagcount_operator' => number::GREATER_THAN,
'tag:flagcount_value1' => 1,
], true],
'Filter tag flag count (no match)' => ['tag:flagcount', [
'tag:flagcount_operator' => number::EQUAL_TO,
'tag:flagcount_value1' => 0,
], false],
'Filter tag time modified' => ['tag:timemodified', [
'tag:timemodified_operator' => date::DATE_RANGE,
'tag:timemodified_from' => 1622502000,