diff --git a/src/common/components/EncounterTypeSelect.js b/src/common/components/EncounterTypeSelect.js
index 84b9f7d40..ae1a5e654 100644
--- a/src/common/components/EncounterTypeSelect.js
+++ b/src/common/components/EncounterTypeSelect.js
@@ -36,9 +36,11 @@ export function EncounterTypeSelect({ isMulti, selectedSubjectTypes = [], select
maxMenuHeight={200}
/>
- onChange([])}>
-
-
+ {selectedEncounterTypes.length > 0 && (
+ onChange([])}>
+
+
+ )}
);
diff --git a/src/common/components/ProgramSelect.js b/src/common/components/ProgramSelect.js
index ca523a0ee..86deb65e8 100644
--- a/src/common/components/ProgramSelect.js
+++ b/src/common/components/ProgramSelect.js
@@ -35,9 +35,11 @@ export function ProgramSelect({ isMulti, selectedSubjectTypes, selectedPrograms,
maxMenuHeight={200}
/>
- onChange([])}>
-
-
+ {selectedPrograms.length > 0 && (
+ onChange([])}>
+
+
+ )}
);
diff --git a/src/formDesigner/components/ReportCard/ReportCardList.js b/src/formDesigner/components/ReportCard/ReportCardList.js
index 02575503f..d0a9b7bda 100644
--- a/src/formDesigner/components/ReportCard/ReportCardList.js
+++ b/src/formDesigner/components/ReportCard/ReportCardList.js
@@ -3,12 +3,17 @@ import ColorValue from "../../common/ColorValue";
import ResourceListView from "../../common/ResourceListView";
import { connect } from "react-redux";
import { Privilege } from "openchs-models";
+import _ from "lodash";
const columns = [
{
title: "Name",
render: rowData => !rowData.voided && {rowData.name}
},
+ {
+ title: "Standard Report Card",
+ render: rowData => _.get(rowData, "standardReportCardType.name")
+ },
{
title: "Description",
render: rowData => rowData.description