Skip to content

Commit 167f7c0

Browse files
Add inheritDefaultDateFromParent to encounter forms (#963)
* Add inheritDefaultDateFromParent and conditionalize date default in encounters
1 parent f00cc55 commit 167f7c0

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

ehr/resources/web/ehr/data/EncounterStoreCollection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Ext4.define('EHR.data.EncounterStoreCollection', {
6464
model.set('Id', parentRec.get('Id'));
6565
}
6666

67-
if (model.fields.get('date') && !model.get('date') && parentRec.get('date')){
67+
if (model.fields.get('date')?.inheritDefaultDateFromParent && !model.get('date') && parentRec.get('date')){
6868
model.set('date', parentRec.get('date'));
6969
}
7070

ehr/resources/web/ehr/model/sources/EncounterChild.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ EHR.model.DataModelManager.registerMetadata('EncounterChild', {
1212
}
1313
},
1414
date: {
15-
inheritDateFromParent: true
15+
inheritDateFromParent: true,
16+
inheritDefaultDateFromParent: true
1617
},
1718
project: {
1819
inheritFromParent: true

ehr/resources/web/ehr/window/EncounterAddRecordWindow.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,16 @@ Ext4.define('EHR.window.EncounterAddRecordWindow', {
9696
var model = this.targetGrid.store.createModel({});
9797
var obj = {};
9898
Ext4.Array.forEach(['Id', 'date', 'parentid', 'project'], function(field){
99-
if (this.targetGrid.store.getFields().get(field)){
100-
obj[field] = rec.get(field);
99+
const fieldConfig = this.targetGrid.store.getFields().get(field);
100+
if (fieldConfig){
101+
if (field === 'date') {
102+
if (fieldConfig.inheritDefaultDateFromParent) {
103+
obj[field] = rec.get(field);
104+
}
105+
}
106+
else {
107+
obj[field] = rec.get(field);
108+
}
101109
}
102110
}, this);
103111

0 commit comments

Comments
 (0)