From 19a45407d76e5649f034f368909a78c49d7f9190 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Thu, 15 Jan 2026 13:09:29 -0800 Subject: [PATCH 1/2] Created a new permission group for accessing the Clinical surgical Rounds input form. --- .../onprc_ehr/dataentry/BloodDrawFormType.java | 15 +++++++++++++++ .../dataentry/ClinicalRoundsFormType.java | 16 ++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java index c73c835b1..fcf75c8fd 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java @@ -25,6 +25,10 @@ import org.labkey.api.ehr.dataentry.WeightFormSection; import org.labkey.api.module.Module; import org.labkey.api.view.template.ClientDependency; +import org.labkey.security.xml.GroupEnumType; +import org.labkey.api.security.GroupManager; +import org.labkey.api.security.Group; +import org.labkey.api.security.permissions.AdminPermission; import java.util.Arrays; import java.util.List; @@ -69,4 +73,15 @@ public Supplier getAddScheduledTreatmentWindowDependency() { return ClientDependency.supplierFromPath("ehr/window/AddScheduledTreatmentWindow.js"); } + //Added: 7-26-2018 R.Blasa + @Override + public boolean isVisible() + { + Group g = GroupManager.getGroup(getCtx().getContainer(), "Form Clinical Rounds SF", GroupEnumType.SITE); + if (g != null && getCtx().getUser().isInGroup(g.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) + { + return false; + } + return super.isVisible(); + } } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java index b0040122c..b6ba76394 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java @@ -77,12 +77,12 @@ public ClinicalRoundsFormType(DataEntryFormContext ctx, Module owner) } - @Override - protected boolean canInsert() - { - if (!getCtx().getContainer().hasPermission(getCtx().getUser(), EHRClinicalEntryPermission.class)) - return false; - - return super.canInsert(); - } +// @Override +// protected boolean canInsert() +// { +// if (!getCtx().getContainer().hasPermission(getCtx().getUser(), EHRClinicalEntryPermission.class)) +// return false; +// +// return super.canInsert(); +// } } From 8419eac672366cda141c04c74e912d63614edc31 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Thu, 15 Jan 2026 13:53:26 -0800 Subject: [PATCH 2/2] Created a new permission group for accessing the Clinical surgical Rounds input form. --- .../org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java | 2 +- .../onprc_ehr/dataentry/ClinicalRoundsFormType.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java index fcf75c8fd..edbe49d39 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java @@ -73,7 +73,7 @@ public Supplier getAddScheduledTreatmentWindowDependency() { return ClientDependency.supplierFromPath("ehr/window/AddScheduledTreatmentWindow.js"); } - //Added: 7-26-2018 R.Blasa + //Added: 1-15-2026 R.Blasa @Override public boolean isVisible() { diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java index b6ba76394..ab5d20c96 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java @@ -77,12 +77,4 @@ public ClinicalRoundsFormType(DataEntryFormContext ctx, Module owner) } -// @Override -// protected boolean canInsert() -// { -// if (!getCtx().getContainer().hasPermission(getCtx().getUser(), EHRClinicalEntryPermission.class)) -// return false; -// -// return super.canInsert(); -// } }