diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/ExamInstructionsPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/ExamInstructionsPanel.js index 58b73ddfc..de02dd4aa 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/ExamInstructionsPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/ExamInstructionsPanel.js @@ -10,7 +10,7 @@ Ext4.define('ONPRC_EHR.panel.ExamInstructionsPanel', { initComponent: function(){ var buttons = []; LDK.Assert.assertNotEmpty('No data entry panel', this.dataEntryPanel); - var btnCfg = EHR.DataEntryUtils.getDataEntryFormButton('APPLYFORMTEMPLATE'); + var btnCfg = EHR.DataEntryUtils.getDataEntryFormButton('APPLYFORMTEMPLATEREV'); if (btnCfg){ btnCfg = this.dataEntryPanel.configureButton(btnCfg); if (btnCfg){ diff --git a/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js b/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js index f8fc9e1bb..c31213f0e 100644 --- a/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js +++ b/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js @@ -282,8 +282,7 @@ Ext4.define('ONPRC_EHR.window.FormTemplateWindow', { getRecordDefaults: function(){ if (this.idSelectionMode == 'none' || this.idSelectionMode == 'multi'){ var date = this.down('#dateField').getValue(); - var idField = this.down('#idField'); - var subjectArray = LDK.Utils.splitIds(idField ? idField.getValue() : ''); + var subjectArray = LDK.Utils.splitIds(this.down('#idField').getValue(), true); if (subjectArray.length == 0){ subjectArray = [null]; 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 17ca29534..2c0d89d73 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java @@ -88,6 +88,11 @@ public BulkClinicalEntryFormType(DataEntryFormContext ctx, Module owner) //Added 9-18-2025 R. Blasa addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/panel/ExamInstructionsPanel.js")); + //Added 11-4-2025 R. Blasa + addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/window/FormTemplateWindow.js")); + + + } @Override