Organisation_report: Only show attributes when any are available

report/Organisation_report/reportData.jrxml

@@ -210,7 +210,9 @@
 		</band>
 		<band height="19">
 			<textField>
-				<reportElement x="0" y="2" width="100" height="15" forecolor="#0033FF" uuid="4b8833cc-3fda-4a75-ae61-83fbfe995f72"/>
+				<reportElement x="0" y="2" width="100" height="15" forecolor="#0033FF" uuid="4b8833cc-3fda-4a75-ae61-83fbfe995f72">
+					<printWhenExpression><![CDATA[$P{ORGAttr} != null && !$P{ORGAttr}.equals("")]]></printWhenExpression>
+				</reportElement>
 				<textElement>
 					<font fontName="Segoe UI" size="8" isUnderline="true"/>
 				</textElement>
@@ -226,7 +228,9 @@
 				<textFieldExpression><![CDATA[$P{ORGAttr}]]></textFieldExpression>
 			</textField>
 			<frame>
-				<reportElement stretchType="RelativeToBandHeight" x="0" y="2" width="555" height="16" uuid="62244829-371e-4972-b91d-cca3c857b15e"/>
+				<reportElement stretchType="RelativeToBandHeight" x="0" y="2" width="555" height="16" isPrintInFirstWholeBand="true" uuid="62244829-371e-4972-b91d-cca3c857b15e">
+					<printWhenExpression><![CDATA[$P{ORGAttr} != null && !$P{ORGAttr}.equals("")]]></printWhenExpression>
+				</reportElement>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>