openchs-models 1.31.72 → 1.31.74

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;
@@ -467,8 +480,12 @@ class Individual extends _BaseEntity.default {
     return _Duration.default.inYear(0);
   }
 
+  getTranslatedNameString(i18n) {
+    return this.isPerson() ? Individual.getFullName(this) : this.subjectType.type === _SubjectType.default.types.User ? `${this.firstName}(${i18n.t('you')})` : this.firstName;
+  }
+
   get nameString() {
-    return this.isPerson() ? Individual.getFullName(this) : this.firstName;
+    return this.isPerson() ? Individual.getFullName(this) : this.subjectType.type === _SubjectType.default.types.User ? `${this.firstName}(You)` : this.firstName;
   }
 
   static getFullName(obj) {

package/dist/ObservationsHolder.js

@@ -59,7 +59,7 @@ class ObservationsHolder {
     const groupObservations = observations && observations.getValueWrapper();
 
     if (parentFormElement.repeatable) {
-      return groupObservations && groupObservations.getGroupObservationAtIndex(questionGroupIndex).getObservation(concept);
+      return groupObservations && groupObservations.size() > questionGroupIndex && groupObservations.getGroupObservationAtIndex(questionGroupIndex).getObservation(concept);
     }
 
     return groupObservations && groupObservations.getObservation(concept);

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: 189,
+    schemaVersion: 190,
     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.`);
@@ -911,6 +909,10 @@ function createRealmConfig() {
           }
         });
       }
+
+      if (oldDB.schemaVersion < 190) {// PlaceHolder for SubjectType.User changes, so that people with previous version of client
+        // are not able to use fastSync of version 190 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/application/Form.js

@@ -227,6 +227,32 @@ class Form extends _BaseEntity.default {
 
     const extraObs = observations.filter(obs => _lodash.default.isNil(orderedObservations.find(oobs => oobs.concept.uuid === obs.concept.uuid)));
     return orderedObservations.concat(extraObs);
+  } //TODO add tests
+
+
+  orderObservationsPerFEG(observations) {
+    const orderedObservations = [];
+
+    const formElementOrdering = _lodash.default.sortBy(this.formElementGroups, feg => feg.displayOrder).map(feg => {
+      let fegOrderedObservations = [];
+      const returnValue = {};
+      returnValue.uuid = feg.uuid;
+      returnValue.feg = feg;
+      returnValue.sortedObservationsArray = fegOrderedObservations;
+      this.orderObservationsWithinAFEG(feg.getFormElements(), observations, fegOrderedObservations);
+      orderedObservations.concat(fegOrderedObservations);
+      return returnValue;
+    });
+
+    return formElementOrdering;
+  }
+
+  orderObservationsWithinAFEG(formElements, observations, orderedObservations) {
+    _lodash.default.sortBy(formElements, fe => fe.displayOrder).forEach(formElement => this.addSortedObservations(formElement, observations, orderedObservations));
+
+    const extraObs = observations.filter(obs => _lodash.default.isNil(orderedObservations.find(oobs => oobs.concept.uuid === obs.concept.uuid)));
+    orderedObservations.concat(extraObs);
+    return extraObs;
   }
 
   sectionWiseOrderedObservations(observations) {

package/dist/application/FormElement.js

@@ -31,6 +31,8 @@ var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
 
 var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
 
+var _RepeatableQuestionGroup = _interopRequireDefault(require("../observation/RepeatableQuestionGroup"));
+
 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; }
@@ -149,8 +151,18 @@ class FormElement extends _BaseEntity.default {
     return formElement;
   }
 
+  newFormElement() {
+    return new FormElement();
+  }
+
   getType() {
-    return this.concept.datatype === _Concept.default.dataType.Coded ? this.type : this.concept.datatype;
+    if (this.concept.datatype === _Concept.default.dataType.Coded) {
+      return this.type;
+    } else if (this.concept.datatype === _Concept.default.dataType.QuestionGroup && this.repeatable) {
+      return _RepeatableQuestionGroup.default.TypeName;
+    } else {
+      return this.concept.datatype;
+    }
   }
 
   isMultiSelect() {
@@ -223,7 +235,7 @@ class FormElement extends _BaseEntity.default {
       }
     } else if (this.concept.datatype === _Concept.default.dataType.Time && !(0, _moment.default)(value, 'HH:mm').isValid() && (!this.mandatory && !_lodash.default.isNil(value) || this.mandatory)) {
       failure.messageKey = "invalidTimeFormat";
-    } else if (this.concept.datatype === _Concept.default.dataType.Date && !(0, _moment.default)(value).isValid() && (!this.mandatory && !_lodash.default.isNil(value) || this.mandatory)) {
+    } else if (this.concept.datatype === _Concept.default.dataType.Date && !(0, _moment.default)(value, 'YYYY-MM-DD').isValid() && (!this.mandatory && !_lodash.default.isNil(value) || this.mandatory)) {
       failure.messageKey = "invalidDateFormat";
     } else if (this.mandatory && this.concept.datatype === _Concept.default.dataType.Duration && _lodash.default.some(_lodash.default.map(value.durations, "durationValue"), durationValue => _lodash.default.isEmpty(durationValue))) {
       failure.messageKey = "emptyValidationMessage";
@@ -286,6 +298,11 @@ class FormElement extends _BaseEntity.default {
     return _lodash.default.isNil(repeatable) ? false : repeatable.getValue();
   }
 
+  get disableManualActions() {
+    const disableManualActions = this.recordByKey("disableManualActions");
+    return _lodash.default.isNil(disableManualActions) ? false : disableManualActions.getValue();
+  }
+
   get datePickerMode() {
     const datePickerMode = this.recordByKey("datePickerMode");
     return _lodash.default.isNil(datePickerMode) ? null : datePickerMode.getValue();
@@ -386,8 +403,12 @@ class FormElement extends _BaseEntity.default {
     return _lodash.default.find(this.formElementGroup.getFormElements(), fe => fe.uuid === this.groupUuid);
   }
 
+  isRepeatableQuestionGroup() {
+    return this.concept.isQuestionGroup() && this.repeatable;
+  }
+
   clone() {
-    const formElement = new FormElement();
+    const formElement = this.newFormElement();
     formElement.uuid = this.uuid;
     formElement.name = this.name;
     formElement.displayOrder = this.displayOrder;

package/dist/index.js

@@ -783,6 +783,12 @@ Object.defineProperty(exports, "DashboardCacheFilter", {
     return _DashboardCacheFilter.default;
   }
 });
+Object.defineProperty(exports, "JSONStringify", {
+  enumerable: true,
+  get: function () {
+    return _JsonStringify.JSONStringify;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -1034,6 +1040,8 @@ var _AgeUtil = _interopRequireDefault(require("./utility/AgeUtil"));
 
 var _DashboardCacheFilter = _interopRequireDefault(require("./application/DashboardCacheFilter"));
 
+var _JsonStringify = require("./utility/JsonStringify");
+
 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; }

package/dist/observation/RepeatableQuestionGroup.js

@@ -88,6 +88,8 @@ class RepeatableQuestionGroup {
 
 }
 
+_defineProperty(RepeatableQuestionGroup, "TypeName", "RepeatableQuestionGroup");
+
 _defineProperty(RepeatableQuestionGroup, "actions", {
   add: 'add',
   remove: 'remove'

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/dist/utility/JsonStringify.js

@@ -0,0 +1,107 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.JSONStringify = void 0;
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+//initial code from : https://javascript.plainenglish.io/create-your-own-implementation-of-json-stringify-simiplied-version-8ab6746cdd1
+const isArray = function (value) {
+  return Array.isArray(value) && typeof value === 'object';
+};
+
+const isObject = function (value) {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+};
+
+const isString = function (value) {
+  return typeof value === 'string';
+};
+
+const isBoolean = function (value) {
+  return typeof value === 'boolean';
+};
+
+const isNumber = function (value) {
+  return typeof value === 'number';
+}; // Common check for number, string and boolean value
+
+
+const restOfDataTypes = function (value) {
+  return isNumber(value) || isString(value) || isBoolean(value);
+}; // This function will be used to remove extra comma from the arrays and object
+
+
+const removeComma = function (str) {
+  const tempArr = str.split('');
+  tempArr.pop();
+  return tempArr.join('');
+};
+
+const duckCheckNativeRealmCollection = function (obj) {
+  return typeof obj === "object" && !_lodash.default.isNil(_lodash.default.get(obj, "removeAllListeners")) && !_lodash.default.isNil(_lodash.default.get(obj, "snapshot"));
+};
+
+function duckCheckForError(obj) {
+  return obj.stack && obj.message;
+}
+
+const JSONStringifyInternal = function (obj, depth, objectMap, arrayWidth, objectKey) {
+  if (depth === 0) return "BELOW_DEPTH"; // Boolean and Number behave in a same way and String we need to add extra quotes
+
+  if (restOfDataTypes(obj)) {
+    const passQuotes = isString(obj) ? `"` : '';
+    return `${passQuotes}${obj}${passQuotes}`;
+  } // Recursive function call for Arrays to handle nested arrays
+
+
+  if (isArray(obj)) {
+    let arrStr = '';
+    obj.forEach((eachValue, index) => {
+      if (index === arrayWidth) arrStr += "....";
+      if (index >= arrayWidth) return;
+      arrStr += JSONStringifyInternal(eachValue, depth - 1, objectMap, arrayWidth);
+      arrStr += ',';
+    });
+    return `[` + removeComma(arrStr) + `]`;
+  }
+
+  if (duckCheckNativeRealmCollection(obj, objectKey)) {
+    return "<realm-collection>";
+  } // Recursive function call for Object to handle nested Object
+
+
+  if (isObject(obj) && _lodash.default.isNil(objectMap.get(obj))) {
+    objectMap.set(obj, true);
+    let objStr = '';
+    const objKeys = Object.keys(obj);
+    objKeys.forEach(eachKey => {
+      const eachValue = obj[eachKey];
+      objStr += `"${eachKey}":${JSONStringifyInternal(eachValue, depth - 1, objectMap, arrayWidth, eachKey)},`;
+    });
+
+    if (duckCheckForError(obj)) {
+      objStr += `message:${obj.message},`;
+      objStr += `stack:${obj.stack},`;
+    }
+
+    return `{` + removeComma(objStr) + `}`;
+  } else if (!_lodash.default.isNil(objectMap.get(obj))) {
+    return "<object_repeated>";
+  } else {
+    return obj;
+  }
+}; // This class is not meant for production purposes, it is to be used for developer assistance like logging.
+// It supports recursive object structure, native realm collection, restricting array width (number of elements that can be stringified), and object tree depth
+
+
+const JSONStringify = function (obj, objectTreeDepth = 3, arrayWidth = 4) {
+  const objectMap = new Map();
+  return JSONStringifyInternal(obj, objectTreeDepth, objectMap, arrayWidth);
+};
+
+exports.JSONStringify = JSONStringify;

package/package.json

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