openchs-models 1.31.73 → 1.31.74

package/dist/CustomFilter.js

@@ -41,8 +41,7 @@ _defineProperty(CustomFilter, "type", {
   EncounterDate: "EncounterDate",
   Address: "Address",
   Concept: "Concept",
-  GroupSubject: "GroupSubject",
-  SubjectType: "SubjectType"
+  GroupSubject: "GroupSubject"
 });
 
 _defineProperty(CustomFilter, "scope", {

package/dist/Observation.js

@@ -84,8 +84,10 @@ class Observation extends _PersistedObject.default {
       return new _Displayable.default(valueWrapper.asDisplayTime(), null);
     } else if (valueWrapper.isSingleCoded) {
       if (observation.concept.datatype === _Concept.default.dataType.Subject) {
-        const subject = subjectService.findByUUID(valueWrapper.getValue());
-        return [new _Displayable.default(subject.nameStringWithUniqueAttribute, subject)];
+        const uuid = valueWrapper.getValue();
+        const subject = subjectService.findByUUID(uuid);
+        const displayName = subject && subject.nameStringWithUniqueAttribute || uuid;
+        return [new _Displayable.default(displayName, 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);

package/dist/ObservationsHolder.js

@@ -59,7 +59,7 @@ class ObservationsHolder {
     const groupObservations = observations && observations.getValueWrapper();
 
     if (parentFormElement.repeatable) {
-      return groupObservations && groupObservations.getGroupObservationAtIndex(questionGroupIndex).getObservation(concept);
+      return groupObservations && groupObservations.size() > questionGroupIndex && groupObservations.getGroupObservationAtIndex(questionGroupIndex).getObservation(concept);
     }
 
     return groupObservations && groupObservations.getObservation(concept);

package/dist/ReportCard.js

@@ -132,14 +132,6 @@ class ReportCard extends _BaseEntity.default {
     return _lodash.default.isNil(this.standardReportCardType) ? false : this.standardReportCardType.isTaskType();
   }
 
-  isStandardReportType() {
-    return !_lodash.default.isNil(this.standardReportCardType);
-  }
-
-  isSubjectTypeFilterSupported() {
-    return this.isStandardReportType() && this.standardReportCardType.isSubjectTypeFilterSupported();
-  }
-
 }
 
 _defineProperty(ReportCard, "schema", {

package/dist/Schema.js

@@ -279,7 +279,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 189,
+    schemaVersion: 190,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
       if (oldDB.schemaVersion === VersionWithEmbeddedMigrationProblem) throw new Error(`Update from schema version ${VersionWithEmbeddedMigrationProblem} is not allowed. Please uninstall and install app.`);
@@ -902,8 +902,16 @@ function createRealmConfig() {
         // newDB.deleteModel("ProgramOutcome");
       }
 
-      if (oldDB.schemaVersion < 189) {// PlaceHolder for SubjectType.User changes, so that people with previous version of client
-        // are not able to use fastSync of version 189 and above
+      if (oldDB.schemaVersion < 189) {
+        _lodash.default.forEach(newDB.objects("SubjectType"), subjectType => {
+          if (!subjectType.settings) {
+            subjectType.settings = '{}';
+          }
+        });
+      }
+
+      if (oldDB.schemaVersion < 190) {// PlaceHolder for SubjectType.User changes, so that people with previous version of client
+        // are not able to use fastSync of version 190 and above
       }
     }
   };

package/dist/StandardReportCardType.js

@@ -118,10 +118,6 @@ class StandardReportCardType extends _BaseEntity.default {
     return typeToStatusMap[this.name];
   }
 
-  isSubjectTypeFilterSupported() {
-    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits].includes(this.name);
-  }
-
 }
 
 _defineProperty(StandardReportCardType, "schema", {

package/package.json

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