openchs-models 1.31.88 → 1.31.90

package/dist/Duration.js

@@ -9,13 +9,16 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
-var _SingleCodedValue = _interopRequireDefault(require("./observation/SingleCodedValue"));
-
 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; }
 
 class Duration {
+  constructor(durationValue, durationUnit) {
+    this._durationValue = durationValue;
+    this.durationUnit = durationUnit;
+  }
+
   static inDay(value) {
     return new Duration(value, Duration.Day);
   }
@@ -42,11 +45,6 @@ class Duration {
     }
   }
 
-  constructor(durationValue, durationUnit) {
-    this._durationValue = durationValue;
-    this.durationUnit = durationUnit;
-  }
-
   get isInYears() {
     return this.durationUnit === Duration.Year;
   }

package/dist/ReportCard.js

@@ -21,6 +21,8 @@ var _Program = _interopRequireDefault(require("./Program"));
 
 var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
+var _Duration = _interopRequireDefault(require("./Duration"));
+
 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; }
@@ -31,7 +33,6 @@ class ReportCard extends _BaseEntity.default {
     reportCard.standardReportCardInputSubjectTypes = [];
     reportCard.standardReportCardInputPrograms = [];
     reportCard.standardReportCardInputEncounterTypes = [];
-    reportCard.standardReportCardInputRecentDuration = null;
     return reportCard;
   }
 
@@ -132,11 +133,12 @@ class ReportCard extends _BaseEntity.default {
     this.that.standardReportCardInputEncounterTypes = this.fromEntityList(x);
   }
 
-  get standardReportCardInputRecentDurationJSON() {
-    return JSON.parse(this.that.standardReportCardInputRecentDurationJSON);
+  getStandardReportCardInputRecentDuration() {
+    const duration = JSON.parse(this.that.standardReportCardInputRecentDurationJSON);
+    return new _Duration.default(duration.value, duration.unit);
   }
 
-  set standardReportCardInputRecentDurationJSON(x) {
+  setStandardReportCardInputRecentDurationJSON(x) {
     this.that.standardReportCardInputRecentDurationJSON = x;
   }
   /**
@@ -177,7 +179,7 @@ class ReportCard extends _BaseEntity.default {
     resource.standardReportCardInputEncounterTypes.forEach(uuid => {
       reportCard.standardReportCardInputEncounterTypes.push(entityService.findByUUID(uuid, _EncounterType.default.schema.name));
     });
-    reportCard.standardReportCardInputRecentDurationJSON = resource.standardReportCardInputRecentDuration;
+    reportCard.setStandardReportCardInputRecentDurationJSON(resource.standardReportCardInputRecentDuration);
     return reportCard;
   }
 

package/dist/StandardReportCardType.js

@@ -15,6 +15,8 @@ var _ApprovalStatus = _interopRequireDefault(require("./ApprovalStatus"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _Duration = _interopRequireDefault(require("./Duration"));
+
 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; }
@@ -161,7 +163,7 @@ _defineProperty(StandardReportCardType, "type", {
   DueChecklist: "Due checklist"
 });
 
-_defineProperty(StandardReportCardType, "recentCardDurationUnits", ["days", "weeks", "months"]);
+_defineProperty(StandardReportCardType, "recentCardDurationUnits", [_Duration.default.Day, _Duration.default.Week, _Duration.default.Month]);
 
 const typeToStatusMap = {
   [StandardReportCardType.type.PendingApproval]: _ApprovalStatus.default.statuses.Pending,

package/package.json

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