From a90db8e3fc4b8e360c11a5ad9d8bc728f7c27be5 Mon Sep 17 00:00:00 2001
From: Rod Roark <rod@sunsetsystems.com>
Date: Tue, 27 Apr 2021 17:26:32 +1000
Subject: [PATCH] Integrate traditional and layout-based forms into their
 chosen categories in the visit summary dropdowns. (#4361)

---
 interface/patient_file/encounter/forms.php | 72 +-----------------------------
 library/registry.inc                       | 40 +++++++++--------
 2 files changed, 24 insertions(+), 88 deletions(-)

diff --git a/interface/patient_file/encounter/forms.php b/interface/patient_file/encounter/forms.php
index fd8e2a701..24799694e 100644
--- a/interface/patient_file/encounter/forms.php
+++ b/interface/patient_file/encounter/forms.php
@@ -496,36 +496,9 @@ function findPosY(obj) {
 <?php //DYNAMIC FORM RETREIVAL
 include_once("$srcdir/registry.inc");
 
-function myGetRegistered($state = "1", $limit = "unlimited", $offset = "0")
-{
-    global $attendant_type;
-    $sql = "SELECT category, nickname, name, state, directory, id, sql_run, " .
-    "unpackaged, date, aco_spec FROM registry WHERE ";
-  // select different forms for groups
-    if ($attendant_type == 'pid') {
-        $sql .= "patient_encounter = 1 AND ";
-    } else {
-        $sql .= "therapy_group_encounter = 1 AND ";
-    }
-    $sql .=  "state LIKE ? ORDER BY category, priority, name";
-    if ($limit != "unlimited") {
-        $sql .= " limit " . escape_limit($limit) . ", " . escape_limit($offset);
-    }
-    $res = sqlStatement($sql, array($state));
-    if ($res) {
-        for ($iter = 0; $row = sqlFetchArray($res); $iter++) {
-            $all[$iter] = $row;
-        }
-    } else {
-        return false;
-    }
-    return $all;
-}
-
-$reg = myGetRegistered();
+$reg = getFormsByCategory();
 $old_category = '';
-
-  $DivId = 1;
+$DivId = 1;
 
 // To see if the encounter is locked. If it is, no new forms can be created
 $encounterLocked = false;
@@ -592,47 +565,6 @@ if ($StringEcho) {
 } else {
     $StringEcho2 = "";
 }
-
-// This shows Layout Based Form names just like the above.
-//
-if ($encounterLocked === false) {
-    $lres = sqlStatement("SELECT grp_form_id AS option_id, grp_title AS title, grp_aco_spec " .
-    "FROM layout_group_properties WHERE " .
-    "grp_form_id LIKE 'LBF%' AND grp_group_id = '' AND grp_activity = 1 " .
-    "ORDER BY grp_seq, grp_title");
-
-    if (sqlNumRows($lres)) {
-        if (!$StringEcho) {
-            $StringEcho = '<ul>';
-        }
-
-        $StringEcho .= "<div class='dropdown d-inline'>\n";
-        $StringEcho .= "<button class='btn btn-secondary dropdown-toggle' type='button' id='lbf' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>" . xlt('Layout Based') . "</button>\n";
-        $StringEcho .= "<div class='dropdown-menu' aria-labelledby='dropdownMenu2'>\n";
-        while ($lrow = sqlFetchArray($lres)) {
-            $option_id = $lrow['option_id']; // should start with LBF
-            $title = $lrow['title'];
-            // Check ACO attribute, if any, of this LBF.
-            if (!empty($lrow['grp_aco_spec'])) {
-                $tmp = explode('|', $lrow['grp_aco_spec']);
-                if (!AclMain::aclCheckCore($tmp[0], $tmp[1], '', 'write') && !AclMain::aclCheckCore($tmp[0], $tmp[1], '', 'addonly')) {
-                    continue;
-                }
-            }
-            $StringEcho .= "<button class='dropdown-item' onclick=\"openNewForm(" .
-            attr_js($rootdir . "/patient_file/encounter/load_form.php?formname=" . urlencode($option_id)) .
-                ", " . attr_js(xl_form_title($title)) . ")\" href='JavaScript:void(0);'>" .
-            text(xl_form_title($title)) . "</button>\n";
-        }
-        $StringEcho .= "</div>\n";
-        $StringEcho .= '</div>';
-    }
-}
-if ($StringEcho) {
-    $StringEcho2 = '<div class="clearfix"></div>';
-} else {
-    $StringEcho2 = "";
-}
 ?>
 <!-- DISPLAYING HOOKS STARTS HERE -->
 <?php
diff --git a/library/registry.inc b/library/registry.inc
index 70b32315d..b70bb59ce 100644
--- a/library/registry.inc
+++ b/library/registry.inc
@@ -128,7 +128,6 @@ function isRegistered($directory, $state = 1)
 
 function getTherapyGroupCategories()
 {
-
     return array('');
 }
 
@@ -137,30 +136,35 @@ function getTherapyGroupCategories()
 //
 function getFormsByCategory($state = '1', $lbfonly = false)
 {
+    global $attendant_type;
     $all = array();
     if (!$lbfonly) {
-      // First get the traditional form types from the registry table.
+        // First get the traditional form types from the registry table.
         $sql = "SELECT category, nickname, name, state, directory, id, sql_run, " .
-        "unpackaged, date, priority, aco_spec FROM registry WHERE " .
-        "state LIKE ? ORDER BY category, priority, name";
+            "unpackaged, date, priority, aco_spec FROM registry WHERE ";
+        if (($attendant_type ?? 'pid') == 'pid') {
+            $sql .= "patient_encounter = 1 AND ";
+        } else {
+            $sql .= "therapy_group_encounter = 1 AND ";
+        }
+        $sql .= "state LIKE ? ORDER BY category, priority, name";
         $res = sqlStatement($sql, array($state));
         if ($res) {
             while ($row = sqlFetchArray($res)) {
-              // Skip fee_sheet from list of registered forms.
-                if ($row['directory'] != 'fee_sheet') {
-                  // Flag this entry as not LBF
-                    $row['LBF'] = false;
-                    $all[] = $row;
-                }
+                // Flag this entry as not LBF
+                $row['LBF'] = false;
+                $all[] = $row;
             }
         }
     }
 
-  // Merge LBF form types into the registry array of form types.
-  // Note that the mapping value is used as the category name.
-    $lres = sqlStatement("SELECT * FROM layout_group_properties " .
-    "WHERE grp_form_id LIKE 'LBF%' AND grp_group_id = '' AND grp_activity = 1 " .
-    "ORDER BY grp_mapping, grp_seq, grp_title");
+    // Merge LBF form types into the registry array of form types.
+    // Note that the mapping value is used as the category name.
+    $lres = sqlStatement(
+        "SELECT * FROM layout_group_properties " .
+        "WHERE grp_form_id LIKE 'LBF%' AND grp_group_id = '' AND grp_activity = 1 " .
+        "ORDER BY grp_mapping, grp_seq, grp_title"
+    );
     while ($lrow = sqlFetchArray($lres)) {
         $rrow = array();
         $rrow['category']  = $lrow['grp_mapping'] ? $lrow['grp_mapping'] : 'Clinical';
@@ -173,9 +177,9 @@ function getFormsByCategory($state = '1', $lbfonly = false)
         $all[] = $rrow;
     }
 
-  // Sort by category, priority, is lbf, name.
+    // Sort by category, priority, is lbf, name.
     usort($all, function ($a, $b) {
-      // Anonymous functions supported as of PHP 5.3. Yay!
+        // Anonymous functions supported as of PHP 5.3. Yay!
         if ($a['category'] == $b['category']) {
             if ($a['priority'] == $b['priority']) {
                 if ($a['LBF'] == $b['LBF']) {
@@ -186,7 +190,7 @@ function getFormsByCategory($state = '1', $lbfonly = false)
                     }
                     return $name1 < $name2 ? -1 : 1;
                 } else {
-                  // Sort LBF with the same priority after standard forms
+                    // Sort LBF with the same priority after standard forms
                     return $b['LBF'] ? -1 : 1;
                 }
             }
-- 
2.11.4.GIT