From 8fc0275e91810cf62e927106a98853749088a8e1 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Mon, 22 Jan 2024 10:59:37 -0800
Subject: [PATCH 1/4] Collapsible panel

---
 .../ehr/dataentry/NonStoreFormSection.java    | 10 +++--
 .../web/ehr/ehr_ext4_dataEntry.lib.xml        |  1 +
 ehr/resources/web/ehr/form/Panel.js           |  4 ++
 ehr/resources/web/ehr/grid/Panel.js           |  4 ++
 .../ehr/plugin/CollapsibleDataEntryPanel.js   | 44 +++++++++++++++++++
 ehr/resources/web/ehr/stylesheet.css          |  4 ++
 6 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 ehr/resources/web/ehr/plugin/CollapsibleDataEntryPanel.js

diff --git a/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java b/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java
index dfe9d3ebe..0c3e6b5f6 100644
--- a/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java
+++ b/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java
@@ -57,9 +57,13 @@ protected List<FormElement> getFormElements(DataEntryFormContext ctx)
     @Override
     public JSONObject toJSON(DataEntryFormContext ctx, boolean includeFormElements)
     {
-        JSONObject ret = super.toJSON(ctx, includeFormElements);
-        ret.put("supportsTemplates", false);
+        JSONObject json = super.toJSON(ctx, includeFormElements);
+        json.put("collapsible", true);
+        json.put("initCollapsed", true);
+        json.put("dataDependentCollapseHeader", false);
 
-        return ret;
+        json.put("supportsTemplates", false);
+
+        return json;
     }
 }
diff --git a/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml b/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml
index b5d5017a2..60557b71e 100644
--- a/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml
+++ b/ehr/resources/web/ehr/ehr_ext4_dataEntry.lib.xml
@@ -20,6 +20,7 @@
         <script path="ehr/plugin/DataBind.js"/>
         <script path="ehr/plugin/ResizableTextArea.js"/>
         <script path="ehr/plugin/RowEditor.js"/>
+        <script path="ehr/plugin/CollapsibleDataEntryPanel.js"/>
 
         <!--fields-->
         <script path="ehr/form/field/AnimalField.js"/>
diff --git a/ehr/resources/web/ehr/form/Panel.js b/ehr/resources/web/ehr/form/Panel.js
index 906e8a51c..f99fff511 100644
--- a/ehr/resources/web/ehr/form/Panel.js
+++ b/ehr/resources/web/ehr/form/Panel.js
@@ -30,6 +30,10 @@ Ext4.define('EHR.form.Panel', {
             buttonAlign: 'left'
         });
 
+        if (this.formConfig.collapsible){
+            this.plugins = ['ehr-collapsibleDataEntryPanel'];
+        }
+
         this.bindConfig = this.bindConfig || {};
         LABKEY.Utils.mergeIf(this.bindConfig, {
             autoCreateRecordOnChange: true,
diff --git a/ehr/resources/web/ehr/grid/Panel.js b/ehr/resources/web/ehr/grid/Panel.js
index 72cd5dc11..86d273f54 100644
--- a/ehr/resources/web/ehr/grid/Panel.js
+++ b/ehr/resources/web/ehr/grid/Panel.js
@@ -17,6 +17,10 @@ Ext4.define('EHR.grid.Panel', {
             return;
         }
 
+        if (this.formConfig.collapsible){
+            this.plugins = ['ehr-collapsibleDataEntryPanel'];
+        }
+
         this.configureColumns();
         this.sortColumns();
 
diff --git a/ehr/resources/web/ehr/plugin/CollapsibleDataEntryPanel.js b/ehr/resources/web/ehr/plugin/CollapsibleDataEntryPanel.js
new file mode 100644
index 000000000..924374f76
--- /dev/null
+++ b/ehr/resources/web/ehr/plugin/CollapsibleDataEntryPanel.js
@@ -0,0 +1,44 @@
+
+/**
+ * A plugin for Ext.form.TextArea that will allow the box to be resized by the user.
+ */
+Ext4.define('EHR.plugin.CollapsibleDataEntryPanel', {
+    extend: 'Ext.AbstractPlugin',
+    alias: 'plugin.ehr-collapsibleDataEntryPanel',
+
+    init: function(panel){
+
+        panel.collapsible = true;
+
+        if ((!panel.store || panel.store.getCount() === 0) && panel.formConfig?.initCollapsed) {
+            panel.collapsed = true;
+        }
+
+        panel.on('collapse', function() {
+            if (!panel.formConfig.dataDependentCollapseHeader || (!panel.store || panel.store.getCount() === 0)) {
+                panel.header?.addCls('collapsed-dataentry-panel');
+            }
+        }, panel);
+
+        panel.on('expand', function() {
+            panel.header?.removeCls('collapsed-dataentry-panel');
+        }, panel);
+
+        panel.on('afterrender', function() {
+            if (panel.header) {
+                if ((!panel.formConfig.dataDependentCollapseHeader || panel.store?.getCount() === 0) && panel.formConfig.initCollapsed) {
+                    panel.header.addCls('collapsed-dataentry-panel');
+                }
+
+                panel.header.on('click', function () {
+                    if (panel.collapsed) {
+                        panel.expand();
+                    }
+                    else {
+                        panel.collapse();
+                    }
+                }, panel);
+            }
+        }, panel);
+    }
+});
\ No newline at end of file
diff --git a/ehr/resources/web/ehr/stylesheet.css b/ehr/resources/web/ehr/stylesheet.css
index c7f64df75..1401467e6 100644
--- a/ehr/resources/web/ehr/stylesheet.css
+++ b/ehr/resources/web/ehr/stylesheet.css
@@ -216,3 +216,7 @@ a:hover .ehr-tool-icon-lg {
 .clinical-history-print .x4-panel-body{
     overflow: visible !important;
 }
+
+.collapsed-dataentry-panel {
+    opacity: 0.5;
+}

From 15780015e2d90c009a6e009afd8ac72efb16738d Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Wed, 24 Jan 2024 05:16:09 -0800
Subject: [PATCH 2/4] Test expand

---
 .../org/labkey/api/ehr/dataentry/NonStoreFormSection.java     | 4 ----
 ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java      | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java b/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java
index 0c3e6b5f6..faf465eed 100644
--- a/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java
+++ b/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java
@@ -58,10 +58,6 @@ protected List<FormElement> getFormElements(DataEntryFormContext ctx)
     public JSONObject toJSON(DataEntryFormContext ctx, boolean includeFormElements)
     {
         JSONObject json = super.toJSON(ctx, includeFormElements);
-        json.put("collapsible", true);
-        json.put("initCollapsed", true);
-        json.put("dataDependentCollapseHeader", false);
-
         json.put("supportsTemplates", false);
 
         return json;
diff --git a/ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java b/ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java
index ee63a2fe5..dee1b5615 100644
--- a/ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java
+++ b/ehr/test/src/org/labkey/test/util/ehr/EHRTestHelper.java
@@ -155,7 +155,10 @@ public Ext4GridRef getExt4GridForFormSection(String sectionTitle)
         Ext4CmpRef.waitForComponent(_test, query);
         Ext4GridRef grid = _test._ext4Helper.queryOne(query, Ext4GridRef.class);
         if (grid != null)
+        {
+            grid.expand();
             grid.setClicksToEdit(1);
+        }
 
         return grid;
     }

From f569885fa75d087d7269374910938bbf0aee7ba5 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Wed, 24 Jan 2024 05:22:01 -0800
Subject: [PATCH 3/4] Update NonStoreFormSection.java

---
 .../org/labkey/api/ehr/dataentry/NonStoreFormSection.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java b/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java
index faf465eed..dfe9d3ebe 100644
--- a/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java
+++ b/ehr/api-src/org/labkey/api/ehr/dataentry/NonStoreFormSection.java
@@ -57,9 +57,9 @@ protected List<FormElement> getFormElements(DataEntryFormContext ctx)
     @Override
     public JSONObject toJSON(DataEntryFormContext ctx, boolean includeFormElements)
     {
-        JSONObject json = super.toJSON(ctx, includeFormElements);
-        json.put("supportsTemplates", false);
+        JSONObject ret = super.toJSON(ctx, includeFormElements);
+        ret.put("supportsTemplates", false);
 
-        return json;
+        return ret;
     }
 }

From da3c0f6d456abaadfc79c65b49e07b5f2bb458de Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Wed, 24 Jan 2024 06:47:02 -0800
Subject: [PATCH 4/4] cleanup

---
 ehr/resources/web/ehr/plugin/CollapsibleDataEntryPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ehr/resources/web/ehr/plugin/CollapsibleDataEntryPanel.js b/ehr/resources/web/ehr/plugin/CollapsibleDataEntryPanel.js
index 924374f76..7946ae291 100644
--- a/ehr/resources/web/ehr/plugin/CollapsibleDataEntryPanel.js
+++ b/ehr/resources/web/ehr/plugin/CollapsibleDataEntryPanel.js
@@ -15,7 +15,7 @@ Ext4.define('EHR.plugin.CollapsibleDataEntryPanel', {
         }
 
         panel.on('collapse', function() {
-            if (!panel.formConfig.dataDependentCollapseHeader || (!panel.store || panel.store.getCount() === 0)) {
+            if (!panel.formConfig.dataDependentCollapseHeader || !panel.store || panel.store.getCount() === 0) {
                 panel.header?.addCls('collapsed-dataentry-panel');
             }
         }, panel);