CSPACE-4263 - adding support in sample report to filter results by tenantid

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper
index d367069e5b66d7fd1fda2f98bdb9fe8ca0d1ab75..ca81228b2e6e3107993f1fe3be7a82082ddf57fa 100644 (file)
Binary files a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper and b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper differ

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
index fd48781afe8500c4ef6bcfb8da9fa3f0c0a5864d..337482b54e21f9ca898e3d3d0ca3aa81763770ff 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
@@ -17,7 +17,10 @@
                <defaultValueExpression><![CDATA[null]]></defaultValueExpression>
        </parameter>
        <parameter name="where_clause" class="java.lang.String" isForPrompting="false">
-               <defaultValueExpression><![CDATA[(($P{csid}==null||($P{csid}.length()==0))?"":" WHERE hierarchy.name = '"+$P{csid}+"'")]]></defaultValueExpression>
+               <defaultValueExpression><![CDATA[(($P{csid}==null||($P{csid}.length()==0))?"":" AND hierarchy.name = '"+$P{csid}+"'")]]></defaultValueExpression>
+       </parameter>
+       <parameter name="tenantid" class="java.lang.String">
+               <defaultValueExpression><![CDATA["1"]]></defaultValueExpression>
        </parameter>
        <queryString>
                <![CDATA[SELECT
@@ -31,6 +34,8 @@
      acquisitions_common."acquisitionreason" AS acquisitions_common_acquisitionreason
 FROM
      "public"."acquisitions_common" acquisitions_common INNER JOIN "public"."hierarchy" hierarchy ON acquisitions_common."id" = hierarchy."id"
+INNER JOIN "public"."collectionspace_core" core ON acquisitions_common."id" = core."id"
+WHERE core.tenantid = $P{tenantid}
 $P!{where_clause}]]>
        </queryString>
        <field name="acquisitions_common_originalobjectpurchasepricevalue" class="java.lang.String"/>