Merge pull request #231 from marcelorhmaia/MOODLE_36_STABLE

Fixes #147
jleyva · Oct 3, 2024 · 133a93c · 133a93c
2 parents 9c6ecbc + 97347a6
commit 133a93c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/components/plot/bar/graph.php b/components/plot/bar/graph.php
@@ -31,12 +31,15 @@
 // TODO check if this is correct should be int only?
 $id = required_param('id', PARAM_ALPHANUM);
 $reportid = required_param('reportid', PARAM_INT);
+$courseid = optional_param('courseid', null, PARAM_INT);
 
 if (!$report = $DB->get_record('block_configurable_reports', ['id' => $reportid])) {
  throw new moodle_exception('reportdoesnotexists');
 }
 
-$courseid = $report->courseid;
+if (!$courseid || !$report->global) {
+ $courseid = $report->courseid;
+}
 
 if (!$course = $DB->get_record('course', ['id' => $courseid])) {
  throw new moodle_exception('No such course id');

diff --git a/components/plot/bar/plugin.class.php b/components/plot/bar/plugin.class.php
@@ -108,7 +108,7 @@ public function execute($id, $data, $finalreport) {
  $graphdata = urlencode(json_encode($series));
 
  return $CFG->wwwroot . '/blocks/configurable_reports/components/plot/bar/graph.php?reportid=' . $this->report->id . '&id=' .
- $id . '&graphdata=' . $graphdata;
+ $id . '&graphdata=' . $graphdata . '&courseid='.$this->report->courseid;
  }
 
  /**

diff --git a/components/plot/line/graph.php b/components/plot/line/graph.php
@@ -34,12 +34,15 @@
 
 $id = required_param('id', PARAM_ALPHANUM);
 $reportid = required_param('reportid', PARAM_INT);
+$courseid = optional_param('courseid', null, PARAM_INT);
 
 if (!$report = $DB->get_record('block_configurable_reports', ['id' => $reportid])) {
  throw new moodle_exception('reportdoesnotexists');
 }
 
-$courseid = $report->courseid;
+if (!$courseid || !$report->global) {
+ $courseid = $report->courseid;
+}
 
 if (!$course = $DB->get_record('course', ['id' => $courseid])) {
  throw new moodle_exception('No such course id');

diff --git a/components/plot/line/plugin.class.php b/components/plot/line/plugin.class.php
@@ -93,7 +93,7 @@ public function execute($id, $data, $finalreport) {
  }
 
  return $CFG->wwwroot . '/blocks/configurable_reports/components/plot/line/graph.php?reportid=' . $this->report->id .
- '&id=' . $id . $params . '&amp;min=' . $minvalue . '&amp;max=' . $maxvalue;
+ '&id=' . $id . $params . '&amp;min=' . $minvalue . '&amp;max=' . $maxvalue . '&courseid='.$this->report->courseid;
  }
 
  /**

diff --git a/components/plot/pie/graph.php b/components/plot/pie/graph.php
@@ -33,12 +33,15 @@
 
 $id = required_param('id', PARAM_ALPHANUM);
 $reportid = required_param('reportid', PARAM_INT);
+$courseid = optional_param('courseid', null, PARAM_INT);
 
 if (!$report = $DB->get_record('block_configurable_reports', ['id' => $reportid])) {
  throw new moodle_exception('reportdoesnotexists');
 }
 
-$courseid = $report->courseid;
+if (!$courseid || !$report->global) {
+ $courseid = $report->courseid;
+}
 
 if (!$course = $DB->get_record('course', ['id' => $courseid])) {
  throw new moodle_exception("No such course id");

diff --git a/components/plot/pie/plugin.class.php b/components/plot/pie/plugin.class.php
@@ -148,7 +148,7 @@ public function execute($id, $data, $finalreport) {
  $colorpalette = base64_encode(implode(',', $colors));
 
  return $CFG->wwwroot . '/blocks/configurable_reports/components/plot/pie/graph.php?reportid=' . $this->report->id . '&id=' .
- $id . '&serie0=' . $serie0 . '&serie1=' . $serie1 . '&colorpalette=' . $colorpalette;
+ $id . '&serie0=' . $serie0 . '&serie1=' . $serie1 . '&colorpalette=' . $colorpalette . '&courseid='.$this->report->courseid;
  }
 
  /**