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

MDL-40515: report_log: List activities in optgroups

Browse Source
This commit is contained in:
Adam Olley
2013-09-30 11:20:44 +09:30
parent 7bc37de925
commit 227d3fcbd3
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report/log/locallib.php
+22 -4
View File
@@ -226,12 +226,14 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0,
/// Casting $course->modinfo to string prevents one notice when the field is null
if ($modinfo = unserialize((string)$course->modinfo)) {
$section = 0;
$thissection = array();
foreach ($modinfo as $mod) {
if ($mod->mod == "label") {
continue;
}
if ($mod->section > 0 and $section <> $mod->section) {
$activities["section/$mod->section"] = '--- '.get_section_name($course, $mod->section).' ---';
$activities[] = $thissection;
$thissection = array();
}
$section = $mod->section;
$mod->name = strip_tags(format_string($mod->name, true));
@@ -241,12 +243,19 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0,
if (!$mod->visible) {
$mod->name = "(".$mod->name.")";
}
$activities["$mod->cm"] = $mod->name;
$key = get_section_name($course, $mod->section);
if (!isset($thissection[$key])) {
$thissection[$key] = array();
}
$thissection[$key][$mod->cm] = $mod->name;
if ($mod->cm == $modid) {
$selectedactivity = "$mod->cm";
}
}
if (!empty($thissection)) {
$activities[] = $thissection;
}
}
if (has_capability('report/log:view', $sitecontext) && !$course->category) {
@@ -479,12 +488,14 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate=
/// Casting $course->modinfo to string prevents one notice when the field is null
if ($modinfo = unserialize((string)$course->modinfo)) {
$section = 0;
$thissection = array();
foreach ($modinfo as $mod) {
if ($mod->mod == "label") {
continue;
}
if ($mod->section > 0 and $section <> $mod->section) {
$activities["section/$mod->section"] = '--- '.get_section_name($course, $mod->section).' ---';
$activities[] = $thissection;
$thissection = array();
}
$section = $mod->section;
$mod->name = strip_tags(format_string($mod->name, true));
@@ -494,12 +505,19 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate=
if (!$mod->visible) {
$mod->name = "(".$mod->name.")";
}
$activities["$mod->cm"] = $mod->name;
$key = get_section_name($course, $mod->section);
if (!isset($thissection[$key])) {
$thissection[$key] = array();
}
$thissection[$key][$mod->cm] = $mod->name;
if ($mod->cm == $modid) {
$selectedactivity = "$mod->cm";
}
}
if (!empty($thissection)) {
$activities[] = $thissection;
}
}
if (has_capability('report/log:view', $sitecontext) && ($course->id == SITEID)) {