From c3f268bb4b306d849d05263ed9c88e90c3711572 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Mon, 3 Nov 2025 23:35:29 -0800 Subject: [PATCH 1/4] Modified program to allow template to load unsorted list of monkey ids. --- .../resources/web/onprc_ehr/panel/ExamInstructionsPanel.js | 2 +- .../resources/web/onprc_ehr/window/FormTemplateWindow.js | 6 ++++-- .../labkey/onprc_ehr/dataentry/ClinicalReportFormType.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) 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..1e90d5855 100644 --- a/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js +++ b/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js @@ -282,8 +282,10 @@ 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 idField = this.down('#idField'); + var subjectArray = LDK.Utils.splitIds(this.down('#idField').getValue(), true); + + // var subjectArray = LDK.Utils.splitIds(idField ? idField.getValue() : ''); if (subjectArray.length == 0){ subjectArray = [null]; diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java index fa7b11c04..a5525763b 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java @@ -50,7 +50,7 @@ public class ClinicalReportFormType extends TaskForm public ClinicalReportFormType(DataEntryFormContext ctx, Module owner) { super(ctx, owner, NAME, LABEL, "Clinical", Arrays.asList( - new NonStoreFormSection("Instructions", "Instructions", "ehr-examinstructionspanel", Arrays.asList(ClientDependency.supplierFromPath("ehr/panel/ExamInstructionsPanel.js"))), + new NonStoreFormSection("Instructions", "Instructions", "onprc_ehr-examinstructionspanel", Arrays.asList(ClientDependency.supplierFromPath("ehr/panel/ExamInstructionsPanel.js"))), new TaskFormSection(), new ExtendedAnimalDetailsFormSection(), new SimpleFormPanelSection("study", "Clinical Remarks", "SOAP", false, EHRService.FORM_SECTION_LOCATION.Tabs), From 936505aa56a9363223f5b817109c74dff838dd8d Mon Sep 17 00:00:00 2001 From: ohsudev Date: Tue, 4 Nov 2025 14:52:55 -0800 Subject: [PATCH 2/4] Modified program to allow unsorted entries of a list of monkey ids onto the template form menus. --- .../onprc_ehr/dataentry/BulkClinicalEntryFormType.java | 5 +++++ .../labkey/onprc_ehr/dataentry/ClinicalReportFormType.java | 6 ++++++ 2 files changed, 11 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 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 diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java index a5525763b..620f74753 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java @@ -96,6 +96,12 @@ public ClinicalReportFormType(DataEntryFormContext ctx, Module owner) // Modified: 10-5-2017 R.Blasa reinstalled 2-12-21 addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/model/sources/ClinicalReport.js")); + //Added 11-4-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")); + // Added: 7-22-2025 R.Blasa addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/panel/ExamCasesHousingDataEntryPanel.js")); From 9ad3915e31ed463e185007df6eee8a42ebbc2596 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Tue, 4 Nov 2025 15:17:15 -0800 Subject: [PATCH 3/4] Modified program to allow unsorted entries of a list of monkey ids onto the template form menus. --- .../onprc_ehr/dataentry/ClinicalReportFormType.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java index 620f74753..fa7b11c04 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java @@ -50,7 +50,7 @@ public class ClinicalReportFormType extends TaskForm public ClinicalReportFormType(DataEntryFormContext ctx, Module owner) { super(ctx, owner, NAME, LABEL, "Clinical", Arrays.asList( - new NonStoreFormSection("Instructions", "Instructions", "onprc_ehr-examinstructionspanel", Arrays.asList(ClientDependency.supplierFromPath("ehr/panel/ExamInstructionsPanel.js"))), + new NonStoreFormSection("Instructions", "Instructions", "ehr-examinstructionspanel", Arrays.asList(ClientDependency.supplierFromPath("ehr/panel/ExamInstructionsPanel.js"))), new TaskFormSection(), new ExtendedAnimalDetailsFormSection(), new SimpleFormPanelSection("study", "Clinical Remarks", "SOAP", false, EHRService.FORM_SECTION_LOCATION.Tabs), @@ -96,12 +96,6 @@ public ClinicalReportFormType(DataEntryFormContext ctx, Module owner) // Modified: 10-5-2017 R.Blasa reinstalled 2-12-21 addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/model/sources/ClinicalReport.js")); - //Added 11-4-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")); - // Added: 7-22-2025 R.Blasa addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/panel/ExamCasesHousingDataEntryPanel.js")); From 80be1a30e8fa876f3a9df29e969d0f85813afe62 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Tue, 4 Nov 2025 15:21:57 -0800 Subject: [PATCH 4/4] Modified program to allow unsorted entries of a list of monkey ids onto the template form menus. --- onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js b/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js index 1e90d5855..c31213f0e 100644 --- a/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js +++ b/onprc_ehr/resources/web/onprc_ehr/window/FormTemplateWindow.js @@ -282,11 +282,8 @@ 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(this.down('#idField').getValue(), true); - // var subjectArray = LDK.Utils.splitIds(idField ? idField.getValue() : ''); - if (subjectArray.length == 0){ subjectArray = [null]; }