From d6c14b363cbbe4a6b09e46e41cf78b39506f72e0 Mon Sep 17 00:00:00 2001
From: Michael Ritter <mikejritter@users.noreply.github.com>
Date: Thu, 25 May 2023 14:27:33 -0600
Subject: [PATCH] DRYD-1154: De-urn reports (#350)

---
 .../src/main/resources/Acq_List_Basic.jrxml   |  3 +++
 .../src/main/resources/CC_List_Basic.jrxml    |  3 +++
 .../resources/Exhibition_List_Basic.jrxml     |  3 +++
 .../main/resources/LoansIn_List_Basic.jrxml   |  3 +++
 .../main/resources/LoansOut_List_Basic.jrxml  |  3 +++
 .../src/main/resources/coreAcquisition.jrxml  | 20 +++++++------------
 .../src/main/resources/coreGroupObject.jrxml  |  8 ++++----
 .../src/main/resources/coreIntake.jrxml       | 18 ++++++-----------
 .../src/main/resources/coreLoanIn.jrxml       | 18 ++++++-----------
 .../src/main/resources/coreLoanOut.jrxml      | 18 ++++++-----------
 .../src/main/resources/coreObjectExit.jrxml   | 18 ++++++-----------
 11 files changed, 50 insertions(+), 65 deletions(-)

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 f25230d52..042a7a103 100644
--- 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 ae41c6ea7..2ea8b5f6d 100644
--- 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 f4e75851a..114597367 100644
--- 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 a937efb51..379f94d49 100644
--- 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 7b572a3ff..941859e54 100644
--- 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 64d93c55e..44e460e82 100644
--- 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 398666745..4a614b5e6 100644
--- 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 e185cc32b..7a36a9bc2 100644
--- 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 e7b5454aa..a5276e300 100644
--- 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 a96ad2661..fa916187f 100644
--- 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 3fe0d9871..d70fb8d94 100644
--- 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)
-- 
2.47.3