openchs-models 1.33.28 → 1.33.30

package/dist/ReportCard.js

@@ -140,6 +140,18 @@ class ReportCard extends _BaseEntity.default {
     });
     reportCard.setStandardReportCardInputRecentDurationJSON(resource.standardReportCardInputRecentDuration);
     reportCard.action = resource.action || null;
+    if (resource.actionDetail) {
+      if (resource.actionDetail.subjectTypeUUID) {
+        reportCard.actionDetailSubjectType = entityService.findByUUID(resource.actionDetail.subjectTypeUUID, _SubjectType.default.schema.name);
+      }
+      if (resource.actionDetail.programUUID) {
+        reportCard.actionDetailProgram = entityService.findByUUID(resource.actionDetail.programUUID, _Program.default.schema.name);
+      }
+      if (resource.actionDetail.encounterTypeUUID) {
+        reportCard.actionDetailEncounterType = entityService.findByUUID(resource.actionDetail.encounterTypeUUID, _EncounterType.default.schema.name);
+      }
+      reportCard.actionDetailVisitType = resource.actionDetail.visitType || null;
+    }
     return reportCard;
   }
   isStandardTaskType() {
@@ -179,11 +191,45 @@ class ReportCard extends _BaseEntity.default {
   set action(x) {
     this.that.action = x;
   }
+  get actionDetailSubjectType() {
+    return this.toEntity("actionDetailSubjectType", _SubjectType.default);
+  }
+  set actionDetailSubjectType(x) {
+    this.that.actionDetailSubjectType = this.fromObject(x);
+  }
+  get actionDetailProgram() {
+    return this.toEntity("actionDetailProgram", _Program.default);
+  }
+  set actionDetailProgram(x) {
+    this.that.actionDetailProgram = this.fromObject(x);
+  }
+  get actionDetailEncounterType() {
+    return this.toEntity("actionDetailEncounterType", _EncounterType.default);
+  }
+  set actionDetailEncounterType(x) {
+    this.that.actionDetailEncounterType = this.fromObject(x);
+  }
+  get actionDetailVisitType() {
+    return this.that.actionDetailVisitType;
+  }
+  set actionDetailVisitType(x) {
+    this.that.actionDetailVisitType = x;
+  }
+  isActionDoVisit() {
+    return this.action === ReportCard.actionTypes.DoVisit;
+  }
+  isScheduledVisitType() {
+    return this.actionDetailVisitType === ReportCard.visitTypes.Scheduled;
+  }
 }
 _defineProperty(ReportCard, "actionTypes", {
   ViewSubjectProfile: "ViewSubjectProfile",
   DoVisit: "DoVisit"
 });
+_defineProperty(ReportCard, "visitTypes", {
+  Scheduled: "Scheduled",
+  Unplanned: "Unplanned"
+});
 _defineProperty(ReportCard, "schema", {
   name: "ReportCard",
   primaryKey: "uuid",
@@ -238,6 +284,25 @@ _defineProperty(ReportCard, "schema", {
     action: {
       type: "string",
       optional: true
+    },
+    actionDetailSubjectType: {
+      type: "object",
+      objectType: "SubjectType",
+      optional: true
+    },
+    actionDetailProgram: {
+      type: "object",
+      objectType: "Program",
+      optional: true
+    },
+    actionDetailEncounterType: {
+      type: "object",
+      objectType: "EncounterType",
+      optional: true
+    },
+    actionDetailVisitType: {
+      type: "string",
+      optional: true
     }
   }
 });

package/dist/Schema.js

@@ -180,7 +180,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 208,
+    schemaVersion: 209,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
       if (oldDB.schemaVersion === VersionWithEmbeddedMigrationProblem) throw new Error(`Update from schema version ${VersionWithEmbeddedMigrationProblem} is not allowed. Please uninstall and install app.`);

package/dist/reports/ReportCardResult.js

@@ -70,11 +70,11 @@ class ReportCardResult extends _BaseEntity.default {
     reportCardResult.hasErrorMsg = hasErrorMsg;
     return reportCardResult;
   }
-  static fromQueryResult(result, reportCard) {
+  static fromQueryResult(result) {
     const reportCardResult = ReportCardResult.create(result.primaryValue, result.secondaryValue, _lodash.default.isFunction(result.lineListFunction), result.hasErrorMsg);
     if (!result.hasErrorMsg) {
       reportCardResult.cardName = result.cardName;
-      reportCardResult.cardColor = _lodash.default.isNil(result.cardColor) ? reportCard ? reportCard.colour : undefined : result.cardColor;
+      reportCardResult.cardColor = result.cardColor;
       reportCardResult.textColor = result.textColor;
     }
     return reportCardResult;

package/package.json

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