openchs-models 1.30.32 → 1.30.34

package/Makefile

@@ -15,9 +15,6 @@ 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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.EntityApprovalStatusMetaData = void 0;
 
 var _Concept = _interopRequireDefault(require("./Concept"));
 
@@ -167,9 +167,7 @@ const refData = (clazz, {
   translated,
   parent,
   syncWeight,
-  resUrl,
-  syncPushRequired = true,
-  syncPullRequired = true
+  resUrl
 } = {}) => ({
   schemaName: clazz.schema.name,
   entityName: clazz.schema.name,
@@ -180,9 +178,7 @@ const refData = (clazz, {
   resourceSearchFilterURL: filter,
   parent: parent,
   syncWeight: syncWeight,
-  resourceUrl: resUrl,
-  syncPushRequired,
-  syncPullRequired
+  resourceUrl: resUrl
 });
 
 const refDataNameTranslated = (clazz, attrs = {}) => refData(clazz, _objectSpread({}, attrs, {
@@ -190,7 +186,6 @@ const refDataNameTranslated = (clazz, attrs = {}) => refData(clazz, _objectSprea
 }));
 
 const txData = (clazz, {
-  entityName,
   res,
   resUrl,
   parent,
@@ -201,13 +196,10 @@ const txData = (clazz, {
   privilegeName,
   queryParam,
   hasMoreThanOneAssociation,
-  apiQueryParams,
-  apiQueryParamKey,
-  syncPushRequired = true,
-  syncPullRequired = true
+  apiQueryParams
 } = {}) => ({
   schemaName: clazz.schema.name,
-  entityName: entityName || clazz.schema.name,
+  entityName: clazz.schema.name,
   entityClass: clazz,
   resourceName: res || _lodash.default.camelCase(clazz.schema.name),
   resourceUrl: resUrl,
@@ -221,10 +213,41 @@ const txData = (clazz, {
   privilegeName,
   queryParam,
   hasMoreThanOneAssociation: !!hasMoreThanOneAssociation,
+  apiQueryParams
+});
+
+const virtualTxData = (clazz, {
+  res,
+  entityName,
+  resUrl,
+  parent,
+  apiVersion,
+  syncWeight,
+  privilegeParam,
+  privilegeEntity,
+  privilegeName,
+  queryParam,
+  hasMoreThanOneAssociation,
   apiQueryParams,
-  apiQueryParamKey,
-  syncPushRequired,
-  syncPullRequired
+  apiQueryParamKey
+} = {}) => ({
+  schemaName: clazz.schema.name,
+  entityName: entityName,
+  entityClass: clazz,
+  resourceName: res || _lodash.default.camelCase(clazz.schema.name),
+  resourceUrl: resUrl,
+  type: "virtualTx",
+  nameTranslated: false,
+  parent: parent,
+  apiVersion,
+  syncWeight: syncWeight,
+  privilegeParam,
+  privilegeEntity,
+  privilegeName,
+  queryParam,
+  hasMoreThanOneAssociation: !!hasMoreThanOneAssociation,
+  apiQueryParams,
+  apiQueryParamKey
 });
 
 const checklistDetail = refData(_ChecklistDetail.default, {
@@ -386,13 +409,11 @@ const groupSubject = txData(_GroupSubject.default, {
 const videoTelemetric = txData(_VideoTelemetric.default, {
   res: "videotelemetric",
   parent: video,
-  syncWeight: 0,
-  syncPullRequired: false
+  syncWeight: 0
 });
 const syncTelemetry = txData(_SyncTelemetry.default, {
   resUrl: "syncTelemetry",
-  syncWeight: 1,
-  syncPullRequired: false
+  syncWeight: 1
 });
 const userInfo = txData(_UserInfo.default, {
   resUrl: "me",
@@ -404,8 +425,7 @@ const identifierAssignment = txData(_IdentifierAssignment.default, {
 });
 const ruleFailureTelemetry = txData(_RuleFailureTelemetry.default, {
   resUrl: "ruleFailureTelemetry",
-  syncWeight: 0,
-  syncPullRequired: false
+  syncWeight: 0
 });
 const groups = refData(_Groups.default, {
   res: "groups",
@@ -470,7 +490,12 @@ const groupDashboard = refData(_GroupDashboard.default, {
   res: "groupDashboard",
   syncWeight: 0
 });
-const subjectEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
+const EntityApprovalStatusMetaData = txData(_EntityApprovalStatus.default, {
+  res: "entityApprovalStatus",
+  entityName: "EntityApprovalStatus"
+});
+exports.EntityApprovalStatusMetaData = EntityApprovalStatusMetaData;
+const subjectEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'SubjectEntityApprovalStatus',
@@ -482,10 +507,9 @@ const subjectEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   privilegeEntity: _Privilege.default.privilegeEntityType.subject,
   privilegeName: _Privilege.default.privilegeName.viewSubject,
   parent: individual,
-  syncWeight: 2,
-  syncPushRequired: false
+  syncWeight: 2
 });
-const encounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
+const encounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'EncounterEntityApprovalStatus',
@@ -497,10 +521,9 @@ const encounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
   privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
   privilegeName: _Privilege.default.privilegeName.viewVisit,
   parent: encounter,
-  syncWeight: 2,
-  syncPushRequired: false
+  syncWeight: 2
 });
-const programEncounterEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
+const programEncounterEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'ProgramEncounterEntityApprovalStatus',
@@ -512,10 +535,9 @@ const programEncounterEntityApprovalStatus = txData(_EntityApprovalStatus.defaul
   privilegeEntity: _Privilege.default.privilegeEntityType.encounter,
   privilegeName: _Privilege.default.privilegeName.viewVisit,
   parent: programEncounter,
-  syncWeight: 2,
-  syncPushRequired: false
+  syncWeight: 2
 });
-const programEnrolmentEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
+const programEnrolmentEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'ProgramEnrolmentEntityApprovalStatus',
@@ -527,10 +549,9 @@ const programEnrolmentEntityApprovalStatus = txData(_EntityApprovalStatus.defaul
   privilegeEntity: _Privilege.default.privilegeEntityType.enrolment,
   privilegeName: _Privilege.default.privilegeName.viewEnrolmentDetails,
   parent: programEnrolment,
-  syncWeight: 2,
-  syncPushRequired: false
+  syncWeight: 2
 });
-const checklistItemEntityApprovalStatus = txData(_EntityApprovalStatus.default, {
+const checklistItemEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
   entityName: 'ChecklistItemEntityApprovalStatus',
@@ -542,13 +563,7 @@ const checklistItemEntityApprovalStatus = txData(_EntityApprovalStatus.default,
   privilegeEntity: _Privilege.default.privilegeEntityType.checklist,
   privilegeName: _Privilege.default.privilegeName.viewChecklist,
   parent: checklistItem,
-  syncWeight: 2,
-  syncPushRequired: false
-});
-const entityApprovalStatus = txData(_EntityApprovalStatus.default, {
-  res: 'entityApprovalStatus',
-  syncWeight: 1,
-  syncPullRequired: false
+  syncWeight: 2
 });
 const news = txData(_News.default, {
   syncWeight: 0
@@ -630,7 +645,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, entityApprovalStatus, 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, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
   }
 
   static entitiesLoadedFromServer() {
@@ -638,11 +653,16 @@ class EntityMetaData {
   }
 
   static findByName(entityName) {
-    return _lodash.default.find(EntityMetaData.model(), entityMetadata => entityMetadata.entityName === entityName);
+    return EntityMetaData.findByNameIn(entityName, EntityMetaData.model());
+  }
+
+  static findByNameIn(entityName, modelCollection) {
+    return _lodash.default.find(modelCollection, //TODO check if this works
+    entityMetadata => entityMetadata.entityName === entityName);
   }
 
-  static getEntitiesToBePulled() {
-    return _lodash.default.filter(EntityMetaData.model(), entityMetadata => entityMetadata.syncPullRequired);
+  static allModels() {
+    return _lodash.default.concat(EntityApprovalStatusMetaData, EntityMetaData.model());
   }
 
 }

package/dist/Individual.js

@@ -51,8 +51,6 @@ 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; }
@@ -405,21 +403,23 @@ class Individual extends _BaseEntity.default {
     this.name = this.nameString;
   }
 
-  getAgeAndDateOfBirthDisplay(i18n) {
-    if (this.dateOfBirthVerified) return `${_AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n)} (${_General.default.toDisplayDate(this.dateOfBirth)})`;
-    return _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n);
-  }
-
-  getAgeInYears(asOnDate = (0, _moment.default)(), precise = false) {
-    return _AgeUtil.default.getAgeInYears(this.dateOfBirth, asOnDate, precise);
-  }
+  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();
 
-  getAgeInMonths(asOnDate = (0, _moment.default)(), precise = false) {
-    return _AgeUtil.default.getAgeInMonths(this.dateOfBirth, asOnDate, precise);
+    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);
+    }
   }
 
-  getAgeInWeeks(asOnDate = (0, _moment.default)(), precise = false) {
-    return _AgeUtil.default.getAgeInWeeks(this.dateOfBirth, asOnDate, precise);
+  getAgeAndDateOfBirthDisplay(i18n) {
+    if (this.dateOfBirthVerified) return `${this.getDisplayAge(i18n)} (${_General.default.toDisplayDate(this.dateOfBirth)})`;
+    return this.getDisplayAge(i18n);
   }
 
   getAge(asOnDate = (0, _moment.default)()) {
@@ -448,6 +448,22 @@ 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}`;
   }
@@ -802,14 +818,22 @@ class Individual extends _BaseEntity.default {
   }
 
   userProfileSubtext2(i18n) {
-    return this.isPerson() ? _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n) : "";
+    return this.isPerson() ? this.getDisplayAge(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;
   } //TODO these methods are slightly differece because of differece in UI on search result and my dashboard listing. Not taking the hit right now.
 
 
   detail1(i18n) {
     return this.isPerson() ? {
       label: "Age",
-      value: _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n)
+      value: this.getDisplayAge(i18n)
     } : {};
   }
 

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: 178,
+    schemaVersion: 177,
     migration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
 
@@ -761,12 +761,6 @@ 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

@@ -105,6 +105,12 @@ Object.defineProperty(exports, "EntityMetaData", {
     return _EntityMetaData.default;
   }
 });
+Object.defineProperty(exports, "EntityApprovalStatusMetaData", {
+  enumerable: true,
+  get: function () {
+    return _EntityMetaData.EntityApprovalStatusMetaData;
+  }
+});
 Object.defineProperty(exports, "EntityQueue", {
   enumerable: true,
   get: function () {
@@ -789,12 +795,6 @@ Object.defineProperty(exports, "DateTimeUtil", {
     return _DateTimeUtil.default;
   }
 });
-Object.defineProperty(exports, "AgeUtil", {
-  enumerable: true,
-  get: function () {
-    return _AgeUtil.default;
-  }
-});
 Object.defineProperty(exports, "CustomDashboardCache", {
   enumerable: true,
   get: function () {
@@ -834,7 +834,7 @@ var _Encounter = _interopRequireDefault(require("./Encounter"));
 
 var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
-var _EntityMetaData = _interopRequireDefault(require("./EntityMetaData"));
+var _EntityMetaData = _interopRequireWildcard(require("./EntityMetaData"));
 
 var _EntityQueue = _interopRequireDefault(require("./EntityQueue"));
 
@@ -1058,8 +1058,6 @@ var _ArrayUtil = _interopRequireDefault(require("./utility/ArrayUtil"));
 
 var _DateTimeUtil = _interopRequireDefault(require("./utility/DateTimeUtil"));
 
-var _AgeUtil = _interopRequireDefault(require("./utility/AgeUtil"));
-
 var _CustomDashboardCache = _interopRequireDefault(require("./CustomDashboardCache"));
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }

package/package.json

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

package/.github/add_to_project.yml

@@ -1,16 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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/dist/utility/AgeUtil.js

@@ -1,59 +0,0 @@
-"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;