openchs-models 1.31.84 → 1.31.86

package/dist/ReportCard.js

@@ -31,6 +31,7 @@ class ReportCard extends _BaseEntity.default {
     reportCard.standardReportCardInputSubjectTypes = [];
     reportCard.standardReportCardInputPrograms = [];
     reportCard.standardReportCardInputEncounterTypes = [];
+    reportCard.standardReportCardInputRecentDuration = null;
     return reportCard;
   }
 
@@ -130,6 +131,14 @@ class ReportCard extends _BaseEntity.default {
   set standardReportCardInputEncounterTypes(x) {
     this.that.standardReportCardInputEncounterTypes = this.fromEntityList(x);
   }
+
+  get standardReportCardInputRecentDurationJSON() {
+    return JSON.parse(this.that.standardReportCardInputRecentDurationJSON);
+  }
+
+  set standardReportCardInputRecentDurationJSON(x) {
+    this.that.standardReportCardInputRecentDurationJSON = x;
+  }
   /**
    * Helper method used to generate unique key value for Nested Report Cards using UUID and Index of the Report Card.
    * The Nested Report Card's query responses would be mapped to the corresponding Dashboard Report cards using the UUID and Index.
@@ -168,6 +177,7 @@ class ReportCard extends _BaseEntity.default {
     resource.standardReportCardInputEncounterTypes.forEach(uuid => {
       reportCard.standardReportCardInputEncounterTypes.push(entityService.findByUUID(uuid, _EncounterType.default.schema.name));
     });
+    reportCard.standardReportCardInputRecentDurationJSON = resource.standardReportCardInputRecentDuration;
     return reportCard;
   }
 
@@ -183,6 +193,10 @@ class ReportCard extends _BaseEntity.default {
     return this.isStandardReportType() && this.standardReportCardType.isSubjectTypeFilterSupported();
   }
 
+  isRecentType() {
+    return this.isStandardReportType() && this.standardReportCardType.isRecentType();
+  }
+
 }
 
 _defineProperty(ReportCard, "schema", {
@@ -230,6 +244,10 @@ _defineProperty(ReportCard, "schema", {
     standardReportCardInputEncounterTypes: {
       type: "list",
       objectType: "EncounterType"
+    },
+    standardReportCardInputRecentDurationJSON: {
+      type: "string",
+      optional: true
     }
   }
 });

package/dist/Schema.js

@@ -279,7 +279,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 192,
+    schemaVersion: 193,
     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/StandardReportCardType.js

@@ -81,7 +81,7 @@ class StandardReportCardType extends _BaseEntity.default {
   }
 
   defaultTypes() {
-    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.LatestRegistrations, StandardReportCardType.type.LatestEnrolments, StandardReportCardType.type.LatestVisits, StandardReportCardType.type.Total];
+    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits, StandardReportCardType.type.Total];
   }
 
   isApprovalType() {
@@ -119,7 +119,11 @@ class StandardReportCardType extends _BaseEntity.default {
   }
 
   isSubjectTypeFilterSupported() {
-    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits].includes(this.name);
+    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits].includes(this.name);
+  }
+
+  isRecentType() {
+    return [StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits].includes(this.name);
   }
 
 }
@@ -147,9 +151,9 @@ _defineProperty(StandardReportCardType, "type", {
   Rejected: "Rejected",
   ScheduledVisits: "Scheduled visits",
   OverdueVisits: "Overdue visits",
-  LatestRegistrations: "Last 24 hours registrations",
-  LatestEnrolments: "Last 24 hours enrolments",
-  LatestVisits: "Last 24 hours visits",
+  RecentRegistrations: "Recent registrations",
+  RecentEnrolments: "Recent enrolments",
+  RecentVisits: "Recent visits",
   Total: "Total",
   Comments: "Comments",
   CallTasks: "Call tasks",
@@ -157,6 +161,8 @@ _defineProperty(StandardReportCardType, "type", {
   DueChecklist: "Due checklist"
 });
 
+_defineProperty(StandardReportCardType, "recentCardDurationUnits", ["days", "weeks", "months"]);
+
 const typeToStatusMap = {
   [StandardReportCardType.type.PendingApproval]: _ApprovalStatus.default.statuses.Pending,
   [StandardReportCardType.type.Approved]: _ApprovalStatus.default.statuses.Approved,

package/package.json

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