fixed plot graph not working (#1396)

LibreHealthIO · Feb 1, 2019 · f016374 · f016374
1 parent 893902f
commit f016374
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/interface/forms/track_anything/report.js b/interface/forms/track_anything/report.js
@@ -59,8 +59,8 @@ function ta_report_plot_graph(formid,ofc_name,the_track_name,ofc_date,ofc_value)
         var thetrack = JSON.stringify(the_track_name + " [Track " + formid + "]");
         var thedates = JSON.stringify(ofc_date);
         var thevalues = JSON.stringify(ofc_value);
-        
-        $.ajax({ url: '<?php echo $modules_dir; ?>openflashchart/graph_track_anything.php',
+
+    jQuery.ajax({ url: '../../../modules/openflashchart/graph_track_anything.php',
                      type: 'POST',
                      data: { dates:  thedates, 
                                      values: thevalues, 
@@ -73,15 +73,18 @@ function ta_report_plot_graph(formid,ofc_name,the_track_name,ofc_date,ofc_value)
                                  // ofc will look after a variable named "ofc"
                                  // inside of the flashvars
                                  // However, we need to set both
-                                 // data and flashvars.ofc 
+                                 // data and flashvars.ofc
                                  data=returnData;
                                  flashvars.ofc = returnData;
                                  // call ofc with proper falshchart
-                                        swfobject.embedSWF('<?php echo $modules_dir; ?>openflashchart/open-flash-chart.swf', 
+                                        swfobject.embedSWF('../../../modules/openflashchart/open-flash-chart.swf',
                                         "graph" + formid, "650", "200", "9.0.0","",flashvars);  
                         },
                         error: function (XMLHttpRequest, textStatus, errorThrown) {
                                 alert(XMLHttpRequest.responseText);
+                            console.log(textStatus);
+                            console.log(XMLHttpRequest);
+                            console.log(errorThrown);
                                 //alert("XMLHttpRequest="+XMLHttpRequest.responseText+"\ntextStatus="+textStatus+"\nerrorThrown="+errorThrown);
                         }
 

diff --git a/interface/patient_file/encounter/forms.php b/interface/patient_file/encounter/forms.php
@@ -35,8 +35,8 @@
 ?>
 
 <?php // include generic js support for graphing ?>
-<script type="text/javascript" src="<?php echo $modules_dir; ?>openflashchart/js/json/json2.js"></script>
-<script type="text/javascript" src="<?php echo $modules_dir; ?>openflashchart/js/swfobject.js"></script>
+    <script type="text/javascript" src="<?php echo $GLOBALS['web_root']?>/modules/openflashchart/js/json/json2.js"></script>
+    <script type="text/javascript" src="<?php echo $GLOBALS['web_root']?>/modules/openflashchart/js/swfobject.js"></script>
 
 <?php // if the track_anything form exists, then include the styling and js functions for graphing
 if (file_exists(dirname(__FILE__) . "/../../forms/track_anything/style.css")) { ?>

diff --git a/modules/openflashchart/graph_track_anything.php b/modules/openflashchart/graph_track_anything.php
@@ -19,8 +19,8 @@
 $fake_register_globals=false;
 //
 
-require_once(dirname(__FILE__) . "/../../interface/globals.php");
-require_once($GLOBALS['srcdir'] . "/openflashchart/php-ofc-library/open-flash-chart.php");
+require_once("../../interface/globals.php");
+require_once($modules_dir. "/openflashchart/php-ofc-library/open-flash-chart.php");
 require_once($GLOBALS['srcdir'] . "/formdata.inc.php");
 
 // get $_POSTed data