Skip to content

Add inheritDefaultDateFromParent to encounter forms #963

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
labkey-martyp merged 2 commits into from
Jun 5, 2025
Merged

Add inheritDefaultDateFromParent to encounter forms #963

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
dc473fe
encounters inherit from parent
labkey-martyp Jun 3, 2025
e14298c
new property
labkey-martyp Jun 3, 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
2 changes: 1 addition & 1 deletion ehr/resources/web/ehr/data/EncounterStoreCollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Ext4.define('EHR.data.EncounterStoreCollection', {
model.set('Id', parentRec.get('Id'));
}

if (model.fields.get('date') && !model.get('date') && parentRec.get('date')){
if (model.fields.get('date')?.inheritDefaultDateFromParent && !model.get('date') && parentRec.get('date')){
model.set('date', parentRec.get('date'));
}

Expand Down
3 changes: 2 additions & 1 deletion ehr/resources/web/ehr/model/sources/EncounterChild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ EHR.model.DataModelManager.registerMetadata('EncounterChild', {
}
},
date: {
inheritDateFromParent: true
inheritDateFromParent: true,
inheritDefaultDateFromParent: true
},
project: {
inheritFromParent: true
Expand Down
12 changes: 10 additions & 2 deletions ehr/resources/web/ehr/window/EncounterAddRecordWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,16 @@ Ext4.define('EHR.window.EncounterAddRecordWindow', {
var model = this.targetGrid.store.createModel({});
var obj = {};
Ext4.Array.forEach(['Id', 'date', 'parentid', 'project'], function(field){
if (this.targetGrid.store.getFields().get(field)){
obj[field] = rec.get(field);
const fieldConfig = this.targetGrid.store.getFields().get(field);
if (fieldConfig){
if (field === 'date') {
if (fieldConfig.inheritDefaultDateFromParent) {
obj[field] = rec.get(field);
}
}
else {
obj[field] = rec.get(field);
}
}
}, this);

Expand Down