openchs-models 1.31.61 → 1.31.62

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() {
@@ -387,7 +399,7 @@ class FormElement extends _BaseEntity.default {
   }
 
   clone() {
-    const formElement = new FormElement();
+    const formElement = this.newFormElement();
     formElement.uuid = this.uuid;
     formElement.name = this.name;
     formElement.displayOrder = this.displayOrder;

package/dist/observation/RepeatableQuestionGroup.js

@@ -88,6 +88,8 @@ 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.61",
+    "version": "1.31.62",
     "private": false,
     "repository": {
         "type": "git",