openchs-models 1.30.34 → 1.30.37

package/.github/add_to_project.yml

@@ -0,0 +1,16 @@
+name: Add to Product board
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add all issues created in this repository to the Avni product board
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.5.0
+        with:
+          project-url: https://github.com/orgs/avniproject/projects/2
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

package/.github/workflows/add_to_project.yml

@@ -0,0 +1,18 @@
+name: Automatically add items to project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.5.0
+        with:
+          # You can target a project in a different organization
+          # to the issue
+          project-url: https://github.com/orgs/avniproject/projects/2/
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

package/.github/workflows/issue_states.yml

@@ -0,0 +1,21 @@
+name: 'Close cards moved to Done Lane'
+
+on:
+  project_card:
+    types: [created, edited, moved]
+
+permissions:
+  repository-projects: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/issue-states@v3
+        with:
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          open-issue-columns: ''
+          closed-issue-columns: 'Done'
+          log-output: false

package/Makefile

@@ -15,6 +15,9 @@ release:
 	git pull --tags
 	git pull --rebase
 	@echo "Ensure version changes follow semantic versioning - https://classic.yarnpkg.com/en/docs/dependency-versions#toc-semantic-versioning"
+	@echo "\033[1mLatest openchs-models version across branches:"
+	npm view openchs-models version
+	@echo "\033[0m"
 	yarn version
 	@echo "   Now please run \nmake publish"
 

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, {
@@ -186,39 +190,8 @@ const refDataNameTranslated = (clazz, attrs = {}) => refData(clazz, _objectSprea
 }));
 
 const txData = (clazz, {
-  res,
-  resUrl,
-  parent,
-  apiVersion,
-  syncWeight,
-  privilegeParam,
-  privilegeEntity,
-  privilegeName,
-  queryParam,
-  hasMoreThanOneAssociation,
-  apiQueryParams
-} = {}) => ({
-  schemaName: clazz.schema.name,
-  entityName: clazz.schema.name,
-  entityClass: clazz,
-  resourceName: res || _lodash.default.camelCase(clazz.schema.name),
-  resourceUrl: resUrl,
-  type: "tx",
-  nameTranslated: false,
-  parent: parent,
-  apiVersion,
-  syncWeight: syncWeight,
-  privilegeParam,
-  privilegeEntity,
-  privilegeName,
-  queryParam,
-  hasMoreThanOneAssociation: !!hasMoreThanOneAssociation,
-  apiQueryParams
-});
-
-const virtualTxData = (clazz, {
-  res,
   entityName,
+  res,
   resUrl,
   parent,
   apiVersion,
@@ -229,14 +202,16 @@ const virtualTxData = (clazz, {
   queryParam,
   hasMoreThanOneAssociation,
   apiQueryParams,
-  apiQueryParamKey
+  apiQueryParamKey,
+  syncPushRequired = true,
+  syncPullRequired = true
 } = {}) => ({
   schemaName: clazz.schema.name,
-  entityName: entityName,
+  entityName: entityName || clazz.schema.name,
   entityClass: clazz,
   resourceName: res || _lodash.default.camelCase(clazz.schema.name),
   resourceUrl: resUrl,
-  type: "virtualTx",
+  type: "tx",
   nameTranslated: false,
   parent: parent,
   apiVersion,
@@ -247,7 +222,9 @@ const virtualTxData = (clazz, {
   queryParam,
   hasMoreThanOneAssociation: !!hasMoreThanOneAssociation,
   apiQueryParams,
-  apiQueryParamKey
+  apiQueryParamKey,
+  syncPushRequired,
+  syncPullRequired
 });
 
 const checklistDetail = refData(_ChecklistDetail.default, {
@@ -409,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",
@@ -425,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",
@@ -495,7 +475,7 @@ const EntityApprovalStatusMetaData = txData(_EntityApprovalStatus.default, {
   entityName: "EntityApprovalStatus"
 });
 exports.EntityApprovalStatusMetaData = EntityApprovalStatusMetaData;
-const subjectEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const subjectEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'SubjectEntityApprovalStatus',
@@ -507,9 +487,10 @@ const subjectEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default,
   privilegeEntity: _Privilege.default.privilegeEntityType.subject,
   privilegeName: _Privilege.default.privilegeName.viewSubject,
   parent: individual,
-  syncWeight: 2
+  syncWeight: 2,
+  syncPushRequired: false
 });
-const encounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const encounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'EncounterEntityApprovalStatus',
@@ -521,9 +502,10 @@ const encounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.defaul
   privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
   privilegeName: _Privilege.default.privilegeName.viewVisit,
   parent: encounter,
-  syncWeight: 2
+  syncWeight: 2,
+  syncPushRequired: false
 });
-const programEncounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const programEncounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'ProgramEncounterEntityApprovalStatus',
@@ -535,9 +517,10 @@ const programEncounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus
   privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
   privilegeName: _Privilege.default.privilegeName.viewVisit,
   parent: programEncounter,
-  syncWeight: 2
+  syncWeight: 2,
+  syncPushRequired: false
 });
-const programEnrolmentEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const programEnrolmentEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'ProgramEnrolmentEntityApprovalStatus',
@@ -549,9 +532,10 @@ const programEnrolmentEntityApprovalStatus = virtualTxData(_EntityApprovalStatus
   privilegeEntity: _Privilege.default.privilegeEntityType.enrolment,
   privilegeName: _Privilege.default.privilegeName.viewEnrolmentDetails,
   parent: programEnrolment,
-  syncWeight: 2
+  syncWeight: 2,
+  syncPushRequired: false
 });
-const checklistItemEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
+const checklistItemEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'ChecklistItemEntityApprovalStatus',
@@ -563,7 +547,13 @@ const checklistItemEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.de
   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,
+  syncPullRequired: false
 });
 const news = txData(_News.default, {
   syncWeight: 0
@@ -645,7 +635,7 @@ class EntityMetaData {
 
   //order is important. last entity in each (tx and ref) with be executed first. parent should be synced before the child.
   static model() {
-    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
+    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, entityApprovalStatus, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
   }
 
   static entitiesLoadedFromServer() {
@@ -657,8 +647,11 @@ class EntityMetaData {
   }
 
   static findByNameIn(entityName, modelCollection) {
-    return _lodash.default.find(modelCollection, //TODO check if this works
-    entityMetadata => entityMetadata.entityName === entityName);
+    return _lodash.default.find(modelCollection, entityMetadata => entityMetadata.entityName === entityName);
+  }
+
+  static getEntitiesToBePulled() {
+    return _lodash.default.filter(EntityMetaData.model(), entityMetadata => entityMetadata.syncPullRequired);
   }
 
   static allModels() {

package/dist/Individual.js

@@ -51,6 +51,8 @@ var _ArrayHelper = _interopRequireDefault(require("./framework/ArrayHelper"));
 
 var _MergeUtil = _interopRequireDefault(require("./utility/MergeUtil"));
 
+var _AgeUtil = _interopRequireDefault(require("./utility/AgeUtil"));
+
 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; }
@@ -403,23 +405,21 @@ class Individual extends _BaseEntity.default {
     this.name = this.nameString;
   }
 
-  getDisplayAge(i18n) {
-    //Keeping date of birth to be always entered and displayed as per the current date. It would be perhaps more error prone for users to put themselves in the past and enter age as of that date
-    const ageInYears = this.getAgeInYears();
+  getAgeAndDateOfBirthDisplay(i18n) {
+    if (this.dateOfBirthVerified) return `${_AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n)} (${_General.default.toDisplayDate(this.dateOfBirth)})`;
+    return _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n);
+  }
 
-    if (ageInYears < 1) {
-      let ageInWeeks = (0, _moment.default)().diff(this.dateOfBirth, "weeks");
-      return ageInWeeks === 0 ? _Duration.default.inDay((0, _moment.default)().diff(this.dateOfBirth, "days")).toString(i18n) : _Duration.default.inWeek(ageInWeeks).toString(i18n);
-    } else if (ageInYears < 2) {
-      return _Duration.default.inMonth((0, _moment.default)().diff(this.dateOfBirth, "months")).toString(i18n);
-    } else {
-      return _Duration.default.inYear(ageInYears).toString(i18n);
-    }
+  getAgeInYears(asOnDate = (0, _moment.default)(), precise = false) {
+    return _AgeUtil.default.getAgeInYears(this.dateOfBirth, asOnDate, precise);
   }
 
-  getAgeAndDateOfBirthDisplay(i18n) {
-    if (this.dateOfBirthVerified) return `${this.getDisplayAge(i18n)} (${_General.default.toDisplayDate(this.dateOfBirth)})`;
-    return this.getDisplayAge(i18n);
+  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)()) {
@@ -448,22 +448,6 @@ class Individual extends _BaseEntity.default {
     }
   }
 
-  getAgeIn(unit) {
-    return (asOnDate = (0, _moment.default)(), precise = false) => (0, _moment.default)(asOnDate).diff(this.dateOfBirth, unit, precise);
-  }
-
-  getAgeInMonths(asOnDate = (0, _moment.default)(), precise = false) {
-    return this.getAgeIn("months")(asOnDate, precise);
-  }
-
-  getAgeInWeeks(asOnDate, precise) {
-    return this.getAgeIn("weeks")(asOnDate, precise);
-  }
-
-  getAgeInYears(asOnDate = (0, _moment.default)(), precise = false) {
-    return this.getAgeIn("years")(asOnDate, precise);
-  }
-
   toSummaryString() {
     return `${this.name}, Age: ${this.getAge().toString()}, ${this.gender.name}`;
   }
@@ -818,7 +802,15 @@ class Individual extends _BaseEntity.default {
   }
 
   userProfileSubtext2(i18n) {
-    return this.isPerson() ? this.getDisplayAge(i18n) : "";
+    return this.isPerson() ? _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n) : "";
+  }
+
+  subjectAddressText(i18n) {
+    const parentAddress = _lodash.default.get(this, 'lowestAddressLevel.locationMappings[0].parent.name');
+
+    let addressText = i18n.t(this.lowestAddressLevel.name);
+    if (!_lodash.default.isNil(parentAddress)) addressText += ', ' + i18n.t(parentAddress);
+    return addressText;
   }
 
   subjectAddressText(i18n) {
@@ -833,7 +825,7 @@ class Individual extends _BaseEntity.default {
   detail1(i18n) {
     return this.isPerson() ? {
       label: "Age",
-      value: this.getDisplayAge(i18n)
+      value: _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n)
     } : {};
   }
 

package/dist/Privilege.js

@@ -89,6 +89,37 @@ _defineProperty(Privilege, "privilegeName", {
   approveChecklistItem: "Approve ChecklistItem"
 });
 
+_defineProperty(Privilege, "PrivilegeType", {
+  ViewSubject: "ViewSubject",
+  RegisterSubject: "RegisterSubject",
+  EditSubject: "EditSubject",
+  VoidSubject: "VoidSubject",
+  EnrolSubject: "EnrolSubject",
+  ViewEnrolmentDetails: "ViewEnrolmentDetails",
+  EditEnrolmentDetails: "EditEnrolmentDetails",
+  ExitEnrolment: "ExitEnrolment",
+  ViewVisit: "ViewVisit",
+  ScheduleVisit: "ScheduleVisit",
+  PerformVisit: "PerformVisit",
+  EditVisit: "EditVisit",
+  CancelVisit: "CancelVisit",
+  VoidVisit: "VoidVisit",
+  ViewChecklist: "ViewChecklist",
+  EditChecklist: "EditChecklist",
+  AddMember: "AddMember",
+  EditMember: "EditMember",
+  RemoveMember: "RemoveMember",
+  ApproveSubject: "ApproveSubject",
+  RejectSubject: "RejectSubject",
+  ApproveEnrolment: "ApproveEnrolment",
+  RejectEnrolment: "RejectEnrolment",
+  ApproveEncounter: "ApproveEncounter",
+  RejectEncounter: "RejectEncounter",
+  ApproveChecklistitem: "ApproveChecklistitem",
+  RejectChecklistitem: "RejectChecklistitem",
+  UploadMetadataAndData: "UploadMetadataAndData"
+});
+
 _defineProperty(Privilege, "privilegeEntityType", {
   subject: "Subject",
   enrolment: "Enrolment",

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/dist/index.js

@@ -801,6 +801,12 @@ Object.defineProperty(exports, "CustomDashboardCache", {
     return _CustomDashboardCache.default;
   }
 });
+Object.defineProperty(exports, "AgeUtil", {
+  enumerable: true,
+  get: function () {
+    return _AgeUtil.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -1060,6 +1066,8 @@ var _DateTimeUtil = _interopRequireDefault(require("./utility/DateTimeUtil"));
 
 var _CustomDashboardCache = _interopRequireDefault(require("./CustomDashboardCache"));
 
+var _AgeUtil = _interopRequireDefault(require("./utility/AgeUtil"));
+
 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/dist/utility/AgeUtil.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _Duration = _interopRequireDefault(require("../Duration"));
+
+var _moment = _interopRequireDefault(require("moment"));
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class AgeUtil {
+  static getDisplayAge(dateOfBirth, i18n) {
+    //Keeping date of birth to be always entered and displayed as per the current date. It would be perhaps more error prone for users to put themselves in the past and enter age as of that date
+    const ageInYears = this.getAgeInYears(dateOfBirth);
+
+    if (ageInYears < 1) {
+      let ageInWeeks = this.getAgeInWeeks(dateOfBirth);
+      return ageInWeeks === 0 ? _Duration.default.inDay((0, _moment.default)().diff(dateOfBirth, "days")).toString(i18n) : _Duration.default.inWeek(ageInWeeks).toString(i18n);
+    } else if (ageInYears < 2) {
+      return _Duration.default.inMonth(this.getAgeInMonths(dateOfBirth)).toString(i18n);
+    } else if (ageInYears < 6) {
+      let ageInMonths = this.getAgeInMonths(dateOfBirth);
+
+      let noOfYears = _lodash.default.toInteger(ageInMonths / 12);
+
+      let noOfMonths = ageInMonths % 12;
+      let durationInYears = `${_Duration.default.inYear(noOfYears).toString(i18n)}`;
+      if (noOfMonths > 0) return `${durationInYears} ${_Duration.default.inMonth(noOfMonths).toString(i18n)}`;
+      return durationInYears;
+    } else {
+      return _Duration.default.inYear(ageInYears).toString(i18n);
+    }
+  }
+
+  static getAgeInYears(dateOfBirth, asOnDate = (0, _moment.default)(), precise = false) {
+    return this.getAgeIn(dateOfBirth, "years")(asOnDate, precise);
+  }
+
+  static getAgeInMonths(dateOfBirth, asOnDate = (0, _moment.default)(), precise = false) {
+    return this.getAgeIn(dateOfBirth, "months")(asOnDate, precise);
+  }
+
+  static getAgeInWeeks(dateOfBirth, asOnDate, precise) {
+    return this.getAgeIn(dateOfBirth, "weeks")(asOnDate, precise);
+  }
+
+  static getAgeIn(dateOfBirth, unit) {
+    return (asOnDate = (0, _moment.default)(), precise = false) => (0, _moment.default)(asOnDate).diff(dateOfBirth, unit, precise);
+  }
+
+}
+
+var _default = AgeUtil;
+exports.default = _default;

package/package.json

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