openchs-models 1.33.0 → 1.33.2

package/dist/ChecklistItemDetail.js

@@ -151,7 +151,7 @@ _defineProperty(ChecklistItemDetail, "schema", {
     },
     stateConfig: {
       type: "list",
-      objectType: _SchemaNames.default.ChecklistItemStatus
+      objectType: "EmbeddedChecklistItemStatus"
     },
     form: {
       type: 'object',

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: 'EmbeddedStringKeyNumericValue'
+    },
+    to: {
+      type: 'object',
+      objectType: 'EmbeddedStringKeyNumericValue'
+    },
     color: {
       type: "string",
       default: "yellow"

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/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

@@ -132,13 +132,17 @@ _defineProperty(Encounter, "schema", {
       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: {
@@ -162,7 +166,8 @@ _defineProperty(Encounter, "schema", {
       objectType: "Observation"
     },
     cancelLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     voided: {

package/dist/Individual.js

@@ -1159,7 +1159,8 @@ _defineProperty(Individual, "schema", {
       objectType: "GroupSubject"
     },
     registrationLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     comments: {

package/dist/ProgramEncounter.js

@@ -192,7 +192,10 @@ _defineProperty(ProgramEncounter, "schema", {
       type: "date",
       optional: true
     },
-    programEnrolment: _SchemaNames.default.ProgramEnrolment,
+    programEnrolment: {
+      type: 'object',
+      objectType: 'ProgramEnrolment'
+    },
     observations: {
       type: "list",
       objectType: "Observation"
@@ -206,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: {

package/dist/ProgramEnrolment.js

@@ -687,11 +687,13 @@ _defineProperty(ProgramEnrolment, "schema", {
       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: {

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/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,7 +437,7 @@ _defineProperty(FormElement, "schema", {
     mandatory: "bool",
     keyValues: {
       type: "list",
-      objectType: _SchemaNames.default.KeyValue
+      objectType: "EmbeddedKeyValue"
     },
     concept: {
       type: 'object',
@@ -452,7 +452,8 @@ _defineProperty(FormElement, "schema", {
       objectType: 'FormElementGroup'
     },
     validFormat: {
-      type: _SchemaNames.default.Format,
+      type: 'object',
+      objectType: 'EmbeddedFormat',
       optional: true
     },
     voided: {

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

@@ -179,7 +179,8 @@ _defineProperty(DraftEncounter, "schema", {
       objectType: "Observation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     name: {
@@ -203,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

@@ -223,7 +223,8 @@ _defineProperty(DraftSubject, "schema", {
       objectType: "Observation"
     },
     registrationLocation: {
-      type: _SchemaNames.default.Point,
+      type: 'object',
+      objectType: 'Point',
       optional: true
     },
     updatedOn: "date",

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,7 +212,7 @@ class Task extends _BaseEntity.default {
 }
 
 _defineProperty(Task, "schema", {
-  name: _SchemaNames.default.Task,
+  name: "Task",
   primaryKey: "uuid",
   properties: _objectSpread({
     uuid: "string",
@@ -239,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",

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/package.json

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