Merge pull request #3 from golenkovm/issue146

Let filters to be set before running reports
catalyst · Oct 5, 2022 · e4b060b · e4b060b
2 parents 0e66a15 + e006f5b
commit e4b060b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/lang/en/block_configurable_reports.php b/lang/en/block_configurable_reports.php
@@ -54,6 +54,7 @@
 $string['field'] = "Field";
 
 // Report form
+$string['applyfilters'] = "Apply filters to run the report";
 $string['typeofreport'] = "Type of report";
 $string['enablejsordering'] = "Enable JavaScript ordering";
 $string['enablejspagination'] = "Enable JavaScript Pagination";

diff --git a/report.class.php b/report.class.php
@@ -779,7 +779,11 @@ public function print_report_page(\moodle_page $moodlepage) {
 
             $this->print_export_options();
         } else {
-            echo '<div class="centerpara">'.get_string('norecordsfound', 'block_configurable_reports').'</div>';
+            if (isset($this->filterform) && !$this->filterform->get_data()) {
+                echo '<div class="centerpara">'.get_string('applyfilters', 'block_configurable_reports').'</div>';
+            } else {
+                echo '<div class="centerpara">'.get_string('norecordsfound', 'block_configurable_reports').'</div>';
+            }
         }
 
         echo '<div class="centerpara"><br />';

diff --git a/reports/sql/report.class.php b/reports/sql/report.class.php
@@ -129,7 +129,7 @@ public function create_report() {
 
             $sql = $this->prepare_sql($sql);
 
-            if ($rs = $this->execute_query($sql)) {
+            if (isset($this->filterform) && $this->filterform->get_data() && $rs = $this->execute_query($sql)) {
                 foreach ($rs as $row) {
                     if (empty($finaltable)) {
                         foreach ($row as $colname => $value) {

diff --git a/viewreport.php b/viewreport.php
@@ -71,14 +71,14 @@
 $download = ($download && $format && strpos($report->export, $format.',') !== false) ? true : false;
 
 if ($download && $report->type == "sql") $reportclass->setForExport(true);
+$reportclass->check_filters_request();
 $reportclass->create_report();
 
 $action = (!empty($download)) ? 'download' : 'view';
 cr_add_to_log($report->courseid, 'configurable_reports', $action, '/block/configurable_reports/viewreport.php?id='.$id, $report->name);
 
 // No download, build navigation header etc..
 if (!$download) {
-    $reportclass->check_filters_request();
     $reportname = format_string($report->name);
     $navlinks = array();