openchs-models 1.31.76 → 1.31.77

package/dist/CustomFilter.js

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

package/dist/Individual.js

@@ -1087,10 +1087,6 @@ class Individual extends _BaseEntity.default {
     (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
   }
 
-  static getAddressLevelDummyUUID() {
-    return ADDRESS_LEVEL_DUMMY_UUID;
-  }
-
 }
 
 _defineProperty(Individual, "schema", {

package/dist/Observation.js

@@ -84,10 +84,8 @@ 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 uuid = valueWrapper.getValue();
-        const subject = subjectService.findByUUID(uuid);
-        const displayName = subject && subject.nameStringWithUniqueAttribute || uuid;
-        return [new _Displayable.default(displayName, 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);

package/dist/ObservationsHolder.js

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

package/dist/ReportCard.js

@@ -15,14 +15,16 @@ var _StandardReportCardType = _interopRequireDefault(require("./StandardReportCa
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _SubjectType = _interopRequireDefault(require("./SubjectType"));
+
+var _Program = _interopRequireDefault(require("./Program"));
+
+var _EncounterType = _interopRequireDefault(require("./EncounterType"));
+
 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; }
 
-function throwInvalidIndexError(index, reportCardsLength) {
-  throw new Error(`Invalid index ${index} specified for reportCard with length ${reportCardsLength}`);
-}
-
 class ReportCard extends _BaseEntity.default {
   constructor(that = null) {
     super(that);
@@ -96,6 +98,30 @@ class ReportCard extends _BaseEntity.default {
   get textColor() {
     return _lodash.default.isNil(this.standardReportCardType) ? '#ffffff' : this.standardReportCardType.textColor;
   }
+
+  get standardReportCardInputSubjectTypes() {
+    return this.toEntityList("standardReportCardInputSubjectTypes", _SubjectType.default);
+  }
+
+  set standardReportCardInputSubjectTypes(x) {
+    this.that.standardReportCardInputSubjectTypes = this.fromEntityList(x);
+  }
+
+  get standardReportCardInputPrograms() {
+    return this.toEntityList("standardReportCardInputPrograms", _Program.default);
+  }
+
+  set standardReportCardInputPrograms(x) {
+    this.that.standardReportCardInputPrograms = this.fromEntityList(x);
+  }
+
+  get standardReportCardInputEncounterTypes() {
+    return this.toEntityList("standardReportCardInputEncounterTypes", _EncounterType.default);
+  }
+
+  set standardReportCardInputEncounterTypes(x) {
+    this.that.standardReportCardInputEncounterTypes = this.fromEntityList(x);
+  }
   /**
    * Helper method used to generate unique key value for Nested Report Cards using UUID and Index of the Report Card.
    * The Nested Report Card's query responses would be mapped to the corresponding Dashboard Report cards using the UUID and Index.
@@ -132,6 +158,14 @@ 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", {
@@ -166,8 +200,20 @@ _defineProperty(ReportCard, "schema", {
       type: "int",
       default: 1,
       optional: true
-    } //Used only by nested ReportCards
-
+    },
+    //Used only by nested ReportCards
+    standardReportCardInputSubjectTypes: {
+      type: "list",
+      objectType: "SubjectType"
+    },
+    standardReportCardInputPrograms: {
+      type: "list",
+      objectType: "Program"
+    },
+    standardReportCardInputEncounterTypes: {
+      type: "list",
+      objectType: "EncounterType"
+    }
   }
 });
 

package/dist/Schema.js

@@ -902,16 +902,8 @@ function createRealmConfig() {
         // newDB.deleteModel("ProgramOutcome");
       }
 
-      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
+      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
       }
     }
   };

package/dist/StandardReportCardType.js

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

package/dist/reports/DashboardFilterConfig.js

@@ -111,6 +111,8 @@ const dateFilterTypes = [_CustomFilter.default.type.RegistrationDate, _CustomFil
 
 class DashboardFilterConfig {
   constructor() {
+    _defineProperty(this, "subjectType", void 0);
+
     _defineProperty(this, "type", void 0);
 
     _defineProperty(this, "widget", void 0);
@@ -140,6 +142,10 @@ class DashboardFilterConfig {
     return this.type === _CustomFilter.default.type.GroupSubject;
   }
 
+  isSubjectTypeFilter() {
+    return this.type === _CustomFilter.default.type.SubjectType;
+  }
+
   isValid() {
     const valid = !_lodash.default.isNil(this.type);
     if (!valid) return valid;
@@ -149,6 +155,7 @@ class DashboardFilterConfig {
   toServerRequest() {
     const request = {
       type: this.type,
+      subjectTypeUUID: this.subjectType && this.subjectType.uuid,
       widget: this.widget
     };
     if (this.isConceptTypeFilter()) request.observationBasedFilter = this.observationBasedFilter.toServerRequest();else if (this.isGroupSubjectTypeFilter()) request.groupSubjectTypeFilter = this.groupSubjectTypeFilter.toServerRequest();
@@ -175,6 +182,12 @@ class DashboardFilterConfig {
     return [RegistrationDate, EnrolmentDate, ProgramEncounterDate, EncounterDate].includes(this.type) || this.isConceptTypeFilter() && this.observationBasedFilter.isWidgetRequired();
   }
 
+  setSubjectType(subjectType) {
+    if (_lodash.default.get(subjectType, "uuid") !== _lodash.default.get(this.subjectType, "uuid")) {
+      this.subjectType = subjectType;
+    }
+  }
+
   willObservationBeInScopeOfProgramEnrolment() {
     return this.isConceptTypeFilter() && this.observationBasedFilter.willObservationBeInScopeOfProgramEnrolment();
   }
@@ -200,6 +213,7 @@ class DashboardFilterConfig {
   clone() {
     const clone = new DashboardFilterConfig();
     clone.type = this.type;
+    clone.subjectType = this.subjectType;
     clone.widget = this.widget;
     clone.groupSubjectTypeFilter = this.groupSubjectTypeFilter;
     clone.observationBasedFilter = this.observationBasedFilter;

package/package.json

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