openchs-models 1.23.8 → 1.23.11

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,23 @@ release:
 
 publish:
 	git push && git push origin --tags
+
+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

@@ -182,7 +182,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, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default],
-  schemaVersion: 160,
+  schemaVersion: 161,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       var oldObjects = oldDB.objects("DecisionConfig");

package/dist/StandardReportCardType.js

@@ -9,6 +9,8 @@ var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
 var _General = _interopRequireDefault(require("./utility/General"));
 
+var _TaskType = _interopRequireDefault(require("./task/TaskType"));
+
 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; }
@@ -20,7 +22,8 @@ class StandardReportCardType extends _BaseEntity.default {
       [StandardReportCardType.type.Rejected]: 'cancel',
       [StandardReportCardType.type.PendingApproval]: 'av-timer',
       [StandardReportCardType.type.Comments]: 'message',
-      [StandardReportCardType.type.Tasks]: 'sticky-note-2'
+      [StandardReportCardType.type.CallTasks]: 'call',
+      [StandardReportCardType.type.OpenSubjectTasks]: 'sticky-note-2'
     };
     return typeIcon[this.name];
   }
@@ -31,7 +34,8 @@ class StandardReportCardType extends _BaseEntity.default {
       [StandardReportCardType.type.Rejected]: '#bf360c',
       [StandardReportCardType.type.PendingApproval]: '#6a1b9a',
       [StandardReportCardType.type.Comments]: '#3949ab',
-      [StandardReportCardType.type.Tasks]: '#3949ab'
+      [StandardReportCardType.type.CallTasks]: '#69a672',
+      [StandardReportCardType.type.OpenSubjectTasks]: '#717cac'
     };
     return typeCardColor[this.name];
   }
@@ -40,14 +44,14 @@ class StandardReportCardType extends _BaseEntity.default {
     return this.isStandardCard() ? '#ffffff' : 'rgba(0, 0, 0, 0.87)';
   }
 
-  isStandardCard() {
-    return _.includes([...this.approvalTypes(), StandardReportCardType.type.Comments, StandardReportCardType.type.Tasks], this.name);
-  }
-
   static fromResource(resource) {
     return _General.default.assignFields(resource, new StandardReportCardType(), ["uuid", "name", "description", "voided"]);
   }
 
+  isStandardCard() {
+    return _.includes([...this.approvalTypes(), StandardReportCardType.type.Comments, StandardReportCardType.type.CallTasks, StandardReportCardType.type.OpenSubjectTasks], this.name);
+  }
+
   approvalTypes() {
     return [StandardReportCardType.type.PendingApproval, StandardReportCardType.type.Approved, StandardReportCardType.type.Rejected];
   }
@@ -65,7 +69,17 @@ class StandardReportCardType extends _BaseEntity.default {
   }
 
   isTaskType() {
-    return this.name === StandardReportCardType.type.Tasks;
+    return _.includes([StandardReportCardType.type.CallTasks, StandardReportCardType.type.OpenSubjectTasks], this.name);
+  }
+
+  getTaskTypeType() {
+    switch (this.name) {
+      case StandardReportCardType.type.CallTasks:
+        return _TaskType.default.TaskTypeName.Call;
+
+      case StandardReportCardType.type.OpenSubjectTasks:
+        return _TaskType.default.TaskTypeName.OpenSubject;
+    }
   }
 
   isDefaultType() {
@@ -102,7 +116,8 @@ _defineProperty(StandardReportCardType, "type", {
   LatestVisits: "Last 24 hours visits",
   Total: "Total",
   Comments: "Comments",
-  Tasks: "Tasks"
+  CallTasks: "Call tasks",
+  OpenSubjectTasks: "Open subject tasks"
 });
 
 var _default = StandardReportCardType;

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/package.json

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