openchs-models 1.30.30 → 1.30.32

package/dist/EntityMetaData.js

@@ -167,7 +167,9 @@ const refData = (clazz, {
   translated,
   parent,
   syncWeight,
-  resUrl
+  resUrl,
+  syncPushRequired = true,
+  syncPullRequired = true
 } = {}) => ({
   schemaName: clazz.schema.name,
   entityName: clazz.schema.name,
@@ -178,7 +180,9 @@ const refData = (clazz, {
   resourceSearchFilterURL: filter,
   parent: parent,
   syncWeight: syncWeight,
-  resourceUrl: resUrl
+  resourceUrl: resUrl,
+  syncPushRequired,
+  syncPullRequired
 });
 
 const refDataNameTranslated = (clazz, attrs = {}) => refData(clazz, _objectSpread({}, attrs, {
@@ -198,7 +202,9 @@ const txData = (clazz, {
   queryParam,
   hasMoreThanOneAssociation,
   apiQueryParams,
-  apiQueryParamKey
+  apiQueryParamKey,
+  syncPushRequired = true,
+  syncPullRequired = true
 } = {}) => ({
   schemaName: clazz.schema.name,
   entityName: entityName || clazz.schema.name,
@@ -216,7 +222,9 @@ const txData = (clazz, {
   queryParam,
   hasMoreThanOneAssociation: !!hasMoreThanOneAssociation,
   apiQueryParams,
-  apiQueryParamKey
+  apiQueryParamKey,
+  syncPushRequired,
+  syncPullRequired
 });
 
 const checklistDetail = refData(_ChecklistDetail.default, {
@@ -378,11 +386,13 @@ const groupSubject = txData(_GroupSubject.default, {
 const videoTelemetric = txData(_VideoTelemetric.default, {
   res: "videotelemetric",
   parent: video,
-  syncWeight: 0
+  syncWeight: 0,
+  syncPullRequired: false
 });
 const syncTelemetry = txData(_SyncTelemetry.default, {
   resUrl: "syncTelemetry",
-  syncWeight: 1
+  syncWeight: 1,
+  syncPullRequired: false
 });
 const userInfo = txData(_UserInfo.default, {
   resUrl: "me",
@@ -394,7 +404,8 @@ const identifierAssignment = txData(_IdentifierAssignment.default, {
 });
 const ruleFailureTelemetry = txData(_RuleFailureTelemetry.default, {
   resUrl: "ruleFailureTelemetry",
-  syncWeight: 0
+  syncWeight: 0,
+  syncPullRequired: false
 });
 const groups = refData(_Groups.default, {
   res: "groups",
@@ -471,7 +482,8 @@ const subjectEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   privilegeEntity: _Privilege.default.privilegeEntityType.subject,
   privilegeName: _Privilege.default.privilegeName.viewSubject,
   parent: individual,
-  syncWeight: 2
+  syncWeight: 2,
+  syncPushRequired: false
 });
 const encounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
@@ -485,7 +497,8 @@ const encounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
   privilegeName: _Privilege.default.privilegeName.viewVisit,
   parent: encounter,
-  syncWeight: 2
+  syncWeight: 2,
+  syncPushRequired: false
 });
 const programEncounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
@@ -499,7 +512,8 @@ const programEncounterEntityApprovalStatus = txData(_EntityApprovalStatus.defaul
   privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
   privilegeName: _Privilege.default.privilegeName.viewVisit,
   parent: programEncounter,
-  syncWeight: 2
+  syncWeight: 2,
+  syncPushRequired: false
 });
 const programEnrolmentEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
@@ -513,7 +527,8 @@ const programEnrolmentEntityApprovalStatus = txData(_EntityApprovalStatus.defaul
   privilegeEntity: _Privilege.default.privilegeEntityType.enrolment,
   privilegeName: _Privilege.default.privilegeName.viewEnrolmentDetails,
   parent: programEnrolment,
-  syncWeight: 2
+  syncWeight: 2,
+  syncPushRequired: false
 });
 const checklistItemEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
@@ -527,11 +542,13 @@ const checklistItemEntityApprovalStatus = txData(_EntityApprovalStatus.default,
   privilegeEntity: _Privilege.default.privilegeEntityType.checklist,
   privilegeName: _Privilege.default.privilegeName.viewChecklist,
   parent: checklistItem,
-  syncWeight: 2
+  syncWeight: 2,
+  syncPushRequired: false
 });
 const entityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: 'entityApprovalStatus',
-  syncWeight: 1
+  syncWeight: 1,
+  syncPullRequired: false
 });
 const news = txData(_News.default, {
   syncWeight: 0
@@ -624,6 +641,10 @@ class EntityMetaData {
     return _lodash.default.find(EntityMetaData.model(), entityMetadata => entityMetadata.entityName === entityName);
   }
 
+  static getEntitiesToBePulled() {
+    return _lodash.default.filter(EntityMetaData.model(), entityMetadata => entityMetadata.syncPullRequired);
+  }
+
 }
 
 var _default = EntityMetaData;

package/dist/Individual.js

@@ -410,9 +410,21 @@ class Individual extends _BaseEntity.default {
     return _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n);
   }
 
+  getAgeInYears(asOnDate = (0, _moment.default)(), precise = false) {
+    return _AgeUtil.default.getAgeInYears(this.dateOfBirth, asOnDate, precise);
+  }
+
+  getAgeInMonths(asOnDate = (0, _moment.default)(), precise = false) {
+    return _AgeUtil.default.getAgeInMonths(this.dateOfBirth, asOnDate, precise);
+  }
+
+  getAgeInWeeks(asOnDate = (0, _moment.default)(), precise = false) {
+    return _AgeUtil.default.getAgeInWeeks(this.dateOfBirth, asOnDate, precise);
+  }
+
   getAge(asOnDate = (0, _moment.default)()) {
-    if (_AgeUtil.default.getAgeInYears(this.dateOfBirth, asOnDate) > 0) return _Duration.default.inYear(_AgeUtil.default.getAgeInYears(this.dateOfBirth));
-    if (_AgeUtil.default.getAgeInMonths(this.dateOfBirth, asOnDate) > 0) return _Duration.default.inMonth(asOnDate.diff(this.dateOfBirth, "months"));
+    if (this.getAgeInYears(asOnDate) > 0) return _Duration.default.inYear(this.getAgeInYears());
+    if (this.getAgeInMonths(asOnDate) > 0) return _Duration.default.inMonth(asOnDate.diff(this.dateOfBirth, "months"));
     return _Duration.default.inYear(0);
   }
 
@@ -455,7 +467,7 @@ class Individual extends _BaseEntity.default {
       return _ValidationResult.default.failure(Individual.validationKeys.DOB, "emptyValidationMessage");
     } else if (!(0, _moment.default)(this.dateOfBirth).isValid()) {
       return _ValidationResult.default.failure(Individual.validationKeys.DOB, "invalidDateFormat");
-    } else if (_AgeUtil.default.getAgeInYears(this.dateOfBirth) > 120) {
+    } else if (this.getAgeInYears() > 120) {
       return _ValidationResult.default.failure(Individual.validationKeys.DOB, "ageTooHigh");
     } else if (this.isRegistrationBeforeDateOfBirth) {
       return _ValidationResult.default.failure(Individual.validationKeys.DOB, "registrationBeforeDateOfBirth");

package/dist/Schema.js

@@ -200,7 +200,7 @@ const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.de
 function createRealmConfig() {
   return {
     //order is important, should be arranged according to the dependency
-    schemaVersion: 177,
+    schemaVersion: 178,
     migration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
 
@@ -761,6 +761,12 @@ function createRealmConfig() {
           }
         });
       }
+
+      if (oldDB.schemaVersion < 178) {
+        const pushOnlyEntities = oldDB.objects(_EntitySyncStatus.default.schema.name).filtered("entityName = 'EntityApprovalStatus' OR entityName = 'SyncTelemetry' OR entityName = 'VideoTelemetric' OR entityName = 'RuleFailureTelemetry'");
+
+        _lodash.default.forEach(pushOnlyEntities, pushOnlyEntity => newDB.delete(pushOnlyEntity));
+      }
     }
   };
 }

package/package.json

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