diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsCasePanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsCasePanel.js index d0b42a561..752c7f113 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsCasePanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsCasePanel.js @@ -8,9 +8,9 @@ //Created 5-9-2016 R.Blasa -Ext4.define('onprc_ehr.panel.AnimalDetailsCasePanel', { - extend: 'EHR.panel.SnapshotPanel', - alias: 'widget.onprc_ehr-animaldetailspanel', +Ext4.define('ONPRC_EHR.panel.AnimalDetailsCasePanel', { + extend: 'onprc_ehr.panel.SnapshotPanel', + alias: 'widget.onprc_ehr-animaldetailscasepanel', border: true, showExtendedInformation: false, @@ -88,7 +88,7 @@ Ext4.define('onprc_ehr.panel.AnimalDetailsCasePanel', { }, items: [{ xtype: 'container', - width: 380, + width: 780, //Modified width 2-15-2024 R. Blasa defaults: { xtype: 'displayfield', labelWidth: this.defaultLabelWidth @@ -119,6 +119,13 @@ Ext4.define('onprc_ehr.panel.AnimalDetailsCasePanel', { xtype: 'displayfield', fieldLabel: 'Active Cases', name: 'activeCases' + },{ + // Added: 2-15-2024 R. Blasa + xtype: 'ehr-snapshotchildpanel', + headerLabel: 'Sustained Release Medication', + name: 'sdrug' + + }] },{ xtype: 'container', @@ -266,6 +273,8 @@ Ext4.define('onprc_ehr.panel.AnimalDetailsCasePanel', { toSet['assignmentsAndGroups'] = values.length ? values.join('
') : null; } , + + //Added 4-28-2016 R.Blasa appendCases: function(toSet, results){ var values = []; diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsPanel.js index 7d350807e..bfdfb287e 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsPanel.js @@ -5,7 +5,7 @@ * * @param subjectId */ -Ext4.define('ONPC_EHR.panel.AnimalDetailsPanel', { +Ext4.define('ONPRC_EHR.panel.AnimalDetailsPanel', { extend: 'onprc_ehr.panel.SnapshotPanel', alias: 'widget.onprc_ehr-animaldetailspanels', diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailsRoundsFormSection.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailsRoundsFormSection.java index f030316a2..6f80026a2 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailsRoundsFormSection.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailsRoundsFormSection.java @@ -24,7 +24,7 @@ public class AnimalDetailsRoundsFormSection extends NonStoreFormSection public AnimalDetailsRoundsFormSection() { // //Modified 5-4-2016 R.Blasa - super("AnimalDetails", "Animal Details", "onprc_ehr-animaldetailspanel" ); + super("AnimalDetails", "Animal Details", "onprc_ehr-animaldetailscasepanel" ); //Modified 5-4-2016 R.Blasa addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/panel/AnimalDetailsCasePanel.js"));