From 0e23de1a5fe752fc738d6e3ec31b3e843030e177 Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 13:42:15 -0700 Subject: [PATCH 01/10] Modified Bulk Clinical Entry to contain Pairing Observation Entry form. --- .../labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java index 2c0d89d73..715316d98 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java @@ -55,6 +55,7 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner) new DrugAdministrationFormSection(ClientDependency.supplierFromPath("onprc_ehr/window/ONPRC_AddScheduledTreatmentWindow.js")), new TreatmentOrdersFormSection(), new WeightFormSection(), + new PairingFormSection(), new SimpleGridPanel("study", "blood", "Blood Draws"), new SimpleGridPanel("ehr", "snomed_tags", "Diagnostic Codes") )); @@ -91,6 +92,9 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner) //Added 11-4-2025 R. Blasa addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/window/FormTemplateWindow.js")); + //Added 6-22-2026 R.Blasa + addClientDependency(ClientDependency.supplierFromPath("/onprc_ehr/model/sources/Pairing_Properties.js")); + } From 99335d851c8fa9fff60c5b345df194f6010c756f Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 15:11:12 -0700 Subject: [PATCH 02/10] Modified Bulk Clinical Entry to contain Pairing Observation Entry form. --- .../sources/Bulk_Clinic_Pairing_Properties.js | 135 ++++++++++++++++++ .../dataentry/BulkClinicalEntryFormType.java | 4 +- 2 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js new file mode 100644 index 000000000..1ab6486a4 --- /dev/null +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2016-2017 LabKey Corporation + * + * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 + */ + +//Created 6-7-2016 R.Blasa +EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', { + allQueries: { + + }, + byQuery: { + + 'study.pairings': { + + outcome: { + hidden: true + }, + Id: { + allowBlank: false, + columnConfig: { + width: 100 + } + }, + infant_id: { + hidden: true + }, + + eventtype: { + columnConfig: { + width: 250 + }, + editorConfig: { + caseSensitive: false, + anyMatch: true, + listConfig: { + innerTpl: '{[(values.category ? "" + LABKEY.Utils.encodeHtml(values.category) + ": " : "") + LABKEY.Utils.encodeHtml(values.value)]}', + getInnerTpl: function () { + return this.innerTpl; + } + } + }, + lookup: { + xtype: 'combobox', + schemaName: 'ehr_Lookups', + queryName: 'pairingstarttype', + columns: 'value,category,sort_order,date_disabled', + keyColumn: 'value', + displayColumn: 'value', + sort: 'category,value,sort_order', + filterArray: [ + LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK) + ] + } + }, + outcome: { + hidden: true + }, + goal: { + hidden: true + }, + endeventType: { + columnConfig: { + width: 180 + }, + lookup: { + filterArray: [ + LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK) + ] + } + }, + + enddate: { + hidden: false + }, + + separationreason: { + hidden: true + }, + observation: { + allowBlank: true, + columnConfig: { + width: 250 + }, + lookup: { + filterArray: [ + LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK) + ] + } + }, + + remark2: { + xtype: 'textareafield', + columnConfig: { + width: 200 + } + }, + room: { + allowBlank: false, + columnConfig: { + width: 130 + } + }, + cage: { + allowBlank: false, + columnConfig: { + width: 100 + } + }, + priorgrouphousing: { + hidden: true + }, + category: { + allowBlank: false, + columnConfig: { + width: 200 + } + }, + other_infant: { + hidden: true + }, + lowestcage: { + hidden: true + }, + remark: { + xtype: 'textareafield', + columnConfig: { + width: 200 + } + } + + } + + } +}); \ No newline at end of file diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java index 715316d98..d745af4c4 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java @@ -65,6 +65,8 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner) s.addConfigSource("ClinicalDefaults"); //Added 6-4-2015 Blasa s.addConfigSource("ClinicalProcedures"); + + s.addConfigSource("Bulk_Pairing_Properties"); } addClientDependency(ClientDependency.supplierFromPath("ehr/model/sources/ClinicalDefaults.js")); @@ -93,7 +95,7 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner) addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/window/FormTemplateWindow.js")); //Added 6-22-2026 R.Blasa - addClientDependency(ClientDependency.supplierFromPath("/onprc_ehr/model/sources/Pairing_Properties.js")); + addClientDependency(ClientDependency.supplierFromPath("/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js")); From a00e37f36aaab6595bd99fc90fd0f8ef0331be5d Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 15:34:48 -0700 Subject: [PATCH 03/10] Modified Bulk Clinical Entry to contain Pairing Observation Entry form. --- .../sources/Bulk_Clinic_Pairing_Properties.js | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js index 1ab6486a4..df26647f7 100644 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js @@ -49,7 +49,8 @@ EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', { displayColumn: 'value', sort: 'category,value,sort_order', filterArray: [ - LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK) + LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK), + LABKEY.Filter.create('category', 'STF Clinical', LABKEY.Filter.Types.EQUAL) ] } }, @@ -65,28 +66,19 @@ EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', { }, lookup: { filterArray: [ - LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK) + LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK), + LABKEY.Filter.create('value', 'STF Clinical', LABKEY.Filter.Types.EQUAL) ] } }, - - enddate: { + enddate: { hidden: false }, - separationreason: { hidden: true }, observation: { - allowBlank: true, - columnConfig: { - width: 250 - }, - lookup: { - filterArray: [ - LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK) - ] - } + hidden: true }, remark2: { @@ -113,7 +105,13 @@ EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', { category: { allowBlank: false, columnConfig: { - width: 200 + width: 150 + }, + lookup: { + filterArray: [ + LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK), + LABKEY.Filter.create('value', 'STF Clinical', LABKEY.Filter.Types.EQUAL) + ] } }, other_infant: { From 1ad9467dbaf5b721c4ce029d20dc3ce20f6851d5 Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 15:41:56 -0700 Subject: [PATCH 04/10] Modified Bulk Clinical Entry to contain Pairing Observation Entry form. --- .../sources/Bulk_Clinic_Pairing_Properties.js | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js index df26647f7..097e73120 100644 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js @@ -61,15 +61,34 @@ EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', { hidden: true }, endeventType: { - columnConfig: { - width: 180 - }, - lookup: { - filterArray: [ - LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK), - LABKEY.Filter.create('value', 'STF Clinical', LABKEY.Filter.Types.EQUAL) - ] - } + + columnConfig: { + width: 250 + }, + editorConfig: { + caseSensitive: false, + anyMatch: true, + listConfig: { + innerTpl: '{[(values.category ? "" + LABKEY.Utils.encodeHtml(values.category) + ": " : "") + LABKEY.Utils.encodeHtml(values.value)]}', + getInnerTpl: function () { + return this.innerTpl; + } + } + }, + lookup: { + xtype: 'combobox', + schemaName: 'ehr_Lookups', + queryName: 'pairingendtypes', + columns: 'value,category,sort_order,date_disabled', + keyColumn: 'value', + displayColumn: 'value', + sort: 'category,value,sort_order', + filterArray: [ + LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK), + LABKEY.Filter.create('category', 'STF Clinical', LABKEY.Filter.Types.EQUAL) + ] + } + }, enddate: { hidden: false From ae5dd07e81acac5c1cdfec5a3f897a4672c6b004 Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 16:01:49 -0700 Subject: [PATCH 05/10] Modified Bulk Clinical Entry to contain Pairing Observation Entry form. --- .../sources/Bulk_Clinic_Pairing_Properties.js | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js index 097e73120..35847b37c 100644 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js @@ -61,34 +61,14 @@ EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', { hidden: true }, endeventType: { - - columnConfig: { - width: 250 - }, - editorConfig: { - caseSensitive: false, - anyMatch: true, - listConfig: { - innerTpl: '{[(values.category ? "" + LABKEY.Utils.encodeHtml(values.category) + ": " : "") + LABKEY.Utils.encodeHtml(values.value)]}', - getInnerTpl: function () { - return this.innerTpl; - } - } - }, lookup: { - xtype: 'combobox', - schemaName: 'ehr_Lookups', - queryName: 'pairingendtypes', - columns: 'value,category,sort_order,date_disabled', - keyColumn: 'value', - displayColumn: 'value', - sort: 'category,value,sort_order', + columnConfig: { + width: 250 + }, filterArray: [ - LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK), - LABKEY.Filter.create('category', 'STF Clinical', LABKEY.Filter.Types.EQUAL) + LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK) ] } - }, enddate: { hidden: false From 45fafea03618b843692a1acba305edaef272199f Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 16:19:48 -0700 Subject: [PATCH 06/10] Modified Bulk Clinical Entry to contain Pairing Observation Entry form. --- .../sources/Bulk_Clinic_Pairing_Properties.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js index 35847b37c..6b5009bb6 100644 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js @@ -61,15 +61,15 @@ EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', { hidden: true }, endeventType: { - lookup: { - columnConfig: { - width: 250 - }, - filterArray: [ - LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK) - ] - } - }, + columnConfig: { + width: 250 + }, + lookup: { + filterArray: [ + LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK) + ] + } + }, enddate: { hidden: false }, From 35b8372b7f51f494ab0ef939e05860573d3b28d0 Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 22:51:59 -0700 Subject: [PATCH 07/10] Modified Clinical Medications Online version of the Printable web site so that online version mirrors the report of pdf version of the reports. --- .../onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js index 6b5009bb6..8c01cc7d2 100644 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js @@ -117,7 +117,7 @@ EHR.model.DataModelManager.registerMetadata('Bulk_Pairing_Properties', { hidden: true }, lowestcage: { - hidden: true + hidden: false }, remark: { xtype: 'textareafield', From ecd94a327486950eb71c84d19dea58fa1e29cd07 Mon Sep 17 00:00:00 2001 From: blasar Date: Tue, 23 Jun 2026 00:21:19 -0700 Subject: [PATCH 08/10] Modified Bulk Clinical Entry to include a new input form called "Pairing Observation". --- .../dataentry/ARTCoreRequestFormType.java | 6 ++++++ .../onprc_ehr/dataentry/ASBRequestFormType.java | 15 +++++++++++++++ .../onprc_ehr/dataentry/BloodDrawFormType.java | 6 ++++++ .../dataentry/BulkClinicalEntryFormType.java | 16 ++++++++-------- .../dataentry/ClinicalRoundsFormType.java | 16 ++++++++++++++++ .../onprc_ehr/dataentry/PMICRequestFormType.java | 11 ++++++++++- .../onprc_ehr/dataentry/PairingFormType.java | 15 +++++++++++++++ 7 files changed, 76 insertions(+), 9 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ARTCoreRequestFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ARTCoreRequestFormType.java index bf6083a6b..bbf92bae7 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ARTCoreRequestFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ARTCoreRequestFormType.java @@ -56,6 +56,12 @@ public boolean isVisible() { return false; } + + Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); + if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) + { + return false; + } return super.isVisible(); } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ASBRequestFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ASBRequestFormType.java index eb1c615b5..f22c13fac 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ASBRequestFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ASBRequestFormType.java @@ -22,7 +22,11 @@ import org.labkey.api.ehr.dataentry.RequestForm; import org.labkey.api.ehr.dataentry.RequestFormSection; import org.labkey.api.module.Module; +import org.labkey.api.security.Group; +import org.labkey.api.security.GroupManager; +import org.labkey.api.security.permissions.AdminPermission; import org.labkey.api.view.template.ClientDependency; +import org.labkey.security.xml.GroupEnumType; import java.util.Arrays; @@ -53,4 +57,15 @@ public ASBRequestFormType(DataEntryFormContext ctx, Module owner) s.addConfigSource("ASB_Services"); } } + //Added: 6-23-2026 R.Blasa + @Override + public boolean isVisible() + { + Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); + if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) + { + return false; + } + return super.isVisible(); + } } 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 edbe49d39..bd7a68aa7 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java @@ -82,6 +82,12 @@ public boolean isVisible() { return false; } + + Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); + if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) + { + return false; + } return super.isVisible(); } } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java index d745af4c4..588e49a8c 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java @@ -101,14 +101,14 @@ public BulkClinicalEntryFormType(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(); +// } @Override protected List getMoreActionButtonConfigs() 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 ab5d20c96..44acdbeeb 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java @@ -27,7 +27,11 @@ import org.labkey.api.ehr.security.EHRClinicalEntryPermission; import org.labkey.api.module.Module; import org.labkey.api.query.Queryable; +import org.labkey.api.security.Group; +import org.labkey.api.security.GroupManager; +import org.labkey.api.security.permissions.AdminPermission; import org.labkey.api.view.template.ClientDependency; +import org.labkey.security.xml.GroupEnumType; import java.util.Arrays; @@ -77,4 +81,16 @@ public ClinicalRoundsFormType(DataEntryFormContext ctx, Module owner) } + //Added: 6-23-2026 R.Blasa + @Override + public boolean isVisible() + { + Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); + if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) + { + return false; + } + return super.isVisible(); + } + } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PMICRequestFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PMICRequestFormType.java index 647e3c387..1c51b8942 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PMICRequestFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PMICRequestFormType.java @@ -75,7 +75,16 @@ public boolean isVisible() { return false; } - return super.isVisible(); + + //Added: 6-23-2026 R.Blasa + + Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); + if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) + { + return false; + } + return super.isVisible(); + } } \ No newline at end of file diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PairingFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PairingFormType.java index abf1da752..9466cf922 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PairingFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PairingFormType.java @@ -21,7 +21,11 @@ import org.labkey.api.ehr.dataentry.TaskFormSection; import org.labkey.api.ehr.security.EHRBehaviorEntryPermission; import org.labkey.api.module.Module; +import org.labkey.api.security.Group; +import org.labkey.api.security.GroupManager; +import org.labkey.api.security.permissions.AdminPermission; import org.labkey.api.view.template.ClientDependency; +import org.labkey.security.xml.GroupEnumType; import java.util.Arrays; @@ -67,6 +71,17 @@ public PairingFormType(DataEntryFormContext ctx, Module owner) } + //Added: 6-23-2026 R.Blasa + @Override + public boolean isVisible() + { + Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); + if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) + { + return false; + } + return super.isVisible(); + } } From e8083e0a6c08323b06232aee0631f609faba56ae Mon Sep 17 00:00:00 2001 From: blasar Date: Tue, 23 Jun 2026 09:16:29 -0700 Subject: [PATCH 09/10] Modified Bulk Clinical Entry to include a new input form called "Pairing Observation". --- .../dataentry/ARTCoreRequestFormType.java | 6 ------ .../onprc_ehr/dataentry/ASBRequestFormType.java | 15 --------------- .../dataentry/BulkClinicalEntryFormType.java | 16 +++++++--------- .../dataentry/ClinicalRoundsFormType.java | 16 ---------------- .../onprc_ehr/dataentry/PairingFormType.java | 15 --------------- 5 files changed, 7 insertions(+), 61 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ARTCoreRequestFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ARTCoreRequestFormType.java index bbf92bae7..bf6083a6b 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ARTCoreRequestFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ARTCoreRequestFormType.java @@ -56,12 +56,6 @@ public boolean isVisible() { return false; } - - Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); - if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) - { - return false; - } return super.isVisible(); } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ASBRequestFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ASBRequestFormType.java index f22c13fac..eb1c615b5 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ASBRequestFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ASBRequestFormType.java @@ -22,11 +22,7 @@ import org.labkey.api.ehr.dataentry.RequestForm; import org.labkey.api.ehr.dataentry.RequestFormSection; import org.labkey.api.module.Module; -import org.labkey.api.security.Group; -import org.labkey.api.security.GroupManager; -import org.labkey.api.security.permissions.AdminPermission; import org.labkey.api.view.template.ClientDependency; -import org.labkey.security.xml.GroupEnumType; import java.util.Arrays; @@ -57,15 +53,4 @@ public ASBRequestFormType(DataEntryFormContext ctx, Module owner) s.addConfigSource("ASB_Services"); } } - //Added: 6-23-2026 R.Blasa - @Override - public boolean isVisible() - { - Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); - if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) - { - return false; - } - return super.isVisible(); - } } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java index 588e49a8c..78cdb5d56 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java @@ -97,19 +97,17 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner) //Added 6-22-2026 R.Blasa addClientDependency(ClientDependency.supplierFromPath("/onprc_ehr/model/sources/Bulk_Clinic_Pairing_Properties.js")); + } + @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(); -// } - @Override protected List getMoreActionButtonConfigs() { 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 44acdbeeb..ab5d20c96 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalRoundsFormType.java @@ -27,11 +27,7 @@ import org.labkey.api.ehr.security.EHRClinicalEntryPermission; import org.labkey.api.module.Module; import org.labkey.api.query.Queryable; -import org.labkey.api.security.Group; -import org.labkey.api.security.GroupManager; -import org.labkey.api.security.permissions.AdminPermission; import org.labkey.api.view.template.ClientDependency; -import org.labkey.security.xml.GroupEnumType; import java.util.Arrays; @@ -81,16 +77,4 @@ public ClinicalRoundsFormType(DataEntryFormContext ctx, Module owner) } - //Added: 6-23-2026 R.Blasa - @Override - public boolean isVisible() - { - Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); - if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) - { - return false; - } - return super.isVisible(); - } - } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PairingFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PairingFormType.java index 9466cf922..abf1da752 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PairingFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PairingFormType.java @@ -21,11 +21,7 @@ import org.labkey.api.ehr.dataentry.TaskFormSection; import org.labkey.api.ehr.security.EHRBehaviorEntryPermission; import org.labkey.api.module.Module; -import org.labkey.api.security.Group; -import org.labkey.api.security.GroupManager; -import org.labkey.api.security.permissions.AdminPermission; import org.labkey.api.view.template.ClientDependency; -import org.labkey.security.xml.GroupEnumType; import java.util.Arrays; @@ -71,17 +67,6 @@ public PairingFormType(DataEntryFormContext ctx, Module owner) } - //Added: 6-23-2026 R.Blasa - @Override - public boolean isVisible() - { - Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); - if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) - { - return false; - } - return super.isVisible(); - } } From dee1bad3228d1f6383497cdfca738873461a7590 Mon Sep 17 00:00:00 2001 From: blasar Date: Tue, 23 Jun 2026 13:16:05 -0700 Subject: [PATCH 10/10] Modified Bulk Clinical entry to exclude other forms. --- .../labkey/onprc_ehr/dataentry/BloodDrawFormType.java | 6 ------ .../onprc_ehr/dataentry/PMICRequestFormType.java | 11 +---------- 2 files changed, 1 insertion(+), 16 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 bd7a68aa7..edbe49d39 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BloodDrawFormType.java @@ -82,12 +82,6 @@ public boolean isVisible() { return false; } - - Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); - if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) - { - return false; - } return super.isVisible(); } } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PMICRequestFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PMICRequestFormType.java index 1c51b8942..647e3c387 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PMICRequestFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/PMICRequestFormType.java @@ -75,16 +75,7 @@ public boolean isVisible() { return false; } - - //Added: 6-23-2026 R.Blasa - - Group h = GroupManager.getGroup(getCtx().getContainer(), "Bulk Clinical SF", GroupEnumType.SITE); - if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) - { - return false; - } - return super.isVisible(); - + return super.isVisible(); } } \ No newline at end of file