encounters inherit from parent

Author: labkey-martyp

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

@@ -60,19 +60,19 @@ Ext4.define('EHR.data.EncounterStoreCollection', {
             var parentRec = this.getEncountersRecord(model.get('parentid'));
             if (parentRec){
                 model.beginEdit();
-                if (parentRec.get('Id') !== model.get('Id')){
+                if (parentRec.get('Id') !== model.get('Id') && model.fields.get('Id')?.inheritFromParent){
                     model.set('Id', parentRec.get('Id'));
                 }
 
-                if (model.fields.get('date') && !model.get('date') && parentRec.get('date')){
+                if (model.fields.get('date')?.inheritDateFromParent && !model.get('date') && parentRec.get('date')){
                     model.set('date', parentRec.get('date'));
                 }
 
-                if (model.fields.get('project') && !model.get('project') && parentRec.get('project')){
+                if (model.fields.get('project')?.inheritFromParent && !model.get('project') && parentRec.get('project')){
                     model.set('project', parentRec.get('project'));
                 }
 
-                if (model.fields.get('chargetype') && !model.get('chargetype') && parentRec.get('chargetype')){
+                if (model.fields.get('chargetype')?.inheritFromParent && !model.get('chargetype') && parentRec.get('chargetype')){
                     model.set('chargetype', parentRec.get('chargetype'));
                 }
 

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

@@ -96,8 +96,14 @@ 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' && fieldConfig.inheritDateFromParent) {
+                        obj[field] = rec.get(field);
+                    }
+                    else if (fieldConfig.inheritFromParent) {
+                        obj[field] = rec.get(field);
+                    }
                 }
             }, this);