From 4e870fe48a8e98b36ca05e059696354d700a615b Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:17:06 -0700 Subject: [PATCH 1/3] Modified Surgical Rounds validation process. --- onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js b/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js index 26a68123b..ac25fa9eb 100644 --- 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, 'INFO'); } } From f2c224034e637971ec44f7f57d6643010a7ba3b2 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Fri, 11 Oct 2024 00:42:44 -0700 Subject: [PATCH 2/3] Modified Mense input form to allow error messages to be displayed when trigger scripts generates a warning. --- .../scripts/onprc_ehr/onprc_triggers.js | 2 +- .../web/onprc_ehr/model/sources/Menses.js | 38 +++++++++++++++++++ .../onprc_ehr/dataentry/MensFormType.java | 21 +++++++++- 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 onprc_ehr/resources/web/onprc_ehr/model/sources/Menses.js diff --git a/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js b/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js index ac25fa9eb..43cefaf5c 100644 --- 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, 'INFO'); + 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 new file mode 100644 index 000000000..a359167b9 --- /dev/null +++ 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' + +}); \ No newline at end of file diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MensFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MensFormType.java index c1c78a93d..c425023fe 100644 --- 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,31 @@ 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 getButtonConfigs() + { + List defaultButtons = new ArrayList<>(); + + defaultButtons.remove("SUBMIT"); + defaultButtons.add("SAVEDRAFT"); + defaultButtons.add("SAVECLOSE"); + defaultButtons.add("REVIEW"); + defaultButtons.add("MENSEFINAL"); + + + return defaultButtons; + } @Override protected boolean canInsert() From abf312a395e518bba71057c24eb0989f296eca93 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Fri, 11 Oct 2024 00:55:51 -0700 Subject: [PATCH 3/3] Modified Mense input form to allow error messages to be displayed when trigger scripts generates a warning. --- onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MensFormType.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MensFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MensFormType.java index c425023fe..8a168cd66 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MensFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/MensFormType.java @@ -47,7 +47,6 @@ public MensFormType(DataEntryFormContext ctx, Module owner) addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/model/sources/Menses.js")); - setDisplayReviewRequired(true); for (FormSection s : getFormSections()) { @@ -63,7 +62,7 @@ protected List getButtonConfigs() defaultButtons.remove("SUBMIT"); defaultButtons.add("SAVEDRAFT"); - defaultButtons.add("SAVECLOSE"); + defaultButtons.add("CLOSE"); defaultButtons.add("REVIEW"); defaultButtons.add("MENSEFINAL");