openchs-models 1.30.3 → 1.30.6

package/dist/AbstractEncounter.js

@@ -29,11 +29,13 @@ var _Observation = _interopRequireDefault(require("./Observation"));
 
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
 
+var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
+
 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; }
 
-const mergeMap = new Map([[_EntityApprovalStatus.default, "approvalStatuses"]]);
+const mergeMap = new Map([[_SchemaNames.default.EntityApprovalStatus, "approvalStatuses"]]);
 
 class AbstractEncounter extends _BaseEntity.default {
   constructor(that = null) {

package/dist/ChecklistItem.js

@@ -33,7 +33,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; }
 
-const mergeMap = new Map([[_EntityApprovalStatus.default, "approvalStatuses"]]);
+const mergeMap = new Map([[_SchemaNames.default.EntityApprovalStatus, "approvalStatuses"]]);
 
 class ChecklistItem extends _BaseEntity.default {
   constructor(that = null) {

package/dist/EntityApprovalStatus.js

@@ -144,7 +144,7 @@ class EntityApprovalStatus extends _BaseEntity.default {
 }
 
 _defineProperty(EntityApprovalStatus, "schema", {
-  name: "EntityApprovalStatus",
+  name: _SchemaNames.default.EntityApprovalStatus,
   primaryKey: "uuid",
   properties: {
     uuid: "string",

package/dist/Family.js

@@ -29,10 +29,14 @@ var _ObservationsHolder = _interopRequireDefault(require("./ObservationsHolder")
 
 var _Observation = _interopRequireDefault(require("./Observation"));
 
+var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
+
 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; }
 
+const mergeMap = new Map([[_SchemaNames.default.ProgramEnrolment, "enrolments"], [_SchemaNames.default.Encounter, "encounters"]]);
+
 class Family extends _BaseEntity.default {
   constructor(that = null) {
     super(that);
@@ -237,7 +241,7 @@ _defineProperty(Family, "validationKeys", {
 
 _defineProperty(Family, "childAssociations", () => new Map([[_ProgramEnrolment.default, "enrolments"], [_Encounter.default, "encounters"]]));
 
-_defineProperty(Family, "merge", childEntityClass => _BaseEntity.default.mergeOn(new Map([[_ProgramEnrolment.default, "enrolments"], [_Encounter.default, "encounters"]]).get(childEntityClass)));
+_defineProperty(Family, "merge", childEntityClass => _BaseEntity.default.mergeOn(mergeMap.get(childEntityClass)));
 
 var _default = Family;
 exports.default = _default;

package/dist/Individual.js

@@ -53,6 +53,8 @@ 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; }
 
+const mergeMap = new Map([[_SchemaNames.default.ProgramEnrolment, "enrolments"], [_SchemaNames.default.Encounter, "encounters"], [_SchemaNames.default.IndividualRelationship, "relationships"], [_SchemaNames.default.Comment, "comments"]]);
+
 class Individual extends _BaseEntity.default {
   constructor(that = null) {
     super(that);
@@ -1104,10 +1106,10 @@ _defineProperty(Individual, "directCopyFields", ["uuid", "firstName", "middleNam
 
 _defineProperty(Individual, "dateFields", ["dateOfBirth", "registrationDate"]);
 
-_defineProperty(Individual, "merge", childEntityClass => _BaseEntity.default.mergeOn(new Map([[_ProgramEnrolment.default, "enrolments"], [_Encounter.default, "encounters"], [_IndividualRelationship.default, "relationships"], [_Comment.default, "comments"]]).get(childEntityClass)));
+_defineProperty(Individual, "merge", childEntityClass => _BaseEntity.default.mergeOn(mergeMap.get(childEntityClass)));
 
 _defineProperty(Individual, "mergeMultipleParents", (childEntityClass, entities) => {
-  if (childEntityClass === _GroupSubject.default) {
+  if (childEntityClass === _GroupSubject.default.schema.name) {
     const individual = _lodash.default.head(entities);
 
     const key = individual.subjectType.group ? 'groupSubjects' : 'groups';

package/dist/ProgramEnrolment.js

@@ -43,7 +43,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; }
 
-const mergeMap = new Map([[_ProgramEncounter.default, "encounters"], [_Checklist.default, "checklists"], [_EntityApprovalStatus.default, "approvalStatuses"]]);
+const mergeMap = new Map([[_SchemaNames.default.ProgramEncounter, "encounters"], [_SchemaNames.default.Checklist, "checklists"], [_SchemaNames.default.EntityApprovalStatus, "approvalStatuses"]]);
 
 class ProgramEnrolment extends _BaseEntity.default {
   constructor(that = null) {
@@ -669,7 +669,7 @@ _defineProperty(ProgramEnrolment, "schema", {
 
 _defineProperty(ProgramEnrolment, "parentAssociations", () => new Map([[_Individual.default, "individualUUID"]]));
 
-_defineProperty(ProgramEnrolment, "childAssociations", () => new Map([[_ProgramEncounter.default, "encounters"], [_Checklist.default, "checklists"]]));
+_defineProperty(ProgramEnrolment, "childAssociations", () => new Map([[_SchemaNames.default.ProgramEncounter, "encounters"], [_SchemaNames.default.Checklist, "checklists"]]));
 
 _defineProperty(ProgramEnrolment, "merge", childEntityClass => _BaseEntity.default.mergeOn(mergeMap.get(childEntityClass)));
 

package/dist/SchemaNames.js

@@ -81,5 +81,7 @@ _defineProperty(SchemaNames, "Comment", "Comment");
 
 _defineProperty(SchemaNames, "Concept", "Concept");
 
+_defineProperty(SchemaNames, "EntityApprovalStatus", "EntityApprovalStatus");
+
 var _default = SchemaNames;
 exports.default = _default;

package/dist/reports/DashboardFilterConfig.js

@@ -111,8 +111,6 @@ 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);
@@ -143,14 +141,13 @@ class DashboardFilterConfig {
   }
 
   isValid() {
-    const valid = !(_lodash.default.isNil(this.type) || _lodash.default.isNil(this.subjectType));
+    const valid = !_lodash.default.isNil(this.type);
     if (!valid) return valid;
     if (this.isConceptTypeFilter()) return this.observationBasedFilter.isValid();else if (this.isGroupSubjectTypeFilter()) return this.groupSubjectTypeFilter.isValid();else if (this.isWidgetRequired()) return !_lodash.default.isNil(this.widget);else return true;
   }
 
   toServerRequest() {
     const request = {
-      subjectTypeUUID: this.subjectType.uuid,
       type: this.type,
       widget: this.widget
     };
@@ -178,19 +175,6 @@ 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;
-
-      if (!_lodash.default.isNil(this.observationBasedFilter)) {
-        this.observationBasedFilter.programs = [];
-        this.observationBasedFilter.encounterTypes = [];
-      } else if (!_lodash.default.isNil(this.groupSubjectTypeFilter)) {
-        this.groupSubjectTypeFilter.subjectType = null;
-      }
-    }
-  }
-
   willObservationBeInScopeOfProgramEnrolment() {
     return this.isConceptTypeFilter() && this.observationBasedFilter.willObservationBeInScopeOfProgramEnrolment();
   }
@@ -212,7 +196,6 @@ 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.30.3",
+    "version": "1.30.6",
     "private": false,
     "repository": {
         "type": "git",