From 15715f6c593a68c40ce7c00c5971720ec6d3aeeb Mon Sep 17 00:00:00 2001 From: Rod Roark Date: Wed, 11 Apr 2012 12:46:52 -0700 Subject: [PATCH] New dynamic patient list/finder feature. --- interface/main/finder/dynamic_finder.php | 193 ++++ interface/main/finder/dynamic_finder_ajax.php | 152 +++ interface/main/left_nav.php | 6 +- interface/main/main_screen.php | 44 +- interface/patient_file/summary/demographics.php | 98 +- .../ColReorder/media/js/ColReorderWithResize.js | 1194 ++++++++++++++++++++ sql/4_1_0-to-4_1_1_upgrade.sql | 9 + sql/database.sql | 7 + 8 files changed, 1636 insertions(+), 67 deletions(-) create mode 100644 interface/main/finder/dynamic_finder.php create mode 100644 interface/main/finder/dynamic_finder_ajax.php create mode 100644 library/js/datatables/extras/ColReorder/media/js/ColReorderWithResize.js diff --git a/interface/main/finder/dynamic_finder.php b/interface/main/finder/dynamic_finder.php new file mode 100644 index 000000000..263c142e1 --- /dev/null +++ b/interface/main/finder/dynamic_finder.php @@ -0,0 +1,193 @@ + +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. + +// Sanitize escapes and stop fake register globals. +// +$sanitize_all_escapes = true; +$fake_register_globals = false; + +require_once("../../globals.php"); +require_once("$srcdir/formdata.inc.php"); + +$popup = empty($_REQUEST['popup']) ? 0 : 1; + +// Generate some code based on the list of columns. +// +$colcount = 0; +$footer = ""; +$header = ""; +$coljson = ""; +$res = sqlStatement("SELECT option_id, title FROM list_options WHERE " . + "list_id = 'ptlistcols' ORDER BY seq, title"); +while ($row = sqlFetchArray($res)) { + $colname = $row['option_id']; + $title = xl_list_label($row['title']); + $header .= " "; + $header .= text($title); + $header .= "\n"; + $footer .= " \n"; + if ($coljson) $coljson .= ", "; + $coljson .= "{\"sName\": \"" . addcslashes($colname, "\t\r\n\"\\") . "\"}"; + ++$colcount; +} +?> + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + +

...

+ +

+ + + + + + + diff --git a/interface/main/finder/dynamic_finder_ajax.php b/interface/main/finder/dynamic_finder_ajax.php new file mode 100644 index 000000000..89f6565b4 --- /dev/null +++ b/interface/main/finder/dynamic_finder_ajax.php @@ -0,0 +1,152 @@ + +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. + +// Sanitize escapes and disable fake globals registration. +// +$sanitize_all_escapes = true; +$fake_register_globals = false; + +require_once("../../globals.php"); +require_once("$srcdir/formdata.inc.php"); + +$popup = empty($_REQUEST['popup']) ? 0 : 1; + +// With the ColReorder or ColReorderWithResize plug-in, the expected column +// ordering may have been changed by the user. So we cannot depend on +// list_options to provide that. +// +$aColumns = explode(',', $_GET['sColumns']); + +// Paging parameters. -1 means not applicable. +// +$iDisplayStart = isset($_GET['iDisplayStart' ]) ? 0 + $_GET['iDisplayStart' ] : -1; +$iDisplayLength = isset($_GET['iDisplayLength']) ? 0 + $_GET['iDisplayLength'] : -1; +$limit = ''; +if ($iDisplayStaart >= 0 && $iDisplayLength >= 0) { + $limit = "LIMIT $iDisplayStart, $iDisplayLength"; +} + +// Column sorting parameters. +// +$orderby = ''; +if (isset($_GET['iSortCol_0'])) { + for ($i = 0; $i < intval($_GET['iSortingCols']); ++$i) { + $iSortCol = intval($_GET["iSortCol_$i"]); + if ($_GET["bSortable_$iSortCol"] == "true" ) { + $sSortDir = add_escape_custom($_GET["sSortDir_$i"]); // ASC or DESC + // We are to sort on column # $iSortCol in direction $sSortDir. + $orderby .= $orderby ? ', ' : 'ORDER BY '; + // + if ($aColumns[$iSortCol] == 'name') { + $orderby .= "lname $sSortDir, fname $sSortDir, mname $sSortDir"; + } + else { + $orderby .= "`" . add_escape_custom($aColumns[$iSortCol]) . "` $sSortDir"; + } + } + } +} + +// Global filtering. +// +$where = ''; +if (isset($_GET['sSearch']) && $_GET['sSearch'] !== "") { + $sSearch = add_escape_custom($_GET['sSearch']); + foreach ($aColumns as $colname) { + $where .= $where ? "OR " : "WHERE ( "; + if ($colname == 'name') { + $where .= + "lname LIKE '$sSearch%' OR " . + "fname LIKE '$sSearch%' OR " . + "mname LIKE '$sSearch%' "; + } + else { + $where .= "`" . add_escape_custom($colname) . "` LIKE '$sSearch%' "; + } + } + if ($where) $where .= ")"; +} + +// Column-specific filtering. +// +for ($i = 0; $i < count($aColumns); ++$i) { + $colname = $aColumns[$i]; + if (isset($_GET["bSearchable_$i"]) && $_GET["bSearchable_$i"] == "true" && $_GET["sSearch_$i"] != '') { + $where .= $where ? ' AND' : 'WHERE'; + $sSearch = add_escape_custom($_GET["sSearch_$i"]); + if ($colname == 'name') { + $where .= " ( " . + "lname LIKE '$sSearch%' OR " . + "fname LIKE '$sSearch%' OR " . + "mname LIKE '$sSearch%' )"; + } + else { + $where .= " `" . add_escape_custom($colname) . "` LIKE '$sSearch%'"; + } + } +} + +// Compute list of column names for SELECT clause. +// Always includes pid because we need it for row identification. +// +$sellist = 'pid'; +foreach ($aColumns as $colname) { + if ($colname == 'pid') continue; + $sellist .= ", "; + if ($colname == 'name') { + $sellist .= "lname, fname, mname"; + } + else { + $sellist .= "`" . add_escape_custom($colname) . "`"; + } +} + +// Get total number of rows in the table. +// +$row = sqlQuery("SELECT COUNT(id) AS count FROM patient_data"); +$iTotal = $row['count']; + +// Get total number of rows in the table after filtering. +// +$row = sqlQuery("SELECT COUNT(id) AS count FROM patient_data $where"); +$iFilteredTotal = $row['count']; + +// Build the output data array. +// +$out = array( + "sEcho" => intval($_GET['sEcho']), + "iTotalRecords" => $iTotal, + "iTotalDisplayRecords" => $iFilteredTotal, + "aaData" => array() +); +$query = "SELECT $sellist FROM patient_data $where $orderby $limit"; +$res = sqlStatement($query); +while ($row = sqlFetchArray($res)) { + // Each will have an ID identifying the patient. + $arow = array('DT_RowId' => 'pid_' . $row['pid']); + foreach ($aColumns as $colname) { + if ($colname == 'name') { + $name = $row['lname']; + if ($name && $row['fname']) $name .= ', '; + if ($row['fname']) $name .= $row['fname']; + if ($row['mname']) $name .= ' ' . $row['mname']; + $arow[] = $name; + } + else { + $arow[] = $row[$colname]; + } + } + $out['aaData'][] = $arow; +} + +// error_log($query); // debugging + +// Dump the output array as JSON. +// +echo json_encode($out); +?> diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php index b825c5aae..9fb526d35 100644 --- a/interface/main/left_nav.php +++ b/interface/main/left_nav.php @@ -980,6 +980,7 @@ if ($GLOBALS['athletic_team']) {

+ @@ -1103,8 +1104,9 @@ if ($GLOBALS['athletic_team']) {