From 5bb5bffd9dd04f0632bdd01ee0f62e4982492ebd Mon Sep 17 00:00:00 2001 From: Rod Roark Date: Tue, 10 Jan 2012 21:19:55 -0800 Subject: [PATCH] Accept, save and show observation dates/times in vitals. --- interface/forms/vitals/C_FormVitals.class.php | 13 ++++++---- interface/forms/vitals/FormVitals.class.php | 30 ++++++++++++---------- .../forms/vitals/templates/vitals/general_new.html | 23 ++++++++++++++--- 3 files changed, 45 insertions(+), 21 deletions(-) diff --git a/interface/forms/vitals/C_FormVitals.class.php b/interface/forms/vitals/C_FormVitals.class.php index 997041e65..251b02fce 100644 --- a/interface/forms/vitals/C_FormVitals.class.php +++ b/interface/forms/vitals/C_FormVitals.class.php @@ -42,9 +42,12 @@ class C_FormVitals extends Controller { $dbconn = $GLOBALS['adodb']['db']; //Combined query for retrieval of vital information which is not deleted - $sql = "SELECT form_vitals.* from form_vitals,forms where form_vitals.id != $form_id and form_vitals.pid =". $GLOBALS['pid']; - $sql .=" and forms.deleted!=1 and form_vitals.id=forms.form_id"; - $sql .= " ORDER BY form_vitals.date DESC"; + $sql = "SELECT fv.*, fe.date AS encdate " . + "FROM form_vitals AS fv, forms AS f, form_encounter AS fe WHERE " . + "fv.id != $form_id and fv.pid = " . $GLOBALS['pid'] . " AND " . + "f.formdir = 'vitals' AND f.deleted = 0 AND f.form_id = fv.id AND " . + "fe.pid = f.pid AND fe.encounter = f.encounter " . + "ORDER BY encdate DESC, fv.date DESC"; $result = $dbconn->Execute($sql); // get the patient's current age @@ -55,9 +58,9 @@ class C_FormVitals extends Controller { $i = 1; while($result && !$result->EOF) { - $results[$i]['id'] = $result->fields['id']; - $results[$i]['date'] = $result->fields['date']; + $results[$i]['encdate'] = substr($result->fields['encdate'], 0, 10); + $results[$i]['date'] = $result->fields['date']; $results[$i]['activity'] = $result->fields['activity']; $results[$i]['bps'] = $result->fields['bps']; $results[$i]['bpd'] = $result->fields['bpd']; diff --git a/interface/forms/vitals/FormVitals.class.php b/interface/forms/vitals/FormVitals.class.php index d04da7bca..6beb930ac 100644 --- a/interface/forms/vitals/FormVitals.class.php +++ b/interface/forms/vitals/FormVitals.class.php @@ -110,19 +110,23 @@ class FormVitals extends ORDataObject { return $this->activity; } - function get_date() { - - if(!$this->date){ - $this->date = date('YmdHis', time()); - } - return $this->date; - - } - function set_date($dt) { - if (!empty($dt)) { - $this->date = $dt; - } - } + function get_date() { + if(!$this->date){ + $this->date = date('YmdHis', time()); + } + return $this->date; + } + + function set_date($dt) { + if (!empty($dt)) { + $dt = str_replace('-', '', $dt); + $dt = str_replace(':', '', $dt); + $dt = str_replace(' ', '', $dt); + while (strlen($dt) < 14) $dt .= '0'; + $this->date = $dt; + } + } + function get_user() { return $this->user; } diff --git a/interface/forms/vitals/templates/vitals/general_new.html b/interface/forms/vitals/templates/vitals/general_new.html index 0cbaa147f..25c661fd6 100644 --- a/interface/forms/vitals/templates/vitals/general_new.html +++ b/interface/forms/vitals/templates/vitals/general_new.html @@ -1,8 +1,17 @@ {php}html_header_show();{/php} -{literal} + + + + + +{php} include_once("{$GLOBALS['srcdir']}/dynarch_calendar_en.inc.php"); {/php} + + {/literal} -- 2.11.4.GIT