openchs-models 1.10.2 → 1.11.2

package/dist/Concept.js

@@ -29,6 +29,8 @@ var _PhoneNumber = _interopRequireDefault(require("./PhoneNumber"));
 
 var _Identifier = _interopRequireDefault(require("./Identifier"));
 
+var _QuestionGroup = _interopRequireDefault(require("./observation/QuestionGroup"));
+
 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; }
@@ -203,6 +205,10 @@ class Concept {
       return _Identifier.default.fromObs(obsValue);
     }
 
+    if (this.isQuestionGroup()) {
+      return _QuestionGroup.default.fromObs(obsValue);
+    }
+
     return new _PrimitiveValue.default(obsValue, this.datatype);
   }
 
@@ -230,6 +236,14 @@ class Concept {
     return this.isType(Concept.dataType.Id);
   }
 
+  isQuestionGroup() {
+    return this.isType(Concept.dataType.QuestionGroup);
+  }
+
+  isPrimitive() {
+    return [Concept.dataType.Text, Concept.dataType.Time, Concept.dataType.Numeric, Concept.dataType.Video, Concept.dataType.Image, Concept.dataType.Audio, Concept.dataType.Date, Concept.dataType.DateTime, Concept.dataType.Location, Concept.dataType.File].includes(this.datatype);
+  }
+
   getAnswers() {
     return _lodash.default.sortBy(this.answers, answer => {
       return _lodash.default.indexOf([Concept.StandardConcepts.OtherConceptUUID, Concept.StandardConcepts.NoneConceptUUID], answer.concept.uuid) !== -1 ? 99999 : answer.answerOrder;
@@ -335,6 +349,7 @@ _defineProperty(Concept, "dataType", {
   Subject: "Subject",
   PhoneNumber: "PhoneNumber",
   GroupAffiliation: "GroupAffiliation",
+  QuestionGroup: "QuestionGroup",
   File: "File",
 
   get Media() {

package/dist/Observation.js

@@ -78,6 +78,14 @@ class Observation {
       return new _Displayable.default(addressLevel.name, addressLevel);
     } else if (observation.concept.isPhoneNumberConcept()) {
       return new _Displayable.default(_lodash.default.toString(valueWrapper.toString()), null);
+    } else if (observation.concept.isQuestionGroup()) {
+      const groupObservations = valueWrapper.getValue();
+
+      const groupQuestionValues = _lodash.default.map(groupObservations, obs => ({
+        [obs.concept.name]: obs.getReadableValue()
+      }));
+
+      return new _Displayable.default(JSON.stringify(groupQuestionValues), null);
     } else {
       const unit = _lodash.default.defaultTo(observation.concept.unit, "");
 
@@ -113,7 +121,7 @@ class Observation {
 
       if (this.concept.isDurationConcept()) {
         valueParsed = valueParsed.durations;
-      } else if (this.concept.isPhoneNumberConcept() || this.concept.isIdConcept()) {
+      } else if (this.concept.isPhoneNumberConcept() || this.concept.isIdConcept() || this.concept.isQuestionGroup()) {
         return this.concept.getValueWrapperFor(valueParsed);
       } else {
         valueParsed = valueParsed.answer;
@@ -164,6 +172,10 @@ class Observation {
               return answerConcept.name;
             });
         }
+      } else if (this.concept.isQuestionGroup()) {
+        return _lodash.default.map(value, obs => ({
+          [obs.concept.name]: obs.getReadableValue()
+        }));
       }
 
       return value;

package/dist/ObservationsHolder.js

@@ -23,6 +23,8 @@ var _PhoneNumber = _interopRequireDefault(require("./PhoneNumber"));
 
 var _Identifier = _interopRequireDefault(require("./Identifier"));
 
+var _QuestionGroup = _interopRequireDefault(require("./observation/QuestionGroup"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -59,7 +61,7 @@ class ObservationsHolder {
 
     _lodash.default.remove(this.observations, obs => obs.concept.uuid === formElement.concept.uuid);
 
-    if ([_Concept.default.dataType.Text, _Concept.default.dataType.Time, _Concept.default.dataType.Numeric, _Concept.default.dataType.Video, _Concept.default.dataType.Image, _Concept.default.dataType.Audio, _Concept.default.dataType.Date, _Concept.default.dataType.DateTime, _Concept.default.dataType.Location, _Concept.default.dataType.File].includes(formElement.getType()) && (0, _lodash.isNil)(formElement.durationOptions)) {
+    if (formElement.concept.isPrimitive() && (0, _lodash.isNil)(formElement.durationOptions)) {
       this.addOrUpdatePrimitiveObs(formElement.concept, value);
     }
 
@@ -235,6 +237,43 @@ class ObservationsHolder {
     return observation;
   }
 
+  updateGroupQuestion(parentConcept, childConcept, value, childFormElement) {
+    const parentObservation = this.getObservation(parentConcept);
+    const childObservations = _lodash.default.isEmpty(parentObservation) ? new _QuestionGroup.default() : parentObservation.getValueWrapper();
+
+    if (childConcept.isPrimitive() && _lodash.default.isNil(childFormElement.durationOptions)) {
+      childObservations.removeExistingObs(childConcept);
+
+      if (!_lodash.default.isEmpty(_lodash.default.toString(value))) {
+        const observation = _Observation.default.create(childConcept, new _PrimitiveValue.default(value, childConcept.datatype));
+
+        childObservations.addObservation(observation);
+      }
+    }
+
+    if (childConcept.isCodedConcept()) {
+      let observation = childObservations.getObservation(childConcept);
+      const isSingleSelect = childFormElement.isSingleSelect();
+
+      if (_lodash.default.isEmpty(observation)) {
+        observation = _Observation.default.create(childConcept, isSingleSelect ? new _SingleCodedValue.default(value) : new _MultipleCodedValues.default().push(value));
+        childObservations.addObservation(observation);
+      } else {
+        isSingleSelect ? observation.toggleSingleSelectAnswer(value) : observation.toggleMultiSelectAnswer(value);
+
+        if (observation.hasNoAnswer()) {
+          childObservations.removeExistingObs(childConcept);
+        }
+      }
+    }
+
+    this._removeExistingObs(parentConcept);
+
+    if (!childObservations.isEmpty()) {
+      this.observations.push(_Observation.default.create(parentConcept, childObservations));
+    }
+  }
+
   toggleMultiSelectAnswer(concept, answerUUID) {
     return this.toggleCodedAnswer(concept, answerUUID, false);
   }

package/dist/Schema.js

@@ -168,7 +168,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var _default = {
   //order is important, should be arranged according to the dependency
   schema: [_LocaleMapping.default, _Settings.default, _Concept.ConceptAnswer, _Concept.default, _EncounterType.default, _Gender.default, _UserDefinedIndividualProperty.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _ProgramOutcome.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _ConfigFile.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _VisitScheduleInterval.default, _VisitScheduleConfig.default, _ProgramConfig.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, _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],
-  schemaVersion: 148,
+  schemaVersion: 149,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       var oldObjects = oldDB.objects("DecisionConfig");

package/dist/application/Form.js

@@ -21,6 +21,8 @@ var _EntitySyncStatus = _interopRequireDefault(require("../EntitySyncStatus"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
+var _QuestionGroup = _interopRequireDefault(require("../observation/QuestionGroup"));
+
 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; }
@@ -132,11 +134,10 @@ class Form {
   orderObservations(observations) {
     const orderedObservations = [];
 
-    const conceptOrdering = _lodash.default.sortBy(this.formElementGroups, feg => feg.displayOrder).map(feg => _lodash.default.sortBy(feg.getFormElements(), fe => fe.displayOrder).map(fe => fe.concept));
+    const formElementOrdering = _lodash.default.sortBy(this.formElementGroups, feg => feg.displayOrder).map(feg => _lodash.default.sortBy(feg.getFormElements(), fe => fe.displayOrder));
 
-    _lodash.default.flatten(conceptOrdering).map(concept => {
-      const foundObs = observations.find(obs => obs.concept.uuid === concept.uuid);
-      if (!_lodash.default.isNil(foundObs)) orderedObservations.push(foundObs);
+    _lodash.default.flatten(formElementOrdering).map(formElement => {
+      this.addSortedObservations(formElement, observations, orderedObservations);
     });
 
     const extraObs = observations.filter(obs => _lodash.default.isNil(orderedObservations.find(oobs => oobs.concept.uuid === obs.concept.uuid)));
@@ -152,13 +153,12 @@ class Form {
     }) => displayOrder);
 
     _lodash.default.forEach(orderedFEG, feg => {
-      const conceptOrdering = _lodash.default.sortBy(feg.getFormElements(), fe => fe.displayOrder).map(fe => fe.concept);
+      const formElementOrdering = _lodash.default.sortBy(feg.getFormElements(), fe => fe.displayOrder);
 
       const fegObs = [];
 
-      _lodash.default.forEach(conceptOrdering, concept => {
-        const foundObs = observations.find(obs => obs.concept.uuid === concept.uuid);
-        if (!_lodash.default.isNil(foundObs)) fegObs.push(foundObs);
+      _lodash.default.forEach(formElementOrdering, formElement => {
+        this.addSortedObservations(formElement, observations, fegObs);
       });
 
       if (!_lodash.default.isEmpty(fegObs)) {
@@ -180,6 +180,20 @@ class Form {
     return sections;
   }
 
+  addSortedObservations(formElement, observations, orderedObservations) {
+    const concept = formElement.concept;
+    const foundObs = observations.find(obs => obs.concept.uuid === concept.uuid);
+
+    if (!_lodash.default.isNil(foundObs) && concept.isQuestionGroup()) {
+      const clonedObs = foundObs.cloneForEdit();
+      const sortedChildObs = this.orderObservations(clonedObs.getValueWrapper().getValue());
+      clonedObs.valueJSON = JSON.stringify(new _QuestionGroup.default(sortedChildObs));
+      if (!_lodash.default.isEmpty(sortedChildObs)) orderedObservations.push(clonedObs);
+    } else {
+      if (!_lodash.default.isNil(foundObs)) orderedObservations.push(foundObs);
+    }
+  }
+
   getFormElementGroupOrder(groupUUID) {
     const orderedFEG = _lodash.default.sortBy(this.nonVoidedFormElementGroups(), ({
       displayOrder

package/dist/application/FormElement.js

@@ -37,6 +37,7 @@ class FormElement {
     const formElement = _General.default.assignFields(resource, new FormElement(), ["uuid", "name", "displayOrder", "mandatory", "type", "voided", "rule"], []);
 
     formElement.formElementGroup = formElementGroup;
+    formElement.groupUuid = _ResourceUtil.default.getUUIDFor(resource, "groupQuestionUUID");
     formElement.concept = concept; //remove orphan keyValues (because KeyValue doesn't have primary key
 
     entityService.deleteObjects(resource["uuid"], FormElement.schema.name, "keyValues");
@@ -196,6 +197,10 @@ class FormElement {
     return this.name === elementNameOrUUID || this.uuid === elementNameOrUUID;
   }
 
+  isQuestionGroup() {
+    return !_lodash.default.isNil(this.groupUuid);
+  }
+
   toJSON() {
     return {
       uuid: this.uuid,
@@ -204,7 +209,8 @@ class FormElement {
       mandatory: this.mandatory,
       keyValues: this.keyValues,
       concept: this.concept,
-      formElementGroupUUID: this.formElementGroup.uuid
+      formElementGroupUUID: this.formElementGroup.uuid,
+      groupUuid: this.groupUuid
     };
   }
 
@@ -278,6 +284,10 @@ _defineProperty(FormElement, "schema", {
     rule: {
       type: "string",
       optional: true
+    },
+    groupUuid: {
+      type: "string",
+      optional: true
     }
   }
 });

package/dist/application/FormElementGroup.js

@@ -17,6 +17,8 @@ var _FormElement = _interopRequireDefault(require("./FormElement"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _QuestionGroup = _interopRequireDefault(require("../observation/QuestionGroup"));
+
 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; }
@@ -68,13 +70,24 @@ class FormElementGroup {
   validate(observationHolder, filteredFormElements) {
     const validationResults = [];
     filteredFormElements.forEach(formElement => {
-      const observation = observationHolder.findObservation(formElement.concept);
-      const validationResult = formElement.validate(_lodash.default.isNil(observation) ? null : observation.getValue());
-      validationResults.push(validationResult);
+      if (formElement.isQuestionGroup()) {
+        const parentFormElement = _lodash.default.find(filteredFormElements, fe => fe.uuid === formElement.groupUuid);
+
+        const parentObservation = observationHolder.findObservation(parentFormElement.concept);
+        const childObservations = _lodash.default.isEmpty(parentObservation) ? new _QuestionGroup.default() : parentObservation.getValueWrapper();
+        this.validateFormElement(formElement, childObservations.findObservation(formElement.concept), validationResults);
+      } else {
+        this.validateFormElement(formElement, observationHolder.findObservation(formElement.concept), validationResults);
+      }
     });
     return validationResults;
   }
 
+  validateFormElement(formElement, observation, validationResults) {
+    const validationResult = formElement.validate(_lodash.default.isNil(observation) ? null : observation.getValue());
+    validationResults.push(validationResult);
+  }
+
   get formElementIds() {
     return this.getFormElements().map(formElement => {
       return formElement.uuid;

package/dist/index.js

@@ -645,6 +645,12 @@ Object.defineProperty(exports, "SubjectMigration", {
     return _SubjectMigration.default;
   }
 });
+Object.defineProperty(exports, "QuestionGroup", {
+  enumerable: true,
+  get: function () {
+    return _QuestionGroup.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -858,6 +864,8 @@ var _FileFormat = _interopRequireDefault(require("./FileFormat"));
 
 var _SubjectMigration = _interopRequireDefault(require("./SubjectMigration"));
 
+var _QuestionGroup = _interopRequireDefault(require("./observation/QuestionGroup"));
+
 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/QuestionGroup.js

@@ -0,0 +1,105 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _Concept = _interopRequireWildcard(require("../Concept"));
+
+var _Observation = _interopRequireDefault(require("../Observation"));
+
+var _General = _interopRequireDefault(require("../utility/General"));
+
+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; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class QuestionGroup {
+  constructor(groupObservations = []) {
+    this.groupObservations = groupObservations;
+  }
+
+  get toResource() {
+    return _lodash.default.map(this.groupObservations, obs => obs.toResource);
+  }
+
+  static fromObs({
+    groupObservations
+  }) {
+    const newObs = _lodash.default.map(groupObservations, ({
+      concept,
+      valueJSON
+    }) => {
+      const observation = new _Observation.default();
+      observation.concept = QuestionGroup.constructConceptModel(concept);
+      const value = valueJSON.answer || valueJSON.value;
+      observation.valueJSON = observation.concept.getValueWrapperFor(value);
+      return observation;
+    });
+
+    return new QuestionGroup(newObs);
+  }
+
+  static constructConceptModel(resource) {
+    const concept = _Concept.default.fromResource(resource);
+
+    concept.datatype = resource.datatype;
+
+    if (!_lodash.default.isNil(resource.answers)) {
+      concept.answers = _lodash.default.map(resource.answers, answer => {
+        const conceptAnswer = _General.default.assignFields(answer, new _Concept.ConceptAnswer(), ["uuid", "answerOrder", "abnormal", "unique", "voided"]);
+
+        conceptAnswer.concept = QuestionGroup.constructConceptModel(answer.concept);
+        return conceptAnswer;
+      });
+    }
+
+    return concept;
+  }
+
+  getValue() {
+    return this.groupObservations;
+  }
+
+  findObservation(concept) {
+    return _lodash.default.find(this.groupObservations, observation => {
+      return observation.concept.uuid === concept.uuid;
+    });
+  }
+
+  getObservation(concept) {
+    return this.findObservation(concept);
+  }
+
+  addObservation(observation) {
+    this.groupObservations.push(observation);
+  }
+
+  removeExistingObs(concept) {
+    _lodash.default.remove(this.groupObservations, obs => obs.concept.uuid === concept.uuid);
+  }
+
+  getValueForConcept(concept) {
+    const observation = this.findObservation(concept);
+    return _lodash.default.isNil(observation) ? observation : observation.getReadableValue();
+  }
+
+  cloneForEdit() {
+    const newObs = _lodash.default.map(this.groupObservations, o => o.cloneForEdit());
+
+    return new QuestionGroup(newObs);
+  }
+
+  isEmpty() {
+    return _lodash.default.isEmpty(this.groupObservations);
+  }
+
+}
+
+var _default = QuestionGroup;
+exports.default = _default;

package/dist/utility/General.js

@@ -15,6 +15,8 @@ var _Observation = _interopRequireDefault(require("../Observation"));
 
 var _Concept = _interopRequireDefault(require("../Concept"));
 
+var _QuestionGroup = _interopRequireDefault(require("../observation/QuestionGroup"));
+
 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; }
@@ -150,8 +152,16 @@ class General {
       if (!_lodash.default.isNil(source[observationField])) {
         _lodash.default.toPairs(source[observationField]).forEach(([conceptUUID, value]) => {
           const observation = new _Observation.default();
-          observation.concept = entityService.findByKey("uuid", conceptUUID, _Concept.default.schema.name);
-          observation.valueJSON = JSON.stringify(observation.concept.getValueWrapperFor(value));
+          const concept = entityService.findByKey("uuid", conceptUUID, _Concept.default.schema.name);
+          observation.concept = concept;
+
+          if (concept.isQuestionGroup()) {
+            const groupObservations = this.createQuestionGroupObservations(value, entityService);
+            observation.valueJSON = JSON.stringify(new _QuestionGroup.default(groupObservations));
+          } else {
+            observation.valueJSON = JSON.stringify(observation.concept.getValueWrapperFor(value));
+          }
+
           observations.push(observation);
         });
       }
@@ -161,6 +171,15 @@ class General {
     return dest;
   }
 
+  static createQuestionGroupObservations(keyValues, entityService) {
+    return _lodash.default.map(_lodash.default.toPairs(keyValues), ([conceptUUID, value]) => {
+      const observation = new _Observation.default();
+      observation.concept = entityService.findByKey("uuid", conceptUUID, _Concept.default.schema.name);
+      observation.valueJSON = observation.concept.getValueWrapperFor(value);
+      return observation;
+    });
+  }
+
   static pick(from, attributes, listAttributes) {
     const picked = _lodash.default.pick(from, attributes);
 

package/package.json

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