From 38df906906bb2c2261d0f504ba5bb7a87ddec30a Mon Sep 17 00:00:00 2001
From: Hank Rappaport <hanksterr7@aol.com>
Date: Fri, 12 Jan 2024 02:37:21 -0500
Subject: [PATCH] fix: clinical rules - fix the optional/required setting
 (#7154)

---
 .../super/rules/controllers/edit/helper/common.php  | 13 ++++++++++---
 .../super/rules/controllers/edit/view/diagnosis.php |  4 +++-
 interface/super/rules/library/RuleCriteria.php      |  6 +++++-
 sql/database.sql                                    |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/interface/super/rules/controllers/edit/helper/common.php b/interface/super/rules/controllers/edit/helper/common.php
index 183d41c87df..b50e5d95676 100644
--- a/interface/super/rules/controllers/edit/helper/common.php
+++ b/interface/super/rules/controllers/edit/helper/common.php
@@ -66,6 +66,13 @@
 <!-- -->
 <!-- -->
 <!-- -->
+
+<!--
+HR: I inverted the meaning of these radios to match what gets saved in db. Db meaning controls logic. 
+Db field is "required_flag", and its label says has value 0 for required, and 1 for optional. but this is inverted.
+If field's value is 1, logic treats as "required"
+-->
+
 <?php function common_fields($args)
 {
     ?>
@@ -73,10 +80,10 @@
     <p class="form-row">
         <span class="left_col colhead req" data-field="fld_optional"><?php echo xlt('Optional'); ?></span>
         <span class="end_col">
-            <input id="fld_optional" type="radio" name="fld_optional" class="field" value="yes"
-                    <?php echo $criteria->optional ? "CHECKED" : ""?>> <?php echo xlt('Yes'); ?>
             <input id="fld_optional" type="radio" name="fld_optional" class="field" value="no"
-                    <?php echo !$criteria->optional ? "CHECKED" : ""?>> <?php echo xlt('No'); ?>
+                    <?php echo !$criteria->optional ? "CHECKED" : ""?>> <?php echo xlt('Yes');?>
+            <input id="fld_optional" type="radio" name="fld_optional" class="field" value="yes"
+                    <?php echo $criteria->optional ? "CHECKED" : ""?>> <?php echo xlt('No'); ?>
         </span>
     </p>
 
diff --git a/interface/super/rules/controllers/edit/view/diagnosis.php b/interface/super/rules/controllers/edit/view/diagnosis.php
index eb79ae9c754..610cbb220ac 100644
--- a/interface/super/rules/controllers/edit/view/diagnosis.php
+++ b/interface/super/rules/controllers/edit/view/diagnosis.php
@@ -20,7 +20,9 @@
     <?php } else { ?>
         <link rel="stylesheet" href="<?php echo $GLOBALS['themes_static_relative']; ?>/misc/rules.css?v=<?php echo $GLOBALS['v_js_includes']; ?>" />
     <?php } ?>
-    <script src="../../../library/dialog.js?v=<?php echo $v_js_includes; ?>"></script>
+    
+    <script src="../../../library/dialog.js?v=<?php echo $GLOBALS['v_js_includes']; ?>"></script>
+    
     <script>
         // This invokes the find-code popup.
         function sel_diagnosis() {
diff --git a/interface/super/rules/library/RuleCriteria.php b/interface/super/rules/library/RuleCriteria.php
index 9eff51ef0dc..a4af026ad0c 100644
--- a/interface/super/rules/library/RuleCriteria.php
+++ b/interface/super/rules/library/RuleCriteria.php
@@ -16,12 +16,14 @@ abstract class RuleCriteria
 {
     /**
      * if true, then criteria is optional; required otherwise
+     *
      * @var boolean
      */
     var $optional;
 
     /**
      * if true, then criteira is an inclusion; exclusion otherwise
+     *
      * @var boolean
      */
     var $inclusion = true;
@@ -38,6 +40,7 @@ abstract class RuleCriteria
 
     /**
      * uniquely identifies this criteria
+     *
      * @var string
      */
     var $guid;
@@ -52,7 +55,8 @@ abstract class RuleCriteria
 
     function getCharacteristics()
     {
-        $characteristics = $this->optional ? xl("Optional") : xl("Required");
+        // HR: reverse this to match logic behavior
+        $characteristics = $this->optional ? xl("Required") : xl("Optional");
         $characteristics .= " ";
         $characteristics .= $this->inclusion ? xl("Inclusion") : xl("Exclusion");
 
diff --git a/sql/database.sql b/sql/database.sql
index 5da9740c654..500aef7e010 100644
--- a/sql/database.sql
+++ b/sql/database.sql
@@ -8053,7 +8053,7 @@ DROP TABLE IF EXISTS `rule_filter`;
 CREATE TABLE `rule_filter` (
   `id` varchar(31) NOT NULL DEFAULT '' COMMENT 'Maps to the id column in the clinical_rules table',
   `include_flag` tinyint(1) NOT NULL default 0 COMMENT '0 is exclude and 1 is include',
-  `required_flag` tinyint(1) NOT NULL default 0 COMMENT '0 is required and 1 is optional',
+  `required_flag` tinyint(1) NOT NULL default 0 COMMENT '0 is optional and 1 is required',
   `method` varchar(31) NOT NULL DEFAULT '' COMMENT 'Maps to list_options list rule_filters',
   `method_detail` varchar(31) NOT NULL DEFAULT '' COMMENT 'Maps to list_options lists rule__intervals',
   `value` varchar(255) NOT NULL DEFAULT '',