mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

MDL-66695 forumreport_summary: Added handling for all groups view count

Browse Source 
Part of MDL-66076.
This commit is contained in:
Michael Hawkins 2019-09-27 18:10:30 +08:00 committed by Jun Pataleta
parent 235a6db7fb
commit 9eebd58aa2
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mod/forum/report/summary/classes/summary_table.php
View File

@ -115,7 +115,7 @@ class summary_table extends table_sql {
];
// Only include viewcount column when no groups filter is applied.
if (empty($filters['groups'])) {
if (!$this->is_filtered_by_groups($filters['groups'])) {
$this->logreader = $this->get_internal_log_reader();
if ($this->logreader) {
$columnheaders['viewcount'] = get_string('viewcount', 'forumreport_summary');
@ -288,12 +288,8 @@ class summary_table extends table_sql {
break;
case self::FILTER_GROUPS:
// Find total number of options available (groups plus 'no groups').
$availablegroups = groups_get_activity_allowed_groups($this->cm);
$alloptionscount = 1 + count($availablegroups);
// Skip adding filter if not applied, or all options are selected.
if (!empty($values) && count($values) < $alloptionscount) {
if ($this->is_filtered_by_groups($values)) {
// Include users without groups if that option (-1) is selected.
$nonekey = array_search(-1, $values, true);
@ -614,4 +610,26 @@ class summary_table extends table_sql {
$dbman->create_temp_table($xmldbtable);
}
/**
* Check whether the groups filter will be applied by checking whether the number of groups selected
* matches the total number of options available (all groups plus no groups option).
*
* @param array $groups The group IDs selected.
* @return bool
*/
protected function is_filtered_by_groups(array $groups): bool {
static $groupsavailablecount = null;
if (empty($groups)) {
return false;
}
// Find total number of options available (groups plus 'no groups'), if not already fetched.
if (is_null($groupsavailablecount)) {
$groupsavailablecount = 1 + count(groups_get_activity_allowed_groups($this->cm));
}
return (count($groups) < $groupsavailablecount);
}
}