openchs-models 1.33.24 → 1.33.26

package/dist/AddressLevel.js

@@ -11,6 +11,8 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _Observation = _interopRequireDefault(require("./Observation"));
 var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -160,7 +162,11 @@ class AddressLevel extends _BaseEntity.default {
     }, addressLevel, ['locationProperties'], entityService);
   }
   static fromResource(resource, entityService) {
-    return AddressLevel.create(resource, entityService);
+    const existing = entityService.findByKey("uuid", resource.uuid, AddressLevel.schema.name);
+    const existingLocationMappings = existing && existing.locationMappings ? existing.locationMappings : [];
+    return AddressLevel.create(_objectSpread({}, resource, {
+      locationMappings: existingLocationMappings
+    }), entityService);
   }
   static associateLocationMapping(locationMapping, locationMappingRes, entityService) {
     let location = _BaseEntity.default.getParentEntity(entityService, LocationMapping, locationMappingRes, CHILD_LOCATION_UUID, AddressLevel.schema.name);

package/dist/Schema.js

@@ -67,6 +67,8 @@ var _ReportCard = _interopRequireDefault(require("./ReportCard"));
 var _Dashboard = _interopRequireDefault(require("./Dashboard"));
 var _DashboardSectionCardMapping = _interopRequireDefault(require("./DashboardSectionCardMapping"));
 var _DraftSubject = _interopRequireDefault(require("./draft/DraftSubject"));
+var _DraftEnrolment = _interopRequireDefault(require("./draft/DraftEnrolment"));
+var _DraftProgramEncounter = _interopRequireDefault(require("./draft/DraftProgramEncounter"));
 var _StandardReportCardType = _interopRequireDefault(require("./StandardReportCardType"));
 var _ApprovalStatus = _interopRequireDefault(require("./ApprovalStatus"));
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
@@ -99,7 +101,7 @@ var _NestedReportCardResult = _interopRequireDefault(require("./reports/NestedRe
 var _SubjectLocation = _interopRequireDefault(require("./SubjectLocation"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const entities = [_ReportCardResult.default, _NestedReportCardResult.default, _SubjectLocation.default, _DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _ConceptMedia.default, _Concept.default, _EncounterType.default, _Gender.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _CustomDashboardCache.default, _LocationHierarchy.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
+const entities = [_ReportCardResult.default, _NestedReportCardResult.default, _SubjectLocation.default, _DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _ConceptMedia.default, _Concept.default, _EncounterType.default, _Gender.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _CustomDashboardCache.default, _LocationHierarchy.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _DraftEnrolment.default, _DraftProgramEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
 function migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creatorFn) {
   console.log(`schema: ${schemaName}, field: ${field}`);
   newDB.objects(schemaName).forEach(newDbParentEntity => {
@@ -178,7 +180,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 206,
+    schemaVersion: 207,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
       if (oldDB.schemaVersion === VersionWithEmbeddedMigrationProblem) throw new Error(`Update from schema version ${VersionWithEmbeddedMigrationProblem} is not allowed. Please uninstall and install app.`);
@@ -774,6 +776,17 @@ function createRealmConfig() {
           }
         });
       }
+      if (oldDB.schemaVersion < 207) {
+        const now = new Date();
+        _lodash.default.forEach(newDB.objects("DraftEncounter"), draftEncounter => {
+          draftEncounter.updatedOn = now;
+        });
+        _lodash.default.forEach(newDB.objects("DraftSubject"), draftSubject => {
+          if (!draftSubject.updatedOn) {
+            draftSubject.updatedOn = now;
+          }
+        });
+      }
     }
   };
 }

package/dist/SchemaNames.js

@@ -10,7 +10,6 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 class SchemaNames {}
 _defineProperty(SchemaNames, "Family", "Family");
 _defineProperty(SchemaNames, "AddressLevel", "AddressLevel");
-_defineProperty(SchemaNames, "DraftEncounter", "DraftEncounter");
 _defineProperty(SchemaNames, "EntitySyncStatus", "EntitySyncStatus");
 _defineProperty(SchemaNames, "Individual", "Individual");
 _defineProperty(SchemaNames, "ProgramEnrolment", "ProgramEnrolment");
@@ -29,6 +28,9 @@ _defineProperty(SchemaNames, "MenuItem", "MenuItem");
 _defineProperty(SchemaNames, "StringKeyNumericValue", "EmbeddedStringKeyNumericValue");
 _defineProperty(SchemaNames, "UserSubjectAssignment", "UserSubjectAssignment");
 _defineProperty(SchemaNames, "DraftSubject", "DraftSubject");
+_defineProperty(SchemaNames, "DraftEncounter", "DraftEncounter");
+_defineProperty(SchemaNames, "DraftEnrolment", "DraftEnrolment");
+_defineProperty(SchemaNames, "DraftProgramEncounter", "DraftProgramEncounter");
 _defineProperty(SchemaNames, "SubjectProgramEligibility", "SubjectProgramEligibility");
 _defineProperty(SchemaNames, "IndividualRelation", "IndividualRelation");
 _defineProperty(SchemaNames, "IndividualRelationGenderMapping", "IndividualRelationGenderMapping");

package/dist/draft/DraftEncounter.js

@@ -86,6 +86,12 @@ class DraftEncounter extends _BaseEntity.default {
   set cancelLocation(x) {
     this.that.cancelLocation = this.fromObject(x);
   }
+  get updatedOn() {
+    return this.that.updatedOn;
+  }
+  set updatedOn(x) {
+    this.that.updatedOn = x;
+  }
   static create(encounter) {
     const draftEncounter = new DraftEncounter();
     draftEncounter.uuid = encounter.uuid;
@@ -101,6 +107,7 @@ class DraftEncounter extends _BaseEntity.default {
     draftEncounter.cancelObservations = _ObservationsHolder.default.clone(encounter.cancelObservations);
     draftEncounter.cancelLocation = encounter.cancelLocation;
     draftEncounter.voided = encounter.voided;
+    draftEncounter.updatedOn = new Date();
     return draftEncounter;
   }
   constructEncounter() {
@@ -176,7 +183,8 @@ _defineProperty(DraftEncounter, "schema", {
     voided: {
       type: "bool",
       default: false
-    }
+    },
+    updatedOn: "date"
   }
 });
 var _default = DraftEncounter;

package/dist/draft/DraftEnrolment.js

@@ -0,0 +1,155 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _ObservationsHolder = _interopRequireDefault(require("../ObservationsHolder"));
+var _ProgramEnrolment = _interopRequireDefault(require("../ProgramEnrolment"));
+var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
+var _Program = _interopRequireDefault(require("../Program"));
+var _Individual = _interopRequireDefault(require("../Individual"));
+var _Observation = _interopRequireDefault(require("../Observation"));
+var _Point = _interopRequireDefault(require("../geo/Point"));
+var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
+var _lodash = _interopRequireDefault(require("lodash"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+class DraftEnrolment extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+  get program() {
+    return this.toEntity("program", _Program.default);
+  }
+  set program(x) {
+    this.that.program = this.fromObject(x);
+  }
+  get enrolmentDateTime() {
+    return this.that.enrolmentDateTime;
+  }
+  set enrolmentDateTime(x) {
+    this.that.enrolmentDateTime = x;
+  }
+  get individual() {
+    return this.toEntity("individual", _Individual.default);
+  }
+  set individual(x) {
+    this.that.individual = this.fromObject(x);
+  }
+  get observations() {
+    return this.toEntityList("observations", _Observation.default);
+  }
+  set observations(x) {
+    this.that.observations = this.fromEntityList(x);
+  }
+  get enrolmentLocation() {
+    return this.toEntity("enrolmentLocation", _Point.default);
+  }
+  set enrolmentLocation(x) {
+    this.that.enrolmentLocation = this.fromObject(x);
+  }
+  get programExitDateTime() {
+    return this.that.programExitDateTime;
+  }
+  set programExitDateTime(x) {
+    this.that.programExitDateTime = x;
+  }
+  get programExitObservations() {
+    return this.toEntityList("programExitObservations", _Observation.default);
+  }
+  set programExitObservations(x) {
+    this.that.programExitObservations = this.fromEntityList(x);
+  }
+  get exitLocation() {
+    return this.toEntity("exitLocation", _Point.default);
+  }
+  set exitLocation(x) {
+    this.that.exitLocation = this.fromObject(x);
+  }
+  get updatedOn() {
+    return this.that.updatedOn;
+  }
+  set updatedOn(x) {
+    this.that.updatedOn = x;
+  }
+  static create(enrolment) {
+    const draftEnrolment = new DraftEnrolment();
+    draftEnrolment.uuid = enrolment.uuid;
+    draftEnrolment.program = enrolment.program;
+    draftEnrolment.enrolmentDateTime = enrolment.enrolmentDateTime;
+    draftEnrolment.individual = enrolment.individual;
+    draftEnrolment.observations = _ObservationsHolder.default.clone(enrolment.observations);
+    draftEnrolment.enrolmentLocation = enrolment.enrolmentLocation;
+    draftEnrolment.programExitDateTime = enrolment.programExitDateTime;
+    draftEnrolment.programExitObservations = _ObservationsHolder.default.clone(enrolment.programExitObservations);
+    draftEnrolment.exitLocation = enrolment.exitLocation;
+    draftEnrolment.voided = enrolment.voided;
+    draftEnrolment.updatedOn = new Date();
+    return draftEnrolment;
+  }
+  constructEnrolment() {
+    const enrolment = new _ProgramEnrolment.default();
+    enrolment.uuid = this.uuid;
+    enrolment.program = _lodash.default.isNil(this.program) ? null : this.program.clone();
+    enrolment.enrolmentDateTime = this.enrolmentDateTime;
+    enrolment.individual = this.individual;
+    enrolment.observations = _ObservationsHolder.default.clone(this.observations);
+    enrolment.enrolmentLocation = _lodash.default.isNil(this.enrolmentLocation) ? null : this.enrolmentLocation.clone();
+    enrolment.programExitDateTime = this.programExitDateTime;
+    enrolment.programExitObservations = _ObservationsHolder.default.clone(this.programExitObservations);
+    enrolment.exitLocation = _lodash.default.isNil(this.exitLocation) ? null : this.exitLocation.clone();
+    enrolment.voided = this.voided;
+    enrolment.encounters = [];
+    enrolment.checklists = [];
+    enrolment.approvalStatuses = [];
+    return enrolment;
+  }
+}
+_defineProperty(DraftEnrolment, "schema", {
+  name: _SchemaNames.default.DraftEnrolment,
+  primaryKey: "uuid",
+  properties: {
+    uuid: "string",
+    program: {
+      type: 'object',
+      objectType: 'Program'
+    },
+    enrolmentDateTime: "date",
+    individual: {
+      type: 'object',
+      objectType: 'Individual'
+    },
+    observations: {
+      type: "list",
+      objectType: "Observation"
+    },
+    enrolmentLocation: {
+      type: 'object',
+      objectType: 'Point',
+      optional: true
+    },
+    programExitDateTime: {
+      type: "date",
+      optional: true
+    },
+    programExitObservations: {
+      type: "list",
+      objectType: "Observation"
+    },
+    exitLocation: {
+      type: 'object',
+      objectType: 'Point',
+      optional: true
+    },
+    voided: {
+      type: "bool",
+      default: false
+    },
+    updatedOn: "date"
+  }
+});
+var _default = DraftEnrolment;
+exports.default = _default;

package/dist/draft/DraftProgramEncounter.js

@@ -0,0 +1,191 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _ObservationsHolder = _interopRequireDefault(require("../ObservationsHolder"));
+var _ProgramEncounter = _interopRequireDefault(require("../ProgramEncounter"));
+var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
+var _EncounterType = _interopRequireDefault(require("../EncounterType"));
+var _ProgramEnrolment = _interopRequireDefault(require("../ProgramEnrolment"));
+var _Observation = _interopRequireDefault(require("../Observation"));
+var _Point = _interopRequireDefault(require("../geo/Point"));
+var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+class DraftProgramEncounter extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+  get encounterType() {
+    return this.toEntity("encounterType", _EncounterType.default);
+  }
+  set encounterType(x) {
+    this.that.encounterType = this.fromObject(x);
+  }
+  get name() {
+    return this.that.name;
+  }
+  set name(x) {
+    this.that.name = x;
+  }
+  get earliestVisitDateTime() {
+    return this.that.earliestVisitDateTime;
+  }
+  set earliestVisitDateTime(x) {
+    this.that.earliestVisitDateTime = x;
+  }
+  get maxVisitDateTime() {
+    return this.that.maxVisitDateTime;
+  }
+  set maxVisitDateTime(x) {
+    this.that.maxVisitDateTime = x;
+  }
+  get encounterDateTime() {
+    return this.that.encounterDateTime;
+  }
+  set encounterDateTime(x) {
+    this.that.encounterDateTime = x;
+  }
+  get programEnrolment() {
+    return this.toEntity("programEnrolment", _ProgramEnrolment.default);
+  }
+  set programEnrolment(x) {
+    this.that.programEnrolment = this.fromObject(x);
+  }
+  get observations() {
+    return this.toEntityList("observations", _Observation.default);
+  }
+  set observations(x) {
+    this.that.observations = this.fromEntityList(x);
+  }
+  get cancelDateTime() {
+    return this.that.cancelDateTime;
+  }
+  set cancelDateTime(x) {
+    this.that.cancelDateTime = x;
+  }
+  get cancelObservations() {
+    return this.toEntityList("cancelObservations", _Observation.default);
+  }
+  set cancelObservations(x) {
+    this.that.cancelObservations = this.fromEntityList(x);
+  }
+  get encounterLocation() {
+    return this.toEntity("encounterLocation", _Point.default);
+  }
+  set encounterLocation(x) {
+    this.that.encounterLocation = this.fromObject(x);
+  }
+  get cancelLocation() {
+    return this.toEntity("cancelLocation", _Point.default);
+  }
+  set cancelLocation(x) {
+    this.that.cancelLocation = this.fromObject(x);
+  }
+  get updatedOn() {
+    return this.that.updatedOn;
+  }
+  set updatedOn(x) {
+    this.that.updatedOn = x;
+  }
+  static create(programEncounter) {
+    const draftProgramEncounter = new DraftProgramEncounter();
+    draftProgramEncounter.uuid = programEncounter.uuid;
+    draftProgramEncounter.name = programEncounter.name;
+    draftProgramEncounter.encounterType = programEncounter.encounterType;
+    draftProgramEncounter.earliestVisitDateTime = programEncounter.earliestVisitDateTime;
+    draftProgramEncounter.maxVisitDateTime = programEncounter.maxVisitDateTime;
+    draftProgramEncounter.encounterDateTime = programEncounter.encounterDateTime;
+    draftProgramEncounter.programEnrolment = programEncounter.programEnrolment;
+    draftProgramEncounter.observations = _ObservationsHolder.default.clone(programEncounter.observations);
+    draftProgramEncounter.cancelDateTime = programEncounter.cancelDateTime;
+    draftProgramEncounter.cancelObservations = _ObservationsHolder.default.clone(programEncounter.cancelObservations);
+    draftProgramEncounter.encounterLocation = programEncounter.encounterLocation;
+    draftProgramEncounter.cancelLocation = programEncounter.cancelLocation;
+    draftProgramEncounter.voided = programEncounter.voided;
+    draftProgramEncounter.updatedOn = new Date();
+    return draftProgramEncounter;
+  }
+  constructProgramEncounter() {
+    const programEncounter = new _ProgramEncounter.default();
+    programEncounter.uuid = this.uuid;
+    programEncounter.name = this.name;
+    programEncounter.encounterType = this.encounterType;
+    programEncounter.earliestVisitDateTime = this.earliestVisitDateTime;
+    programEncounter.maxVisitDateTime = this.maxVisitDateTime;
+    programEncounter.encounterDateTime = this.encounterDateTime;
+    programEncounter.programEnrolment = this.programEnrolment;
+    programEncounter.observations = _ObservationsHolder.default.clone(this.observations);
+    programEncounter.cancelDateTime = this.cancelDateTime;
+    programEncounter.cancelObservations = _ObservationsHolder.default.clone(this.cancelObservations);
+    programEncounter.encounterLocation = this.encounterLocation;
+    programEncounter.cancelLocation = this.cancelLocation;
+    programEncounter.voided = this.voided;
+    programEncounter.approvalStatuses = [];
+    return programEncounter;
+  }
+}
+_defineProperty(DraftProgramEncounter, "schema", {
+  name: _SchemaNames.default.DraftProgramEncounter,
+  primaryKey: "uuid",
+  properties: {
+    uuid: "string",
+    name: {
+      type: "string",
+      optional: true
+    },
+    encounterType: {
+      type: 'object',
+      objectType: 'EncounterType'
+    },
+    earliestVisitDateTime: {
+      type: "date",
+      optional: true
+    },
+    maxVisitDateTime: {
+      type: "date",
+      optional: true
+    },
+    encounterDateTime: {
+      type: "date",
+      optional: true
+    },
+    programEnrolment: {
+      type: 'object',
+      objectType: 'ProgramEnrolment'
+    },
+    observations: {
+      type: "list",
+      objectType: "Observation"
+    },
+    cancelDateTime: {
+      type: "date",
+      optional: true
+    },
+    cancelObservations: {
+      type: "list",
+      objectType: "Observation"
+    },
+    encounterLocation: {
+      type: 'object',
+      objectType: 'Point',
+      optional: true
+    },
+    cancelLocation: {
+      type: 'object',
+      objectType: 'Point',
+      optional: true
+    },
+    voided: {
+      type: "bool",
+      default: false
+    },
+    updatedOn: "date"
+  }
+});
+var _default = DraftProgramEncounter;
+exports.default = _default;

package/dist/index.js

@@ -711,6 +711,18 @@ Object.defineProperty(exports, "DraftEncounter", {
     return _DraftEncounter.default;
   }
 });
+Object.defineProperty(exports, "DraftEnrolment", {
+  enumerable: true,
+  get: function () {
+    return _DraftEnrolment.default;
+  }
+});
+Object.defineProperty(exports, "DraftProgramEncounter", {
+  enumerable: true,
+  get: function () {
+    return _DraftProgramEncounter.default;
+  }
+});
 Object.defineProperty(exports, "SubjectProgramEligibility", {
   enumerable: true,
   get: function () {
@@ -953,6 +965,8 @@ var _TaskStatus = _interopRequireDefault(require("./task/TaskStatus"));
 var _TaskType = _interopRequireDefault(require("./task/TaskType"));
 var _TaskUnAssignment = _interopRequireDefault(require("./task/TaskUnAssignment"));
 var _DraftEncounter = _interopRequireDefault(require("./draft/DraftEncounter"));
+var _DraftEnrolment = _interopRequireDefault(require("./draft/DraftEnrolment"));
+var _DraftProgramEncounter = _interopRequireDefault(require("./draft/DraftProgramEncounter"));
 var _SubjectProgramEligibility = _interopRequireDefault(require("./program/SubjectProgramEligibility"));
 var _UserSubjectAssignment = _interopRequireDefault(require("./assignment/UserSubjectAssignment"));
 var _RealmProxy = _interopRequireDefault(require("./framework/RealmProxy"));

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.33.24",
+    "version": "1.33.26",
     "private": false,
     "repository": {
         "type": "git",