More complete support for activity flag in list_options table. (opene…

…mr#274) * More complete support for activity flag in list_options table. * Added more modules to previous commit.
sokogfb · Sep 28, 2016 · 894a2ab · 894a2ab
1 parent 9f9409f
commit 894a2ab
Show file tree

Hide file tree

Showing 72 changed files with 200 additions and 197 deletions.
diff --git a/interface/billing/payment_master.inc.php b/interface/billing/payment_master.inc.php
@@ -41,7 +41,7 @@ function generate_list_payment_category($tag_name, $list_id, $currvalue, $title,
   $selectEmptyName = htmlspecialchars( xl($empty_name), ENT_QUOTES);
   if ($empty_name) $s .= "<option value=''>" . $selectEmptyName . "</option>";
   $lres = sqlStatement("SELECT * FROM list_options " .
-    "WHERE list_id = ? ORDER BY seq, title", array($list_id) );
+    "WHERE list_id = ? AND activity = 1 ORDER BY seq, title", array($list_id) );
   $got_selected = FALSE;
   while ($lrow = sqlFetchArray($lres)) {
     $optionValue = htmlspecialchars( $lrow['option_id'], ENT_QUOTES);

diff --git a/interface/billing/sl_eob_invoice.php b/interface/billing/sl_eob_invoice.php
@@ -4,7 +4,7 @@
  * sl_eob_search.php.  For automated (X12 835) remittance posting
  * see sl_eob_process.php.
  *
- * Copyright (C) 2005-2010 Rod Roark <[email protected]>
+ * Copyright (C) 2005-2016 Rod Roark <[email protected]>
  * 
  * LICENSE: This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,8 +23,6 @@
  * @author  Terry Hill <[email protected]>
  * @link    http://www.open-emr.org
  */
-
-
 
   require_once("../globals.php");
   require_once("$srcdir/log.inc");
@@ -253,7 +251,7 @@ function updateFields(payField, adjField, balField, coPayField, isFirstProcCode)
         $reason_type = '1';
         if ($reason) {
           $tmp = sqlQuery("SELECT option_value FROM list_options WHERE " .
-            "list_id = 'adjreason' AND " .
+            "list_id = 'adjreason' AND activity = 1 AND " .
             "option_id = '" . add_escape_custom($reason) . "'");
           if (empty($tmp['option_value'])) {
             // This should not happen but if it does, apply old logic.
@@ -668,7 +666,7 @@ function updateFields(payField, adjField, balField, coPayField, isFirstProcCode)
 // Adjustment reasons are now taken from the list_options table.
 echo "    <option value=''></option>\n";
 $ores = sqlStatement("SELECT option_id, title, is_default FROM list_options " .
-  "WHERE list_id = 'adjreason'  ORDER BY seq, title");
+  "WHERE list_id = 'adjreason' AND activity = 1 ORDER BY seq, title");
 while ($orow = sqlFetchArray($ores)) {
   echo "    <option value='" . htmlspecialchars($orow['option_id'], ENT_QUOTES) . "'";
   if ($orow['is_default']) echo " selected";

diff --git a/interface/cmsportal/insurance_form.php b/interface/cmsportal/insurance_form.php
@@ -312,7 +312,7 @@ function validate() {
   if ($newvalue !== '') {
     if ($list_id) {
       $tmp = sqlQuery("SELECT option_id FROM list_options WHERE " .
-        "list_id = ? AND title = ? ORDER BY option_id LIMIT 1",
+        "list_id = ? AND title = ? AND activity = 1 ORDER BY option_id LIMIT 1",
         array($list_id, $newvalue));
       if (isset($tmp['option_id'])) $newvalue = $tmp['option_id'];
     }

diff --git a/interface/cmsportal/list_requests.php b/interface/cmsportal/list_requests.php
@@ -38,7 +38,7 @@
  */
 function getListItem($listid, $value) {
   $lrow = sqlQuery("SELECT title FROM list_options " .
-    "WHERE list_id = ? AND option_id = ?",
+    "WHERE list_id = ? AND option_id = ? AND activity = 1",
     array($listid, $value));
   $tmp = xl_list_label($lrow['title']);
   if (empty($tmp)) $tmp = "($report_status)";

diff --git a/interface/de_identification_forms/find_immunization_popup.php b/interface/de_identification_forms/find_immunization_popup.php
@@ -148,7 +148,7 @@ function check_search_str()
   $search_term = $_REQUEST['search_term'];
   {
     $query = "SELECT count(*) as count FROM list_options " .
-      "WHERE (list_id = 'immunizations' and title LIKE '%$search_term%' ) " ;
+      "WHERE (list_id = 'immunizations' and title LIKE '%$search_term%' AND activity = 1) " ;
 	$res = sqlStatement($query);
 	if ($row = sqlFetchArray($res))
 	{
@@ -164,7 +164,7 @@ function check_search_str()
 	 <?php
       }
     $query = "SELECT option_id,title FROM list_options " .
-      "WHERE (list_id = 'immunizations' and title LIKE '%$search_term%' ) " .
+      "WHERE (list_id = 'immunizations' and title LIKE '%$search_term%' AND activity = 1) " .
       "ORDER BY title";
    $res = sqlStatement($query);
 	$row_count = 0;

diff --git a/interface/drugs/add_edit_drug.php b/interface/drugs/add_edit_drug.php
@@ -66,7 +66,7 @@ function writeTemplateLine($selector, $dosage, $period, $quantity, $refills, $pr
     echo "</td>\n";
   }
   $pres = sqlStatement("SELECT option_id FROM list_options " .
-    "WHERE list_id = 'taxrate' ORDER BY seq");
+    "WHERE list_id = 'taxrate' AND activity = 1 ORDER BY seq");
   while ($prow = sqlFetchArray($pres)) {
     echo "  <td class='tmplcell'>";
     echo "<input type='checkbox' name='form_tmpl[$tmpl_line_no][taxrate][" . attr($prow['option_id']) . "]' value='1'";
@@ -374,7 +374,7 @@ function sel_related() {
     "LEFT JOIN product_warehouse AS pw ON " .
     "pw.pw_drug_id = ? AND " .
     "pw.pw_warehouse = lo.option_id WHERE " .
-    "lo.list_id = 'warehouse' ORDER BY lo.seq, lo.title",
+    "lo.list_id = 'warehouse' AND lo.activity = 1 ORDER BY lo.seq, lo.title",
     array($drug_id));
   while ($pwrow = sqlFetchArray($pwres)) {
     $pwarr[] = $pwrow;
@@ -493,7 +493,7 @@ function sel_related() {
   // for new template lines.
   $emptyPrices = array();
   $pres = sqlStatement("SELECT option_id, title FROM list_options " .
-    "WHERE list_id = 'pricelevel' ORDER BY seq");
+    "WHERE list_id = 'pricelevel' AND activity = 1 ORDER BY seq");
   while ($prow = sqlFetchArray($pres)) {
     $emptyPrices[$prow['option_id']] = '';
     echo "     <td><b>" .
@@ -502,7 +502,7 @@ function sel_related() {
   }
   // Show a heading for each tax rate.
   $pres = sqlStatement("SELECT option_id, title FROM list_options " .
-    "WHERE list_id = 'taxrate' ORDER BY seq");
+    "WHERE list_id = 'taxrate' AND activity = 1 ORDER BY seq");
   while ($prow = sqlFetchArray($pres)) {
     echo "     <td><b>" .
 	 generate_display_field(array('data_type'=>'1','list_id'=>'taxrate'), $prow['option_id']) .
@@ -522,7 +522,7 @@ function sel_related() {
         "FROM list_options AS lo LEFT OUTER JOIN prices AS p ON " .
         "p.pr_id = ? AND p.pr_selector = ? AND " .
         "p.pr_level = lo.option_id " .
-        "WHERE list_id = 'pricelevel' ORDER BY lo.seq",
+        "WHERE lo.list_id = 'pricelevel' AND lo.activity = 1 ORDER BY lo.seq",
         array($drug_id, $selector));
       while ($prow = sqlFetchArray($pres)) {
         $prices[$prow['option_id']] = $prow['pr_price'];

diff --git a/interface/drugs/add_edit_lot.php b/interface/drugs/add_edit_lot.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2006, 2010 Rod Roark <[email protected]>
+// Copyright (C) 2006-2016 Rod Roark <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@ function genWarehouseList($tag_name, $currvalue, $title, $class='') {
   $allow_multiple = $drow['allow_multiple'];
 
   $lres = sqlStatement("SELECT * FROM list_options " .
-    "WHERE list_id = 'warehouse' ORDER BY seq, title");
+    "WHERE list_id = 'warehouse' AND activity = 1 ORDER BY seq, title");
 
   echo "<select name='".attr($tag_name)."' id='".attr($tag_name)."'";
   if ($class) echo " class='".attr($class)."'";
@@ -456,7 +456,7 @@ function trans_type_changed() {
   "di.inventory_id, di.lot_number, di.on_hand, lo.title " .
   "FROM drug_inventory AS di " .
   "LEFT JOIN list_options AS lo ON lo.list_id = 'warehouse' AND " .
-  "lo.option_id = di.warehouse_id " .
+  "lo.option_id = di.warehouse_id AND lo.activity = 1 " .
   "WHERE di.drug_id = ? AND di.inventory_id != ? AND " .
   "di.on_hand > 0 AND di.destroy_date IS NULL " .
   "ORDER BY di.lot_number, lo.title, di.inventory_id", array ($drug_id,$lot_id));

diff --git a/interface/drugs/drug_inventory.php b/interface/drugs/drug_inventory.php
@@ -44,9 +44,9 @@
   "LEFT JOIN drug_inventory AS di ON di.drug_id = d.drug_id " .
   "AND di.destroy_date IS NULL " .
   "LEFT JOIN list_options AS lo ON lo.list_id = 'warehouse' AND " .
-  "lo.option_id = di.warehouse_id " .
+  "lo.option_id = di.warehouse_id AND lo.activity = 1 " .
   "LEFT JOIN list_options AS lof ON lof.list_id = 'drug_form' AND " .
-  "lof.option_id = d.form " .
+  "lof.option_id = d.form AND lof.activity = 1 " .
   "ORDER BY $orderby");
 ?>
 <html>

diff --git a/interface/drugs/drugs.inc.php b/interface/drugs/drugs.inc.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2006-2015 Rod Roark <[email protected]>
+// Copyright (C) 2006-2016 Rod Roark <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -90,7 +90,7 @@ function sellDrug($drug_id, $quantity, $fee, $patient_id=0, $encounter_id=0,
   $query = "SELECT di.*, lo.option_id, lo.seq " .
     "FROM drug_inventory AS di " .
     "LEFT JOIN list_options AS lo ON lo.list_id = 'warehouse' AND " .
-    "lo.option_id = di.warehouse_id " .
+    "lo.option_id = di.warehouse_id AND lo.activity = 1 " .
     "WHERE " .
     "di.drug_id = ? AND di.destroy_date IS NULL ";
   $sqlarr = array($drug_id);

diff --git a/interface/eRxStore.php b/interface/eRxStore.php
@@ -279,7 +279,7 @@ public function selectPrescriptionIdsNotUploadedByPatientId($patientId, $uploadA
 	public function selectOptionIdByTitle($listId, $title) {
 		$return = sqlQuery('SELECT option_id
 			FROM list_options
-			WHERE list_id = ?
+			WHERE list_id = ? AND activity = 1
 				AND title = ?;',
 			array(
 				$listId,
@@ -301,7 +301,7 @@ public function selectOptionIdByTitle($listId, $title) {
 	public function selectOptionIdsByListId($listId) {
 		$return = sqlQuery('SELECT option_id
 			FROM list_options
-			WHERE list_id = ?
+			WHERE list_id = ? AND activity = 1
 			ORDER BY ABS(option_id) DESC
 			LIMIT 1;',
 			array($listId)

diff --git a/interface/eRx_xml.php b/interface/eRx_xml.php
@@ -693,11 +693,11 @@ function OutsidePrescription($doc,$r,$pid,$prescid)
             DATE_FORMAT(date_added,'%Y%m%d') AS date_added,CONCAT_WS(fname,' ',mname,' ',lname) AS docname,p.quantity
             FROM prescriptions AS p
             LEFT JOIN users AS u ON p.provider_id=u.id
-            LEFT JOIN list_options AS l1 ON l1.list_id='drug_form' AND l1.option_id=p.form
-            LEFT JOIN list_options AS l2 ON l2.list_id='drug_route' AND l2.option_id=p.route
-            LEFT JOIN list_options AS l3 ON l3.list_id='drug_interval' AND l3.option_id=p.interval
-            LEFT JOIN list_options AS l4 ON l4.list_id='drug_units' AND l4.option_id=p.unit
-            WHERE p.drug<>'' and p.id=?",array($prescid));
+            LEFT JOIN list_options AS l1 ON l1.list_id = 'drug_form'     AND l1.option_id = p.form     AND l1.activity = 1
+            LEFT JOIN list_options AS l2 ON l2.list_id = 'drug_route'    AND l2.option_id = p.route    AND l2.activity = 1
+            LEFT JOIN list_options AS l3 ON l3.list_id = 'drug_interval' AND l3.option_id = p.interval AND l3.activity = 1
+            LEFT JOIN list_options AS l4 ON l4.list_id = 'drug_units'    AND l4.option_id = p.unit     AND l4.activity = 1
+            WHERE p.drug <> '' and p.id = ?",array($prescid));
         $b = $doc->createElement( "OutsidePrescription" );
             $externalId = $doc->createElement( "externalId" );
             $externalId->appendChild(
@@ -811,7 +811,7 @@ function PatientMedication($doc,$r,$pid,$med_limit)
 function PatientFreeformAllergy($doc,$r,$pid)
 {
     $res=sqlStatement("SELECT id,l.title as title1,lo.title as title2,comments FROM lists AS l
-    LEFT JOIN list_options AS lo ON l.outcome=lo.option_id AND lo.list_id='outcome'
+    LEFT JOIN list_options AS lo ON l.outcome = lo.option_id AND lo.list_id = 'outcome' AND lo.activity = 1
 	WHERE `type`='allergy' AND pid=? AND erx_source='0' and erx_uploaded='0' AND (enddate is null or enddate = '' or enddate = '0000-00-00')",array($pid));
 	$allergyId=array();
     while($row=sqlFetchArray($res))

diff --git a/interface/forms/LBF/new.php b/interface/forms/LBF/new.php
@@ -97,9 +97,9 @@ function end_group() {
 $formid   = isset($_GET['id']      ) ? intval($_GET['id']) : 0;
 $portalid = isset($_GET['portalid']) ? intval($_GET['portalid']) : 0;
 
-// Get title and number of history columns for this form.
-$tmp = sqlQuery("SELECT title, option_value FROM list_options WHERE " .
-  "list_id = 'lbfnames' AND option_id = ?", array($formname) );
+// Get some info about this form.
+$tmp = sqlQuery("SELECT title, option_value, notes FROM list_options WHERE " .
+  "list_id = 'lbfnames' AND option_id = ? AND activity = 1", array($formname));
 $formtitle = $tmp['title'];
 $formhistory = 0 + $tmp['option_value'];
 

diff --git a/interface/forms/LBF/printable.php b/interface/forms/LBF/printable.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2009 Rod Roark <[email protected]>
+// Copyright (C) 2009-2016 Rod Roark <[email protected]>
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
 $formname = isset($_GET['formname']) ? $_GET['formname'] : '';
 
 $tmp = sqlQuery("SELECT title FROM list_options WHERE " .
-  "list_id = 'lbfnames' AND option_id = ? LIMIT 1", array($formname) );
+  "list_id = 'lbfnames' AND option_id = ? AND activity = 1 LIMIT 1", array($formname) );
 $formtitle = $tmp['title'];
 
 $fres = sqlStatement("SELECT * FROM layout_options " .

diff --git a/interface/forms/fee_sheet/new.php b/interface/forms/fee_sheet/new.php
@@ -44,7 +44,7 @@
 $alertmsg = '';
 
 // Determine if more than one price level is in use.
-$tmp = sqlQuery("SELECT COUNT(*) AS count FROM list_options where list_id = 'pricelevel'");
+$tmp = sqlQuery("SELECT COUNT(*) AS count FROM list_options where list_id = 'pricelevel' AND activity = 1");
 $price_levels_are_used = $tmp['count'] > 1;
 
 // Format a money amount with decimals but no other decoration.
@@ -731,7 +731,7 @@ function pricelevel_changed(sel) {
 
 // Create drop-lists based on categories defined within the codes.
 $pres = sqlStatement("SELECT option_id, title FROM list_options " .
-  "WHERE list_id = 'superbill' ORDER BY seq");
+  "WHERE list_id = 'superbill' AND activity = 1 ORDER BY seq");
 while ($prow = sqlFetchArray($pres)) {
   global $code_types;
   ++$i;
@@ -1198,7 +1198,7 @@ function pricelevel_changed(sel) {
 
 // Allow the patient price level to be fixed here.
 $plres = sqlStatement("SELECT option_id, title FROM list_options " .
-  "WHERE list_id = 'pricelevel' ORDER BY seq");
+  "WHERE list_id = 'pricelevel' AND activity = 1 ORDER BY seq, title");
 if (true) {
   $pricelevel = $fs->getPriceLevel();
   echo "   <span class='billcell'><b>" . xlt('Default Price Level') . ":</b></span>\n";

diff --git a/interface/forms/procedure_order/new.php b/interface/forms/procedure_order/new.php
@@ -64,7 +64,7 @@ function QuotedOrNull($fld) {
 function getListOptions($list_id , $fieldnames=array('option_id', 'title', 'seq'))
 {
 	$output =  array();
-	$query = sqlStatement("SELECT ".implode(',',$fieldnames)." FROM list_options where list_id=? order by seq", array($list_id));
+	$query = sqlStatement("SELECT ".implode(',',$fieldnames)." FROM list_options where list_id = ? AND activity = 1 order by seq", array($list_id));
 	while($ll = sqlFetchArray($query)) {
 		foreach($fieldnames as $val)
 		  $output[$ll['option_id']][$val] = $ll[$val];

diff --git a/interface/main/backup.php b/interface/main/backup.php
@@ -1,6 +1,6 @@
 <?php
 /* $Id$ */
-// Copyright (C) 2008-2014 Rod Roark <[email protected]>
+// Copyright (C) 2008-2014, 2016 Rod Roark <[email protected]>
 // Adapted for cross-platform operation by Bill Cernansky (www.mi-squared.com)
 //
 // This program is free software; you can redistribute it and/or
@@ -303,7 +303,7 @@ function gzopen($filename, $mode, $use_include_path = 0)
   echo "<b>" . xlt('Lists') . "</b><br />\n";
   echo "<select multiple name='form_sel_lists[]' size='15'>";
   $lres = sqlStatement("SELECT option_id, title FROM list_options WHERE " .
-    "list_id = 'lists' ORDER BY title, seq");
+    "list_id = 'lists' AND activity = 1 ORDER BY title, seq");
   while ($lrow = sqlFetchArray($lres)) {
     echo "<option value='" . attr($lrow['option_id']) . "'";
     echo ">" . text(xl_list_label($lrow['title'])) . "</option>\n";
@@ -315,7 +315,7 @@ function gzopen($filename, $mode, $use_include_path = 0)
   echo "<b>" . xlt('Layouts') . "</b><br />\n";
   echo "<select multiple name='form_sel_layouts[]' size='15'>";
   $lres = sqlStatement("SELECT option_id, title FROM list_options WHERE " .
-    "list_id = 'lbfnames' ORDER BY title, seq");
+    "list_id = 'lbfnames' AND activity = 1 ORDER BY title, seq");
   while ($lrow = sqlFetchArray($lres)) {
     echo "<option value='" . attr($lrow['option_id']) . "'";
     echo ">" . text(xl_layout_label($lrow['title'])) . "</option>\n";

diff --git a/interface/main/finder/dynamic_finder.php b/interface/main/finder/dynamic_finder.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2012 Rod Roark <[email protected]>
+// Copyright (C) 2012, 2016 Rod Roark <[email protected]>
 // Sponsored by David Eschelbacher, MD
 //
 // This program is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 $header  = "";
 $coljson = "";
 $res = sqlStatement("SELECT option_id, title FROM list_options WHERE " .
-  "list_id = 'ptlistcols' ORDER BY seq, title");
+  "list_id = 'ptlistcols' AND activity = 1 ORDER BY seq, title");
 while ($row = sqlFetchArray($res)) {
   $colname = $row['option_id'];
   $title = xl_list_label($row['title']);

diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php
@@ -1082,7 +1082,7 @@ function selpopup(selobj) {
 //
 
 $lres = sqlStatement("SELECT * FROM list_options " .
-  "WHERE list_id = 'lbfnames' ORDER BY seq, title");
+  "WHERE list_id = 'lbfnames' AND activity = 1 ORDER BY seq, title");
 if (sqlNumRows($lres)) {
   while ($lrow = sqlFetchArray($lres)) {
     $option_id = $lrow['option_id']; // should start with LBF
@@ -1386,7 +1386,7 @@ function selpopup(selobj) {
           <?php genPopLink(xl('Referral'),'../patient_file/transaction/print_referral.php'); ?>
 <?php
   $lres = sqlStatement("SELECT * FROM list_options " .
-  "WHERE list_id = 'lbfnames' ORDER BY seq, title");
+  "WHERE list_id = 'lbfnames' AND activity = 1 ORDER BY seq, title");
   while ($lrow = sqlFetchArray($lres)) {
     $option_id = $lrow['option_id']; // should start with LBF
     $title = $lrow['title'];

diff --git a/interface/main/tabs/menu/menu_updates.php b/interface/main/tabs/menu/menu_updates.php
@@ -60,7 +60,7 @@ function update_visit_forms(&$menu_list)
     $baseURL="/interface/patient_file/encounter/load_form.php?formname=";
     $menu_list->children=array();
 $lres = sqlStatement("SELECT * FROM list_options " .
-  "WHERE list_id = 'lbfnames' ORDER BY seq, title");
+  "WHERE list_id = 'lbfnames' AND activity = 1 ORDER BY seq, title");
 if (sqlNumRows($lres)) {
   while ($lrow = sqlFetchArray($lres)) {
     $option_id = $lrow['option_id']; // should start with LBF

diff --git a/interface/new/new.php b/interface/new/new.php
@@ -97,7 +97,7 @@ function validate() {
    <select name='title'>
 <?php
 $ores = sqlStatement("SELECT option_id, title FROM list_options " .
-  "WHERE list_id = 'titles' ORDER BY seq");
+  "WHERE list_id = 'titles' AND activity = 1 ORDER BY seq");
 while ($orow = sqlFetchArray($ores)) {
   echo "    <option value='" . $orow['option_id'] . "'";
   if ($orow['option_id'] == $form_title) echo " selected";
@@ -145,7 +145,7 @@ function validate() {
     <option value=''>Unassigned</option>
 <?php
 $ores = sqlStatement("SELECT option_id, title FROM list_options " .
-  "WHERE list_id = 'sex' ORDER BY seq");
+  "WHERE list_id = 'sex' AND activity = 1 ORDER BY seq");
 while ($orow = sqlFetchArray($ores)) {
   echo "    <option value='" . $orow['option_id'] . "'";
   if ($orow['option_id'] == $form_sex) echo " selected";
@@ -166,7 +166,7 @@ function validate() {
     <option value=''>Unassigned</option>
 <?php
 $ores = sqlStatement("SELECT option_id, title FROM list_options " .
-  "WHERE list_id = 'refsource' ORDER BY seq");
+  "WHERE list_id = 'refsource' AND activity = 1 ORDER BY seq");
 while ($orow = sqlFetchArray($ores)) {
   echo "    <option value='" . $orow['option_id'] . "'";
   if ($orow['option_id'] == $form_refsource) echo " selected";