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

MDL-17372 course reports: Added full plugin support for course reports - backported from HEAD

Browse Source
This commit is contained in:
skodak
2008-11-27 20:31:02 +00:00
parent 901c4aae9f
commit 12748c8425
7 changed files with 63 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/index.php
+3
View File
@@ -473,6 +473,9 @@
/// Check all message output plugins and upgrade if necessary
upgrade_plugins('message','message/output',"$CFG->wwwroot/$CFG->admin/index.php");
/// Check all course report plugins and upgrade if necessary
upgrade_plugins('coursereport', 'course/report', "$CFG->wwwroot/$CFG->admin/index.php");
/// Check all admin report plugins and upgrade if necessary
upgrade_plugins('report', $CFG->admin.'/report', "$CFG->wwwroot/$CFG->admin/index.php");
course/report.php
+13 -6
View File
@@ -9,9 +9,10 @@
error("That's an invalid course id");
}
require_login($course->id);
require_login($course);
require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_COURSE, $course->id));
$context = get_context_instance(CONTEXT_COURSE, $course->id);
require_capability('moodle/site:viewreports', $context);
$strreports = get_string('reports');
@@ -25,10 +26,16 @@
foreach ($directories as $directory) {
$pluginfile = $CFG->dirroot.'/course/report/'.$directory.'/mod.php';
if (file_exists($pluginfile)) {
echo '<div class="plugin">';
//echo $pluginfile;
include_once($pluginfile); // Fragment for listing
echo '</div>';
ob_start();
include($pluginfile); // Fragment for listing
$html = ob_get_contents();
ob_end_clean();
// add div only if plugin accessible
if ($html !== '') {
echo '<div class="plugin">';
echo $html;
echo '</div>';
}
}
}
course/report/log/mod.php
+8 -7
View File
@@ -7,13 +7,14 @@
require_once($CFG->dirroot.'/course/lib.php');
require_once($CFG->dirroot.'/course/report/log/lib.php');
if (has_capability('moodle/site:viewreports', $context)) {
print_heading(get_string('chooselogs') .':');
print_heading(get_string('chooselogs') .':');
print_log_selector_form($course);
print_log_selector_form($course);
print_heading(get_string('chooselivelogs') .':');
echo '<p>';
link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);
echo '</p>';
print_heading(get_string('chooselivelogs') .':');
echo '<p>';
link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);
echo '</p>';
}
?>
course/report/outline/mod.php
+7 -5
View File
@@ -4,9 +4,11 @@
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
echo '<p>';
$activityreport = get_string( 'activityreport' );
echo "<a href=\"{$CFG->wwwroot}/course/report/outline/index.php?id={$course->id}\">";
echo "$activityreport</a>\n";
echo '</p>';
if (has_capability('moodle/site:viewreports', $context)) {
echo '<p>';
$activityreport = get_string( 'activityreport' );
echo "<a href=\"{$CFG->wwwroot}/course/report/outline/index.php?id={$course->id}\">";
echo "$activityreport</a>\n";
echo '</p>';
}
?>
course/report/participation/mod.php
+7 -6
View File
@@ -4,10 +4,11 @@
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
echo '<p>';
$participationreport = get_string('participationreport');
echo "<a href=\"{$CFG->wwwroot}/course/report/participation/index.php?id={$course->id}\">";
echo "$participationreport</a>\n";
echo '</p>';
if (has_capability('moodle/site:viewreports', $context)) {
echo '<p>';
$participationreport = get_string('participationreport');
echo "<a href=\"{$CFG->wwwroot}/course/report/participation/index.php?id={$course->id}\">";
echo "$participationreport</a>\n";
echo '</p>';
}
?>
course/report/stats/mod.php
+10 -8
View File
@@ -4,13 +4,15 @@
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
if (!empty($CFG->enablestats)) {
echo '<p>';
echo '<a href="'.$CFG->wwwroot.'/course/report/stats/index.php?course='.$course->id.'">'.get_string('stats').'</a>';
echo '</p>';
} else {
echo '<p>';
echo get_string('statsoff');
echo '</p>';
if (has_capability('moodle/site:viewreports', $context)) {
if (!empty($CFG->enablestats)) {
echo '<p>';
echo '<a href="'.$CFG->wwwroot.'/course/report/stats/index.php?course='.$course->id.'">'.get_string('stats').'</a>';
echo '</p>';
} else {
echo '<p>';
echo get_string('statsoff');
echo '</p>';
}
}
?>
lib/accesslib.php
+15 -1
View File
@@ -3093,6 +3093,10 @@ function load_capability_def($component) {
$defpath = $CFG->dirroot.'/grade/report/'.$compparts[1].'/db/access.php';
$varprefix = $compparts[0].'_'.$compparts[1];
} else if ($compparts[0] == 'coursereport') {
$defpath = $CFG->dirroot.'/course/report/'.$compparts[1].'/db/access.php';
$varprefix = $compparts[0].'_'.$compparts[1];
} else {
$defpath = $CFG->dirroot.'/'.$component.'/db/access.php';
$varprefix = str_replace('/', '_', $component);
@@ -3818,6 +3822,10 @@ function get_capability_string($capabilityname) {
$string = get_string($stringname, 'gradereport_'.$componentname);
break;
case 'coursereport':
$string = get_string($stringname, 'coursereport_'.$componentname);
break;
default:
$string = get_string($stringname);
break;
@@ -3866,6 +3874,8 @@ function get_component_string($component, $contextlevel) {
|| preg_match('|^gradeexport/|', $component)
|| preg_match('|^gradereport/|', $component)) {
$string = get_string('gradebook', 'admin');
} else if (preg_match('|^coursereport/|', $component)) {
$string = get_string('reports');
} else {
$string = get_string('course');
}
@@ -5257,7 +5267,7 @@ function component_level_changed($cap, $comp, $contextlevel) {
$compsb = explode('/', $comp);
// list of system reports
if (($compsa[0] == 'report') &&($compsb[0] == 'report')) {
if (($compsa[0] == 'report') && ($compsb[0] == 'report')) {
return false;
}
@@ -5266,6 +5276,10 @@ function component_level_changed($cap, $comp, $contextlevel) {
($compsb[0] == 'gradeexport' || $compsb[0] == 'gradeimport' || $compsb[0] == 'gradereport')) {
return false;
}
if (($compsa[0] == 'coursereport') && ($compsb[0] == 'coursereport')) {
return false;
}
}
return ($cap->component != $comp || $cap->contextlevel != $contextlevel);