openchs-models 1.16.2 → 1.17.0

package/dist/Concept.js

@@ -31,6 +31,8 @@ var _Identifier = _interopRequireDefault(require("./Identifier"));
 
 var _QuestionGroup = _interopRequireDefault(require("./observation/QuestionGroup"));
 
+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; }
@@ -206,7 +208,7 @@ class Concept {
     }
 
     if (this.isQuestionGroup()) {
-      return _QuestionGroup.default.fromObs(obsValue);
+      return 'repeatableObservations' in obsValue ? _RepeatableQuestionGroup.default.fromObs(obsValue) : _QuestionGroup.default.fromObs(obsValue);
     }
 
     return new _PrimitiveValue.default(obsValue, this.datatype);

package/dist/ObservationsHolder.js

@@ -27,6 +27,8 @@ var _QuestionGroup = _interopRequireDefault(require("./observation/QuestionGroup
 
 var _General = _interopRequireDefault(require("./utility/General"));
 
+var _RepeatableQuestionGroup = _interopRequireDefault(require("./observation/RepeatableQuestionGroup"));
+
 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; }
@@ -201,7 +203,7 @@ class ObservationsHolder {
             uuid
           }) => fe.groupUuid === uuid);
 
-          this.updateGroupQuestion(_lodash.default.get(parentFormElement, 'concept'), concept, value, fe);
+          this.updateGroupQuestion(parentFormElement, fe, value);
         } else {
           concept.isCodedConcept() ? this.addOrUpdateCodedObs(concept, value, fe.isSingleSelect()) : this.addOrUpdatePrimitiveObs(concept, value);
         }
@@ -261,9 +263,21 @@ class ObservationsHolder {
     return observation;
   }
 
-  updateGroupQuestion(parentConcept, childConcept, value, childFormElement) {
+  updateGroupQuestion(parentFormElement, childFormElement, value) {
+    const parentConcept = parentFormElement.concept;
     const parentObservation = this.getObservation(parentConcept);
     const childObservations = _lodash.default.isEmpty(parentObservation) ? new _QuestionGroup.default() : parentObservation.getValueWrapper();
+    this.updateChildObservations(childFormElement, childObservations, value);
+
+    this._removeExistingObs(parentConcept);
+
+    if (!childObservations.isEmpty()) {
+      this.observations.push(_Observation.default.create(parentConcept, childObservations));
+    }
+  }
+
+  updateChildObservations(childFormElement, childObservations, value) {
+    const childConcept = childFormElement.concept;
 
     if (childConcept.isPrimitive() && _lodash.default.isNil(childFormElement.durationOptions)) {
       childObservations.removeExistingObs(childConcept);
@@ -290,11 +304,29 @@ class ObservationsHolder {
         }
       }
     }
+  }
+
+  updateRepeatableGroupQuestion(index, parentFormElement, childFormElement, value, action) {
+    const parentConcept = parentFormElement.concept;
+    const observations = this.getObservation(parentConcept);
+    const repeatableObservations = _lodash.default.isEmpty(observations) ? new _RepeatableQuestionGroup.default() : observations.getValueWrapper();
+
+    if (action === _RepeatableQuestionGroup.default.actions.add) {
+      repeatableObservations.addQuestionGroup();
+      return;
+    } else if (action === _RepeatableQuestionGroup.default.actions.remove) {
+      repeatableObservations.removeQuestionGroup(index);
+      return;
+    }
+
+    const childObservations = repeatableObservations.getGroupObservationAtIndex(index);
+    this.updateChildObservations(childFormElement, childObservations, value);
+    repeatableObservations.updateGroupObservationsAtIndex(childObservations, index);
 
     this._removeExistingObs(parentConcept);
 
-    if (!childObservations.isEmpty()) {
-      this.observations.push(_Observation.default.create(parentConcept, childObservations));
+    if (!repeatableObservations.isEmpty()) {
+      this.observations.push(_Observation.default.create(parentConcept, repeatableObservations));
     }
   }
 

package/dist/application/Form.js

@@ -23,6 +23,8 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _QuestionGroup = _interopRequireDefault(require("../observation/QuestionGroup"));
 
+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; }
@@ -203,8 +205,10 @@ class Form {
 
     if (!_lodash.default.isNil(foundObs) && concept.isQuestionGroup()) {
       const clonedObs = foundObs.cloneForEdit();
-      const sortedChildObs = this.orderQuestionGroupObservations(clonedObs.getValueWrapper().getValue(), formElement.uuid);
-      clonedObs.valueJSON = JSON.stringify(new _QuestionGroup.default(sortedChildObs));
+      const valueWrapper = clonedObs.getValueWrapper();
+      const isRepeatable = valueWrapper.isRepeatable();
+      const sortedChildObs = isRepeatable ? _lodash.default.flatMap(valueWrapper.getValue(), questionGroup => new _QuestionGroup.default(this.orderQuestionGroupObservations(questionGroup.getValue(), formElement.uuid))) : this.orderQuestionGroupObservations(valueWrapper.getValue(), formElement.uuid);
+      clonedObs.valueJSON = JSON.stringify(isRepeatable ? new _RepeatableQuestionGroup.default(sortedChildObs) : new _QuestionGroup.default(sortedChildObs));
       if (!_lodash.default.isEmpty(sortedChildObs)) orderedObservations.push(clonedObs);
     } else {
       if (!_lodash.default.isNil(foundObs)) orderedObservations.push(foundObs);

package/dist/application/FormElement.js

@@ -178,6 +178,11 @@ class FormElement {
     return _lodash.default.isNil(editable) ? true : editable.getValue();
   }
 
+  get repeatable() {
+    const repeatable = this.recordByKey("repeatable");
+    return _lodash.default.isNil(repeatable) ? false : repeatable.getValue();
+  }
+
   get datePickerMode() {
     const datePickerMode = this.recordByKey("datePickerMode");
     return _lodash.default.isNil(datePickerMode) ? null : datePickerMode.getValue();

package/dist/application/FormElementGroup.js

@@ -19,6 +19,10 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _QuestionGroup = _interopRequireDefault(require("../observation/QuestionGroup"));
 
+var _RepeatableQuestionGroup = _interopRequireDefault(require("../observation/RepeatableQuestionGroup"));
+
+var _ValidationResult = _interopRequireDefault(require("./ValidationResult"));
+
 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; }
@@ -70,19 +74,43 @@ class FormElementGroup {
   validate(observationHolder, filteredFormElements) {
     const validationResults = [];
     filteredFormElements.forEach(formElement => {
-      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 {
+      if (formElement.concept.isQuestionGroup()) {
+        const childFormElements = _lodash.default.filter(filteredFormElements, fe => fe.groupUuid === formElement.uuid);
+
+        const observations = observationHolder.findObservation(formElement.concept);
+
+        if (formElement.repeatable) {
+          const repeatableQuestionGroup = _lodash.default.isEmpty(observations) ? new _RepeatableQuestionGroup.default() : observations.getValueWrapper();
+          const groupValidationResults = [];
+
+          _lodash.default.forEach(repeatableQuestionGroup.getAllQuestionGroupObservations(), questionGroup => {
+            const childValidations = [];
+            this.validateQuestionGroup(questionGroup, childFormElements, childValidations);
+            groupValidationResults.push(childValidations);
+          });
+
+          const isSuccess = _lodash.default.every(groupValidationResults, childValidations => _lodash.default.every(childValidations, ({
+            success
+          }) => success));
+
+          const validationResult = new _ValidationResult.default(isSuccess, formElement.uuid);
+          validationResult.groupValidations = groupValidationResults;
+          validationResults.push(validationResult);
+        } else {
+          const questionGroup = _lodash.default.isEmpty(observations) ? new _QuestionGroup.default() : observations.getValueWrapper();
+          this.validateQuestionGroup(questionGroup, childFormElements, validationResults);
+        }
+      } else if (!formElement.isQuestionGroup()) {
         this.validateFormElement(formElement, observationHolder.findObservation(formElement.concept), validationResults);
       }
     });
     return validationResults;
   }
 
+  validateQuestionGroup(questionGroup, childFormElements, validationResults) {
+    _lodash.default.forEach(childFormElements, formElement => this.validateFormElement(formElement, questionGroup.findObservation(formElement.concept), validationResults));
+  }
+
   validateFormElement(formElement, observation, validationResults) {
     const validationResult = formElement.validate(_lodash.default.isNil(observation) ? null : observation.getValue());
     validationResults.push(validationResult);

package/dist/application/ValidationResult.js

@@ -17,6 +17,7 @@ class ValidationResult {
     this.formIdentifier = formIdentifier;
     this.messageKey = messageKey;
     this.extra = extra;
+    this.groupValidations = [];
   }
 
   static successful(formIdentifier) {

package/dist/index.js

@@ -651,6 +651,12 @@ Object.defineProperty(exports, "QuestionGroup", {
     return _QuestionGroup.default;
   }
 });
+Object.defineProperty(exports, "RepeatableQuestionGroup", {
+  enumerable: true,
+  get: function () {
+    return _RepeatableQuestionGroup.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -866,6 +872,8 @@ var _SubjectMigration = _interopRequireDefault(require("./SubjectMigration"));
 
 var _QuestionGroup = _interopRequireDefault(require("./observation/QuestionGroup"));
 
+var _RepeatableQuestionGroup = _interopRequireDefault(require("./observation/RepeatableQuestionGroup"));
+
 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

@@ -25,7 +25,20 @@ class QuestionGroup {
   }
 
   get toResource() {
-    return _lodash.default.map(this.groupObservations, obs => obs.toResource);
+    const resource = {};
+
+    _lodash.default.forEach(this.groupObservations, obs => {
+      const {
+        conceptUUID,
+        value
+      } = obs.toResource;
+
+      _lodash.default.assign(resource, {
+        [conceptUUID]: value
+      });
+    });
+
+    return resource;
   }
 
   static fromObs({
@@ -66,6 +79,10 @@ class QuestionGroup {
     return this.groupObservations;
   }
 
+  isRepeatable() {
+    return false;
+  }
+
   findObservation(concept) {
     return _lodash.default.find(this.groupObservations, observation => {
       return observation.concept.uuid === concept.uuid;

package/dist/observation/RepeatableQuestionGroup.js

@@ -0,0 +1,91 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _QuestionGroup = _interopRequireDefault(require("./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; }
+
+class RepeatableQuestionGroup {
+  constructor(groupObservations) {
+    this.repeatableObservations = _lodash.default.isEmpty(groupObservations) ? [new _QuestionGroup.default()] : groupObservations;
+  }
+
+  get toResource() {
+    return _lodash.default.map(this.repeatableObservations, obs => obs.toResource);
+  }
+
+  static fromObs({
+    repeatableObservations
+  }) {
+    const newObs = _lodash.default.map(repeatableObservations, obs => _QuestionGroup.default.fromObs(obs));
+
+    return new RepeatableQuestionGroup(newObs);
+  }
+
+  getValue() {
+    return this.repeatableObservations;
+  }
+
+  isRepeatable() {
+    return true;
+  }
+
+  cloneForEdit() {
+    const newObs = _lodash.default.map(this.repeatableObservations, o => o.cloneForEdit());
+
+    return new RepeatableQuestionGroup(newObs);
+  }
+
+  isEmpty() {
+    return _lodash.default.isEmpty(this.repeatableObservations);
+  }
+
+  updateGroupObservationsAtIndex(groupObservations, index) {
+    if (!groupObservations.isEmpty()) {
+      this.repeatableObservations.splice(index, 1, groupObservations);
+    } else {
+      this.repeatableObservations.splice(index, 1);
+    }
+  }
+
+  getGroupObservationAtIndex(index) {
+    return this.repeatableObservations[index];
+  }
+
+  size() {
+    return _lodash.default.size(this.repeatableObservations);
+  }
+
+  nonEmptySize() {
+    return _lodash.default.size(_lodash.default.filter(this.repeatableObservations, questionGroup => !questionGroup.isEmpty()));
+  }
+
+  addQuestionGroup() {
+    this.repeatableObservations.push(new _QuestionGroup.default());
+  }
+
+  removeQuestionGroup(index) {
+    this.repeatableObservations.splice(index, 1);
+  }
+
+  getAllQuestionGroupObservations() {
+    return this.repeatableObservations;
+  }
+
+}
+
+_defineProperty(RepeatableQuestionGroup, "actions", {
+  add: 'add',
+  remove: 'remove'
+});
+
+var _default = RepeatableQuestionGroup;
+exports.default = _default;

package/dist/utility/General.js

@@ -17,6 +17,8 @@ var _Concept = _interopRequireDefault(require("../Concept"));
 
 var _QuestionGroup = _interopRequireDefault(require("../observation/QuestionGroup"));
 
+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; }
@@ -156,8 +158,8 @@ class General {
           observation.concept = concept;
 
           if (concept.isQuestionGroup()) {
-            const groupObservations = this.createQuestionGroupObservations(value, entityService);
-            observation.valueJSON = JSON.stringify(new _QuestionGroup.default(groupObservations));
+            const valueJson = _lodash.default.isArray(value) ? this.getRepeatableQuestionValue(value, entityService) : this.createQuestionGroupObservations(value, entityService);
+            observation.valueJSON = JSON.stringify(valueJson);
           } else {
             observation.valueJSON = JSON.stringify(observation.concept.getValueWrapperFor(value));
           }
@@ -171,13 +173,21 @@ class General {
     return dest;
   }
 
+  static getRepeatableQuestionValue(values, entityService) {
+    const repeatableValues = _lodash.default.map(values, value => this.createQuestionGroupObservations(value, entityService));
+
+    return new _RepeatableQuestionGroup.default(repeatableValues);
+  }
+
   static createQuestionGroupObservations(keyValues, entityService) {
-    return _lodash.default.map(_lodash.default.toPairs(keyValues), ([conceptUUID, value]) => {
+    const questionGroupObservations = _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;
     });
+
+    return new _QuestionGroup.default(questionGroupObservations);
   }
 
   static pick(from, attributes, listAttributes) {

package/package.json

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