From b21c106926077c2550da2f3aa63c6a25d2ddd1c2 Mon Sep 17 00:00:00 2001
From: "Joseph P. White" <jpwhite4@buffalo.edu>
Date: Thu, 5 Dec 2019 14:27:37 -0500
Subject: [PATCH] Revert XDReportManager changes from #967

The pull request #967 added extra code to the report manager that
manipulated the start and end times of charts in a report. This broke
the report generator. These changes appear to not be necessary at all
and must have been added by mistake.
---
 classes/XDReportManager.php | 38 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/classes/XDReportManager.php b/classes/XDReportManager.php
index 7a2fbe5846..12aecdb2cc 100644
--- a/classes/XDReportManager.php
+++ b/classes/XDReportManager.php
@@ -1327,11 +1327,7 @@ public function fetchChartBlob(
             $timeframe_type = $iq[0]['timeframe_type'];
         }
 
-        if (is_array($insertion_rank) && array_key_exists('start_date', $insertion_rank) && array_key_exists('end_date', $insertion_rank) && !(is_null($insertion_rank['start_date'])) && !(is_null($insertion_rank['end_date']))) {
-            $start_date = $insertion_rank['start_date'];
-            $end_date = $insertion_rank['end_date'];
-        }
-        elseif (strtolower($timeframe_type) == 'user defined') {
+        if (strtolower($timeframe_type) == 'user defined') {
             $start_date = $active_start;
             $end_date = $active_end;
         }
@@ -1608,16 +1604,12 @@ public function generateChartBlob(
      * \param outputdir the name of an existing, writable directory in which to put the files.
      * \param report_id the identifier for the report
      * \param export_format the specified export format
-     * \param start_date the start date for output
-     * \param end_date the end date for output
      * \returns The name of the report file that was written
      */
     private function writeXMLConfiguration(
         $outputdir,
         $report_id,
-        $export_format = null,
-        $start_date = null,
-        $end_date = null
+        $export_format = null
     ) {
         $dom = new \DOMDocument("1.0");
 
@@ -1692,24 +1684,22 @@ private function writeXMLConfiguration(
                 $entry['title']
             );
 
-            if ((is_null($start_date) || is_null($end_date))) {
-                // Use start and end date from report if start or end date is not supplied as function parameters
-                if (strtolower($entry['timeframe_type']) == 'user defined') {
-                    list($start_date, $end_date)
-                        = explode(' to ', $entry['comments']);
-                }
-                else {
-                    $e = \xd_date\getEndpoints($entry['timeframe_type']);
+            if (strtolower($entry['timeframe_type']) == 'user defined') {
+                list($start_date, $end_date)
+                    = explode(' to ', $entry['comments']);
+            }
+            else {
+                $e = \xd_date\getEndpoints($entry['timeframe_type']);
 
-                    $start_date = $e['start_date'];
-                    $end_date   = $e['end_date'];
-                }
+                $start_date = $e['start_date'];
+                $end_date   = $e['end_date'];
             }
+
             // Update comments and hyperlink so reporting engine can
             // work with the correct chart (image)
             $entry['comments'] = $start_date . ' to ' . $end_date;
 
-            $imagedata = $this->fetchChartBlob("report", array("report_id" => $report_id, "ordering" => $entry['order'], "start_date" => $start_date, "end_date" => $end_date) );
+            $imagedata = $this->fetchChartBlob("report", array("report_id" => $report_id, "ordering" => $entry['order'] ) );
             $imagefilename = $outputdir . "/" . $entry['order'] . ".png";
             file_put_contents($imagefilename, $imagedata);
 
@@ -1795,7 +1785,7 @@ private function writeXMLConfiguration(
         return $report_filename;
     }
 
-    public function buildReport($report_id, $export_format, $start_date = null, $end_date = null)
+    public function buildReport($report_id, $export_format)
     {
 
         if (
@@ -1857,7 +1847,7 @@ public function buildReport($report_id, $export_format, $start_date = null, $end
 
         // Generate a report definition (XML) to be used as the input to
         // the Jasper Report Builder application
-        $this->writeXMLConfiguration($template_path, $report_id, $export_format, $start_date, $end_date);
+        $this->writeXMLConfiguration($template_path, $report_id, $export_format);
 
         $charts_per_page = $this->getReportChartsPerPage($report_id);