openchs-models 1.30.24 → 1.30.25

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.EntityApprovalStatusMetaData = void 0;
+exports.default = void 0;
 
 var _Concept = _interopRequireDefault(require("./Concept"));
 
@@ -490,11 +490,6 @@ const groupDashboard = refData(_GroupDashboard.default, {
   res: "groupDashboard",
   syncWeight: 0
 });
-const EntityApprovalStatusMetaData = txData(_EntityApprovalStatus.default, {
-  res: "entityApprovalStatus",
-  entityName: "EntityApprovalStatus"
-});
-exports.EntityApprovalStatusMetaData = EntityApprovalStatusMetaData;
 const subjectEntityApprovalStatus = virtualTxData(_EntityApprovalStatus.default, {
   res: "entityApprovalStatus",
   resUrl: "entityApprovalStatus",
@@ -653,18 +648,10 @@ class EntityMetaData {
   }
 
   static findByName(entityName) {
-    return EntityMetaData.findByNameIn(entityName, EntityMetaData.model());
-  }
-
-  static findByNameIn(entityName, modelCollection) {
-    return _lodash.default.find(modelCollection, //TODO check if this works
+    return _lodash.default.find(EntityMetaData.model(), //TODO check if this works
     entityMetadata => entityMetadata.entityName === entityName);
   }
 
-  static allModels() {
-    return _lodash.default.concat(EntityApprovalStatusMetaData, EntityMetaData.model());
-  }
-
 }
 
 var _default = EntityMetaData;

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,28 +405,14 @@ 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();
-
-    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);
-    }
-  }
-
   getAgeAndDateOfBirthDisplay(i18n) {
-    if (this.dateOfBirthVerified) return `${this.getDisplayAge(i18n)} (${_General.default.toDisplayDate(this.dateOfBirth)})`;
-    return this.getDisplayAge(i18n);
+    if (this.dateOfBirthVerified) return `${_AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n)} (${_General.default.toDisplayDate(this.dateOfBirth)})`;
+    return _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n);
   }
 
   getAge(asOnDate = (0, _moment.default)()) {
-    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"));
+    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"));
     return _Duration.default.inYear(0);
   }
 
@@ -448,22 +436,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}`;
   }
@@ -483,7 +455,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 (this.getAgeInYears() > 120) {
+    } else if (_AgeUtil.default.getAgeInYears(this.dateOfBirth) > 120) {
       return _ValidationResult.default.failure(Individual.validationKeys.DOB, "ageTooHigh");
     } else if (this.isRegistrationBeforeDateOfBirth) {
       return _ValidationResult.default.failure(Individual.validationKeys.DOB, "registrationBeforeDateOfBirth");
@@ -818,14 +790,14 @@ class Individual extends _BaseEntity.default {
   }
 
   userProfileSubtext2(i18n) {
-    return this.isPerson() ? this.getDisplayAge(i18n) : "";
+    return this.isPerson() ? _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n) : "";
   } //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: this.getDisplayAge(i18n)
+      value: _AgeUtil.default.getDisplayAge(this.dateOfBirth, i18n)
     } : {};
   }
 

package/dist/index.js

@@ -105,12 +105,6 @@ 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 () {
@@ -795,6 +789,12 @@ Object.defineProperty(exports, "DateTimeUtil", {
     return _DateTimeUtil.default;
   }
 });
+Object.defineProperty(exports, "AgeUtil", {
+  enumerable: true,
+  get: function () {
+    return _AgeUtil.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -828,7 +828,7 @@ var _Encounter = _interopRequireDefault(require("./Encounter"));
 
 var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
-var _EntityMetaData = _interopRequireWildcard(require("./EntityMetaData"));
+var _EntityMetaData = _interopRequireDefault(require("./EntityMetaData"));
 
 var _EntityQueue = _interopRequireDefault(require("./EntityQueue"));
 
@@ -1052,6 +1052,8 @@ var _ArrayUtil = _interopRequireDefault(require("./utility/ArrayUtil"));
 
 var _DateTimeUtil = _interopRequireDefault(require("./utility/DateTimeUtil"));
 
+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/reports/DashboardFilterConfig.js

@@ -186,10 +186,14 @@ class DashboardFilterConfig {
   validate(filterValue) {
     const inputDataType = this.getInputDataType();
 
-    if ([_Concept.default.dataType.Date, _Concept.default.dataType.DateTime, _Concept.default.dataType.Time].includes(inputDataType) && this.widget === _CustomFilter.default.widget.Range) {
+    if ([_Concept.default.dataType.Date, _Concept.default.dataType.DateTime].includes(inputDataType) && this.widget === _CustomFilter.default.widget.Range) {
       return _DateTimeUtil.default.validateDateRange(filterValue.minValue, filterValue.maxValue);
     }
 
+    if (_Concept.default.dataType.Time === inputDataType && this.widget === _CustomFilter.default.widget.Range) {
+      return _DateTimeUtil.default.validateTimeRange(filterValue.minValue, filterValue.maxValue);
+    }
+
     return [true];
   }
 

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

@@ -19,6 +19,13 @@ class DateTimeUtil {
     return [true];
   }
 
+  static validateTimeRange(fromTime, toTime) {
+    if (_lodash.default.isNil(toTime) && _lodash.default.isNil(fromTime)) return [true];
+    if (_lodash.default.isNil(toTime) || _lodash.default.isNil(fromTime)) return [false, 'bothTimeShouldBeSelectedError'];
+    if (!(0, _moment.default)(fromTime, 'HH:mm').isSameOrBefore((0, _moment.default)(toTime, 'HH:mm'))) return [false, 'startTimeGreaterThanEndError'];
+    return [true];
+  }
+
 }
 
 var _default = DateTimeUtil;

package/package.json

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