Skip to content

[bot] Merge 24.11 to 25.3 #502

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

Merged
github-actions merged 2 commits into from
Mar 24, 2025
Merged

[bot] Merge 24.11 to 25.3 #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f51724d
Behavior Obs Feedback (#500)
labkey-martyp Mar 20, 2025
602934d
Merge 24.11 to 25.3
labkey-teamcity Mar 24, 2025
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
8 changes: 4 additions & 4 deletions nirc_ehr/resources/data/observation_types.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
value category editorconfig schemaName queryName valueColumn
Abdominal Observations {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"abdominal_obs_type","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups abdominal_obs_type value
Abnormal Behaviors Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"behavior_types","displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups behavior_types value
Activity Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"activity","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups activity value
Activity {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"activity","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups activity value
Alopecia Regrowth Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"alopecia_regrowth","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups alopecia_regrowth value
Alopecia Score Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"alopecia_score","forceSelection":true,"displayField":"title","valueField":"value","sortFields":"sort_order"} ehr_lookups alopecia_score value
Alopecia Type Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"alopecia_type","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups alopecia_type value
Appetite Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"app_score","displayField":"value","sortFields":"sort_order","valueField":"value"} ehr_lookups app_score value
Attitude Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"att_score","displayField":"value","valueField":"value"} ehr_lookups att_score value
Appetite {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"app_score","displayField":"value","sortFields":"sort_order","valueField":"value"} ehr_lookups app_score value
Attitude {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"att_score","displayField":"value","valueField":"value"} ehr_lookups att_score value
Auscultation {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"normal_abnormal_only","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups normal_abnormal_only value
Bandage/Splint Observations {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"bandage_observations","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups bandage_observations value
BCS {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"bcs_score","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups bcs_score value
Expand All @@ -17,7 +17,7 @@ Daily Enrichment Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups",
Dental/Oral Observations {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"dental_obs","displayField":"value","sortFields":"sort_order","valueField":"value"} ehr_lookups dental_obs value
Dermatologic Observations {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"derm_obs","displayField":"value","sortFields":"sort_order","valueField":"value"} ehr_lookups derm_obs value
Environmental Change Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"yes_no_order","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups yes_no_order value
Feed Assessment Behavior {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"feed_assess_types","displayField":"value","valueField":"value"} ehr_lookups feed_assess_types value
Feed Assessment {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"feed_assess_types","displayField":"value","valueField":"value"} ehr_lookups feed_assess_types value
General Observations {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"general_obs","displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups general_obs value
Genitourinary Observations {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"genitourinary_obs","displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups genitourinary_obs value
Hernia {"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"hernia_types","displayField":"value","valueField":"value","sortFields":"sort_order"} ehr_lookups hernia_types value
Expand Down
14 changes: 14 additions & 0 deletions nirc_ehr/resources/web/nirc_ehr/model/sources/BehaviorDefaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,26 @@ EHR.model.DataModelManager.registerMetadata('BehaviorDefaults', {
type: {
hidden: true,
defaultValue: 'Behavior'
},
category: {
lookup: {
filterArray: [
LABKEY.Filter.create('category', 'Behavior')
]
}
}
},
'study.observation_order': {
type: {
hidden: true,
defaultValue: 'Behavior'
},
category: {
lookup: {
filterArray: [
LABKEY.Filter.create('category', 'Behavior')
]
}
}
},
'study.drug': {
Expand Down
18 changes: 17 additions & 1 deletion nirc_ehr/resources/web/nirc_ehr/model/sources/ClinicalDefaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,15 @@ EHR.model.DataModelManager.registerMetadata('ClinicalDefaults', {
type: {
hidden: true,
defaultValue: 'Clinical'
}
},
category: {
lookup: {
columns: 'value,description',
filterArray: [
LABKEY.Filter.create('category', null, LABKEY.Filter.Types.ISBLANK)
],
}
},
},
'study.vitals': {
category: {
Expand All @@ -214,6 +222,14 @@ EHR.model.DataModelManager.registerMetadata('ClinicalDefaults', {
type: {
hidden: true,
defaultValue: 'Clinical'
},
category: {
lookup: {
columns: 'value,description',
filterArray: [
LABKEY.Filter.create('category', null, LABKEY.Filter.Types.ISBLANK)
],
}
}
}
}
Expand Down
20 changes: 20 additions & 0 deletions nirc_ehr/resources/web/nirc_ehr/model/sources/ObsDefaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
EHR.model.DataModelManager.registerMetadata('ObsDefaults', {
byQuery: {
'study.clinical_observations': {
category: {
lookup: {
columns: 'value,description',
filterArray: []
}
},
},
'study.observation_order': {
category: {
lookup: {
columns: 'value,description',
filterArray: []
}
}
}
}
});
2 changes: 2 additions & 0 deletions nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCClinicalObservationsFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@ public NIRCClinicalObservationsFormType(DataEntryFormContext ctx, Module owner)
));

addClientDependency(ClientDependency.supplierFromPath("nirc_ehr/model/sources/ClinicalDefaults.js"));
addClientDependency(ClientDependency.supplierFromPath("nirc_ehr/model/sources/ObsDefaults.js"));

// Needed for case and scheduled date/time when navigating from treatment or observation schedule
addClientDependency(ClientDependency.supplierFromPath("nirc_ehr/buttons/treatmentSubmit.js"));

for (FormSection s : this.getFormSections())
{
s.addConfigSource("ClinicalDefaults");
s.addConfigSource("ObsDefaults");
}
}

Expand Down