openchs-models 1.31.34 → 1.31.35

package/dist/EntityMetaData.js

@@ -634,11 +634,7 @@ class EntityMetaData {
   }
 
   static entitiesLoadedFromServer() {
-    return _lodash.default.differenceBy(_Schema.default.getInstance().getEntities(), [_Settings.default, _LocaleMapping.default].concat(EntityMetaData.embeddedEntities()), "schema.name");
-  }
-
-  static embeddedEntities() {
-    return _lodash.default.filter(_Schema.default.getInstance().getEntities(), entity => entity.schema.embedded);
+    return _lodash.default.differenceBy(_Schema.default.getInstance().getEntities(), [_Settings.default, _LocaleMapping.default], "schema.name");
   }
 
   static findByName(entityName) {

package/dist/Family.js

@@ -211,7 +211,7 @@ class Family extends _BaseEntity.default {
 }
 
 _defineProperty(Family, "schema", {
-  name: _SchemaNames.default.Family,
+  name: "Family",
   primaryKey: "uuid",
   properties: {
     uuid: "string",
@@ -226,7 +226,7 @@ _defineProperty(Family, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     }
   }
 });

package/dist/GroupSubject.js

@@ -17,14 +17,8 @@ var _General = _interopRequireDefault(require("./utility/General"));
 
 var _GroupRole = _interopRequireDefault(require("./GroupRole"));
 
-var _AuditUtil = require("./utility/AuditUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class GroupSubject extends _BaseEntity.default {
@@ -72,38 +66,6 @@ class GroupSubject extends _BaseEntity.default {
     this.that.membershipEndDate = x;
   }
 
-  get createdBy() {
-    return this.that.createdBy;
-  }
-
-  set createdBy(x) {
-    this.that.createdBy = x;
-  }
-
-  get lastModifiedBy() {
-    return this.that.lastModifiedBy;
-  }
-
-  set lastModifiedBy(x) {
-    this.that.lastModifiedBy = x;
-  }
-
-  get createdByUUID() {
-    return this.that.createdByUUID;
-  }
-
-  set createdByUUID(x) {
-    this.that.createdByUUID = x;
-  }
-
-  get lastModifiedByUUID() {
-    return this.that.lastModifiedByUUID;
-  }
-
-  set lastModifiedByUUID(x) {
-    this.that.lastModifiedByUUID = x;
-  }
-
   get toResource() {
     const resource = _lodash.default.pick(this, ["uuid"]);
 
@@ -160,7 +122,6 @@ class GroupSubject extends _BaseEntity.default {
     groupSubjectEntity.groupSubject = groupOrHouseholdSubject;
     groupSubjectEntity.memberSubject = memberSubject;
     groupSubjectEntity.groupRole = groupRole;
-    (0, _AuditUtil.mapAuditFields)(groupSubjectEntity, resource);
     return groupSubjectEntity;
   }
 
@@ -229,7 +190,7 @@ _defineProperty(GroupSubject, "EXPLICIT_ERROR_CODE_KEY_FOR_MISSING_MEMBER", 'Gro
 _defineProperty(GroupSubject, "schema", {
   name: "GroupSubject",
   primaryKey: "uuid",
-  properties: _objectSpread({
+  properties: {
     uuid: "string",
     groupSubject: "Individual",
     memberSubject: "Individual",
@@ -243,7 +204,7 @@ _defineProperty(GroupSubject, "schema", {
       type: "bool",
       default: false
     }
-  }, _AuditUtil.AuditFields)
+  }
 });
 
 var _default = GroupSubject;

package/dist/IdentifierAssignment.js

@@ -19,14 +19,8 @@ var _IdentifierSource = _interopRequireDefault(require("./IdentifierSource"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _AuditUtil = require("./utility/AuditUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class IdentifierAssignment extends _BaseEntity.default {
@@ -82,45 +76,12 @@ class IdentifierAssignment extends _BaseEntity.default {
     this.that.used = x;
   }
 
-  get createdBy() {
-    return this.that.createdBy;
-  }
-
-  set createdBy(x) {
-    this.that.createdBy = x;
-  }
-
-  get lastModifiedBy() {
-    return this.that.lastModifiedBy;
-  }
-
-  set lastModifiedBy(x) {
-    this.that.lastModifiedBy = x;
-  }
-
-  get createdByUUID() {
-    return this.that.createdByUUID;
-  }
-
-  set createdByUUID(x) {
-    this.that.createdByUUID = x;
-  }
-
-  get lastModifiedByUUID() {
-    return this.that.lastModifiedByUUID;
-  }
-
-  set lastModifiedByUUID(x) {
-    this.that.lastModifiedByUUID = x;
-  }
-
   static fromResource(identifierAssignmentResource, entityService) {
     const identifierAssignment = _General.default.assignFields(identifierAssignmentResource, new IdentifierAssignment(), ["uuid", "identifier", "assignmentOrder", "voided"]);
 
     identifierAssignment.identifierSource = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(identifierAssignmentResource, "identifierSourceUUID"), _IdentifierSource.default.schema.name);
     identifierAssignment.individual = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(identifierAssignmentResource, "individualUUID"), _Individual.default.schema.name);
     identifierAssignment.programEnrolment = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(identifierAssignmentResource, "programEnrolmentUUID"), _ProgramEnrolment.default.schema.name);
-    (0, _AuditUtil.mapAuditFields)(identifierAssignment, identifierAssignmentResource);
     return identifierAssignment;
   }
 
@@ -151,7 +112,7 @@ exports.default = IdentifierAssignment;
 _defineProperty(IdentifierAssignment, "schema", {
   name: "IdentifierAssignment",
   primaryKey: "uuid",
-  properties: _objectSpread({
+  properties: {
     uuid: "string",
     identifierSource: "IdentifierSource",
     identifier: "string",
@@ -173,5 +134,5 @@ _defineProperty(IdentifierAssignment, "schema", {
       default: false,
       optional: false
     }
-  }, _AuditUtil.AuditFields)
+  }
 });

package/dist/Individual.js

@@ -53,14 +53,8 @@ var _MergeUtil = _interopRequireDefault(require("./utility/MergeUtil"));
 
 var _AgeUtil = _interopRequireDefault(require("./utility/AgeUtil"));
 
-var _AuditUtil = require("./utility/AuditUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 const mergeMap = new Map([[_SchemaNames.default.ProgramEnrolment, "enrolments"], [_SchemaNames.default.Encounter, "encounters"], [_SchemaNames.default.IndividualRelationship, "relationships"], [_SchemaNames.default.EntityApprovalStatus, "approvalStatuses"], [_SchemaNames.default.Comment, "comments"]]);
@@ -234,38 +228,6 @@ class Individual extends _BaseEntity.default {
     this.that.approvalStatuses = this.fromEntityList(x);
   }
 
-  get createdBy() {
-    return this.that.createdBy;
-  }
-
-  set createdBy(x) {
-    this.that.createdBy = x;
-  }
-
-  get lastModifiedBy() {
-    return this.that.lastModifiedBy;
-  }
-
-  set lastModifiedBy(x) {
-    this.that.lastModifiedBy = x;
-  }
-
-  get createdByUUID() {
-    return this.that.createdByUUID;
-  }
-
-  set createdByUUID(x) {
-    this.that.createdByUUID = x;
-  }
-
-  get lastModifiedByUUID() {
-    return this.that.lastModifiedByUUID;
-  }
-
-  set lastModifiedByUUID(x) {
-    this.that.lastModifiedByUUID = x;
-  }
-
   static createEmptyInstance() {
     const individual = new Individual();
     individual.uuid = _General.default.randomUUID();
@@ -356,7 +318,6 @@ class Individual extends _BaseEntity.default {
     individual.name = individual.nameString;
     if (!_lodash.default.isNil(individualResource.registrationLocation)) individual.registrationLocation = _Point.default.fromResource(individualResource.registrationLocation);
     individual.subjectType = subjectType;
-    (0, _AuditUtil.mapAuditFields)(individual, individualResource);
     return individual;
   }
 
@@ -1059,7 +1020,7 @@ class Individual extends _BaseEntity.default {
 _defineProperty(Individual, "schema", {
   name: _SchemaNames.default.Individual,
   primaryKey: "uuid",
-  properties: _objectSpread({
+  properties: {
     uuid: "string",
     subjectType: "SubjectType",
     name: "string",
@@ -1104,7 +1065,7 @@ _defineProperty(Individual, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     relationships: {
       type: "list",
@@ -1115,7 +1076,7 @@ _defineProperty(Individual, "schema", {
       objectType: "GroupSubject"
     },
     registrationLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: "Point",
       optional: true
     },
     comments: {
@@ -1133,8 +1094,9 @@ _defineProperty(Individual, "schema", {
     latestEntityApprovalStatus: {
       type: "EntityApprovalStatus",
       optional: true
-    }
-  }, _AuditUtil.AuditFields)
+    } //Reporting purposes
+
+  }
 });
 
 _defineProperty(Individual, "validationKeys", {

package/dist/Observation.js

@@ -49,7 +49,7 @@ class Observation extends _PersistedObject.default {
     this.that.valueJSON = x;
   }
 
-  static create(concept, value) {
+  static create(concept, value, abnormal = false) {
     const observation = new Observation();
     observation.concept = concept;
     observation.valueJSON = value;
@@ -164,7 +164,7 @@ class Observation extends _PersistedObject.default {
   }
 
   cloneForEdit() {
-    return clone(this.concept, this.getValueWrapper().cloneForEdit());
+    return clone(this.concept.cloneForReference(), this.getValueWrapper().cloneForEdit());
   }
 
   shallowClone() {
@@ -254,15 +254,10 @@ class Observation extends _PersistedObject.default {
     return this.concept.isMobileNo();
   }
 
-  isForMedia(mediaName) {
-    return _Concept.default.dataType.Media.includes(this.concept.datatype) && this.valueJSON.includes(mediaName);
-  }
-
 }
 
 _defineProperty(Observation, "schema", {
-  name: "EmbeddedObservation",
-  embedded: true,
+  name: "Observation",
   properties: {
     concept: "Concept",
     valueJSON: "string"

package/dist/ObservationsHolder.js

@@ -72,10 +72,54 @@ class ObservationsHolder {
   findObservationByValue(value) {
     return _lodash.default.find(this.observations, observation => observation.getValue() === value);
   }
-  /*
-  Called from the wizard on changes done by the user for primitive fields (including Date)
-   */
 
+  updateObs(formElement, value) {
+    const currentValue = this.getObservation(formElement.concept);
+
+    _ArrayHelper.default.remove(this.observations, obs => obs.concept.uuid === formElement.concept.uuid);
+
+    if (formElement.concept.isPrimitive() && (0, _lodash.isNil)(formElement.durationOptions)) {
+      this.addOrUpdatePrimitiveObs(formElement.concept, value);
+    }
+
+    if (formElement.getType() === _Concept.default.dataType.Id) {
+      if (!_lodash.default.isEmpty(value)) {
+        this.observations.push(_Observation.default.create(formElement.concept, _Identifier.default.fromObs(_objectSpread({}, currentValue, {
+          value
+        }))));
+      }
+    }
+
+    if (formElement.isSingleSelect()) {
+      if (!_lodash.default.isEmpty(value)) {
+        const observation = _Observation.default.create(formElement.concept, new _SingleCodedValue.default(value));
+
+        this.observations.push(observation);
+      }
+    }
+
+    if (formElement.isMultiSelect()) {
+      if (!_lodash.default.isEmpty(value)) {
+        const observation = _Observation.default.create(formElement.concept, new _MultipleCodedValues.default(value));
+
+        this.observations.push(observation);
+      }
+    }
+
+    if (formElement.getType() === _Concept.default.dataType.Duration && !(0, _lodash.isNil)(formElement.durationOptions)) {
+      if (!_lodash.default.isEmpty(value) && !_lodash.default.isEmpty(value.durations)) {
+        const observation = _Observation.default.create(formElement.concept, _CompositeDuration.default.fromObs(value));
+
+        this.observations.push(observation);
+      }
+    }
+
+    if (formElement.getType() === _Concept.default.dataType.PhoneNumber) {
+      const observation = _Observation.default.create(formElement.concept, _PhoneNumber.default.fromObs(value));
+
+      this.observations.push(observation);
+    }
+  }
 
   addOrUpdatePrimitiveObs(concept, value, answerSource = _Observation.default.AnswerSource.Manual) {
     let currentObservation = this.findObservation(concept);
@@ -92,8 +136,7 @@ class ObservationsHolder {
         this.observations.push(_Observation.default.create(concept, new _PrimitiveValue.default(value, concept.datatype, answerSource)));
       }
     }
-  } //private
-
+  }
 
   _removeExistingObs(concept) {
     const observation = this.getObservation(concept);
@@ -101,8 +144,7 @@ class ObservationsHolder {
     if (!_lodash.default.isEmpty(observation)) {
       _ArrayHelper.default.remove(this.observations, obs => obs.concept.uuid === observation.concept.uuid);
     }
-  } //private
-
+  }
 
   addOrUpdateCodedObs(concept, value, isSingleSelect, answerSource = _Observation.default.AnswerSource.Auto) {
     this._removeExistingObs(concept);
@@ -117,10 +159,6 @@ class ObservationsHolder {
       this.observations.push(observation);
     }
   }
-  /*
-  called during edit of form element by the user and when the page transition takes place
-   */
-
 
   removeNonApplicableObs(allFormElements, applicableFormElements) {
     const formElementsIncludingRepeatableElements = [];
@@ -155,10 +193,9 @@ class ObservationsHolder {
       }
     });
     return _lodash.default.flatten(inApplicableFormElements.map(fe => this._removeObs(fe))).filter(obs => !_lodash.default.isEmpty(obs));
-  } //private
-
+  }
 
-  removeNonApplicableAnswersFromQuestionGroup(fe, isSingleSelect) {
+  removeNonApplicableAnswersFromQuestionGroup(fe, isSingleSelect, allFormElements) {
     const questionGroup = this.getQuestionGroups(fe);
     const questionGroupObservation = questionGroup && questionGroup.getGroupObservationAtIndex(fe.questionGroupIndex);
     const observation = questionGroupObservation && questionGroupObservation.getObservation(fe.concept);
@@ -175,8 +212,7 @@ class ObservationsHolder {
 
       questionGroupObservation.addObservation(newObservation);
     }
-  } //private
-
+  }
 
   _removeObs(formElement) {
     if (formElement.isQuestionGroup()) {
@@ -192,8 +228,7 @@ class ObservationsHolder {
     const parentFormElement = formElement.getParentFormElement();
     const questionGroupObservations = this.getObservation(parentFormElement.concept);
     return questionGroupObservations && questionGroupObservations.getValueWrapper();
-  } //private
-
+  }
 
   removeNonApplicableAnswers(fe, isSingleSelect, observation) {
     if (!_lodash.default.isEmpty(observation)) {
@@ -210,10 +245,6 @@ class ObservationsHolder {
       this.observations.push(newObservation);
     }
   }
-  /*
-  Called from wizard after the update of the fields is called for all types. This is to sync up the coded fields based on the rules.
-   */
-
 
   updatePrimitiveCodedObs(applicableFormElements, formElementStatuses) {
     const updateQuestionGroupObs = (parentFormElement, questionGroupIndex, fe, value) => {
@@ -274,15 +305,10 @@ class ObservationsHolder {
       }
     });
   }
-  /*
-  called for direct edit of single select field
-   */
-
 
   toggleSingleSelectAnswer(concept, answerUUID) {
     return this.toggleCodedAnswer(concept, answerUUID, true);
-  } //private
-
+  }
 
   toggleCodedAnswer(concept, answerUUID, isSingleSelect) {
     let observation = this.getObservation(concept);
@@ -304,10 +330,6 @@ class ObservationsHolder {
       return observation;
     }
   }
-  /*
-  called for direct edit of duration field
-   */
-
 
   updateCompositeDurationValue(concept, duration) {
     let observation = this.getObservation(concept);
@@ -322,10 +344,6 @@ class ObservationsHolder {
     this.observations.push(observation);
     return observation;
   }
-  /*
-  called for direct edit of phone number field
-   */
-
 
   updatePhoneNumberValue(concept, phoneNumber, verified = false, skipVerification = false) {
     let observation = this.getObservation(concept);
@@ -356,8 +374,7 @@ class ObservationsHolder {
     if (!childObservations.isEmpty()) {
       this.observations.push(_Observation.default.create(parentConcept, childObservations));
     }
-  } //private
-
+  }
 
   updateChildObservations(childFormElement, childObservations, value, verified = false, skipVerification = false) {
     const childConcept = childFormElement.concept;
@@ -449,8 +466,7 @@ class ObservationsHolder {
         observation.valueJSON = JSON.stringify(observation.valueJSON);
       }
     });
-  } //private
-
+  }
 
   getObservationReadableValue(concept) {
     let obs = this.getObservation(concept);
@@ -466,8 +482,7 @@ class ObservationsHolder {
     } else {
       this.observations.push(_Observation.default.create(concept, valueWrapper));
     }
-  } //private
-
+  }
 
   updateObservationBasedOnValue(oldValue, newValue) {
     const observation = this.findObservationByValue(oldValue);
@@ -502,6 +517,25 @@ class ObservationsHolder {
     }
   }
 
+  migrateMultiSelectMediaObservations(form) {
+    _lodash.default.forEach(form.nonVoidedFormElementGroups(), feg => {
+      _lodash.default.forEach(feg.getFormElements(), fe => {
+        const concept = fe.concept;
+        const observation = this.getObservation(concept);
+
+        if (_lodash.default.includes(_Concept.default.dataType.Media, fe.getType()) && observation && fe.isMultiSelect()) {
+          const valueWrapper = observation.getValueWrapper();
+
+          if (!_lodash.default.isArray(valueWrapper.getValue())) {
+            _General.default.logDebug("ObservationHolder", `Found string value ${valueWrapper.getValue()} for multi select media element, doing migration`);
+
+            observation.valueJSON = new _MultipleCodedValues.default([valueWrapper.getValue()]);
+          }
+        }
+      });
+    });
+  }
+
   toString(I18n) {
     let display = "";
     this.observations.forEach(obs => {

package/dist/ProgramEncounter.js

@@ -25,14 +25,8 @@ var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
-var _AuditUtil = require("./utility/AuditUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class ProgramEncounter extends _AbstractEncounter.default {
@@ -170,7 +164,7 @@ _defineProperty(ProgramEncounter, "validationKeys", {
 _defineProperty(ProgramEncounter, "schema", {
   name: _SchemaNames.default.ProgramEncounter,
   primaryKey: "uuid",
-  properties: _objectSpread({
+  properties: {
     uuid: {
       type: "string"
     },
@@ -196,7 +190,7 @@ _defineProperty(ProgramEncounter, "schema", {
     programEnrolment: _SchemaNames.default.ProgramEnrolment,
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     cancelDateTime: {
       type: "date",
@@ -204,14 +198,14 @@ _defineProperty(ProgramEncounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: "Point",
       optional: true
     },
     cancelLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: "Point",
       optional: true
     },
     voided: {
@@ -225,17 +219,9 @@ _defineProperty(ProgramEncounter, "schema", {
     latestEntityApprovalStatus: {
       type: "EntityApprovalStatus",
       optional: true
-    }
-  }, _AuditUtil.AuditFields, {
-    filledBy: {
-      type: "string",
-      optional: true
-    },
-    filledByUUID: {
-      type: "string",
-      optional: true
-    }
-  })
+    } //Reporting purposes
+
+  }
 });
 
 var _default = ProgramEncounter;