MDL-55029 report_courseoverview: Convert report chart to the new library
Part of MDL-54987 epic.
This commit is contained in:
Simey Lameze
committed by
Dan Poltawski
Dan Poltawski
parent
681e1a7652
commit
6ce35fe0e1
@@ -26,13 +26,15 @@
|
||||
require_once('../../config.php');
|
||||
require_once($CFG->dirroot.'/lib/statslib.php');
|
||||
require_once($CFG->libdir.'/adminlib.php');
|
||||
require_once($CFG->dirroot.'/report/courseoverview/locallib.php');
|
||||
|
||||
$report = optional_param('report', STATS_REPORT_ACTIVE_COURSES, PARAM_INT);
|
||||
$time = optional_param('time', 0, PARAM_INT);
|
||||
$numcourses = optional_param('numcourses', 20, PARAM_INT);
|
||||
$systemcontext = context_system::instance();
|
||||
|
||||
if (empty($CFG->enablestats)) {
|
||||
if (has_capability('moodle/site:config', context_system::instance())) {
|
||||
if (has_capability('moodle/site:config', $systemcontext)) {
|
||||
redirect("$CFG->wwwroot/$CFG->admin/search.php?query=enablestats", get_string('mustenablestats', 'admin'), 3);
|
||||
} else {
|
||||
print_error('statsdisable');
|
||||
@@ -113,7 +115,10 @@ if (!empty($report) && !empty($time)) {
|
||||
echo '</td></tr></table>';
|
||||
|
||||
} else {
|
||||
echo '<div class="graph"><img alt="'.get_string('courseoverviewgraph').'" src="'.$CFG->wwwroot.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
|
||||
require_capability('report/courseoverview:view', $systemcontext);
|
||||
echo html_writer::start_div();
|
||||
report_courseoverview_print_chart($report, $time, $numcourses);
|
||||
echo html_writer::end_div();
|
||||
|
||||
$table = new html_table();
|
||||
$table->align = array('left','center','center','center');
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
<?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/>.
|
||||
|
||||
/**
|
||||
* This file contains functions used by the course overview report.
|
||||
*
|
||||
* @package report
|
||||
* @subpackage courseoverview
|
||||
* @copyright 2016 Simey Lameze <[email protected]>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
defined('MOODLE_INTERNAL') || die;
|
||||
|
||||
require_once('../../config.php');
|
||||
require_once($CFG->dirroot . '/lib/statslib.php');
|
||||
|
||||
/**
|
||||
* Gather course overview data and print the chart.
|
||||
*
|
||||
* @param int $report represents the report type field on the course overview report filter.
|
||||
* @param int $time represents the time period field on the course overview report filter.
|
||||
* @param int $numcourses represents the number of courses field on the course overview report filter.
|
||||
* @return void
|
||||
*/
|
||||
function report_courseoverview_print_chart($report, $time, $numcourses) {
|
||||
global $DB, $OUTPUT, $PAGE;
|
||||
|
||||
$param = stats_get_parameters($time, $report, SITEID, STATS_MODE_RANKED);
|
||||
if (!empty($param->sql)) {
|
||||
$sql = $param->sql;
|
||||
} else {
|
||||
$sql = "SELECT courseid, $param->fields
|
||||
FROM {" . 'stats_' . $param->table . "}
|
||||
WHERE timeend >= $param->timeafter
|
||||
AND stattype = 'activity'
|
||||
AND roleid = 0
|
||||
GROUP BY courseid
|
||||
$param->extras
|
||||
ORDER BY $param->orderby";
|
||||
}
|
||||
$courses = $DB->get_records_sql($sql, $param->params, 0, $numcourses);
|
||||
|
||||
if (empty($courses)) {
|
||||
$PAGE->set_url('/report/courseoverview/index.php');
|
||||
print_error('statsnodata', 'error', $PAGE->url->out());
|
||||
}
|
||||
|
||||
$data = [];
|
||||
$i = 0;
|
||||
foreach ($courses as $c) {
|
||||
$data['labels'][$i] = $DB->get_field('course', 'shortname', array('id' => $c->courseid));
|
||||
|
||||
// Line3 represents the third column of the report table except for the most active users report.
|
||||
// It is a float number and can be participation radio or activity per user.
|
||||
if (isset($c->line3)) {
|
||||
$data['series'][$i] = round($c->line3, 2);
|
||||
} else {
|
||||
$data['series'][$i] = $c->{$param->graphline};
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
|
||||
$chart = new \core\chart_bar();
|
||||
$series = new \core\chart_series($param->{$param->graphline}, $data['series']);
|
||||
$chart->add_series($series);
|
||||
$chart->set_labels($data['labels']);
|
||||
|
||||
echo $OUTPUT->render($chart);
|
||||
}
|
||||
@@ -24,57 +24,7 @@
|
||||
*/
|
||||
|
||||
require_once('../../config.php');
|
||||
require_once($CFG->dirroot.'/lib/statslib.php');
|
||||
require_once($CFG->dirroot.'/lib/graphlib.php');
|
||||
require_once($CFG->libdir . '/filelib.php');
|
||||
|
||||
$report = required_param('report', PARAM_INT);
|
||||
$time = required_param('time', PARAM_INT);
|
||||
$numcourses = required_param('numcourses', PARAM_INT);
|
||||
|
||||
require_login();
|
||||
|
||||
require_capability('report/courseoverview:view', context_system::instance());
|
||||
|
||||
stats_check_uptodate();
|
||||
|
||||
$param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
|
||||
|
||||
if (!empty($param->sql)) {
|
||||
$sql = $param->sql;
|
||||
} else {
|
||||
$sql = "SELECT courseid, $param->fields
|
||||
FROM {".'stats_'.$param->table."}
|
||||
WHERE timeend >= $param->timeafter AND stattype = 'activity' AND roleid = 0
|
||||
GROUP BY courseid
|
||||
$param->extras
|
||||
ORDER BY $param->orderby";
|
||||
}
|
||||
|
||||
$courses = $DB->get_records_sql($sql, $param->params, 0, $numcourses);
|
||||
|
||||
if (empty($courses)) {
|
||||
$PAGE->set_url('/report/courseoverview/index.php');
|
||||
print_error('statsnodata', 'error', $PAGE->url->out());
|
||||
}
|
||||
|
||||
|
||||
$graph = new graph(750,400);
|
||||
|
||||
$graph->parameter['legend'] = 'outside-right';
|
||||
$graph->parameter['legend_size'] = 10;
|
||||
$graph->parameter['x_axis_angle'] = 90;
|
||||
$graph->parameter['title'] = false; // moodle will do a nicer job.
|
||||
$graph->y_tick_labels = null;
|
||||
$graph->offset_relation = null;
|
||||
if ($report != STATS_REPORT_ACTIVE_COURSES) {
|
||||
$graph->parameter['y_decimal_left'] = 2;
|
||||
}
|
||||
|
||||
foreach ($courses as $c) {
|
||||
$graph->x_data[] = $DB->get_field('course', 'shortname', array('id'=>$c->courseid));
|
||||
$graph->y_data['bar1'][] = $c->{$param->graphline};
|
||||
}
|
||||
$graph->y_order = array('bar1');
|
||||
$graph->y_format['bar1'] = array('colour' => 'blue','bar' => 'fill','legend' => $param->{$param->graphline});
|
||||
|
||||
$graph->draw_stack();
|
||||
debugging('This way of generating the chart is deprecated, refer to report_courseoverview_print_chart().', DEBUG_DEVELOPER);
|
||||
send_file_not_found();
|
||||
|
||||
Reference in New Issue
Block a user