From: Michael Ritter Date: Tue, 7 Jan 2025 23:33:49 +0000 (-0700) Subject: Pull cultural determination from nagpra extension (#448) X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e298a0b97295fc4a65e5d70c4a6d3d6b8555171e;p=tmp%2Fjakarta-migration.git Pull cultural determination from nagpra extension (#448) --- diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/repatriation_request_consultation.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/repatriation_request_consultation.jrxml index 10eb3b4a8..633b68116 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/repatriation_request_consultation.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/repatriation_request_consultation.jrxml @@ -89,13 +89,13 @@ FROM hierarchy rr_hierarchy GROUP BY hierarchy.parentid ) partiesinvolved ON partiesinvolved.parentid = rr_hierarchy.id LEFT JOIN ( - -- Production People is overridden on anthro to use ethculture and archculture + -- Pull from the NAGPRA extension to get the cultural determination SELECT related_objects.repatriation_csid, - array_agg(people.objectproductionpeople) AS cultures + array_agg(ndg.nagpradetermculture) AS cultures FROM hierarchy INNER JOIN related_objects on related_objects.object_id = hierarchy.parentid - INNER JOIN objectproductionpeoplegroup people ON people.id = hierarchy.id - WHERE hierarchy.name = 'collectionobjects_common:objectProductionPeopleGroupList' + INNER JOIN nagpradetermgroup ndg ON ndg.id = hierarchy.id + WHERE hierarchy.name = 'collectionobjects_nagpra:nagpraDetermGroupList' GROUP BY related_objects.repatriation_csid ) culturalgroup ON culturalgroup.repatriation_csid = rr_hierarchy.name LEFT JOIN LATERAL (