From: Michael Ritter <mikejritter@users.noreply.github.com>
Date: Fri, 2 Feb 2024 01:07:45 +0000 (-0700)
Subject: DRYD-1373: Update reports that use numberofobjects (#388)
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f3e66de3d8c65df6634801449503ad8e55f26ab7;p=tmp%2Fjakarta-migration.git

DRYD-1373: Update reports that use numberofobjects (#388)
---

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 042a7a103..0f383ddb8 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
@@ -32,7 +32,7 @@
 						ptg.termdisplayname opperson,
 						objectproductionpeople,
 						datedisplaydate,
-						numberofobjects,
+						objectCountGroup.objectcount numberofobjects,
 						dimensionsummary,
 						computedcurrentlocation
 	FROM acquisitions_common ac
@@ -63,6 +63,8 @@
 	LEFT OUTER JOIN measuredpartgroup mpg ON (mpg.id = h10.id)
 	LEFT OUTER JOIN collectionspace_core core ON (coc.id = core.id)
 	LEFT OUTER JOIN misc misc ON (misc.id = coc.id)
+	LEFT OUTER JOIN hierarchy countHierarchy ON (coc.id = countHierarchy.parentid AND countHierarchy.primarytype='objectCountGroup' AND countHierarchy.pos=0)
+	LEFT OUTER JOIN objectcountgroup objectCountGroup ON (countHierarchy.id = objectCountGroup.id)
 	WHERE core.tenantid = $P{tenantid} AND misc.lifecyclestate != 'deleted'
 	AND h1.name = $P{csid}]]>
 	</queryString>
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 2ea8b5f6d..be9875810 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
@@ -32,7 +32,7 @@
 						ptg.termdisplayname opperson,
 						objectproductionpeople,
 						datedisplaydate,
-						numberofobjects,
+						objectCountGroup.objectcount numberofobjects,
 						dimensionsummary,
 						computedcurrentlocation
 	FROM conditionchecks_common cc
@@ -63,6 +63,8 @@
 	LEFT OUTER JOIN measuredpartgroup mpg ON (mpg.id = h10.id)
 	LEFT OUTER JOIN collectionspace_core core ON (coc.id = core.id)
 	LEFT OUTER JOIN misc misc ON (misc.id = coc.id)
+	LEFT OUTER JOIN hierarchy countHierarchy ON (coc.id = countHierarchy.parentid AND countHierarchy.primarytype='objectCountGroup' AND countHierarchy.pos=0)
+	LEFT OUTER JOIN objectcountgroup objectCountGroup ON (countHierarchy.id = objectCountGroup.id)
 	WHERE core.tenantid = $P{tenantid} AND misc.lifecyclestate != 'deleted'
 	AND h1.name = $P{csid}]]>
 	</queryString>
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 114597367..6b96a71ed 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
@@ -33,7 +33,7 @@
 						ptg.termdisplayname opperson,
 						objectproductionpeople,
 						datedisplaydate,
-						numberofobjects,
+						objectCountGroup.objectcount numberofobjects,
 						dimensionsummary,
 						computedcurrentlocation
 	FROM exhibitions_common ec
@@ -64,6 +64,8 @@
 	LEFT OUTER JOIN measuredpartgroup mpg ON (mpg.id = h10.id)
 	LEFT OUTER JOIN collectionspace_core core ON (coc.id = core.id)
 	LEFT OUTER JOIN misc misc ON (misc.id = coc.id)
+	LEFT OUTER JOIN hierarchy countHierarchy ON (coc.id = countHierarchy.parentid AND countHierarchy.primarytype='objectCountGroup' AND countHierarchy.pos=0)
+	LEFT OUTER JOIN objectcountgroup objectCountGroup ON (countHierarchy.id = objectCountGroup.id)
 	WHERE core.tenantid = $P{tenantid} AND misc.lifecyclestate != 'deleted'
 	AND h1.name = $P{csid}]]>
 	</queryString>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/Group_List_Basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/Group_List_Basic.jrxml
index 530263a61..ac696cd3f 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/Group_List_Basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/Group_List_Basic.jrxml
@@ -65,7 +65,7 @@
 						objectproductionperson,
 						objectproductionpeople,
 						datedisplaydate,
-						numberofobjects,
+						objectCountGroup.objectcount numberofobjects,
 						dimensionsummary,
 						computedcurrentlocation
 	FROM collectionobjects_common coc
@@ -87,6 +87,8 @@
 	LEFT OUTER JOIN structureddategroup sdg ON (sdg.id = h9.id)
 	LEFT OUTER JOIN hierarchy h10 ON (coc.id = h10.parentid AND h10.primarytype='measuredPartGroup' AND h10.pos=0)
 	LEFT OUTER JOIN measuredpartgroup mpg ON (mpg.id = h10.id)
+	LEFT OUTER JOIN hierarchy countHierarchy ON (coc.id = countHierarchy.parentid AND countHierarchy.primarytype='objectCountGroup' AND countHierarchy.pos=0)
+	LEFT OUTER JOIN objectcountgroup objectCountGroup ON (countHierarchy.id = objectCountGroup.id)
 	$P!{whereclause}]]>
 	</queryString>
 	<field name="objectnumber" class="java.lang.String"/>
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 379f94d49..59addaf0d 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
@@ -33,7 +33,7 @@
 						ptg.termdisplayname opperson,
 						objectproductionpeople,
 						datedisplaydate,
-						numberofobjects,
+						objectCountGroup.objectcount numberofobjects,
 						dimensionsummary,
 						computedcurrentlocation
 	FROM loansin_common lic
@@ -64,6 +64,8 @@
 	LEFT OUTER JOIN measuredpartgroup mpg ON (mpg.id = h10.id)
 	LEFT OUTER JOIN collectionspace_core core ON (coc.id = core.id)
 	LEFT OUTER JOIN misc misc ON (misc.id = coc.id)
+	LEFT OUTER JOIN hierarchy countHierarchy ON (coc.id = countHierarchy.parentid AND countHierarchy.primarytype='objectCountGroup' AND countHierarchy.pos=0)
+	LEFT OUTER JOIN objectcountgroup objectCountGroup ON (countHierarchy.id = objectCountGroup.id)
 	WHERE core.tenantid = $P{tenantid} AND misc.lifecyclestate != 'deleted'
 	AND h1.name = $P{csid}]]>
 	</queryString>
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 54a6f4819..b2e981fd7 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
@@ -33,7 +33,7 @@
 						ptg.termdisplayname opperson,
 						objectproductionpeople,
 						datedisplaydate,
-						numberofobjects,
+						objectCountGroup.objectcount numberofobjects,
 						dimensionsummary,
 						computedcurrentlocation
 	FROM loansout_common loc
@@ -64,6 +64,8 @@
 	LEFT OUTER JOIN measuredpartgroup mpg ON (mpg.id = h10.id)
 	LEFT OUTER JOIN collectionspace_core core ON (coc.id = core.id)
 	LEFT OUTER JOIN misc misc ON (misc.id = coc.id)
+	LEFT OUTER JOIN hierarchy countHierarchy ON (coc.id = countHierarchy.parentid AND countHierarchy.primarytype='objectCountGroup' AND countHierarchy.pos=0)
+	LEFT OUTER JOIN objectcountgroup objectCountGroup ON (countHierarchy.id = objectCountGroup.id)
 	WHERE core.tenantid = $P{tenantid} AND misc.lifecyclestate != 'deleted'
 	AND h1.name = $P{csid}]]>
 	</queryString>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/catalogue_sheet.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/catalogue_sheet.jrxml
index 4c1a7baaf..ef520a231 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/catalogue_sheet.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/catalogue_sheet.jrxml
@@ -9,7 +9,7 @@
 		<defaultValueExpression><![CDATA["341e66cc-4848-4211-afe2"]]></defaultValueExpression>
 	</parameter>
 	<queryString>
-		<![CDATA[select co_c.objectnumber, co_c.numberofobjects, co_c.collection, ltg.termname,
+		<![CDATA[select co_c.objectnumber, objectCountGroup.objectcount numberofobjects, co_c.collection, ltg.termname,
 		 co_c.editionnumber, vic.displayname, co_fa.materialtechniquedescription, tg.title, dg.datedisplaydate, string_agg(distinct oppeepg.objectproductionpeople,', '),
 		 string_agg(distinct ptg.termdisplayname,', '), string_agg(distinct oporgg.objectproductionorganization,', '), string_agg(distinct mg.material,', '), string_agg(distinct tqg.technique,', '),
 		 co_c2.objectnumber, concat(mpg.measuredpart, ' -- ',string_agg(distinct concat(dsg.dimension, ': ',dsg.value, ' ', dsg.measurementunit), '; '))
@@ -47,6 +47,8 @@ left join hierarchy as h13 on (co_c.id = h13.parentid and h13.primarytype = 'mea
 left join measuredpartgroup as mpg on (mpg.id = h13.id)
 left join hierarchy as h14 on (h13.id = h14.parentid and h14.primarytype = 'dimensionSubGroup')
 left join dimensionsubgroup as dsg on (h14.id = dsg.id)
+LEFT OUTER JOIN hierarchy countHierarchy ON (co_c.id = countHierarchy.parentid AND countHierarchy.primarytype='objectCountGroup' AND countHierarchy.pos=0)
+LEFT OUTER JOIN objectcountgroup objectCountGroup ON (countHierarchy.id = objectCountGroup.id)
 WHERE h0.name = $P{csid}
 GROUP BY co_c.objectnumber, co_c.numberofobjects, co_c.collection, ltg.termname,
 		 co_c.editionnumber, co_fa.cataloglevel, tg.title, dg.datedisplaydate, oppeepg.objectproductionpeople, co_fa.materialtechniquedescription, vic.displayname,
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.jrxml
index fde355c80..0de6c9d8c 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.jrxml
@@ -31,7 +31,7 @@
 	obj.recordstatus,
 	publishto.item AS publishto,
 	installationtype.item AS installationtype,
-	obj.numberofobjects,
+	objectCountGroup.objectcount AS numberofobjects,
 	worktype.objectname AS worktype,
 	material.material, -- deurn
 	bd.item AS briefdescription,
@@ -81,6 +81,8 @@ LEFT JOIN hierarchy material_hier on material_hier.parentid = obj.id and materia
 LEFT JOIN materialgroup material on material.id = material_hier.id
 LEFT JOIN collectionobjects_publicart_publicartcollections collections ON collections.id = obj.id AND collections.pos = 0
 LEFT JOIN collectionobjects_common_owners owners ON owners.id = obj.id AND owners.pos = 0
+LEFT JOIN hierarchy count_hier ON obj.id = count_hier.parentid AND count_hier.primarytype='objectCountGroup' AND count_hier.pos=0
+LEFT JOIN objectcountgroup objectCountGroup ON count_hier.id = objectCountGroup.id
 -- aggregate for the dimension
 LEFT JOIN (
 	SELECT
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/systematicInventory.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/systematicInventory.jrxml
index f06cd9334..9588904ea 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/systematicInventory.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/systematicInventory.jrxml
@@ -22,12 +22,14 @@
 regexp_replace(c.computedcurrentlocation, '^.*\)''(.*)''$', '\1') as storageLocation,
 replace(regexp_replace(c.computedcurrentlocation, '^.*\)''(.*)''$', '\1'), ' ', '0') as locationkey,
 c.objectnumber objectNumber,
-c.numberofobjects objectCount,
+objectCountGroup.objectcount objectCount,
 ong.objectName objectName
 FROM collectionobjects_common c
 left outer join hierarchy h1 on (c.id = h1.parentid and h1.pos=0 and h1.name='collectionobjects_common:objectNameList')
 left outer join objectnamegroup ong on (ong.id=h1.id)
 join misc ms on (c.id=ms.id and ms.lifecyclestate <> 'deleted')
+left join hierarchy count_hier ON (c.id = count_hier.parentid AND count_hier.primarytype='objectCountGroup' AND count_hier.pos=0)
+left join objectcountgroup objectCountGroup ON count_hier.id = objectCountGroup.id
 WHERE replace(regexp_replace(c.computedcurrentlocation, '^.*\)''(.*)''$', '\1'), ' ', '0') >= replace(regexp_replace($P{startLocation}, '^.*\)''(.*)''$', '\1'), ' ', '0')
   and replace(regexp_replace(c.computedcurrentlocation, '^.*\)''(.*)''$', '\1'), ' ', '0') <= replace(regexp_replace($P{endLocation}, '^.*\)''(.*)''$', '\1'), ' ', '0')
 order by locationkey, objectnumber, objectName desc]]>