From 68925f8db62f0380b8d2dafc884301d144921a1e Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Sat, 18 Dec 2010 00:23:10 -0800
Subject: [PATCH] Clarify Address Book gui for laboratories:

  Turns out the Address Book contains lots of administrative information in it,
   so I think it's time it gets promoted to the Administration menu along with
   the following changes:
    1) Moved the 'Address Book' to the Administration menu in left tree menu
    2) In the Address Book listing, it will show the Organization if no name exist
    3) The Address Book data entry form will not show the Name fields for
       company centric fields; so main name can only go in the Organization field,
       and no redundant entries using the now non-existant name fields can be entered.
    4) The categories can now be set as company/person centric in the
       Administration->Lists gui.
    5) To further avoid confusion, in the address list, when you select
       to create a new entry it will use the type from the selector
       with it as default.
    6) Made order facilities, vendors, and distributors all company centric (again this
       can be changed in Administration->Lists gui).
    7) Modified options.inc.php internals to play nicely with ord_lab type.
---
 interface/main/left_nav.php           |  2 +-
 interface/super/edit_list.php         | 21 ++++++++++++++-
 interface/usergroup/addrbook_edit.php | 48 +++++++++++++++++++++++++++++++++--
 interface/usergroup/addrbook_list.php | 29 ++++++++++++++-------
 library/options.inc.php               | 10 ++++++--
 sql/3_2_0-to-4_0_0_upgrade.sql        |  9 +++++++
 sql/database.sql                      | 14 +++++-----
 version.php                           |  2 +-
 8 files changed, 112 insertions(+), 23 deletions(-)

diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php
index 28d1ee654..2559e1185 100644
--- a/interface/main/left_nav.php
+++ b/interface/main/left_nav.php
@@ -984,6 +984,7 @@ if (!empty($reg)) {
       <?php if (acl_check('admin', 'super'    )) genMiscLink('RTop','adm','0',xl('Globals'),'super/edit_globals.php'); ?>
       <?php if (acl_check('admin', 'users'    )) genMiscLink('RTop','adm','0',xl('Facilities'),'usergroup/facilities.php'); ?>
       <?php if (acl_check('admin', 'users'    )) genMiscLink('RTop','adm','0',xl('Users'),'usergroup/usergroup_admin.php'); ?>
+      <?php if (acl_check('admin', 'practice' )) genTreeLink('RTop','adb',xl('Addr Book')); ?>
       <?php
 	  // Changed the target URL from practice settings -> Practice Settings - Pharmacy... Dec 09,09 .. Visolve ... This replaces empty frame with Pharmacy window
 	  if (acl_check('admin', 'practice' )) genMiscLink('RTop','adm','0',xl('Practice'),'../controller.php?practice_settings&pharmacy&action=list'); ?>
@@ -1106,7 +1107,6 @@ if (!empty($reg)) {
     <ul>
       <?php genTreeLink('RBot','aun',xl('Authorizations')); ?>
       <?php genTreeLink('RTop','fax',xl('Fax/Scan')); ?>
-      <?php genTreeLink('RTop','adb',xl('Addr Book')); ?>
       <?php genTreeLink('RTop','ort',xl('Order Catalog')); ?>
       <?php if (!$GLOBALS['disable_chart_tracker']) genTreeLink('RTop','cht',xl('Chart Tracker')); ?>
       <?php genTreeLink('RTop','ono',xl('Ofc Notes')); ?>
diff --git a/interface/super/edit_list.php b/interface/super/edit_list.php
index db0f91de5..34fa4c545 100644
--- a/interface/super/edit_list.php
+++ b/interface/super/edit_list.php
@@ -227,6 +227,25 @@ function writeOptionLine($option_id, $title, $seq, $default, $value, $mapping=''
     echo "</td>\n";
   }
 
+  // Address book categories use option_value to flag category as a
+  // person-centric vs company-centric vs indifferent.
+  //
+  else if ($list_id == 'abook_type') {
+    echo "  <td align='center' class='optcell'>";
+    echo "<select name='opt[$opt_line_no][value]' class='optin'>";
+    foreach (array(
+      1 => xl('Unassigned'),
+      2 => xl('Person'),
+      3 => xl('Company'),
+    ) as $key => $desc) {
+      echo "<option value='$key'";
+      if ($key == $value) echo " selected";
+      echo ">" . htmlspecialchars($desc) . "</option>";
+    }
+    echo "</select>";
+    echo "</td>\n";
+  }
+
   // IPPF includes the ability to map each list item to a "master" identifier.
   // Sports teams use this for some extra info for fitness levels.
   //
@@ -584,7 +603,7 @@ while ($row = sqlFetchArray($res)) {
   <td><b><?php xl('Effectiveness','e'); ?></b></td>
 <?php } else if ($list_id == 'fitness') { ?>
   <td><b><?php xl('Color:Abbr','e'); ?></b></td>
-<?php } else if ($list_id == 'adjreason') { ?>
+<?php } else if ($list_id == 'adjreason' || $list_id == 'abook_type') { ?>
   <td><b><?php xl('Type','e'); ?></b></td>
 <?php } if ($GLOBALS['ippf_specific']) { ?>
   <td><b><?php xl('Global ID','e'); ?></b></td>
diff --git a/interface/usergroup/addrbook_edit.php b/interface/usergroup/addrbook_edit.php
index 0d869c40c..5b7510009 100644
--- a/interface/usergroup/addrbook_edit.php
+++ b/interface/usergroup/addrbook_edit.php
@@ -11,7 +11,11 @@
  require_once("$srcdir/options.inc.php");
  require_once("$srcdir/formdata.inc.php");
 
+ // Collect user id if editing entry
  $userid = $_REQUEST['userid'];
+ 
+ // Collect type if creating a new entry
+ $type = $_REQUEST['type'];
 
  $info_msg = "";
 
@@ -45,6 +49,7 @@
 <head>
 <title><?php echo $userid ? xl('Edit') : xl('Add New') ?> <?php xl('Person','e'); ?></title>
 <link rel="stylesheet" href='<?php echo $css_header ?>' type='text/css'>
+<script type="text/javascript" src="../../library/js/jquery.1.3.2.js"></script>
 
 <style>
 td { font-size:10pt; }
@@ -71,6 +76,31 @@ td { font-size:10pt; }
 </style>
 
 <script language="JavaScript">
+
+ var type_options_js = Array();
+ <?php
+  // Collect the type options. Possible values are:
+  // 1 = Unassigned (default to patient centric)
+  // 2 = Person Centric
+  // 3 = Company Centric (Basically, do not show the Name fields)
+  $sql = sqlStatement("SELECT option_id, option_value FROM list_options WHERE " .
+   "list_id = 'abook_type'");
+  while ($row_query = sqlFetchArray($sql)) {
+   echo "type_options_js"."['" . htmlspecialchars($row_query['option_id'],ENT_QUOTES) . "']=" . htmlspecialchars($row_query['option_value'],ENT_QUOTES) . ";\n";
+  }
+ ?>
+
+ // Process to customize the form by type
+ function typeSelect(a) {
+  if (type_options_js[a] == 3) {
+   // Company centric, so hide the Name entries
+   document.getElementById("nameRow").style.display = "none";
+  }
+  else {
+   // show the name row
+   document.getElementById("nameRow").style.display = "";
+  }
+ }
 </script>
 
 </head>
@@ -197,7 +227,21 @@ td { font-size:10pt; }
  if ($userid) {
   $row = sqlQuery("SELECT * FROM users WHERE id = '$userid'");
  }
+
+ if ($type) { // note this only happens when its new
+  // Set up type
+  $row['abook_type'] = strip_escape_custom($type);
+ }
+
 ?>
+
+<script language="JavaScript">
+ $(document).ready(function() {
+  // customize the form via the type options
+  typeSelect("<?php echo $row['abook_type']; ?>");
+ });
+</script>
+
 <form method='post' name='theform' action='addrbook_edit.php?userid=<?php echo $userid ?>'>
 <center>
 
@@ -207,12 +251,12 @@ td { font-size:10pt; }
   <td width='1%' nowrap><b><?php xl('Type','e'); ?>:</b></td>
   <td>
 <?php
- generate_form_field(array('data_type'=>1,'field_id'=>'abook_type','list_id'=>'abook_type'), $row['abook_type']);
+ echo generate_select_list('form_abook_type', 'abook_type', $row['abook_type'], '', 'Unassigned', '', 'typeSelect(this.value)');
 ?>
   </td>
  </tr>
 
- <tr>
+ <tr id="nameRow">
   <td width='1%' nowrap><b><?php xl('Name','e'); ?>:</b></td>
   <td>
 <?php
diff --git a/interface/usergroup/addrbook_list.php b/interface/usergroup/addrbook_list.php
index 508296f36..64d29ab50 100644
--- a/interface/usergroup/addrbook_list.php
+++ b/interface/usergroup/addrbook_list.php
@@ -55,8 +55,15 @@ function refreshme() {
  document.forms[0].submit();
 }
 
-// Process click to pop up the add/edit window.
-function doedclick(userid) {
+// Process click to pop up the add window.
+function doedclick_add(type) {
+ top.restoreSession(); 
+ dlgopen('addrbook_edit.php?type=' + type, '_blank', 700, 550);
+}
+
+// Process click to pop up the edit window.
+function doedclick_edit(userid) {
+ top.restoreSession();
  dlgopen('addrbook_edit.php?userid=' + userid, '_blank', 700, 550);
 }
 
@@ -84,9 +91,7 @@ function doedclick(userid) {
 <?php
   echo xl('Type') . ": ";
   // Generates a select list named form_abook_type:
-  generate_form_field(array('data_type'=>1, 'field_id'=>'abook_type',
-    'list_id'=>'abook_type','empty_title'=>'All'),
-    strip_escape_custom($_REQUEST['form_abook_type']));
+  echo generate_select_list("form_abook_type", "abook_type", strip_escape_custom($_REQUEST['form_abook_type']), '', 'All');
 ?>
    <input type='checkbox' name='form_external' value='1'<?php if ($form_external) echo ' checked'; ?>
     title='<?php xl("Omit internal users?","e") ?>' />
@@ -94,7 +99,7 @@ function doedclick(userid) {
    <input type='submit' class='button' name='form_search' value='<?php xl("Search","e")?>' />
   </td>
   <td align='right'>
-   <input type='button' class='button' value='<?php xl("Add New","e"); ?>' onclick='doedclick(0)' />
+   <input type='button' class='button' value='<?php xl("Add New","e"); ?>' onclick='doedclick_add(document.forms[0].form_abook_type.value)' />
   </td>
  </tr>
 </table>
@@ -123,10 +128,16 @@ function doedclick(userid) {
   $bgclass = (($encount & 1) ? "evenrow" : "oddrow");
   $username = $row['username'];
   if (! $row['active']) $username = '--';
-  $trTitle = xl('Edit','','',' ') . $row['fname'] . ' ' . $row['mname'] . ' ' . $row['lname'];
+  if ( empty($row['fname']) && empty($row['mname']) && empty($row['lname']) ) {
+   $displayName = $row['organization'];
+  }
+  else {
+   $displayName = $row['fname'] . ' ' . $row['mname'] . ' ' . $row['lname'];
+  }
+  $trTitle = xl('Edit','','',' ') . $displayName;
   echo " <tr class='detail $bgclass' style='cursor:pointer' " .
-       "onclick='doedclick(" . $row['id'] . ")' title='$trTitle'>\n";
-  echo "  <td>" . $row['lname'] . ', ' . $row['fname'] . ' ' . $row['mname'] . "</td>\n";
+       "onclick='doedclick_edit(" . $row['id'] . ")' title='$trTitle'>\n";
+  echo "  <td>" . $displayName . "</td>\n";
   echo "  <td>" . ($username ? '*' : '') . "</td>\n";
   echo "  <td>" . generate_display_field(array('data_type'=>'1','list_id'=>'abook_type'),$row['ab_name']) . "</td>\n";
   echo "  <td>" . $row['specialty'] . "</td>\n";
diff --git a/library/options.inc.php b/library/options.inc.php
index 185a18f83..4b758c542 100644
--- a/library/options.inc.php
+++ b/library/options.inc.php
@@ -21,8 +21,9 @@
 // C = Capitalize first letter of each word (text fields)
 // D = Check for duplicates in New Patient form
 // H = Read-only field copied from static history
+// L = Lab Order ("ord_lab") types only (address book)
 // N = Show in New Patient form
-// O = Procedure Order ("pro_*") types only (address book)
+// O = Procedure Order ("ord_*") types only (address book)
 // U = Capitalize all letters (text fields)
 // V = Vendor types only (address book)
 // R = Distributor types only (address book)
@@ -254,6 +255,9 @@ function generate_form_field($frow, $currvalue) {
   // Address book, preferring organization name if it exists and is not in
   // parentheses, and excluding local users who are not providers.
   // Supports "referred to" practitioners and facilities.
+  // Alternatively the letter L in edit_options means that abook_type
+  // must be "ord_lab", indicating types used with the procedure
+  // lab ordering system.
   // Alternatively the letter O in edit_options means that abook_type
   // must begin with "ord_", indicating types used with the procedure
   // ordering system.
@@ -262,7 +266,9 @@ function generate_form_field($frow, $currvalue) {
   // Alternatively the letter R in edit_options means that abook_type
   // must be "dist", indicating the Distributor type.
   else if ($data_type == 14) {
-    if (strpos($frow['edit_options'], 'O') !== FALSE)
+    if (strpos($frow['edit_options'], 'L') !== FALSE)
+      $tmp = "abook_type = 'ord_lab'";
+    else if (strpos($frow['edit_options'], 'O') !== FALSE)
       $tmp = "abook_type LIKE 'ord\\_%'";
     else if (strpos($frow['edit_options'], 'V') !== FALSE)
       $tmp = "abook_type LIKE 'vendor%'";
diff --git a/sql/3_2_0-to-4_0_0_upgrade.sql b/sql/3_2_0-to-4_0_0_upgrade.sql
index ef9fe9406..aaf5fcd95 100644
--- a/sql/3_2_0-to-4_0_0_upgrade.sql
+++ b/sql/3_2_0-to-4_0_0_upgrade.sql
@@ -965,3 +965,12 @@ UPDATE layout_options SET data_type=33,list_id='ethnicity',field_id='ethnicity',
 UPDATE layout_options SET seq=4 WHERE form_id = 'DEM' and field_id='financial_review';
 
 UPDATE patient_data SET ethnicity= case WHEN ethnoracial IN ('Hispanic','othr_us','othr_non_us') THEN ethnoracial ELSE '' END, race = case WHEN ethnoracial NOT IN ('Hispanic','othr_us','othr_non_us') THEN ethnoracial ELSE '' END;
+
+UPDATE list_options SET option_value = 3 WHERE list_id = 'abook_type' AND option_value = 0 AND option_id = 'ord_img';
+UPDATE list_options SET option_value = 3 WHERE list_id = 'abook_type' AND option_value = 0 AND option_id = 'ord_imm';
+UPDATE list_options SET option_value = 3 WHERE list_id = 'abook_type' AND option_value = 0 AND option_id = 'ord_lab';
+UPDATE list_options SET option_value = 2 WHERE list_id = 'abook_type' AND option_value = 0 AND option_id = 'spe';
+UPDATE list_options SET option_value = 3 WHERE list_id = 'abook_type' AND option_value = 0 AND option_id = 'vendor';
+UPDATE list_options SET option_value = 3 WHERE list_id = 'abook_type' AND option_value = 0 AND option_id = 'dist';
+UPDATE list_options SET option_value = 1 WHERE list_id = 'abook_type' AND option_value = 0 AND option_id = 'oth';
+
diff --git a/sql/database.sql b/sql/database.sql
index 8090b052d..452933d25 100644
--- a/sql/database.sql
+++ b/sql/database.sql
@@ -2180,13 +2180,13 @@ INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES (
 INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('warehouse','onsite'   ,'On Site'   , 5,0);
 
 INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('lists','abook_type'  ,'Address Book Types'  , 1,0);
-INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('abook_type','ord_img','Imaging Service'     , 5,0);
-INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('abook_type','ord_imm','Immunization Service',10,0);
-INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('abook_type','ord_lab','Lab Service'         ,15,0);
-INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('abook_type','spe'    ,'Specialist'          ,20,0);
-INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('abook_type','vendor' ,'Vendor'              ,25,0);
-INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('abook_type','dist'   ,'Distributor'         ,30,0);
-INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('abook_type','oth'    ,'Other'               ,95,0);
+INSERT INTO list_options ( list_id, option_id, title, seq, option_value ) VALUES ('abook_type','ord_img','Imaging Service'     , 5,3);
+INSERT INTO list_options ( list_id, option_id, title, seq, option_value ) VALUES ('abook_type','ord_imm','Immunization Service',10,3);
+INSERT INTO list_options ( list_id, option_id, title, seq, option_value ) VALUES ('abook_type','ord_lab','Lab Service'         ,15,3);
+INSERT INTO list_options ( list_id, option_id, title, seq, option_value ) VALUES ('abook_type','spe'    ,'Specialist'          ,20,2);
+INSERT INTO list_options ( list_id, option_id, title, seq, option_value ) VALUES ('abook_type','vendor' ,'Vendor'              ,25,3);
+INSERT INTO list_options ( list_id, option_id, title, seq, option_value ) VALUES ('abook_type','dist'   ,'Distributor'         ,30,3);
+INSERT INTO list_options ( list_id, option_id, title, seq, option_value ) VALUES ('abook_type','oth'    ,'Other'               ,95,1);
 
 INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('lists','proc_type','Procedure Types', 1,0);
 INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('proc_type','grp','Group'          ,10,0);
diff --git a/version.php b/version.php
index 74456f0fa..29bd32515 100644
--- a/version.php
+++ b/version.php
@@ -12,5 +12,5 @@ $v_tag   = '-dev'; // minor revision number, should be empty for production rele
 // is a database change in the course of development.  It is used
 // internally to determine when a database upgrade is needed.
 //
-$v_database = 11;
+$v_database = 12;
 ?>
-- 
2.11.4.GIT