DRYD-1154: De-urn reports (#350)

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/Acq_List_Basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/Acq_List_Basic.jrxml
index f25230d52ea4a14b2264e0437c270ce6e68ceea4..042a7a1030660b874353b41fcf26a8acace2911e 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/Acq_List_Basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/Acq_List_Basic.jrxml
@@ -11,6 +11,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["objectname,objectproductionorganizationrole,objectproductionpersonrole,computedcurrentlocation"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA["101"]]></defaultValueExpression>
        </parameter>

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/CC_List_Basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/CC_List_Basic.jrxml
index ae41c6ea754de336d386c866c87f013760504724..2ea8b5f6d1ed4eef351db8631eb77dc6cf1c837e 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/CC_List_Basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/CC_List_Basic.jrxml
@@ -11,6 +11,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["objectname,objectproductionorganizationrole,objectproductionpersonrole,computedcurrentlocation"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA["101"]]></defaultValueExpression>
        </parameter>

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/Exhibition_List_Basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/Exhibition_List_Basic.jrxml
index f4e75851af03725d1fcb6ca3f2fbcb2d7d0ff41a..11459736714ba3b87342b7d6b1dbb8b6a046ac51 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/Exhibition_List_Basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/Exhibition_List_Basic.jrxml
@@ -12,6 +12,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["objectname,objectproductionorganizationrole,objectproductionpersonrole,computedcurrentlocation"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA["101"]]></defaultValueExpression>
        </parameter>

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/LoansIn_List_Basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/LoansIn_List_Basic.jrxml
index a937efb515d11ffadc71832487bb23931ac32093..379f94d49f3bd083f11bbdd339e28b6b157b7688 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/LoansIn_List_Basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/LoansIn_List_Basic.jrxml
@@ -12,6 +12,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["objectname,objectproductionorganizationrole,objectproductionpersonrole,computedcurrentlocation"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA["101"]]></defaultValueExpression>
        </parameter>

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/LoansOut_List_Basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/LoansOut_List_Basic.jrxml
index 7b572a3ff96e60a0f10d1038aa0d6b15202ebb48..941859e541fd278753c9b03c3bdbc0edd0054073 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/LoansOut_List_Basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/LoansOut_List_Basic.jrxml
@@ -12,6 +12,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["objectname,objectproductionorganizationrole,objectproductionpersonrole,computedcurrentlocation"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA["101"]]></defaultValueExpression>
        </parameter>

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreAcquisition.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreAcquisition.jrxml
index 64d93c55e5dda7a92fe422329a17b8707586a91c..44e460e825e266b81b99831df632f1f5ad824733 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreAcquisition.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreAcquisition.jrxml
@@ -7,6 +7,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["objectname,productionpeople,productionperson,productionorg"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA[15]]></defaultValueExpression>
        </parameter>
@@ -21,22 +24,13 @@ co.objectnumber AS "objectnumber",
 ong.objectName AS "objectname",
 dg.datedisplaydate AS "acquisitiondate",
 case when (bd.item is not null and bd.item <> '') then
- regexp_replace(bd.item, '^.*\)''(.*)''$', '\1')
+ bd.item
  when co.objectnumber is null then 'No objects are related to this Acquisition.'
  else ''
 end AS description,
-case when (oppp.objectproductionpeople is not null and oppp.objectproductionpeople <> '') then
- regexp_replace(oppp.objectproductionpeople, '^.*\)''(.*)''$', '\1')
- else ''
-end as productionpeople,
-case when (oppr.objectproductionperson is not null and oppr.objectproductionperson <> '') then
- regexp_replace(oppr.objectproductionperson, '^.*\)''(.*)''$', '\1')
- else ''
-end as productionperson,
-case when (opog.objectproductionorganization is not null and opog.objectproductionorganization <> '') then
- regexp_replace(opog.objectproductionorganization, '^.*\)''(.*)''$', '\1')
- else ''
-end as productionorg,
+oppp.objectproductionpeople as productionpeople,
+oppr.objectproductionperson as productionperson,
+opog.objectproductionorganization as productionorg,
 case when (aca.item is not null and aca.item <> '') then
  regexp_replace(aca.item, '^.*\)''(.*)''$', '\1')
  else ''

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreGroupObject.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreGroupObject.jrxml
index 398666745154c7f01a2d35809a57a6286bacc3bb..4a614b5e62f2feabe61ea0012ee7da8c2cfd1e34 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreGroupObject.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreGroupObject.jrxml
@@ -7,6 +7,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["objectname"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA[15]]></defaultValueExpression>
        </parameter>
@@ -25,10 +28,7 @@ h1.name AS "csid",
 co.objectnumber objectNumber,
 sd.datedisplaydate fieldCollectionDate,
 ong.objectName objectName,
-case when (bd.item is not null and bd.item <> '') then
- regexp_replace(bd.item, '^.*\)''(.*)''$', '\1')
- else ''
-end AS description
+bd.item AS description
 FROM hierarchy h1
 JOIN groups_common gc ON (gc.id=h1.id)
 LEFT OUTER JOIN relations_common rc1 ON (h1.name=rc1.subjectcsid)

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreIntake.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreIntake.jrxml
index e185cc32bc326f7f4a2c1b386606ba438daadf07..7a36a9bc2c46594271d91ed74367a7fbfcfaff8d 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreIntake.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreIntake.jrxml
@@ -7,6 +7,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["site,objectname,productionpeople"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA[15]]></defaultValueExpression>
        </parameter>
@@ -21,19 +24,10 @@ inc.entryDate entryDate,
 inc.returnDate returnDate,
 h1.name AS "csid",
 co.objectnumber AS "objectnumber",
-case when (co.fieldcollectionplace  is not null and co.fieldcollectionplace  <> '') then
- regexp_replace(co.fieldcollectionplace , '^.*\)''(.*)''$', '\1')
- else ''
-end AS site,
+co.fieldcollectionplace AS site,
 ong.objectName AS "objectname",
-case when (bd.item is not null and bd.item <> '') then
- regexp_replace(bd.item, '^.*\)''(.*)''$', '\1')
- else ''
-end AS description,
-case when (oppp.objectproductionpeople is not null and oppp.objectproductionpeople <> '') then
- regexp_replace(oppp.objectproductionpeople, '^.*\)''(.*)''$', '\1')
- else ''
-end as productionpeople
+bd.item AS description,
+oppp.objectproductionpeople AS productionpeople
 FROM hierarchy  h1
 JOIN intakes_common inc ON (inc.id=h1.id)
 LEFT OUTER JOIN relations_common rc1 ON (h1.name=rc1.subjectcsid)

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanIn.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanIn.jrxml
index e7b5454aaf24e4d72103a42a168573fde564274e..a5276e300a0ddd008ef6d581b630ab01c6796c5e 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanIn.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanIn.jrxml
@@ -7,6 +7,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["site,objectname,productionpeople"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA[15]]></defaultValueExpression>
        </parameter>
@@ -25,19 +28,10 @@ lic.loanReturnDate as loanReturnDate,
 lic.loanInNote as loanInNote,
 h1.name AS "csid",
 co.objectnumber AS "objectnumber",
-case when (co.fieldcollectionplace  is not null and co.fieldcollectionplace  <> '') then
- regexp_replace(co.fieldcollectionplace , '^.*\)''(.*)''$', '\1')
- else ''
-end AS site,
+co.fieldcollectionplace AS site,
 ong.objectName AS "objectname",
-case when (bd.item is not null and bd.item <> '') then
- regexp_replace(bd.item, '^.*\)''(.*)''$', '\1')
- else ''
-end AS description,
-case when (oppp.objectproductionpeople is not null and oppp.objectproductionpeople <> '') then
- regexp_replace(oppp.objectproductionpeople, '^.*\)''(.*)''$', '\1')
- else ''
-end as productionpeople
+bd.item AS description,
+oppp.objectproductionpeople AS productionpeople
 FROM hierarchy h1
 JOIN loansin_common lic ON (lic.id=h1.id)
 LEFT OUTER JOIN relations_common rc1 ON (h1.name=rc1.subjectcsid)

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanOut.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanOut.jrxml
index a96ad26612127f8b4ac3214cb152e89a68db3569..fa916187f194c2e5d5595a98c47e6e71cd31fc81 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanOut.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreLoanOut.jrxml
@@ -7,6 +7,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["site,objectname,productionpeople"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA[15]]></defaultValueExpression>
        </parameter>
@@ -25,19 +28,10 @@ loc.loanReturnDate loanReturnDate,
 loc.loanOutNote loanOutNote,
 h1.name AS "csid",
 co.objectnumber AS "objectnumber",
-case when (co.fieldcollectionplace  is not null and co.fieldcollectionplace  <> '') then
- regexp_replace(co.fieldcollectionplace , '^.*\)''(.*)''$', '\1')
- else ''
-end AS site,
+co.fieldcollectionplace AS site,
 ong.objectName AS "objectname",
-case when (bd.item is not null and bd.item <> '') then
- regexp_replace(bd.item, '^.*\)''(.*)''$', '\1')
- else ''
-end AS description,
-case when (oppp.objectproductionpeople is not null and oppp.objectproductionpeople <> '') then
- regexp_replace(oppp.objectproductionpeople, '^.*\)''(.*)''$', '\1')
- else ''
-end as productionpeople
+bd.item AS description,
+oppp.objectproductionpeople as productionpeople
 FROM hierarchy h1
 JOIN loansout_common loc ON (loc.id=h1.id)
 LEFT OUTER JOIN relations_common rc1 ON (h1.name=rc1.subjectcsid)

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml
index 3fe0d9871887ee544edded2ebd40bf3a0704c1e3..d70fb8d943bdef9ec1dbcf26e0a8a59b818491e4 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/coreObjectExit.jrxml
@@ -7,6 +7,9 @@
        <style name="SubTitle" forecolor="#666666" fontName="SansSerif" fontSize="18"/>
        <style name="Column header" forecolor="#666666" fontName="SansSerif" fontSize="12" isBold="true"/>
        <style name="Detail" fontName="SansSerif" fontSize="12"/>
+       <parameter name="deurnfields" class="java.lang.String" isForPrompting="false">
+               <defaultValueExpression><![CDATA["site,objectname,productionpeople"]]></defaultValueExpression>
+       </parameter>
        <parameter name="tenantid" class="java.lang.String" isForPrompting="false">
                <defaultValueExpression><![CDATA[15]]></defaultValueExpression>
        </parameter>
@@ -24,20 +27,11 @@ case when (oec.currentOwner is not null and oec.currentOwner <> '') then
 end AS owner,
 h1.name AS "csid",
 co.objectnumber AS "objectnumber",
-case when (co.fieldcollectionplace  is not null and co.fieldcollectionplace  <> '') then
- regexp_replace(co.fieldcollectionplace , '^.*\)''(.*)''$', '\1')
- else ''
-end AS site,
+co.fieldcollectionplace AS site,
 -- co.fieldcollectionnote fieldcollectionnote,
 ong.objectName AS "objectname",
-case when (bd.item is not null and bd.item <> '') then
- regexp_replace(bd.item, '^.*\)''(.*)''$', '\1')
- else ''
-end AS description,
-case when (oppp.objectproductionpeople is not null and oppp.objectproductionpeople <> '') then
- regexp_replace(oppp.objectproductionpeople, '^.*\)''(.*)''$', '\1')
- else ''
-end as productionpeople
+bd.item AS description,
+oppp.objectproductionpeople AS productionpeople
 FROM hierarchy h1
 JOIN objectexit_common oec ON (oec.id=h1.id)
 LEFT OUTER JOIN relations_common rc1 ON (h1.name=rc1.subjectcsid)