openchs-models 1.33.19 → 1.33.21

package/.circleci/config.yml

@@ -55,10 +55,7 @@ workflows:
   version: 2
   test_deploy:
     jobs:
-      - build:
-          filters:
-            tags:
-              only: /^v.*/
+      - build
 #      - publish:
 #          requires:
 #            - build

package/dist/Individual.js

@@ -20,6 +20,7 @@ var _ObservationsHolder = _interopRequireDefault(require("./ObservationsHolder")
 var _Media = require("./Media");
 var _Point = _interopRequireDefault(require("./geo/Point"));
 var _SubjectType = _interopRequireDefault(require("./SubjectType"));
+var _SubjectLocation = _interopRequireDefault(require("./SubjectLocation"));
 var _Observation = _interopRequireDefault(require("./Observation"));
 var _GroupSubject = _interopRequireDefault(require("./GroupSubject"));
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
@@ -143,6 +144,12 @@ class Individual extends _BaseEntity.default {
   set registrationLocation(x) {
     this.that.registrationLocation = this.fromObject(x);
   }
+  get subjectLocation() {
+    return this.toEntity("subjectLocation", _SubjectLocation.default);
+  }
+  set subjectLocation(x) {
+    this.that.subjectLocation = this.fromObject(x);
+  }
   get latestEntityApprovalStatus() {
     return _lodash.default.maxBy(this.approvalStatuses, 'statusDateTime');
   }
@@ -234,6 +241,9 @@ class Individual extends _BaseEntity.default {
     if (!_lodash.default.isNil(this.registrationLocation)) {
       resource["registrationLocation"] = this.registrationLocation.toResource;
     }
+    if (!_lodash.default.isNil(this.subjectLocation)) {
+      resource["subjectLocation"] = this.subjectLocation.toResource;
+    }
     resource["observations"] = [];
     this.observations.forEach(obs => {
       resource["observations"].push(obs.toResource);
@@ -276,6 +286,7 @@ class Individual extends _BaseEntity.default {
     individual.lowestAddressLevel = this.initLowestAddressLevel(addressLevel, subjectType, entityService);
     individual.name = individual.nameString;
     if (!_lodash.default.isNil(individualResource.registrationLocation)) individual.registrationLocation = _Point.default.fromResource(individualResource.registrationLocation);
+    if (!_lodash.default.isNil(individualResource.subjectLocation)) individual.subjectLocation = _SubjectLocation.default.fromResource(individualResource.subjectLocation);
     individual.subjectType = subjectType;
     (0, _AuditUtil.mapAuditFields)(individual, individualResource);
     return individual;
@@ -514,6 +525,7 @@ class Individual extends _BaseEntity.default {
     individual.lowestAddressLevel = _lodash.default.isNil(this.lowestAddressLevel) ? null : _lodash.default.assignIn({}, this.lowestAddressLevel);
     individual.observations = _ObservationsHolder.default.clone(this.observations);
     individual.registrationLocation = _lodash.default.isNil(this.registrationLocation) ? null : this.registrationLocation.clone();
+    individual.subjectLocation = _lodash.default.isNil(this.subjectLocation) ? null : this.subjectLocation.clone();
     individual.relationships = this.relationships;
     individual.groupSubjects = this.groupSubjects;
     individual.groups = this.groups;
@@ -839,6 +851,7 @@ class Individual extends _BaseEntity.default {
       groups: this.groups,
       voided: this.voided,
       registrationLocation: this.registrationLocation,
+      subjectLocation: this.subjectLocation,
       subjectType: this.subjectType,
       comments: this.comments
     };
@@ -923,6 +936,11 @@ _defineProperty(Individual, "schema", {
       objectType: 'Point',
       optional: true
     },
+    subjectLocation: {
+      type: 'object',
+      objectType: 'SubjectLocation',
+      optional: true
+    },
     comments: {
       type: "list",
       objectType: "Comment"

package/dist/Schema.js

@@ -96,9 +96,10 @@ var _MigrationsHelper = _interopRequireDefault(require("./MigrationsHelper"));
 var _MetaDataService = _interopRequireDefault(require("./service/MetaDataService"));
 var _ReportCardResult = _interopRequireDefault(require("./reports/ReportCardResult"));
 var _NestedReportCardResult = _interopRequireDefault(require("./reports/NestedReportCardResult"));
+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, _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, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
 function migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creatorFn) {
   console.log(`schema: ${schemaName}, field: ${field}`);
   newDB.objects(schemaName).forEach(newDbParentEntity => {
@@ -177,7 +178,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 204,
+    schemaVersion: 206,
     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.`);
@@ -760,6 +761,19 @@ function createRealmConfig() {
           }
         });
       }
+      if (oldDB.schemaVersion < 205) {
+        _lodash.default.forEach(newDB.objects("Concept"), concept => {
+          const oldConcept = oldDB.objects("Concept").filtered(`uuid = "${concept.uuid}"`)[0];
+          if (oldConcept && oldConcept.mediaUrl && oldConcept.mediaType) {
+            const conceptMedia = {
+              uuid: _General.default.randomUUID(),
+              url: oldConcept.mediaUrl,
+              type: oldConcept.mediaType
+            };
+            concept.media.push(conceptMedia);
+          }
+        });
+      }
     }
   };
 }

package/dist/SubjectLocation.js

@@ -0,0 +1,83 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _PersistedObject = _interopRequireDefault(require("./PersistedObject"));
+var _Point = _interopRequireDefault(require("./geo/Point"));
+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 SubjectLocation extends _PersistedObject.default {
+  constructor(that = null) {
+    super(that);
+  }
+  get coordinates() {
+    return this.toEntity("coordinates", _Point.default);
+  }
+  set coordinates(x) {
+    this.that.coordinates = this.fromObject(x);
+  }
+  get accuracy() {
+    return this.that.accuracy;
+  }
+  set accuracy(accuracy) {
+    this.that.accuracy = accuracy;
+  }
+
+  // Convenience methods for latitude/longitude access
+  get latitude() {
+    return this.coordinates ? this.coordinates.y : null;
+  }
+  get longitude() {
+    return this.coordinates ? this.coordinates.x : null;
+  }
+  static newInstance(position, accuracy) {
+    const subjectLocation = new SubjectLocation();
+    subjectLocation.coordinates = position;
+    subjectLocation.accuracy = accuracy;
+    return subjectLocation;
+  }
+  static fromResource(resource) {
+    const subjectLocation = new SubjectLocation();
+    if (resource.coordinates) {
+      subjectLocation.coordinates = _Point.default.fromResource(resource.coordinates);
+    }
+    subjectLocation.accuracy = resource.accuracy;
+    return subjectLocation;
+  }
+  get toResource() {
+    const resource = {};
+    if (this.coordinates) {
+      resource.coordinates = this.coordinates.toResource;
+    }
+    resource.accuracy = this.accuracy;
+    return resource;
+  }
+  clone() {
+    const cloned = new SubjectLocation();
+    if (this.coordinates) {
+      cloned.coordinates = this.coordinates.clone();
+    }
+    cloned.accuracy = this.accuracy;
+    return cloned;
+  }
+}
+_defineProperty(SubjectLocation, "schema", {
+  name: "SubjectLocation",
+  properties: {
+    coordinates: {
+      type: 'object',
+      objectType: 'Point',
+      optional: true
+    },
+    accuracy: {
+      type: "double",
+      optional: true
+    }
+  }
+});
+var _default = SubjectLocation;
+exports.default = _default;

package/dist/index.js

@@ -831,6 +831,12 @@ Object.defineProperty(exports, "NestedReportCardResult", {
     return _NestedReportCardResult.default;
   }
 });
+Object.defineProperty(exports, "SubjectLocation", {
+  enumerable: true,
+  get: function () {
+    return _SubjectLocation.default;
+  }
+});
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 var _AddressLevel = _interopRequireWildcard(require("./AddressLevel"));
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
@@ -964,5 +970,6 @@ var _Locations = _interopRequireDefault(require("./location/Locations"));
 var _Range = _interopRequireDefault(require("./reports/Range"));
 var _ReportCardResult = _interopRequireDefault(require("./reports/ReportCardResult"));
 var _NestedReportCardResult = _interopRequireDefault(require("./reports/NestedReportCardResult"));
+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 }; }

package/package.json

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