23.11 fb mense updates (#1155)

* Modified Surgical Rounds validation process. * Modified Mense input form to allow error messages to be displayed when trigger scripts generates a warning. * Modified Mense input form to allow error messages to be displayed when trigger scripts generates a warning.
LabKey · Oct 14, 2024 · 4fc5418 · 4fc5418
1 parent b0ef3d2
commit 4fc5418
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 4 deletions.
diff --git a/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js b/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js
@@ -471,7 +471,7 @@ exports.init = function(EHR){
             var msg = triggerHelper.validateMenseFlagprocess(row.Id);
             if (msg)
             {
-                EHR.Server.Utils.addError(scriptErrors, 'category',  msg, 'ERROR');
+                EHR.Server.Utils.addError(scriptErrors, 'category',  msg, 'WARN');
             }
         }
 

diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Menses.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Menses.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014-2019 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+ */
+EHR.model.DataModelManager.registerMetadata('MensesAddendum', {
+    byQuery: {
+        'study.clinical_observations': {
+            category: {
+                defaultValue: 'Menses'
+            },
+            observation: {
+                defaultValue: 'M'
+            }
+        }
+    }
+});
+
+
+EHR.DataEntryUtils.registerDataEntryFormButton('MENSEFINAL', {
+    text: 'Submit Final',
+    name: 'submit',
+    requiredQC: 'Completed',
+    targetQC: 'Completed',
+    errorThreshold: 'INFO',
+    successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('ehr', 'enterData.view'),
+    disabled: true,
+    itemId: 'finalBtn',
+    handler: function(btn){
+        var panel = btn.up('ehr-dataentrypanel');
+        Ext4.Msg.confirm('Finalize Form', 'You are about to finalize this form.  Do you want to do this?', function(v){
+            if(v == 'yes')
+                this.onSubmit(btn);
+        }, this);
+    },
+    disableOn: 'ERROR'
+
+});
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MensFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MensFormType.java
@@ -25,6 +25,8 @@
 import org.labkey.api.view.template.ClientDependency;
 
 import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * User: bimber
@@ -43,16 +45,30 @@ public MensFormType(DataEntryFormContext ctx, Module owner)
             new MensFormSection()
         ));
 
-        addClientDependency(ClientDependency.supplierFromPath("ehr/model/sources/Menses.js"));
+        addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/model/sources/Menses.js"));
 
-        setDisplayReviewRequired(true);
 
         for (FormSection s : getFormSections())
         {
             s.addConfigSource("Task");
-            s.addConfigSource("Menses");
+            s.addConfigSource("MensesAddendum");
         }
     }
+        //    Added 10-9-2024  r. Blasa
+        @Override
+        protected List<String> getButtonConfigs()
+        {
+            List<String> defaultButtons = new ArrayList<>();
+
+            defaultButtons.remove("SUBMIT");
+            defaultButtons.add("SAVEDRAFT");
+            defaultButtons.add("CLOSE");
+            defaultButtons.add("REVIEW");
+            defaultButtons.add("MENSEFINAL");
+
+
+            return defaultButtons;
+        }
 
     @Override
     protected boolean canInsert()