openchs-models 1.23.2 → 1.23.3

package/dist/AbstractEncounter.js

@@ -25,6 +25,8 @@ var _Point = _interopRequireDefault(require("./geo/Point"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
+var _Observation = _interopRequireDefault(require("./Observation"));
+
 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,18 +205,51 @@ class AbstractEncounter extends _BaseEntity.default {
     return this.latestEntityApprovalStatus && this.latestEntityApprovalStatus.isRejected;
   }
 
-  getEncounterLabel(templateString) {
+  getEncounterLabel(templateString, {
+    conceptService,
+    subjectService,
+    addressLevelService,
+    i18n,
+    encounterService
+  }) {
     const conceptPattern = /{.*?}/g;
     let identifierTemplateString = templateString;
 
     _lodash.default.forEach(templateString.match(conceptPattern), identifier => {
-      const value = identifier === '{Date}' ? _General.default.toDisplayDate(this.encounterDateTime) : this.getObservationReadableValue(identifier.replace(/[{}]/g, ''));
+      const value = identifier === '{Date}' ? _General.default.toDisplayDate(this.encounterDateTime) : this.getValueForDisplay(identifier.replace(/[{}]/g, ''), {
+        conceptService,
+        subjectService,
+        addressLevelService,
+        i18n,
+        encounterService
+      });
       identifierTemplateString = identifierTemplateString.replace(identifier, value);
     });
 
     return identifierTemplateString;
   }
 
+  getValueForDisplay(conceptName, {
+    conceptService,
+    subjectService,
+    addressLevelService,
+    i18n,
+    encounterService
+  }) {
+    const observation = this.findObservation(conceptName);
+
+    const displayValue = _Observation.default.valueForDisplay({
+      observation,
+      conceptService,
+      subjectService,
+      addressLevelService,
+      i18n,
+      encounterService
+    });
+
+    return displayValue.displayValue;
+  }
+
   get subjectType() {
     return _lodash.default.get(this, this.getName() === "Encounter" ? "individual.subjectType" : "programEnrolment.individual.subjectType");
   }

package/dist/Observation.js

@@ -61,7 +61,13 @@ class Observation {
       } else if (observation.concept.datatype === _Concept.default.dataType.Encounter) {
         const encounter = encounterService.findByUUID(valueWrapper.getValue());
         const identifier = observation.concept.recordValueByKey(_Concept.default.keys.encounterIdentifier);
-        return [new _Displayable.default(encounter.getEncounterLabel(identifier), encounter)];
+        return [new _Displayable.default(encounter.getEncounterLabel(identifier, {
+          conceptService,
+          subjectService,
+          addressLevelService,
+          i18n,
+          encounterService
+        }), encounter)];
       } else if (_Concept.default.dataType.Media.includes(observation.concept.datatype)) {
         return new _Displayable.default(valueWrapper.getValue(), null);
       } else {
@@ -77,7 +83,13 @@ class Observation {
         const identifier = observation.concept.recordValueByKey(_Concept.default.keys.encounterIdentifier);
         return valueWrapper.getValue().map(uuid => {
           const encounter = encounterService.findByUUID(uuid);
-          return new _Displayable.default(encounter.getEncounterLabel(identifier), encounter);
+          return new _Displayable.default(encounter.getEncounterLabel(identifier, {
+            conceptService,
+            subjectService,
+            addressLevelService,
+            i18n,
+            encounterService
+          }), encounter);
         });
       } else if (_Concept.default.dataType.Media.includes(observation.concept.datatype)) {
         return new _Displayable.default(valueWrapper.getValue(), null);
@@ -190,6 +202,8 @@ class Observation {
         }
       } else if (this.concept.isQuestionGroup()) {
         return valueWrapper.isRepeatable() ? _lodash.default.map(value, qg => qg.getReadableValue()) : valueWrapper.getReadableValue();
+      } else if (this.concept.isLocationConcept()) {
+        Location;
       }
 
       return value;

package/dist/application/Form.js

@@ -50,7 +50,7 @@ class Form {
       this.deleteOutOfSyncDrafts(entityService, resource.uuid);
     }
 
-    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "visitScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
+    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
   }
 
   static deleteOutOfSyncDrafts(entityService, formUUID) {

package/package.json

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