openchs-models 1.32.21 → 1.32.23

package/dist/Program.js

@@ -68,6 +68,14 @@ class Program extends _ReferenceEntity.default {
     this.that.manualEligibilityCheckRequired = x;
   }
 
+  get showGrowthChart() {
+    return this.that.showGrowthChart;
+  }
+
+  set showGrowthChart(x) {
+    this.that.showGrowthChart = x;
+  }
+
   get enrolmentSummaryRule() {
     return this.that.enrolmentSummaryRule;
   }
@@ -118,6 +126,7 @@ class Program extends _ReferenceEntity.default {
     program.programSubjectLabel = operationalProgram.programSubjectLabel || operationalProgram.name || program.name;
     program.enrolmentSummaryRule = operationalProgram.enrolmentSummaryRule;
     program.manualEligibilityCheckRequired = operationalProgram.manualEligibilityCheckRequired;
+    program.showGrowthChart = operationalProgram.showGrowthChart;
     program.manualEnrolmentEligibilityCheckRule = operationalProgram.manualEnrolmentEligibilityCheckRule;
     program.enrolmentEligibilityCheckRule = operationalProgram.enrolmentEligibilityCheckRule;
     program.allowMultipleEnrolments = operationalProgram.allowMultipleEnrolments;
@@ -162,6 +171,7 @@ _defineProperty(Program, "schema", {
       optional: true
     },
     manualEligibilityCheckRequired: 'bool',
+    showGrowthChart: 'bool',
     manualEnrolmentEligibilityCheckRule: {
       type: 'string',
       optional: true

package/dist/ProgramEnrolment.js

@@ -465,7 +465,7 @@ class ProgramEnrolment extends _BaseEntity.default {
 
     for (let i = 0; i < encounters.length; i++) {
       encounter = encounters[i];
-      observation = encounters[i].findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
+      observation = encounters[i].findObservation(conceptNameOrUuid.toLowerCase(), parentConceptNameOrUuid);
       if (!_lodash.default.isNil(observation)) return {
         observation: observation,
         date: encounter.encounterDateTime
@@ -473,7 +473,7 @@ class ProgramEnrolment extends _BaseEntity.default {
     }
 
     if (checkInEnrolment) return {
-      observation: this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid),
+      observation: this.findObservation(conceptNameOrUuid.toLowerCase(), parentConceptNameOrUuid),
       date: this.enrolmentDateTime
     };
     return {};
@@ -487,7 +487,7 @@ class ProgramEnrolment extends _BaseEntity.default {
   findObservation(conceptNameOrUuid, parentConceptNameOrUuid) {
     const observations = _lodash.default.isNil(parentConceptNameOrUuid) ? this.observations : this.findGroupedObservation(parentConceptNameOrUuid);
     return _lodash.default.find(observations, observation => {
-      return observation.concept.name === conceptNameOrUuid || observation.concept.uuid === conceptNameOrUuid;
+      return observation.concept.name.toLowerCase() === conceptNameOrUuid || observation.concept.uuid === conceptNameOrUuid;
     });
   }
 

package/dist/application/Form.js

@@ -305,12 +305,12 @@ class Form extends _BaseEntity.default {
 
     const orderedFormElements = _lodash.default.sortBy(childFormElements, fe => fe.displayOrder);
 
-    _lodash.default.forEach(orderedFormElements, formElement => this.addSortedObservations(formElement, observations, orderedChildObs));
+    _lodash.default.forEach(orderedFormElements, formElement => this.addSortedObservations(formElement, observations, orderedChildObs, true));
 
     return orderedChildObs;
   }
 
-  addSortedObservations(formElement, observations, orderedObservations) {
+  addSortedObservations(formElement, observations, orderedObservations, forQGChildren = false) {
     const concept = formElement.concept;
     const foundObs = observations.find(obs => obs.concept.uuid === concept.uuid);
 
@@ -326,7 +326,7 @@ class Form extends _BaseEntity.default {
         orderedObservations.push(clonedObs);
       }
     } else {
-      if (!_lodash.default.isNil(foundObs)) {
+      if (!_lodash.default.isNil(foundObs) && (_lodash.default.isNil(formElement.groupUuid) || forQGChildren)) {
         foundObs.styles = formElement.styles;
         orderedObservations.push(foundObs);
       }

package/package.json

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