Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bot] Merge 23.7 to 23.11 #937

Merged
merged 3 commits into from
Mar 4, 2024
Merged

[bot] Merge 23.7 to 23.11 #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da1df27
23.3 fb animal details sustained medication (#925)
Ohsudev Feb 28, 2024
b86b70e
Merge 23.3 to 23.7
labkey-teamcity Mar 1, 2024
64616f9
Merge 23.7 to 23.11
labkey-teamcity Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsCasePanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -266,6 +273,8 @@ Ext4.define('onprc_ehr.panel.AnimalDetailsCasePanel', {

toSet['assignmentsAndGroups'] = values.length ? values.join('<br>') : null;
} ,


//Added 4-28-2016 R.Blasa
appendCases: function(toSet, results){
var values = [];
Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',

Expand Down
2 changes: 1 addition & 1 deletion onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailsRoundsFormSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
Loading