From 9df884df9f4ee9ed933d53b7cdc303b845c057c0 Mon Sep 17 00:00:00 2001 From: Brady Miller Date: Sun, 11 Jun 2017 03:29:07 -0700 Subject: [PATCH] dygraphs changes for 5.0.1 --- interface/forms/track_anything/history.php | 2 +- interface/forms/track_anything/report.php | 2 +- interface/forms/vitals/templates/vitals/general_new.html | 2 +- interface/patient_file/summary/labdata.php | 2 +- interface/themes/core.css | 4 ++++ version.php | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/interface/forms/track_anything/history.php b/interface/forms/track_anything/history.php index 79fcb5e03..f51af6225 100644 --- a/interface/forms/track_anything/history.php +++ b/interface/forms/track_anything/history.php @@ -231,7 +231,7 @@ while($myrow = sqlFetchArray($query)){ // get every single tracks - echo "

"; // here goes the graph + echo "

"; // here goes the graph echo "[" . xlt('Data from') . " "; echo "" . xlt('encounter') . " #" . text($the_encounter) . "]"; echo ""; diff --git a/interface/forms/track_anything/report.php b/interface/forms/track_anything/report.php index ac94bf287..e78d872d0 100644 --- a/interface/forms/track_anything/report.php +++ b/interface/forms/track_anything/report.php @@ -34,7 +34,7 @@ function track_anything_report( $pid, $encounter, $cols, $id){ $dummy = array(); // counter to decide if graph-button is shown $formid = $id; $shownameflag = 0; - echo "

"; + echo "

"; echo ""; // get name of selected track, used for GraphTitle diff --git a/interface/forms/vitals/templates/vitals/general_new.html b/interface/forms/vitals/templates/vitals/general_new.html index a6c2f3300..1bdbbf411 100644 --- a/interface/forms/vitals/templates/vitals/general_new.html +++ b/interface/forms/vitals/templates/vitals/general_new.html @@ -123,7 +123,7 @@ td,th {

{xl t="Vitals"}

{xl t="View Patient"}

"; + echo ""; $value_count = 0; $value_array = array(); // reset local array $date_array = array();// reset local array diff --git a/interface/themes/core.css b/interface/themes/core.css index 123d6b7c6..ed4b1a8b9 100644 --- a/interface/themes/core.css +++ b/interface/themes/core.css @@ -15,6 +15,10 @@ src: url("../../public/assets/font-awesome-4-6-3/fonts/fontawesome-webfont.ttf") format("truetype"); } +.chart-dygraphs { + direction:ltr; +} + .css_button[href*="deleter"]:before, input[type="button"][href*="deleter"]:before, button[href*="deleter"]:before { diff --git a/version.php b/version.php index 4ad9d1f08..92b57c6d7 100644 --- a/version.php +++ b/version.php @@ -47,7 +47,7 @@ if (getenv('OPENEMR__ENVIRONMENT') === 'dev') { $v_js_includes = md5(microtime()); } else { // Change this number when bumping - $v_js_includes = 35; + $v_js_includes = 36; } // Do note modify below $GLOBALS['v_js_includes'] = $v_js_includes; -- 2.11.4.GIT

{xl t="Name"}	{xl t="Unit"}	diff --git a/interface/patient_file/summary/labdata.php b/interface/patient_file/summary/labdata.php index 7ab5b464e..307a26b8a 100644 --- a/interface/patient_file/summary/labdata.php +++ b/interface/patient_file/summary/labdata.php @@ -229,7 +229,7 @@ if($value_select){ // get complete data of each item foreach($value_select as $this_value){ // set a plot-spacer - echo "