openchs-models 1.31.63 → 1.31.65

package/dist/IdentifierAssignment.js

@@ -115,7 +115,7 @@ class IdentifierAssignment extends _BaseEntity.default {
   }
 
   static fromResource(identifierAssignmentResource, entityService) {
-    const identifierAssignment = _General.default.assignFields(identifierAssignmentResource, new IdentifierAssignment(), ["uuid", "identifier", "assignmentOrder", "voided"]);
+    const identifierAssignment = _General.default.assignFields(identifierAssignmentResource, new IdentifierAssignment(), ["uuid", "identifier", "assignmentOrder", "voided", "used"]);
 
     identifierAssignment.identifierSource = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(identifierAssignmentResource, "identifierSourceUUID"), _IdentifierSource.default.schema.name);
     identifierAssignment.individual = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(identifierAssignmentResource, "individualUUID"), _Individual.default.schema.name);
@@ -125,7 +125,7 @@ class IdentifierAssignment extends _BaseEntity.default {
   }
 
   get toResource() {
-    const resource = _lodash.default.pick(this, ["uuid", "identifier", "assignmentOrder", "voided"]);
+    const resource = _lodash.default.pick(this, ["uuid", "identifier", "assignmentOrder", "voided", "used"]);
 
     resource.individualUUID = this.individual ? this.individual.uuid : null;
     resource.programEnrolmentUUID = this.programEnrolment ? this.programEnrolment.uuid : null;

package/dist/application/Form.js

@@ -227,32 +227,6 @@ 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,8 +31,6 @@ 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; }
@@ -151,18 +149,8 @@ class FormElement extends _BaseEntity.default {
     return formElement;
   }
 
-  newFormElement() {
-    return new FormElement();
-  }
-
   getType() {
-    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;
-    }
+    return this.concept.datatype === _Concept.default.dataType.Coded ? this.type : this.concept.datatype;
   }
 
   isMultiSelect() {
@@ -398,12 +386,8 @@ 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 = this.newFormElement();
+    const formElement = new FormElement();
     formElement.uuid = this.uuid;
     formElement.name = this.name;
     formElement.displayOrder = this.displayOrder;

package/dist/index.js

@@ -783,12 +783,6 @@ Object.defineProperty(exports, "DashboardCacheFilter", {
     return _DashboardCacheFilter.default;
   }
 });
-Object.defineProperty(exports, "JSONStringify", {
-  enumerable: true,
-  get: function () {
-    return _JsonStringify.JSONStringify;
-  }
-});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -1040,8 +1034,6 @@ 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,8 +88,6 @@ class RepeatableQuestionGroup {
 
 }
 
-_defineProperty(RepeatableQuestionGroup, "TypeName", "RepeatableQuestionGroup");
-
 _defineProperty(RepeatableQuestionGroup, "actions", {
   add: 'add',
   remove: 'remove'

package/package.json

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

package/dist/utility/JsonStringify.js

@@ -1,107 +0,0 @@
-"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;