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

Merge branch 'wip-MDL-48794-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2015-02-09 13:05:24 +01:00
parent 4f0874c0cf 154685629a
commit 33446800b7
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report/log/graph.php
+20
View File
@@ -143,6 +143,16 @@ if ($type === "usercourse.png") {
$graph->y_data['logs'] = $logs;
$graph->y_order = array('logs');
// Make sure the Y-axis gridlines correspond to the integer values.
if (count($logs) && ($ymax = max($logs)) && ($graph->parameter['y_axis_gridlines'] > 1)) {
if ($ymax < $graph->parameter['y_axis_gridlines'] - 1) {
$graph->parameter['y_axis_gridlines'] = $ymax + 1;
} else if ($ymax % ($graph->parameter['y_axis_gridlines'] - 1)) {
$graph->parameter['y_max_left'] = $graph->parameter['y_max_right'] =
ceil($ymax/($graph->parameter['y_axis_gridlines'] - 1)) * ($graph->parameter['y_axis_gridlines'] - 1);
}
}
if (!empty($CFG->preferlinegraphs)) {
$graph->y_format['logs'] = array('colour' => 'blue', 'line' => 'line');
} else {
@@ -206,6 +216,16 @@ if ($type === "usercourse.png") {
$graph->y_data['logs'] = $logs;
$graph->y_order = array('logs');
// Make sure the Y-axis gridlines correspond to the integer values.
if (count($logs) && ($ymax = max($logs)) && ($graph->parameter['y_axis_gridlines'] > 1)) {
if ($ymax < $graph->parameter['y_axis_gridlines'] - 1) {
$graph->parameter['y_axis_gridlines'] = $ymax + 1;
} else if ($ymax % ($graph->parameter['y_axis_gridlines'] - 1)) {
$graph->parameter['y_max_left'] = $graph->parameter['y_max_right'] =
ceil($ymax/($graph->parameter['y_axis_gridlines'] - 1)) * ($graph->parameter['y_axis_gridlines'] - 1);
}
}
if (!empty($CFG->preferlinegraphs)) {
$graph->y_format['logs'] = array('colour' => 'blue', 'line' => 'line');
} else {