openchs-models 1.31.64 → 1.31.66

package/dist/AddressLevel.js

@@ -242,6 +242,24 @@ class AddressLevel extends _BaseEntity.default {
     return appendLineage(this, []);
   }
 
+  findObservation(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observations = _lodash.default.isNil(parentConceptNameOrUuid) ? this.locationProperties : this.findGroupedObservation(parentConceptNameOrUuid);
+    return _lodash.default.find(observations, observation => {
+      return observation.concept.name === conceptNameOrUuid || observation.concept.uuid === conceptNameOrUuid;
+    });
+  }
+
+  findGroupedObservation(parentConceptNameOrUuid) {
+    const groupedObservations = _lodash.default.find(this.locationProperties, observation => observation.concept.name === parentConceptNameOrUuid || observation.concept.uuid === parentConceptNameOrUuid);
+
+    return _lodash.default.isEmpty(groupedObservations) ? [] : groupedObservations.getValue();
+  }
+
+  getObservationReadableValue(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observationForConcept = this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
+    return _lodash.default.isEmpty(observationForConcept) ? observationForConcept : observationForConcept.getReadableValue();
+  }
+
 }
 
 _defineProperty(AddressLevel, "schema", {

package/dist/Individual.js

@@ -64,6 +64,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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"]]);
+const ADDRESS_LEVEL_DUMMY_UUID = 'f71b2f45-2c11-427f-aa99-be6161a6b413';
 
 class Individual extends _BaseEntity.default {
   constructor(that = null) {
@@ -279,8 +280,15 @@ class Individual extends _BaseEntity.default {
     individual.groupSubjects = [];
     individual.groups = [];
     individual.approvalStatuses = [];
-    individual.lowestAddressLevel = _AddressLevel.default.create({
-      uuid: "",
+    individual.lowestAddressLevel = this.getPlaceholderAddressLevel();
+    individual.voided = false;
+    individual.comments = [];
+    return individual;
+  }
+
+  static getPlaceholderAddressLevel(entityService) {
+    return _AddressLevel.default.create({
+      uuid: ADDRESS_LEVEL_DUMMY_UUID,
       title: "",
       level: 0,
       typeString: "",
@@ -289,10 +297,7 @@ class Individual extends _BaseEntity.default {
       parentUuid: "",
       typeUuid: "",
       locationProperties: []
-    });
-    individual.voided = false;
-    individual.comments = [];
-    return individual;
+    }, entityService);
   }
 
   static createEmptySubjectInstance() {
@@ -340,9 +345,17 @@ class Individual extends _BaseEntity.default {
     individual.dateOfBirth = dateOfBirth;
     individual.dateOfBirthVerified = dateOfBirthVerified;
     individual.gender = gender;
-    individual.lowestAddressLevel = lowestAddressLevel;
+    individual.lowestAddressLevel = this.initLowestAddressLevel(lowestAddressLevel, subjectType, null);
     return individual;
   }
+  /**
+   * Init Lowest AddressLevel with Placeholder only if the Individual SubjectType is User
+   */
+
+
+  static initLowestAddressLevel(lowestAddressLevel, subjectType, entityService) {
+    return lowestAddressLevel || subjectType && subjectType.isUser() && this.getPlaceholderAddressLevel(entityService);
+  }
 
   static fromResource(individualResource, entityService) {
     const addressLevel = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(individualResource, "addressUUID"), _AddressLevel.default.schema.name);
@@ -352,7 +365,7 @@ class Individual extends _BaseEntity.default {
     const individual = _General.default.assignFields(individualResource, new Individual(), this.directCopyFields, this.dateFields, ["observations"], entityService);
 
     individual.gender = gender;
-    individual.lowestAddressLevel = addressLevel;
+    individual.lowestAddressLevel = this.initLowestAddressLevel(addressLevel, subjectType, entityService);
     individual.name = individual.nameString;
     if (!_lodash.default.isNil(individualResource.registrationLocation)) individual.registrationLocation = _Point.default.fromResource(individualResource.registrationLocation);
     individual.subjectType = subjectType;

package/dist/Schema.js

@@ -183,8 +183,6 @@ var _MigrationsHelper = _interopRequireDefault(require("./MigrationsHelper"));
 
 var _MetaDataService = _interopRequireDefault(require("./service/MetaDataService"));
 
-var _moment = _interopRequireDefault(require("moment"));
-
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -281,7 +279,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 188,
+    schemaVersion: 189,
     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.`);
@@ -903,6 +901,10 @@ function createRealmConfig() {
         // newDB.deleteModel("Decision");
         // newDB.deleteModel("ProgramOutcome");
       }
+
+      if (oldDB.schemaVersion < 189) {// PlaceHolder for SubjectType.User changes, so that people with previous version of client
+        // are not able to use fastSync of version 189 and above
+      }
     }
   };
 }

package/dist/SubjectType.js

@@ -260,6 +260,10 @@ class SubjectType extends _ReferenceEntity.default {
     return this.type === SubjectType.types.Individual;
   }
 
+  isUser() {
+    return this.type === SubjectType.types.User;
+  }
+
   registerIcon() {
     return this.isPerson() ? "account-plus" : "plus-box";
   }
@@ -376,7 +380,8 @@ _defineProperty(SubjectType, "types", {
   Person: 'Person',
   Individual: 'Individual',
   Group: 'Group',
-  Household: 'Household'
+  Household: 'Household',
+  User: 'User'
 });
 
 _defineProperty(SubjectType, "settingKeys", {

package/dist/utility/General.js

@@ -150,6 +150,10 @@ class General {
   }
 
   static assignObsFields(source, dest, observationFields = [], entityService) {
+    if (!entityService) {
+      return dest;
+    }
+
     observationFields.forEach(observationField => {
       const observations = [];
 

package/package.json

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