openchs-models 1.13.0 → 1.16.0

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);

package/dist/Concept.js

@@ -189,7 +189,7 @@ class Concept {
   }
 
   getValueWrapperFor(obsValue) {
-    if (this.isCodedConcept() || this.isSubjectConcept()) {
+    if (this.isCodedConcept() || this.isSubjectConcept() || this.isMediaConcept()) {
       return _lodash.default.isArray(obsValue) ? new _MultipleCodedValues.default(obsValue) : new _SingleCodedValue.default(obsValue);
     }
 
@@ -224,6 +224,10 @@ class Concept {
     return this.isType(Concept.dataType.Subject);
   }
 
+  isMediaConcept() {
+    return _lodash.default.includes([Concept.dataType.Image, Concept.dataType.Video, Concept.dataType.File], this.datatype);
+  }
+
   isDurationConcept() {
     return this.isType(Concept.dataType.Duration);
   }
@@ -241,7 +245,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() {

package/dist/Family.js

@@ -50,7 +50,7 @@ class Family extends _BaseEntity.default {
   }
 
   get toResource() {
-    const resource = _lodash.default.pick(this, ["uuid", "firstName", "lastName", "dateOfBirthVerified"]);
+    const resource = _lodash.default.pick(this, ["uuid", "firstName", "lastName", "profilePicture", "dateOfBirthVerified"]);
 
     resource.dateOfBirth = (0, _moment.default)(this.dateOfBirth).format("YYYY-MM-DD");
     resource.registrationDate = (0, _moment.default)(this.registrationDate).format("YYYY-MM-DD");
@@ -67,7 +67,7 @@ class Family extends _BaseEntity.default {
     const addressLevel = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(individualResource, "addressUUID"), _AddressLevel.default.schema.name);
     const gender = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(individualResource, "genderUUID"), _Gender.default.schema.name);
 
-    const individual = _General.default.assignFields(individualResource, new _Individual.default(), ["uuid", "firstName", "lastName", "dateOfBirthVerified"], ["dateOfBirth", "registrationDate"], ["observations"], entityService);
+    const individual = _General.default.assignFields(individualResource, new _Individual.default(), ["uuid", "firstName", "lastName", "profilePicture", "dateOfBirthVerified"], ["dateOfBirth", "registrationDate"], ["observations"], entityService);
 
     individual.gender = gender;
     individual.lowestAddressLevel = addressLevel;

package/dist/Individual.js

@@ -85,6 +85,8 @@ class Individual extends _BaseEntity.default {
 
     _defineProperty(this, "lastName", void 0);
 
+    _defineProperty(this, "profilePicture", void 0);
+
     _defineProperty(this, "dateOfBirthVerified", void 0);
 
     _defineProperty(this, "latestEntityApprovalStatus", void 0);
@@ -127,7 +129,7 @@ class Individual extends _BaseEntity.default {
   }
 
   get toResource() {
-    const resource = _lodash.default.pick(this, ["uuid", "firstName", "lastName", "dateOfBirthVerified", "voided"]);
+    const resource = _lodash.default.pick(this, ["uuid", "firstName", "lastName", "profilePicture", "dateOfBirthVerified", "voided"]);
 
     resource.dateOfBirth = this.dateOfBirth ? (0, _moment.default)(this.dateOfBirth).format("YYYY-MM-DD") : null;
     resource.registrationDate = (0, _moment.default)(this.registrationDate).format("YYYY-MM-DD");
@@ -154,11 +156,12 @@ class Individual extends _BaseEntity.default {
     return this.nonVoidedEnrolments().find(enrolment => enrolment.findLatestObservationInEntireEnrolment(conceptNameOrUuid) !== undefined);
   }
 
-  static newInstance(uuid, firstName, lastName, dateOfBirth, dateOfBirthVerified, gender, lowestAddressLevel, subjectType) {
+  static newInstance(uuid, firstName, lastName, dateOfBirth, dateOfBirthVerified, gender, lowestAddressLevel, subjectType, profilePicture) {
     const individual = new Individual();
     individual.uuid = uuid;
     individual.firstName = firstName;
     individual.lastName = lastName;
+    individual.profilePicture = profilePicture;
     individual.subjectType = subjectType;
     individual.name = individual.nameString;
     individual.dateOfBirth = dateOfBirth;
@@ -173,7 +176,7 @@ class Individual extends _BaseEntity.default {
     const gender = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(individualResource, "genderUUID"), _Gender.default.schema.name);
     const subjectType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(individualResource, "subjectTypeUUID"), _SubjectType.default.schema.name);
 
-    const individual = _General.default.assignFields(individualResource, new Individual(), ["uuid", "firstName", "lastName", "dateOfBirthVerified", "voided"], ["dateOfBirth", "registrationDate"], ["observations"], entityService);
+    const individual = _General.default.assignFields(individualResource, new Individual(), ["uuid", "firstName", "lastName", "profilePicture", "dateOfBirthVerified", "voided"], ["dateOfBirth", "registrationDate"], ["observations"], entityService);
 
     individual.gender = gender;
     individual.lowestAddressLevel = addressLevel;
@@ -460,6 +463,7 @@ class Individual extends _BaseEntity.default {
     individual.name = this.name;
     individual.firstName = this.firstName;
     individual.lastName = this.lastName;
+    individual.profilePicture = this.profilePicture;
     individual.dateOfBirth = this.dateOfBirth;
     individual.registrationDate = this.registrationDate;
     individual.dateOfBirthVerified = this.dateOfBirthVerified;
@@ -485,6 +489,7 @@ class Individual extends _BaseEntity.default {
     individual.name = this.name;
     individual.firstName = this.firstName;
     individual.lastName = this.lastName;
+    individual.profilePicture = this.profilePicture;
     individual.dateOfBirth = this.dateOfBirth;
     individual.gender = _lodash.default.isNil(this.gender) ? null : this.gender.clone();
     return individual;
@@ -600,10 +605,22 @@ class Individual extends _BaseEntity.default {
     return _lodash.default.sortBy(this.nonVoidedEnrolments(), enrolment => enrolment.encounterDateTime);
   }
 
+  getProfilePicture() {
+    return this.profilePicture;
+  }
+
+  updateProfilePicture(newValue) {
+    this.profilePicture = newValue;
+  }
+
   findMediaObservations() {
     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
@@ -784,6 +801,7 @@ class Individual extends _BaseEntity.default {
       uuid: this.uuid,
       firstName: this.firstName,
       lastName: this.lastName,
+      profilePicture: this.profilePicture,
       enrolments: this.enrolments,
       dateOfBirth: this.dateOfBirth,
       gender: this.gender,
@@ -816,6 +834,10 @@ _defineProperty(Individual, "schema", {
       type: "string",
       optional: true
     },
+    profilePicture: {
+      type: "string",
+      optional: true
+    },
     dateOfBirth: {
       type: "date",
       optional: true
@@ -878,6 +900,7 @@ _defineProperty(Individual, "validationKeys", {
   GENDER: "GENDER",
   FIRST_NAME: "FIRST_NAME",
   LAST_NAME: "LAST_NAME",
+  PROFILE_PICTURE: "PROFILE_PICTURE",
   REGISTRATION_DATE: "REGISTRATION_DATE",
   LOWEST_ADDRESS_LEVEL: "LOWEST_ADDRESS_LEVEL",
   REGISTRATION_LOCATION: "REGISTRATION_LOCATION",

package/dist/MediaQueue.js

@@ -12,13 +12,15 @@ 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, 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;
     mediaQueue.entityName = entityName;
+    mediaQueue.entityTargetField = entityTargetField;
     mediaQueue.fileName = fileName;
     mediaQueue.type = type;
+    mediaQueue.conceptUUID = conceptUUID;
     return mediaQueue;
   }
 
@@ -27,8 +29,10 @@ class MediaQueue {
     mediaQueueItem.uuid = this.uuid;
     mediaQueueItem.entityUUID = this.entityUUID;
     mediaQueueItem.entityName = this.entityName;
+    mediaQueueItem.entityTargetField = this.entityTargetField;
     mediaQueueItem.fileName = this.fileName;
     mediaQueueItem.type = this.type;
+    mediaQueueItem.conceptUUID = this.conceptUUID;
     return mediaQueueItem;
   }
 
@@ -41,8 +45,13 @@ _defineProperty(MediaQueue, "schema", {
     uuid: "string",
     entityUUID: "string",
     entityName: "string",
+    entityTargetField: "string",
     fileName: "string",
-    type: "string"
+    type: "string",
+    conceptUUID: {
+      type: "string",
+      optional: true
+    }
   }
 });
 

package/dist/Observation.js

@@ -57,6 +57,8 @@ 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 (_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 +68,8 @@ class Observation {
           const subject = subjectService.findByUUID(uuid);
           return new _Displayable.default(subject.nameStringWithUniqueAttribute, subject);
         });
+      } 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");
@@ -612,6 +612,16 @@ var _default = {
         individual.groups = groups;
       });
     }
+
+    if (oldDB.schemaVersion < 152) {
+      _lodash.default.forEach(newDB.objects(_MediaQueue.default.schema.name), mediaQueueItem => {
+        mediaQueueItem.entityTargetField = "observations";
+      });
+
+      _lodash.default.forEach(newDB.objects(_SubjectType.default.schema.name), sub => {
+        sub.allowProfilePicture = false;
+      });
+    }
   }
 };
 exports.default = _default;

package/dist/SubjectType.js

@@ -29,6 +29,8 @@ class SubjectType extends _ReferenceEntity.default {
 
     _defineProperty(this, "allowEmptyLocation", void 0);
 
+    _defineProperty(this, "allowProfilePicture", void 0);
+
     _defineProperty(this, "uniqueName", void 0);
 
     _defineProperty(this, "validFirstNameFormat", void 0);
@@ -58,6 +60,7 @@ class SubjectType extends _ReferenceEntity.default {
     subjectType.type = operationalSubjectType.type;
     subjectType.subjectSummaryRule = operationalSubjectType.subjectSummaryRule;
     subjectType.uniqueName = operationalSubjectType.uniqueName;
+    subjectType.allowProfilePicture = operationalSubjectType.allowProfilePicture;
     subjectType.validFirstNameFormat = _Format.default.fromResource(operationalSubjectType["validFirstNameFormat"]);
     subjectType.validLastNameFormat = _Format.default.fromResource(operationalSubjectType["validLastNameFormat"]);
     subjectType.iconFileS3Key = operationalSubjectType.iconFileS3Key;
@@ -78,6 +81,7 @@ class SubjectType extends _ReferenceEntity.default {
     cloned.type = this.type;
     cloned.subjectSummaryRule = this.subjectSummaryRule;
     cloned.allowEmptyLocation = this.allowEmptyLocation;
+    cloned.allowProfilePicture = this.allowProfilePicture;
     cloned.uniqueName = this.uniqueName;
     cloned.validFirstNameFormat = this.validFirstNameFormat;
     cloned.validLastNameFormat = this.validLastNameFormat;
@@ -165,6 +169,10 @@ _defineProperty(SubjectType, "schema", {
       type: "string",
       optional: true
     },
+    allowProfilePicture: {
+      type: 'bool',
+      default: false
+    },
     nameHelpText: {
       type: "string",
       optional: true

package/dist/draft/DraftSubject.js

@@ -20,6 +20,7 @@ class DraftSubject {
     draftSubject.subjectType = subject.subjectType;
     draftSubject.firstName = subject.firstName;
     draftSubject.lastName = subject.lastName;
+    draftSubject.profilePicture = subject.profilePicture;
     draftSubject.dateOfBirth = subject.dateOfBirth;
     draftSubject.registrationDate = subject.registrationDate;
     draftSubject.dateOfBirthVerified = subject.dateOfBirthVerified;
@@ -38,6 +39,7 @@ class DraftSubject {
     individual.subjectType = this.subjectType.clone();
     individual.firstName = this.firstName;
     individual.lastName = this.lastName;
+    individual.profilePicture = this.profilePicture;
     individual.dateOfBirth = this.dateOfBirth;
     individual.registrationDate = this.registrationDate;
     individual.dateOfBirthVerified = this.dateOfBirthVerified;
@@ -66,6 +68,10 @@ _defineProperty(DraftSubject, "schema", {
       type: "string",
       optional: true
     },
+    profilePicture: {
+      type: "string",
+      optional: true
+    },
     dateOfBirth: {
       type: "date",
       optional: true

package/package.json

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