openchs-models 1.32.54 → 1.33.1

package/dist/AddressLevel.js

@@ -84,8 +84,14 @@ _defineProperty(LocationMapping, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    parent: "AddressLevel",
-    child: "AddressLevel",
+    parent: {
+      type: 'object',
+      objectType: 'AddressLevel'
+    },
+    child: {
+      type: 'object',
+      objectType: 'AddressLevel'
+    },
     voided: {
       type: "bool",
       default: false

package/dist/Checklist.js

@@ -178,13 +178,19 @@ _defineProperty(Checklist, "schema", {
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
-    detail: "ChecklistDetail",
+    detail: {
+      type: 'object',
+      objectType: 'ChecklistDetail'
+    },
     baseDate: "date",
     items: {
       type: "list",
       objectType: "ChecklistItem"
     },
-    programEnrolment: "ProgramEnrolment"
+    programEnrolment: {
+      type: 'object',
+      objectType: 'ProgramEnrolment'
+    }
   }, _AuditUtil.AuditFields)
 });
 

package/dist/ChecklistItem.js

@@ -355,7 +355,10 @@ _defineProperty(ChecklistItem, "schema", {
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
-    detail: "ChecklistItemDetail",
+    detail: {
+      type: 'object',
+      objectType: 'ChecklistItemDetail'
+    },
     completionDate: {
       type: "date",
       optional: true
@@ -364,13 +367,17 @@ _defineProperty(ChecklistItem, "schema", {
       type: "list",
       objectType: "Observation"
     },
-    checklist: "Checklist",
+    checklist: {
+      type: 'object',
+      objectType: 'Checklist'
+    },
     approvalStatuses: {
       type: "list",
       objectType: "EntityApprovalStatus"
     },
     latestEntityApprovalStatus: {
-      type: "EntityApprovalStatus",
+      type: 'object',
+      objectType: 'EntityApprovalStatus',
       optional: true
     }
   }, _AuditUtil.AuditFields)

package/dist/ChecklistItemDetail.js

@@ -145,22 +145,30 @@ _defineProperty(ChecklistItemDetail, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    concept: "Concept",
+    concept: {
+      type: 'object',
+      objectType: 'Concept'
+    },
     stateConfig: {
       type: "list",
-      objectType: _SchemaNames.default.ChecklistItemStatus
+      objectType: "EmbeddedChecklistItemStatus"
     },
     form: {
-      type: "Form",
+      type: 'object',
+      objectType: 'Form',
       optional: true
     },
-    checklistDetail: "ChecklistDetail",
+    checklistDetail: {
+      type: 'object',
+      objectType: 'ChecklistDetail'
+    },
     voided: {
       type: "bool",
       default: false
     },
     dependentOn: {
-      type: "ChecklistItemDetail",
+      type: 'object',
+      objectType: 'ChecklistItemDetail',
       optional: true
     },
     scheduleOnExpiryOfDependency: {

package/dist/ChecklistItemStatus.js

@@ -129,8 +129,14 @@ _defineProperty(ChecklistItemStatus, "schema", {
   embedded: true,
   properties: {
     state: "string",
-    from: _SchemaNames.default.StringKeyNumericValue,
-    to: _SchemaNames.default.StringKeyNumericValue,
+    from: {
+      type: 'object',
+      objectType: 'StringKeyNumericValue'
+    },
+    to: {
+      type: 'object',
+      objectType: 'StringKeyNumericValue'
+    },
     color: {
       type: "string",
       default: "yellow"

package/dist/Comment.js

@@ -196,12 +196,18 @@ _defineProperty(Comment, "schema", {
   properties: _objectSpread({
     uuid: "string",
     text: "string",
-    subject: "Individual",
+    subject: {
+      type: 'object',
+      objectType: 'Individual'
+    },
     displayUsername: "string",
     createdByUsername: "string",
     createdDateTime: "date",
     lastModifiedDateTime: "date",
-    commentThread: "CommentThread",
+    commentThread: {
+      type: 'object',
+      objectType: 'CommentThread'
+    },
     voided: {
       type: "bool",
       default: false

package/dist/Concept.js

@@ -413,7 +413,7 @@ _defineProperty(Concept, "schema", {
     },
     keyValues: {
       type: "list",
-      objectType: _SchemaNames.default.KeyValue
+      objectType: "EmbeddedKeyValue"
     },
     voided: {
       type: "bool",

package/dist/ConceptAnswer.js

@@ -73,7 +73,10 @@ _defineProperty(ConceptAnswer, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    concept: "Concept",
+    concept: {
+      type: 'object',
+      objectType: 'Concept'
+    },
     answerOrder: "double",
     abnormal: "bool",
     unique: "bool",

package/dist/CustomDashboardCache.js

@@ -155,7 +155,10 @@ _defineProperty(CustomDashboardCache, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    dashboard: "Dashboard",
+    dashboard: {
+      type: 'object',
+      objectType: 'Dashboard'
+    },
     updatedAt: {
       type: "date",
       optional: true

package/dist/DashboardSection.js

@@ -74,7 +74,10 @@ _defineProperty(DashboardSection, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    dashboard: "Dashboard",
+    dashboard: {
+      type: 'object',
+      objectType: 'Dashboard'
+    },
     name: {
       type: "string",
       optional: true

package/dist/DashboardSectionCardMapping.js

@@ -63,8 +63,14 @@ _defineProperty(DashboardSectionCardMapping, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    dashboardSection: "DashboardSection",
-    card: "ReportCard",
+    dashboardSection: {
+      type: 'object',
+      objectType: 'DashboardSection'
+    },
+    card: {
+      type: 'object',
+      objectType: 'ReportCard'
+    },
     displayOrder: "double",
     voided: {
       type: "bool",

package/dist/DocumentationItem.js

@@ -83,7 +83,8 @@ _defineProperty(DocumentationItem, "schema", {
       optional: true
     },
     documentation: {
-      type: 'Documentation'
+      type: 'object',
+      objectType: 'Documentation'
     },
     voided: {
       type: "bool",

package/dist/Encounter.js

@@ -124,18 +124,25 @@ _defineProperty(Encounter, "schema", {
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
-    encounterType: "EncounterType",
+    encounterType: {
+      type: 'object',
+      objectType: 'EncounterType'
+    },
     encounterDateTime: {
       type: "date",
       optional: true
     },
-    individual: _SchemaNames.default.Individual,
+    individual: {
+      type: 'object',
+      objectType: 'Individual'
+    },
     observations: {
       type: "list",
       objectType: "Observation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     name: {
@@ -159,7 +166,8 @@ _defineProperty(Encounter, "schema", {
       objectType: "Observation"
     },
     cancelLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     voided: {
@@ -171,7 +179,8 @@ _defineProperty(Encounter, "schema", {
       objectType: "EntityApprovalStatus"
     },
     latestEntityApprovalStatus: {
-      type: "EntityApprovalStatus",
+      type: 'object',
+      objectType: 'EntityApprovalStatus',
       optional: true
     }
   }, _AuditUtil.AuditFields, {

package/dist/EntityApprovalStatus.js

@@ -215,7 +215,10 @@ _defineProperty(EntityApprovalStatus, "schema", {
   properties: _objectSpread({
     uuid: "string",
     entityUUID: "string",
-    approvalStatus: "ApprovalStatus",
+    approvalStatus: {
+      type: 'object',
+      objectType: 'ApprovalStatus'
+    },
     entityType: "string",
     entityTypeUuid: {
       type: "string",

package/dist/Family.js

@@ -216,8 +216,14 @@ _defineProperty(Family, "schema", {
   properties: {
     uuid: "string",
     registrationDate: "date",
-    lowestAddressLevel: "AddressLevel",
-    headOfFamily: "Individual",
+    lowestAddressLevel: {
+      type: 'object',
+      objectType: 'AddressLevel'
+    },
+    headOfFamily: {
+      type: 'object',
+      objectType: 'Individual'
+    },
     typeOfFamily: "string",
     householdNumber: "string",
     members: {

package/dist/GroupDashboard.js

@@ -80,10 +80,14 @@ _defineProperty(GroupDashboard, "schema", {
       default: false
     },
     group: {
-      type: "Groups",
+      type: 'object',
+      objectType: 'Groups',
       optional: true
     },
-    dashboard: "Dashboard",
+    dashboard: {
+      type: 'object',
+      objectType: 'Dashboard'
+    },
     voided: {
       type: "bool",
       default: false

package/dist/GroupPrivileges.js

@@ -105,8 +105,14 @@ _defineProperty(GroupPrivileges, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    group: "Groups",
-    privilege: "Privilege",
+    group: {
+      type: 'object',
+      objectType: 'Groups'
+    },
+    privilege: {
+      type: 'object',
+      objectType: 'Privilege'
+    },
     subjectTypeUuid: "string",
     programUuid: "string?",
     programEncounterTypeUuid: "string?",

package/dist/GroupRole.js

@@ -114,8 +114,14 @@ _defineProperty(GroupRole, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    groupSubjectType: "SubjectType",
-    memberSubjectType: "SubjectType",
+    groupSubjectType: {
+      type: 'object',
+      objectType: 'SubjectType'
+    },
+    memberSubjectType: {
+      type: 'object',
+      objectType: 'SubjectType'
+    },
     role: "string",
     primary: {
       type: "bool",

package/dist/GroupSubject.js

@@ -231,9 +231,18 @@ _defineProperty(GroupSubject, "schema", {
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
-    groupSubject: "Individual",
-    memberSubject: "Individual",
-    groupRole: "GroupRole",
+    groupSubject: {
+      type: 'object',
+      objectType: 'Individual'
+    },
+    memberSubject: {
+      type: 'object',
+      objectType: 'Individual'
+    },
+    groupRole: {
+      type: 'object',
+      objectType: 'GroupRole'
+    },
     membershipStartDate: "date",
     membershipEndDate: {
       type: "date",

package/dist/IdentifierAssignment.js

@@ -153,11 +153,15 @@ _defineProperty(IdentifierAssignment, "schema", {
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
-    identifierSource: "IdentifierSource",
+    identifierSource: {
+      type: 'object',
+      objectType: 'IdentifierSource'
+    },
     identifier: "string",
     assignmentOrder: "double",
     individual: {
-      type: "Individual",
+      type: 'object',
+      objectType: 'Individual',
       optional: true
     },
     voided: {
@@ -165,7 +169,8 @@ _defineProperty(IdentifierAssignment, "schema", {
       default: false
     },
     programEnrolment: {
-      type: "ProgramEnrolment",
+      type: 'object',
+      objectType: 'ProgramEnrolment',
       optional: true
     },
     used: {

package/dist/Individual.js

@@ -1098,7 +1098,10 @@ _defineProperty(Individual, "schema", {
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
-    subjectType: "SubjectType",
+    subjectType: {
+      type: 'object',
+      objectType: 'SubjectType'
+    },
     name: "string",
     firstName: "string",
     middleName: {
@@ -1122,11 +1125,15 @@ _defineProperty(Individual, "schema", {
       optional: true
     },
     gender: {
-      type: "Gender",
+      type: 'object',
+      objectType: 'Gender',
       optional: true
     },
     registrationDate: "date",
-    lowestAddressLevel: "AddressLevel",
+    lowestAddressLevel: {
+      type: 'object',
+      objectType: 'AddressLevel'
+    },
     voided: {
       type: "bool",
       default: false
@@ -1152,7 +1159,8 @@ _defineProperty(Individual, "schema", {
       objectType: "GroupSubject"
     },
     registrationLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     comments: {
@@ -1168,7 +1176,8 @@ _defineProperty(Individual, "schema", {
       objectType: "EntityApprovalStatus"
     },
     latestEntityApprovalStatus: {
-      type: "EntityApprovalStatus",
+      type: 'object',
+      objectType: 'EntityApprovalStatus',
       optional: true
     }
   }, _AuditUtil.AuditFields)

package/dist/Observation.js

@@ -271,7 +271,10 @@ class Observation extends _PersistedObject.default {
 _defineProperty(Observation, "schema", {
   name: "Observation",
   properties: {
-    concept: "Concept",
+    concept: {
+      type: 'object',
+      objectType: 'Concept'
+    },
     valueJSON: "string"
   }
 });

package/dist/ProgramEncounter.js

@@ -177,7 +177,8 @@ _defineProperty(ProgramEncounter, "schema", {
       optional: true
     },
     encounterType: {
-      type: "EncounterType"
+      type: 'object',
+      objectType: 'EncounterType'
     },
     earliestVisitDateTime: {
       type: "date",
@@ -191,7 +192,10 @@ _defineProperty(ProgramEncounter, "schema", {
       type: "date",
       optional: true
     },
-    programEnrolment: _SchemaNames.default.ProgramEnrolment,
+    programEnrolment: {
+      type: 'object',
+      objectType: 'ProgramEnrolment'
+    },
     observations: {
       type: "list",
       objectType: "Observation"
@@ -205,11 +209,13 @@ _defineProperty(ProgramEncounter, "schema", {
       objectType: "Observation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     cancelLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     voided: {
@@ -221,7 +227,8 @@ _defineProperty(ProgramEncounter, "schema", {
       objectType: "EntityApprovalStatus"
     },
     latestEntityApprovalStatus: {
-      type: "EntityApprovalStatus",
+      type: 'object',
+      objectType: 'EntityApprovalStatus',
       optional: true
     }
   }, _AuditUtil.AuditFields, {

package/dist/ProgramEnrolment.js

@@ -657,7 +657,10 @@ _defineProperty(ProgramEnrolment, "schema", {
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
-    program: "Program",
+    program: {
+      type: 'object',
+      objectType: 'Program'
+    },
     enrolmentDateTime: "date",
     observations: {
       type: "list",
@@ -679,13 +682,18 @@ _defineProperty(ProgramEnrolment, "schema", {
       type: "list",
       objectType: "Checklist"
     },
-    individual: "Individual",
+    individual: {
+      type: 'object',
+      objectType: 'Individual'
+    },
     enrolmentLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     exitLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     voided: {
@@ -697,7 +705,8 @@ _defineProperty(ProgramEnrolment, "schema", {
       objectType: "EntityApprovalStatus"
     },
     latestEntityApprovalStatus: {
-      type: "EntityApprovalStatus",
+      type: 'object',
+      objectType: 'EntityApprovalStatus',
       optional: true
     }
   }, _AuditUtil.AuditFields)

package/dist/ReportCard.js

@@ -242,7 +242,8 @@ _defineProperty(ReportCard, "schema", {
       optional: true
     },
     standardReportCardType: {
-      type: "StandardReportCardType",
+      type: 'object',
+      objectType: 'StandardReportCardType',
       optional: true
     },
     colour: "string",

package/dist/Schema.js

@@ -283,7 +283,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 203,
+    schemaVersion: 204,
     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.`);

package/dist/Settings.js

@@ -211,7 +211,8 @@ _defineProperty(Settings, "schema", {
     uuid: "string",
     serverURL: "string",
     locale: {
-      type: "LocaleMapping",
+      type: 'object',
+      objectType: 'LocaleMapping',
       optional: true
     },
     logLevel: "int",

package/dist/SubjectType.js

@@ -340,15 +340,18 @@ _defineProperty(SubjectType, "schema", {
       default: false
     },
     validFirstNameFormat: {
-      type: _SchemaNames.default.Format,
+      type: 'object',
+      objectType: 'EmbeddedFormat',
       optional: true
     },
     validMiddleNameFormat: {
-      type: _SchemaNames.default.Format,
+      type: 'object',
+      objectType: 'EmbeddedFormat',
       optional: true
     },
     validLastNameFormat: {
-      type: _SchemaNames.default.Format,
+      type: 'object',
+      objectType: 'EmbeddedFormat',
       optional: true
     },
     iconFileS3Key: {

package/dist/application/FormElement.js

@@ -437,16 +437,23 @@ _defineProperty(FormElement, "schema", {
     mandatory: "bool",
     keyValues: {
       type: "list",
-      objectType: _SchemaNames.default.KeyValue
+      objectType: "EmbeddedKeyValue"
+    },
+    concept: {
+      type: 'object',
+      objectType: 'Concept'
     },
-    concept: "Concept",
     type: {
       type: "string",
       optional: true
     },
-    formElementGroup: "FormElementGroup",
+    formElementGroup: {
+      type: 'object',
+      objectType: 'FormElementGroup'
+    },
     validFormat: {
-      type: _SchemaNames.default.Format,
+      type: 'object',
+      objectType: 'EmbeddedFormat',
       optional: true
     },
     voided: {
@@ -462,7 +469,8 @@ _defineProperty(FormElement, "schema", {
       optional: true
     },
     documentation: {
-      type: "Documentation",
+      type: 'object',
+      objectType: 'Documentation',
       optional: true
     }
   }

package/dist/application/FormElementGroup.js

@@ -308,7 +308,10 @@ _defineProperty(FormElementGroup, "schema", {
       type: "list",
       objectType: "FormElement"
     },
-    form: "Form",
+    form: {
+      type: 'object',
+      objectType: 'Form'
+    },
     voided: {
       type: "bool",
       default: false

package/dist/application/FormMapping.js

@@ -171,9 +171,13 @@ _defineProperty(FormMapping, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    form: "Form",
+    form: {
+      type: 'object',
+      objectType: 'Form'
+    },
     subjectType: {
-      type: "SubjectType",
+      type: 'object',
+      objectType: 'SubjectType',
       optional: true
     },
     entityUUID: {
@@ -193,7 +197,8 @@ _defineProperty(FormMapping, "schema", {
       default: false
     },
     taskType: {
-      type: "TaskType",
+      type: 'object',
+      objectType: 'TaskType',
       optional: true
     }
   }

package/dist/assignment/UserSubjectAssignment.js

@@ -9,8 +9,6 @@ var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
 
 var _ResourceUtil = _interopRequireDefault(require("../utility/ResourceUtil"));
 
-var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
-
 var _AuditUtil = require("../utility/AuditUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -77,7 +75,7 @@ class UserSubjectAssignment extends _BaseEntity.default {
 }
 
 _defineProperty(UserSubjectAssignment, "schema", {
-  name: _SchemaNames.default.UserSubjectAssignment,
+  name: "UserSubjectAssignment",
   primaryKey: 'uuid',
   properties: _objectSpread({
     uuid: 'string',

package/dist/draft/DraftEncounter.js

@@ -162,18 +162,25 @@ _defineProperty(DraftEncounter, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    encounterType: "EncounterType",
+    encounterType: {
+      type: 'object',
+      objectType: 'EncounterType'
+    },
     encounterDateTime: {
       type: "date",
       optional: true
     },
-    individual: "Individual",
+    individual: {
+      type: 'object',
+      objectType: 'Individual'
+    },
     observations: {
       type: "list",
       objectType: "Observation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     name: {
@@ -197,7 +204,8 @@ _defineProperty(DraftEncounter, "schema", {
       objectType: "Observation"
     },
     cancelLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     voided: {

package/dist/draft/DraftSubject.js

@@ -187,7 +187,10 @@ _defineProperty(DraftSubject, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    subjectType: "SubjectType",
+    subjectType: {
+      type: 'object',
+      objectType: 'SubjectType'
+    },
     firstName: "string",
     lastName: {
       type: "string",
@@ -206,17 +209,22 @@ _defineProperty(DraftSubject, "schema", {
       optional: true
     },
     gender: {
-      type: "Gender",
+      type: 'object',
+      objectType: 'Gender',
       optional: true
     },
     registrationDate: "date",
-    lowestAddressLevel: "AddressLevel",
+    lowestAddressLevel: {
+      type: 'object',
+      objectType: 'AddressLevel'
+    },
     observations: {
       type: "list",
       objectType: "Observation"
     },
     registrationLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     updatedOn: "date",

package/dist/program/SubjectProgramEligibility.js

@@ -212,8 +212,14 @@ _defineProperty(SubjectProgramEligibility, "schema", {
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
-    subject: "Individual",
-    program: "Program",
+    subject: {
+      type: 'object',
+      objectType: 'Individual'
+    },
+    program: {
+      type: 'object',
+      objectType: 'Program'
+    },
     checkDate: "date",
     eligible: {
       type: "bool",

package/dist/relationship/IndividualRelationGenderMapping.js

@@ -65,8 +65,14 @@ _defineProperty(IndividualRelationGenderMapping, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    relation: "IndividualRelation",
-    gender: "Gender",
+    relation: {
+      type: 'object',
+      objectType: 'IndividualRelation'
+    },
+    gender: {
+      type: 'object',
+      objectType: 'Gender'
+    },
     voided: {
       type: "bool",
       default: false

package/dist/relationship/IndividualRelationship.js

@@ -194,9 +194,18 @@ _defineProperty(IndividualRelationship, "schema", {
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
-    relationship: "IndividualRelationshipType",
-    individualA: "Individual",
-    individualB: "Individual",
+    relationship: {
+      type: 'object',
+      objectType: 'IndividualRelationshipType'
+    },
+    individualA: {
+      type: 'object',
+      objectType: 'Individual'
+    },
+    individualB: {
+      type: 'object',
+      objectType: 'Individual'
+    },
     enterDateTime: {
       type: "date",
       optional: true

package/dist/relationship/IndividualRelationshipType.js

@@ -83,8 +83,14 @@ _defineProperty(IndividualRelationshipType, "schema", {
   properties: {
     uuid: "string",
     name: "string",
-    individualAIsToBRelation: "IndividualRelation",
-    individualBIsToARelation: "IndividualRelation",
+    individualAIsToBRelation: {
+      type: 'object',
+      objectType: 'IndividualRelation'
+    },
+    individualBIsToARelation: {
+      type: 'object',
+      objectType: 'IndividualRelation'
+    },
     voided: {
       type: "bool",
       default: false

package/dist/reports/DashboardFilter.js

@@ -61,7 +61,10 @@ _defineProperty(DashboardFilter, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    dashboard: "Dashboard",
+    dashboard: {
+      type: 'object',
+      objectType: 'Dashboard'
+    },
     name: "string",
     filterConfig: "string",
     voided: {

package/dist/task/Task.js

@@ -25,8 +25,6 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
 
-var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
-
 var _AuditUtil = require("../utility/AuditUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -214,13 +212,19 @@ class Task extends _BaseEntity.default {
 }
 
 _defineProperty(Task, "schema", {
-  name: _SchemaNames.default.Task,
+  name: "Task",
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
     name: "string",
-    taskType: "TaskType",
-    taskStatus: "TaskStatus",
+    taskType: {
+      type: 'object',
+      objectType: 'TaskType'
+    },
+    taskStatus: {
+      type: 'object',
+      objectType: 'TaskStatus'
+    },
     scheduledOn: {
       type: "date"
     },
@@ -233,7 +237,8 @@ _defineProperty(Task, "schema", {
       objectType: "Observation"
     },
     subject: {
-      type: 'Individual',
+      type: 'object',
+      objectType: 'Individual',
       optional: true
     },
     observations: {

package/dist/task/TaskStatus.js

@@ -13,8 +13,6 @@ var _ResourceUtil = _interopRequireDefault(require("../utility/ResourceUtil"));
 
 var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
 
-var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -69,7 +67,7 @@ class TaskStatus extends _BaseEntity.default {
 }
 
 _defineProperty(TaskStatus, "schema", {
-  name: _SchemaNames.default.TaskStatus,
+  name: "TaskStatus",
   primaryKey: "uuid",
   properties: {
     uuid: "string",
@@ -78,7 +76,10 @@ _defineProperty(TaskStatus, "schema", {
       type: 'bool',
       default: false
     },
-    taskType: "TaskType",
+    taskType: {
+      type: 'object',
+      objectType: 'TaskType'
+    },
     voided: {
       type: 'bool',
       default: false

package/dist/task/TaskType.js

@@ -13,8 +13,6 @@ var _lodash = require("lodash");
 
 var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
 
-var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -72,7 +70,7 @@ class TaskType extends _BaseEntity.default {
 }
 
 _defineProperty(TaskType, "schema", {
-  name: _SchemaNames.default.TaskType,
+  name: "TaskType",
   primaryKey: "uuid",
   properties: {
     uuid: "string",

package/dist/task/TaskUnAssignment.js

@@ -9,8 +9,6 @@ var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
 
 var _ResourceUtil = _interopRequireDefault(require("../utility/ResourceUtil"));
 
-var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
-
 var _AuditUtil = require("../utility/AuditUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -99,7 +97,7 @@ class TaskUnAssignment extends _BaseEntity.default {
 }
 
 _defineProperty(TaskUnAssignment, "schema", {
-  name: _SchemaNames.default.TaskUnAssignment,
+  name: "TaskUnAssignment",
   primaryKey: 'uuid',
   properties: _objectSpread({
     uuid: 'string',

package/dist/videos/VideoTelemetric.js

@@ -124,7 +124,10 @@ _defineProperty(VideoTelemetric, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
-    video: "Video",
+    video: {
+      type: 'object',
+      objectType: 'Video'
+    },
     playerOpenTime: "date",
     playerCloseTime: "date",
     videoStartTime: "double",

package/package.json

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