openchs-models 1.9.3 → 1.9.4

package/dist/application/Form.js

@@ -143,6 +143,53 @@ class Form {
     return orderedObservations.concat(extraObs);
   }
 
+  sectionWiseOrderedObservations(observations) {
+    const sections = [];
+    const allObservations = [];
+
+    const orderedFEG = _lodash.default.sortBy(this.formElementGroups, ({
+      displayOrder
+    }) => displayOrder);
+
+    _lodash.default.forEach(orderedFEG, feg => {
+      const conceptOrdering = _lodash.default.sortBy(feg.getFormElements(), fe => fe.displayOrder).map(fe => fe.concept);
+
+      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);
+      });
+
+      if (!_lodash.default.isEmpty(fegObs)) {
+        sections.push({
+          groupName: feg.name,
+          groupUUID: feg.uuid,
+          observations: fegObs
+        });
+        allObservations.push(...fegObs);
+      }
+    });
+
+    const decisionObs = observations.filter(obs => _lodash.default.isNil(allObservations.find(oobs => oobs.concept.uuid === obs.concept.uuid)));
+    if (!_lodash.default.isEmpty(decisionObs)) sections.push({
+      groupName: 'decisions',
+      groupUUID: null,
+      observations: decisionObs
+    });
+    return sections;
+  }
+
+  getFormElementGroupOrder(groupUUID) {
+    const orderedFEG = _lodash.default.sortBy(this.formElementGroups, ({
+      displayOrder
+    }) => displayOrder);
+
+    return _lodash.default.findIndex(orderedFEG, ({
+      uuid
+    }) => uuid === groupUUID) + 1;
+  }
+
 }
 
 _defineProperty(Form, "schema", {

package/package.json

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