openchs-models 1.31.19 → 1.31.20

package/dist/ReportCard.js

@@ -13,10 +13,16 @@ var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
 
 var _StandardReportCardType = _interopRequireDefault(require("./StandardReportCardType"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 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; }
 
+function throwInvalidIndexError(index, reportCardsLength) {
+  throw new Error(`Invalid index ${index} specified for reportCard with length ${reportCardsLength}`);
+}
+
 class ReportCard extends _BaseEntity.default {
   constructor(that = null) {
     super(that);
@@ -62,28 +68,60 @@ class ReportCard extends _BaseEntity.default {
     this.that.colour = x;
   }
 
+  get nested() {
+    return this.that.nested;
+  }
+
+  set nested(x) {
+    this.that.nested = x;
+  }
+
+  get initCountOfCards() {
+    return this.that.initCountOfCards;
+  }
+
+  set initCountOfCards(x) {
+    this.that.initCountOfCards = x;
+  }
+
   get iconName() {
     //TODO: right now not syncing the icon name uploaded from app designer.
-    return _.isNil(this.standardReportCardType) ? null : this.standardReportCardType.iconName;
+    return _lodash.default.isNil(this.standardReportCardType) ? null : this.standardReportCardType.iconName;
   }
 
   get cardColor() {
-    return _.isNil(this.standardReportCardType) ? this.colour : this.standardReportCardType.cardColor;
+    return _lodash.default.isNil(this.standardReportCardType) ? this.colour : this.standardReportCardType.cardColor;
   }
 
   get textColor() {
-    return _.isNil(this.standardReportCardType) ? '#ffffff' : this.standardReportCardType.textColor;
+    return _lodash.default.isNil(this.standardReportCardType) ? '#ffffff' : this.standardReportCardType.textColor;
+  }
+
+  getCardId(index = 0) {
+    return this.uuid + '#' + index;
+  }
+
+  getCardName(response, index = 0) {
+    return _lodash.default.get(response, `reportCards[${index}].name`) || this.name;
+  }
+
+  getCardColor(response, index = 0) {
+    return _lodash.default.get(response, `reportCards[${index}].cardColor`) || this.cardColor;
+  }
+
+  getTextColor(response, index = 0) {
+    return _lodash.default.get(response, `reportCards[${index}].textColor`) || this.textColor;
   }
 
   static fromResource(resource, entityService) {
-    const reportCard = _General.default.assignFields(resource, new ReportCard(), ["uuid", "name", "query", "description", "colour", "voided"]);
+    const reportCard = _General.default.assignFields(resource, new ReportCard(), ["uuid", "name", "query", "description", "colour", "voided", "nested", "initCountOfCards"]);
 
     reportCard.standardReportCardType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "standardReportCardUUID"), _StandardReportCardType.default.schema.name);
     return reportCard;
   }
 
   isStandardTaskType() {
-    return _.isNil(this.standardReportCardType) ? false : this.standardReportCardType.isTaskType();
+    return _lodash.default.isNil(this.standardReportCardType) ? false : this.standardReportCardType.isTaskType();
   }
 
 }
@@ -110,7 +148,18 @@ _defineProperty(ReportCard, "schema", {
     voided: {
       type: "bool",
       default: false
-    }
+    },
+    nested: {
+      type: "bool",
+      default: false,
+      optional: true
+    },
+    initCountOfCards: {
+      type: "int",
+      default: 1,
+      optional: true
+    } //Used only by nested ReportCards
+
   }
 });
 

package/dist/Schema.js

@@ -202,7 +202,7 @@ const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.de
 function createRealmConfig() {
   return {
     //order is important, should be arranged according to the dependency
-    schemaVersion: 181,
+    schemaVersion: 182,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
 
@@ -798,6 +798,13 @@ function createRealmConfig() {
           rft.entityId = null;
         });
       }
+
+      if (oldDB.schemaVersion < 182) {
+        _lodash.default.forEach(newDB.objects(_ReportCard.default.schema.name), rc => {
+          rc.nested = false;
+          rc.initCountOfCards = 1;
+        });
+      }
     }
   };
 }

package/package.json

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