openchs-models 1.25.1 → 1.25.4

package/Makefile

@@ -34,7 +34,10 @@ copy-dist-to-avni-client:
 deploy-to-avni-client:
 	$(if $(local),$(call _deploy,$(local)/packages/openchs-android/node_modules/openchs-models))
 
-deploy-as-source:
+deploy-to-avni-web:
+	$(if $(local),$(call _deploy,$(local)/node_modules/openchs-models))
+
+deploy-as-source-to-avni-client:
 	$(if $(local),$(call _deploy_as_source,$(local)/packages/openchs-android/node_modules/openchs-models))
 
 define _deploy_as_source

package/dist/Schema.js

@@ -188,7 +188,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, _DraftEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default],
-  schemaVersion: 164,
+  schemaVersion: 165,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       const oldObjects = oldDB.objects("DecisionConfig");

package/dist/application/MenuItem.js

@@ -12,8 +12,44 @@ 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; }
 
 class MenuItem {
+  constructor() {
+    _defineProperty(this, "uuid", void 0);
+
+    _defineProperty(this, "displayKey", void 0);
+
+    _defineProperty(this, "type", void 0);
+
+    _defineProperty(this, "icon", void 0);
+
+    _defineProperty(this, "group", void 0);
+
+    _defineProperty(this, "linkFunction", void 0);
+
+    _defineProperty(this, "voided", void 0);
+  }
+
   static fromResource(resource, entityService) {
-    return _General.default.assignFields(resource, new MenuItem(), ['uuid', 'displayKey', 'type', 'icon', "voided", "group", "link"]);
+    return _General.default.assignFields(resource, new MenuItem(), ['uuid', 'displayKey', 'type', 'icon', "voided", "group", "linkFunction"]);
+  }
+
+  static fromDb(obj) {
+    return MenuItem.fromResource(obj);
+  }
+
+  toString() {
+    return `uuid:${this.uuid}; displayKey:${this.displayKey}; type:${this.type}; group:${this.group}; voided:${this.voided}`;
+  }
+
+  isLinkType() {
+    return this.type === MenuItem.HyperlinkTypeName;
+  }
+
+  static getAllGroups() {
+    return [this.FunctionalityGroupName, this.SyncGroupName, this.UserGroupName, this.SupportGroupName];
+  }
+
+  static getAllTypes() {
+    return [this.HyperlinkTypeName];
   }
 
 }
@@ -26,6 +62,8 @@ _defineProperty(MenuItem, "UserGroupName", "User");
 
 _defineProperty(MenuItem, "SupportGroupName", "Support");
 
+_defineProperty(MenuItem, "HyperlinkTypeName", "Link");
+
 _defineProperty(MenuItem, "schema", {
   name: "MenuItem",
   primaryKey: "uuid",
@@ -38,7 +76,7 @@ _defineProperty(MenuItem, "schema", {
       optional: true
     },
     group: "string",
-    link: {
+    linkFunction: {
       type: "string",
       optional: true
     },

package/dist/program/SubjectProgramEligibility.js

@@ -42,6 +42,16 @@ class SubjectProgramEligibility extends _BaseEntity.default {
     _defineProperty(this, "observations", void 0);
   }
 
+  static createEmptyInstance(program, subject) {
+    const subjectProgramEligibility = new SubjectProgramEligibility();
+    subjectProgramEligibility.checkDate = new Date();
+    subjectProgramEligibility.uuid = _General.default.randomUUID();
+    subjectProgramEligibility.observations = [];
+    subjectProgramEligibility.program = program;
+    subjectProgramEligibility.subject = subject;
+    return subjectProgramEligibility;
+  }
+
   get toResource() {
     const resource = _lodash.default.pick(this, ["uuid", "voided", "eligible"]);
 
@@ -108,6 +118,24 @@ class SubjectProgramEligibility extends _BaseEntity.default {
     return subjectProgramEligibility;
   }
 
+  getObservationReadableValue(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observationForConcept = this.findObservation(conceptNameOrUuid, parentConceptNameOrUuid);
+    return _lodash.default.isEmpty(observationForConcept) ? observationForConcept : observationForConcept.getReadableValue();
+  }
+
+  findObservation(conceptNameOrUuid, parentConceptNameOrUuid) {
+    const observations = _lodash.default.isNil(parentConceptNameOrUuid) ? this.observations : this.findGroupedObservation(parentConceptNameOrUuid);
+    return _lodash.default.find(observations, observation => {
+      return observation.concept.name === conceptNameOrUuid || observation.concept.uuid === conceptNameOrUuid;
+    });
+  }
+
+  findGroupedObservation(parentConceptNameOrUuid) {
+    const groupedObservations = _lodash.default.find(this.observations, observation => observation.concept.name === parentConceptNameOrUuid || observation.concept.uuid === parentConceptNameOrUuid);
+
+    return _lodash.default.isEmpty(groupedObservations) ? [] : groupedObservations.getValue();
+  }
+
 }
 
 _defineProperty(SubjectProgramEligibility, "schema", {

package/package.json

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