openchs-models 1.14.0 → 1.16.1

package/dist/AbstractEncounter.js

@@ -186,6 +186,10 @@ class AbstractEncounter extends _BaseEntity.default {
     return (0, _Media.findMediaObservations)(_ObservationsHolder.default.clone(this.observations), _ObservationsHolder.default.clone(this.cancelObservations));
   }
 
+  replaceMediaObservation(originalValue, newValue, conceptUUID) {
+    new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
+  }
+
   replaceObservation(originalValue, newValue) {
     new _ObservationsHolder.default(this.observations).updateObservationBasedOnValue(originalValue, newValue);
     new _ObservationsHolder.default(this.cancelObservations).updateObservationBasedOnValue(originalValue, newValue);
@@ -199,6 +203,10 @@ class AbstractEncounter extends _BaseEntity.default {
     return this.latestEntityApprovalStatus && this.latestEntityApprovalStatus.isRejected;
   }
 
+  getEncounterLabel(identifier) {
+    return identifier === 'Encounter date' ? _General.default.toDisplayDate(encounter.encounterDateTime) : this.getObservationReadableValue(identifier);
+  }
+
   get subjectType() {
     return _lodash.default.get(this, this.getName() === "Encounter" ? "individual.subjectType" : "programEnrolment.individual.subjectType");
   }

package/dist/Concept.js

@@ -189,7 +189,7 @@ class Concept {
   }
 
   getValueWrapperFor(obsValue) {
-    if (this.isCodedConcept() || this.isSubjectConcept()) {
+    if (this.isSelectConcept()) {
       return _lodash.default.isArray(obsValue) ? new _MultipleCodedValues.default(obsValue) : new _SingleCodedValue.default(obsValue);
     }
 
@@ -224,6 +224,18 @@ class Concept {
     return this.isType(Concept.dataType.Subject);
   }
 
+  isEncounterConcept() {
+    return this.isType(Concept.dataType.Encounter);
+  }
+
+  isMediaConcept() {
+    return _lodash.default.includes([Concept.dataType.Image, Concept.dataType.Video, Concept.dataType.File], this.datatype);
+  }
+
+  isSelectConcept() {
+    return this.isCodedConcept() || this.isSubjectConcept() || this.isEncounterConcept() || this.isMediaConcept();
+  }
+
   isDurationConcept() {
     return this.isType(Concept.dataType.Duration);
   }
@@ -241,7 +253,7 @@ class Concept {
   }
 
   isPrimitive() {
-    return [Concept.dataType.Text, Concept.dataType.Time, Concept.dataType.Numeric, Concept.dataType.Video, Concept.dataType.Image, Concept.dataType.Audio, Concept.dataType.Date, Concept.dataType.DateTime, Concept.dataType.Location, Concept.dataType.File].includes(this.datatype);
+    return [Concept.dataType.Text, Concept.dataType.Time, Concept.dataType.Numeric, Concept.dataType.Audio, Concept.dataType.Date, Concept.dataType.DateTime, Concept.dataType.Location].includes(this.datatype);
   }
 
   getAnswers() {
@@ -351,6 +363,7 @@ _defineProperty(Concept, "dataType", {
   GroupAffiliation: "GroupAffiliation",
   QuestionGroup: "QuestionGroup",
   File: "File",
+  Encounter: "Encounter",
 
   get Media() {
     return [this.Image, this.Video, this.Audio, this.File];
@@ -362,7 +375,14 @@ _defineProperty(Concept, "keys", {
   isWithinCatchment: 'isWithinCatchment',
   lowestAddressLevelTypeUUIDs: 'lowestAddressLevelTypeUUIDs',
   highestAddressLevelTypeUUID: 'highestAddressLevelTypeUUID',
-  subjectTypeUUID: 'subjectTypeUUID'
+  subjectTypeUUID: 'subjectTypeUUID',
+  encounterTypeUUID: 'encounterTypeUUID',
+  encounterScope: 'encounterScope',
+  encounterIdentifier: 'encounterIdentifier'
+});
+
+_defineProperty(Concept, "encounterScopes", {
+  withinSubject: 'Within Subject'
 });
 
 _defineProperty(Concept, "childAssociations", () => new Map([[ConceptAnswer, "answers"]]));

package/dist/Individual.js

@@ -617,6 +617,10 @@ class Individual extends _BaseEntity.default {
     return (0, _Media.findMediaObservations)(this.observations);
   }
 
+  replaceMediaObservation(originalValue, newValue, conceptUUID) {
+    new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
+  }
+
   replaceObservation(originalValue, newValue) {
     new _ObservationsHolder.default(this.observations).updateObservationBasedOnValue(originalValue, newValue);
   } //TODO use polymorphism to avoid if checks based on this

package/dist/MediaQueue.js

@@ -12,7 +12,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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 MediaQueue {
-  static create(entityUUID, entityName, fileName, type, entityTargetField, uuid = _General.default.randomUUID()) {
+  static create(entityUUID, entityName, fileName, type, entityTargetField, conceptUUID, uuid = _General.default.randomUUID()) {
     var mediaQueue = new MediaQueue();
     mediaQueue.entityUUID = entityUUID;
     mediaQueue.uuid = uuid;
@@ -20,6 +20,7 @@ class MediaQueue {
     mediaQueue.entityTargetField = entityTargetField;
     mediaQueue.fileName = fileName;
     mediaQueue.type = type;
+    mediaQueue.conceptUUID = conceptUUID;
     return mediaQueue;
   }
 
@@ -31,6 +32,7 @@ class MediaQueue {
     mediaQueueItem.entityTargetField = this.entityTargetField;
     mediaQueueItem.fileName = this.fileName;
     mediaQueueItem.type = this.type;
+    mediaQueueItem.conceptUUID = this.conceptUUID;
     return mediaQueueItem;
   }
 
@@ -45,7 +47,11 @@ _defineProperty(MediaQueue, "schema", {
     entityName: "string",
     entityTargetField: "string",
     fileName: "string",
-    type: "string"
+    type: "string",
+    conceptUUID: {
+      type: "string",
+      optional: true
+    }
   }
 });
 

package/dist/Observation.js

@@ -45,7 +45,8 @@ class Observation {
     conceptService,
     subjectService,
     addressLevelService,
-    i18n
+    i18n,
+    encounterService
   }) {
     const valueWrapper = observation.getValueWrapper();
 
@@ -57,6 +58,12 @@ class Observation {
       if (observation.concept.datatype === _Concept.default.dataType.Subject) {
         const subject = subjectService.findByUUID(valueWrapper.getValue());
         return [new _Displayable.default(subject.nameStringWithUniqueAttribute, subject)];
+      } 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)];
+      } else if (_Concept.default.dataType.Media.includes(observation.concept.datatype)) {
+        return new _Displayable.default(valueWrapper.getValue(), null);
       } else {
         return new _Displayable.default(i18n.t(conceptService.getConceptByUUID(valueWrapper.getConceptUUID()).name), null);
       }
@@ -66,6 +73,14 @@ class Observation {
           const subject = subjectService.findByUUID(uuid);
           return new _Displayable.default(subject.nameStringWithUniqueAttribute, subject);
         });
+      } else if (observation.concept.datatype === _Concept.default.dataType.Encounter) {
+        return valueWrapper.getValue().map(uuid => {
+          const encounter = encounterService.findByUUID(uuid);
+          const identifier = observation.concept.recordValueByKey(_Concept.default.keys.encounterIdentifier);
+          return new _Displayable.default(encounter.getEncounterLabel(identifier), encounter);
+        });
+      } else if (_Concept.default.dataType.Media.includes(observation.concept.datatype)) {
+        return new _Displayable.default(valueWrapper.getValue(), null);
       } else {
         return new _Displayable.default(_lodash.default.join(valueWrapper.getValue().map(value => {
           return i18n.t(conceptService.getConceptByUUID(value).name);

package/dist/ObservationsHolder.js

@@ -25,6 +25,8 @@ var _Identifier = _interopRequireDefault(require("./Identifier"));
 
 var _QuestionGroup = _interopRequireDefault(require("./observation/QuestionGroup"));
 
+var _General = _interopRequireDefault(require("./utility/General"));
+
 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; }
@@ -334,6 +336,50 @@ class ObservationsHolder {
     }
   }
 
+  replaceMediaObservation(oldValue, newValue, conceptUUID) {
+    if (_lodash.default.isNil(conceptUUID)) {
+      return this.updateObservationBasedOnValue(oldValue, newValue);
+    }
+
+    const observation = _lodash.default.find(this.observations, observation => observation.concept.uuid === conceptUUID);
+
+    if (observation) {
+      const valueWrapper = observation.getValueWrapper();
+
+      if (valueWrapper.isMultipleCoded) {
+        const answers = valueWrapper.getValue();
+
+        const oldValueIndex = _lodash.default.indexOf(answers, oldValue);
+
+        const newAnswers = _lodash.default.reject(answers, answer => answer === oldValue);
+
+        newAnswers.splice(oldValueIndex, 0, newValue);
+        observation.valueJSON = new _MultipleCodedValues.default(newAnswers);
+      } else {
+        observation.valueJSON = new _SingleCodedValue.default(newValue);
+      }
+    }
+  }
+
+  migrateMultiSelectMediaObservations(form) {
+    _lodash.default.forEach(form.nonVoidedFormElementGroups(), feg => {
+      _lodash.default.forEach(feg.getFormElements(), fe => {
+        const concept = fe.concept;
+        const observation = this.getObservation(concept);
+
+        if (_lodash.default.includes(_Concept.default.dataType.Media, fe.getType()) && observation && fe.isMultiSelect()) {
+          const valueWrapper = observation.getValueWrapper();
+
+          if (!_lodash.default.isArray(valueWrapper.getValue())) {
+            _General.default.logDebug("ObservationHolder", `Found string value ${valueWrapper.getValue()} for multi select media element, doing migration`);
+
+            observation.valueJSON = new _MultipleCodedValues.default([valueWrapper.getValue()]);
+          }
+        }
+      });
+    });
+  }
+
   toString(I18n) {
     let display = "";
     this.observations.forEach(obs => {

package/dist/ProgramEnrolment.js

@@ -453,6 +453,10 @@ class ProgramEnrolment extends _BaseEntity.default {
     return (0, _Media.findMediaObservations)(_ObservationsHolder.default.clone(this.observations), _ObservationsHolder.default.clone(this.programExitObservations));
   }
 
+  replaceMediaObservation(originalValue, newValue, conceptUUID) {
+    new _ObservationsHolder.default(this.observations).replaceMediaObservation(originalValue, newValue, conceptUUID);
+  }
+
   replaceObservation(originalValue, newValue) {
     new _ObservationsHolder.default(this.observations).updateObservationBasedOnValue(originalValue, newValue);
     new _ObservationsHolder.default(this.programExitObservations).updateObservationBasedOnValue(originalValue, newValue);

package/dist/Schema.js

@@ -168,7 +168,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var _default = {
   //order is important, should be arranged according to the dependency
   schema: [_LocaleMapping.default, _Settings.default, _Concept.ConceptAnswer, _Concept.default, _EncounterType.default, _Gender.default, _UserDefinedIndividualProperty.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _ProgramOutcome.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _ConfigFile.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _VisitScheduleInterval.default, _VisitScheduleConfig.default, _ProgramConfig.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _LocationHierarchy.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default],
-  schemaVersion: 151,
+  schemaVersion: 153,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       var oldObjects = oldDB.objects("DecisionConfig");
@@ -613,7 +613,7 @@ var _default = {
       });
     }
 
-    if (oldDB.schemaVersion < 151) {
+    if (oldDB.schemaVersion < 152) {
       _lodash.default.forEach(newDB.objects(_MediaQueue.default.schema.name), mediaQueueItem => {
         mediaQueueItem.entityTargetField = "observations";
       });

package/package.json

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