openchs-models 1.23.9 → 1.24.0

package/.nvmrc

@@ -1 +1 @@
-v10.15.1
+v10.15

package/Makefile

@@ -12,10 +12,12 @@ deps: check-node-v
 	@rm -rf package-lock.json
 	yarn install
 
-test: check-node-v
+tests:
 	yarn test
 
-build: check-node-v
+build: check-node-v build-only
+
+build-only:
 	yarn run build
 
 release:
@@ -27,3 +29,26 @@ release:
 
 publish:
 	git push && git push origin --tags
+
+copy-dist-to-avni-client:
+	cp -r * ../avni-client/packages/openchs-android/node_modules/openchs-models/
+
+deploy:
+	$(if $(local),$(call _deploy,$(local)/packages/openchs-android/node_modules/openchs-models))
+
+deploy-as-source:
+	$(if $(local),$(call _deploy_as_source,$(local)/packages/openchs-android/node_modules/openchs-models))
+
+define _deploy_as_source
+	rm -rf $1/*
+	mkdir $1/dist
+	cp -r src/* $1/dist/
+	cp package.json $1/
+endef
+
+define _deploy
+	rm -rf $1/*
+	mkdir $1/dist
+	cp -r dist/* $1/dist/
+	cp ./* $1/
+endef

package/dist/Program.js

@@ -38,6 +38,10 @@ class Program extends _ReferenceEntity.default {
     _defineProperty(this, "active", void 0);
 
     _defineProperty(this, "voided", void 0);
+
+    _defineProperty(this, "manualEligibilityCheckRequired", void 0);
+
+    _defineProperty(this, "manualEnrolmentEligibilityCheckRule", void 0);
   }
 
   static fromResource(operationalProgram) {
@@ -90,6 +94,11 @@ _defineProperty(Program, "schema", {
       type: 'string',
       optional: true
     },
+    manualEligibilityCheckRequired: 'bool',
+    manualEnrolmentEligibilityCheckRule: {
+      type: 'string',
+      optional: true
+    },
     voided: {
       type: 'bool',
       default: false

package/dist/Schema.js

@@ -173,6 +173,8 @@ var _TaskStatus = _interopRequireDefault(require("./task/TaskStatus"));
 
 var _TaskUnAssignment = _interopRequireDefault(require("./task/TaskUnAssignment"));
 
+var _DraftEncounter = _interopRequireDefault(require("./draft/DraftEncounter"));
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -181,8 +183,8 @@ 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, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default],
-  schemaVersion: 160,
+  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, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default],
+  schemaVersion: 161,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       var oldObjects = oldDB.objects("DecisionConfig");

package/dist/SubjectType.js

@@ -40,6 +40,8 @@ class SubjectType extends _ReferenceEntity.default {
     _defineProperty(this, "validMiddleNameFormat", void 0);
 
     _defineProperty(this, "validLastNameFormat", void 0);
+
+    _defineProperty(this, "programEligibilitySummaryRule", void 0);
   }
 
   static create(name, group = false, household = false, type) {
@@ -63,6 +65,7 @@ class SubjectType extends _ReferenceEntity.default {
     subjectType.active = operationalSubjectType.active;
     subjectType.type = operationalSubjectType.type;
     subjectType.subjectSummaryRule = operationalSubjectType.subjectSummaryRule;
+    subjectType.programEligibilitySummaryRule = operationalSubjectType.programEligibilitySummaryRule;
     subjectType.uniqueName = operationalSubjectType.uniqueName;
     subjectType.allowMiddleName = operationalSubjectType.allowMiddleName;
     subjectType.allowProfilePicture = operationalSubjectType.allowProfilePicture;
@@ -86,6 +89,7 @@ class SubjectType extends _ReferenceEntity.default {
     cloned.active = this.active;
     cloned.type = this.type;
     cloned.subjectSummaryRule = this.subjectSummaryRule;
+    cloned.programEligibilitySummaryRule = this.programEligibilitySummaryRule;
     cloned.allowEmptyLocation = this.allowEmptyLocation;
     cloned.allowMiddleName = this.allowMiddleName;
     cloned.allowProfilePicture = this.allowProfilePicture;
@@ -153,6 +157,10 @@ _defineProperty(SubjectType, "schema", {
       type: 'string',
       optional: true
     },
+    programEligibilitySummaryRule: {
+      type: 'string',
+      optional: true
+    },
     uniqueName: {
       type: 'bool',
       default: false

package/dist/draft/DraftEncounter.js

@@ -0,0 +1,115 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _ObservationsHolder = _interopRequireDefault(require("../ObservationsHolder"));
+
+var _Encounter = _interopRequireDefault(require("../Encounter"));
+
+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; }
+
+class DraftEncounter {
+  static create(encounter) {
+    const draftEncounter = new DraftEncounter();
+    draftEncounter.uuid = encounter.uuid;
+    draftEncounter.encounterType = encounter.encounterType;
+    draftEncounter.encounterDateTime = encounter.encounterDateTime;
+    draftEncounter.individual = encounter.individual;
+    draftEncounter.observations = encounter.observations;
+    draftEncounter.encounterLocation = encounter.encounterLocation;
+    draftEncounter.name = encounter.name;
+    draftEncounter.earliestVisitDateTime = encounter.earliestVisitDateTime;
+    draftEncounter.maxVisitDateTime = encounter.maxVisitDateTime;
+    draftEncounter.cancelDateTime = encounter.cancelDateTime;
+    draftEncounter.cancelObservations = encounter.cancelObservations;
+    draftEncounter.cancelLocation = encounter.cancelLocation;
+    draftEncounter.voided = encounter.voided;
+    draftEncounter.latestEntityApprovalStatus = encounter.latestEntityApprovalStatus;
+    draftEncounter.registrationLocation = encounter.registrationLocation;
+    draftEncounter.updatedOn = new Date();
+    return draftEncounter;
+  }
+
+  constructEncounter() {
+    const encounter = new _Encounter.default();
+    encounter.uuid = this.uuid;
+    encounter.encounterType = this.encounterType;
+    encounter.encounterDateTime = this.encounterDateTime;
+    encounter.individual = this.individual;
+    encounter.observations = _ObservationsHolder.default.clone(this.observations);
+    encounter.encounterLocation = this.encounterLocation;
+    encounter.name = this.name;
+    encounter.earliestVisitDateTime = this.earliestVisitDateTime;
+    encounter.maxVisitDateTime = this.maxVisitDateTime;
+    encounter.cancelDateTime = this.cancelDateTime;
+    encounter.cancelObservations = _ObservationsHolder.default.clone(this.cancelObservations);
+    encounter.cancelLocation = this.cancelLocation;
+    encounter.voided = this.voided;
+    encounter.latestEntityApprovalStatus = this.latestEntityApprovalStatus;
+    encounter.registrationLocation = this.registrationLocation;
+    return encounter;
+  }
+
+}
+
+_defineProperty(DraftEncounter, "schema", {
+  name: "DraftEncounter",
+  primaryKey: "uuid",
+  properties: {
+    uuid: "string",
+    encounterType: "EncounterType",
+    encounterDateTime: {
+      type: "date",
+      optional: true
+    },
+    individual: "Individual",
+    observations: {
+      type: "list",
+      objectType: "Observation"
+    },
+    encounterLocation: {
+      type: "Point",
+      optional: true
+    },
+    name: {
+      type: "string",
+      optional: true
+    },
+    earliestVisitDateTime: {
+      type: "date",
+      optional: true
+    },
+    maxVisitDateTime: {
+      type: "date",
+      optional: true
+    },
+    cancelDateTime: {
+      type: "date",
+      optional: true
+    },
+    cancelObservations: {
+      type: "list",
+      objectType: "Observation"
+    },
+    cancelLocation: {
+      type: "Point",
+      optional: true
+    },
+    voided: {
+      type: "bool",
+      default: false
+    },
+    latestEntityApprovalStatus: {
+      type: "EntityApprovalStatus",
+      optional: true
+    }
+  }
+});
+
+var _default = DraftEncounter;
+exports.default = _default;

package/dist/index.js

@@ -699,6 +699,12 @@ Object.defineProperty(exports, "TaskUnAssignment", {
     return _TaskUnAssignment.default;
   }
 });
+Object.defineProperty(exports, "DraftEncounter", {
+  enumerable: true,
+  get: function () {
+    return _DraftEncounter.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -930,6 +936,8 @@ var _TaskType = _interopRequireDefault(require("./task/TaskType"));
 
 var _TaskUnAssignment = _interopRequireDefault(require("./task/TaskUnAssignment"));
 
+var _DraftEncounter = _interopRequireDefault(require("./draft/DraftEncounter"));
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/package.json

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