Multiple improvements from IPPF related to layouts. (#1081)

* Multiple improvements from IPPF related to layouts.

A summary of what's new:

o Layout groups may be nested, i.e. each group can have sub-groups.
o Layouts and their groups have properties that may be edited in the layout editor.
o Encounter LBFs may specify sections for direct entry of services, products and diagnoses.
o "Case Management" feature including the ability to link encounter forms to issues,
  and in the issue window a tab for each related encounter form.
o New layout edit option to specify initially-open groups.
o Implemented design-time ACO for LBF encounter forms.
o Improved printing of encounter LBFs.
o Feature to print a demographics profile with data filled in for a specified patient.
o Improvements to printed referrals.
o Provider attribute and selector for LBF encounter forms.
o New layout field type for a single checkbox.
o Support for demographics/history values in LBF static text fields.
o Auto-delete of shared attributes not used by any other form when a form is deleted.
o Assorted layout editor improvements.
o Added "Save and Continue" button to LBF visit forms.
o Added sorting to export of lists and layouts.
o Condition tests in LBF fields now support setting a value instead of just skipping the field.
o Added field condition support to demographics and history.
o Assorted bug fixes.

custom/search.php

@@ -100,11 +100,11 @@ function echoFilterItem($iter, $fieldId, $fieldTitle)
             echo "</td>\n";
     }
 
-        $layoutCols = sqlStatement("SELECT field_id, title, description, group_name "
+        $layoutCols = sqlStatement("SELECT field_id, title, description, group_id "
       . "FROM layout_options "
       . "WHERE form_id='DEM' "
-      . "AND group_name not like ('%Employer%' ) AND uor != 0 "
-      . "ORDER BY group_name,seq");
+      . "AND field_id not like 'em\_%' AND uor != 0 "
+      . "ORDER BY group_id,seq");
 
         echo "<table>";
 

interface/cmsportal/history_form.php

@@ -24,7 +24,7 @@
     $newdata = array();
     $fres = sqlStatement("SELECT * FROM layout_options WHERE " .
     "form_id = 'HIS' AND field_id != '' AND uor > 0 " .
-    "ORDER BY group_name, seq");
+    "ORDER BY group_id, seq");
     while ($frow = sqlFetchArray($fres)) {
         $data_type = $frow['data_type'];
         $field_id  = $frow['field_id'];
@@ -147,7 +147,7 @@ function validate() {
 <?php
 $lores = sqlStatement(
     "SELECT * FROM layout_options " .
-    "WHERE form_id = ? AND uor > 0 ORDER BY group_name, seq",
+    "WHERE form_id = ? AND uor > 0 ORDER BY group_id, seq",
     array('HIS')
 );
 

interface/cmsportal/patient_form.php

@@ -29,7 +29,7 @@
   // configured as unused.
     $fres = sqlStatement("SELECT * FROM layout_options WHERE " .
     "form_id = 'DEM' AND field_id != '' AND (uor > 0 OR field_id = 'cmsportal_login') " .
-    "ORDER BY group_name, seq");
+    "ORDER BY group_id, seq");
     while ($frow = sqlFetchArray($fres)) {
         $data_type = $frow['data_type'];
         $field_id  = $frow['field_id'];
@@ -221,7 +221,7 @@ function validate() {
 <?php
 $lores = sqlStatement(
     "SELECT * FROM layout_options " .
-    "WHERE form_id = ? AND uor > 0 ORDER BY group_name, seq",
+    "WHERE form_id = ? AND uor > 0 ORDER BY group_id, seq",
     array('DEM')
 );