openchs-models 1.31.91 → 1.31.93

package/dist/ReportCard.js

@@ -199,6 +199,22 @@ class ReportCard extends _BaseEntity.default {
     return this.isStandardReportType() && this.standardReportCardType.isRecentType();
   }
 
+  hasInputForSubject() {
+    return this.standardReportCardInputSubjectTypes.length > 0;
+  }
+
+  hasInputForEnrolment() {
+    return this.standardReportCardInputPrograms.length > 0;
+  }
+
+  hasInputForProgramEncounter() {
+    return this.hasInputForEnrolment() && this.standardReportCardInputEncounterTypes.length > 0;
+  }
+
+  hasInputForGeneralEncounter() {
+    return this.standardReportCardInputEncounterTypes.length > 0;
+  }
+
 }
 
 _defineProperty(ReportCard, "schema", {

package/dist/StandardReportCardType.js

@@ -121,7 +121,7 @@ class StandardReportCardType extends _BaseEntity.default {
   }
 
   isSubjectTypeFilterSupported() {
-    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits].includes(this.name);
+    return [StandardReportCardType.type.ScheduledVisits, StandardReportCardType.type.OverdueVisits, StandardReportCardType.type.RecentRegistrations, StandardReportCardType.type.RecentEnrolments, StandardReportCardType.type.RecentVisits, StandardReportCardType.type.Total].includes(this.name);
   }
 
   isRecentType() {

package/dist/application/FormElementGroup.js

@@ -226,7 +226,11 @@ class FormElementGroup extends _BaseEntity.default {
   }
 
   nonVoidedFormElements() {
-    return _lodash.default.filter(this.formElements, formElement => !formElement.voided);
+    return _lodash.default.filter(this.formElements, formElement => {
+      let parentFormElement;
+      if (!_lodash.default.isNil(formElement.groupUuid)) parentFormElement = _lodash.default.find(this.formElements, fe => fe.uuid === formElement.groupUuid);
+      return !formElement.voided && (_lodash.default.isNil(parentFormElement) || !parentFormElement.voided);
+    });
   }
 
   getFormElements() {

package/package.json

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