From: Michael Ritter Date: Thu, 8 Jun 2023 02:17:12 +0000 (-0600) Subject: Report updates (#353) X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f8684eacba025598f10a5574e4788227ae994383;p=tmp%2Fjakarta-migration.git Report updates (#353) --- diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/deaccessions.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/deaccessions.jrxml index 6a3041ce9..237840cb4 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/deaccessions.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/deaccessions.jrxml @@ -26,7 +26,6 @@ exit.id AS id, exit.exitnote, exit.exitnumber, - exit.exitquantity, exit.exitreason, exit.packingnote, exit.deaccessiondate, @@ -51,15 +50,12 @@ SELECT ag.*, ptg.termdisplayname AS primarydisplayname, - secondaryterm.termdisplayname AS secondarydisplayname, exit.csid AS exitcsid FROM objectexits exit INNER JOIN persons_common person on person.refname = exit.disposalproposedrecipient INNER JOIN hierarchy hier on hier.id = person.id INNER JOIN hierarchy ptg_hier on ptg_hier.parentid = person.id and ptg_hier.primarytype = 'personTermGroup' and ptg_hier.pos = 0 INNER JOIN persontermgroup ptg on ptg.id = ptg_hier.id - LEFT JOIN hierarchy secterm_hier ON secterm_hier.parentid = person.id AND secterm_hier.primarytype = 'personTermGroup' AND secterm_hier.pos = 1 - LEFT JOIN persontermgroup secondaryterm ON secondaryterm.id = secterm_hier.id LEFT JOIN contacts_common contact on contact.initem = hier.name LEFT JOIN hierarchy addr_hier on addr_hier.parentid = contact.id and addr_hier.primarytype = 'addressGroup' and addr_hier.pos = 0 LEFT JOIN addressgroup ag on ag.id = addr_hier.id @@ -67,15 +63,12 @@ SELECT ag.*, ptg.termdisplayname AS primarydisplayname, - secondaryterm.termdisplayname AS secondarydisplayname, exit.csid AS exitcsid FROM objectexits exit INNER JOIN persons_common person on person.refname = exit.disposalrecipient INNER JOIN hierarchy hier on hier.id = person.id INNER JOIN hierarchy ptg_hier on ptg_hier.parentid = person.id and ptg_hier.primarytype = 'personTermGroup' and ptg_hier.pos = 0 INNER JOIN persontermgroup ptg on ptg.id = ptg_hier.id - LEFT JOIN hierarchy secterm_hier ON secterm_hier.parentid = person.id AND secterm_hier.primarytype = 'personTermGroup' AND secterm_hier.pos = 1 - LEFT JOIN persontermgroup secondaryterm ON secondaryterm.id = secterm_hier.id LEFT JOIN contacts_common contact on contact.initem = hier.name LEFT JOIN hierarchy addr_hier on addr_hier.parentid = contact.id and addr_hier.primarytype = 'addressGroup' and addr_hier.pos = 0 LEFT JOIN addressgroup ag on ag.id = addr_hier.id @@ -120,25 +113,24 @@ ), related_acquisitions AS ( SELECT acq.acquisitionreferencenumber AS acquisition, - exit.csid as exitcsid - FROM objectexits exit - INNER JOIN relations_common relation ON relation.subjectcsid = exit.csid AND relation.objectdocumenttype = 'Acquisition' + obj.csid as objcsid + FROM related_objects obj + INNER JOIN relations_common relation ON relation.subjectcsid = obj.csid AND relation.objectdocumenttype = 'Acquisition' INNER JOIN misc ON misc.id = relation.id AND misc.lifecyclestate != 'deleted' INNER JOIN hierarchy hier ON hier.name = relation.objectcsid INNER JOIN acquisitions_common acq ON acq.id = hier.id ), related_intakes AS ( SELECT intake.entrynumber AS intake, - exit.csid as exitcsid - FROM objectexits exit - INNER JOIN relations_common relation ON relation.subjectcsid = exit.csid AND relation.objectdocumenttype = 'Intake' + obj.csid as objcsid + FROM related_objects obj + INNER JOIN relations_common relation ON relation.subjectcsid = obj.csid AND relation.objectdocumenttype = 'Intake' INNER JOIN misc ON misc.id = relation.id AND misc.lifecyclestate != 'deleted' INNER JOIN hierarchy hier ON hier.name = relation.objectcsid INNER JOIN intakes_common intake ON intake.id = hier.id ) SELECT exit.exitnumber, - exit.exitquantity, exit.exitdate, exit.exitmethod, exit.exitreason, @@ -156,7 +148,6 @@ SELECT obj.briefdescription, obj.objecthistorynote, proposed_recip.primarydisplayname AS proposed_primaryname, - proposed_recip.secondarydisplayname AS proposed_secondaryname, proposed_recip.addressplace1 AS proposed_addressplace1, proposed_recip.addressplace2 AS proposed_addressplace2, proposed_recip.addresstype AS proposed_addresstype, @@ -165,7 +156,6 @@ SELECT proposed_recip.addresspostcode AS proposed_addresspostcode, proposed_recip.addressstateorprovince AS proposed_addressstateorprovince, recip.primarydisplayname AS recip_primaryname, - recip.secondarydisplayname AS recip_secondaryname, recip.addressplace1 AS recip_addressplace1, recip.addressplace2 AS recip_addressplace2, recip.addresstype AS recip_addresstype, @@ -188,19 +178,14 @@ LEFT JOIN related_objects obj ON obj.exitcsid = exit.csid LEFT JOIN related_object_media media ON media.objcsid = obj.csid LEFT JOIN proposed_recipients proposed_recip ON proposed_recip.exitcsid = exit.csid LEFT JOIN recipients recip ON recip.exitcsid = exit.csid -LEFT JOIN related_acquisitions acquisition ON acquisition.exitcsid = exit.csid -LEFT JOIN related_intakes intake ON intake.exitcsid = exit.csid]]> +LEFT JOIN related_acquisitions acquisition ON acquisition.objcsid = obj.csid +LEFT JOIN related_intakes intake ON intake.objcsid = obj.csid]]> - - - - - @@ -286,11 +271,6 @@ LEFT JOIN related_intakes intake ON intake.exitcsid = exit.csid]]> - - - - - @@ -331,11 +311,6 @@ LEFT JOIN related_intakes intake ON intake.exitcsid = exit.csid]]> - - - - - @@ -430,319 +405,298 @@ LEFT JOIN related_intakes intake ON intake.exitcsid = exit.csid]]> - + - + - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -759,12 +713,6 @@ LEFT JOIN related_intakes intake ON intake.exitcsid = exit.csid]]> - - - - - - @@ -867,12 +815,6 @@ LEFT JOIN related_intakes intake ON intake.exitcsid = exit.csid]]> - - - - - - @@ -921,12 +863,6 @@ LEFT JOIN related_intakes intake ON intake.exitcsid = exit.csid]]> - - - - - - diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.jrxml index bb53ca42b..5cdc6ecd9 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.jrxml @@ -39,7 +39,6 @@ ), person_owners AS ( SELECT ag.*, primaryterm.termdisplayname as primarydisplayname, - secondaryterm.termdisplayname as secondarydisplayname, intake.csid as intakecsid FROM intakes intake INNER JOIN intakes_common_currentowners co ON co.id = intake.id AND co.pos = 0 @@ -47,8 +46,6 @@ INNER JOIN hierarchy hier ON hier.id = person.id INNER JOIN hierarchy term_hier ON term_hier.parentid = person.id AND term_hier.primarytype = 'personTermGroup' AND term_hier.pos = 0 INNER JOIN persontermgroup primaryterm ON primaryterm.id = term_hier.id - LEFT JOIN hierarchy secterm_hier ON secterm_hier.parentid = person.id AND secterm_hier.primarytype = 'personTermGroup' AND secterm_hier.pos = 1 - LEFT JOIN persontermgroup secondaryterm ON secondaryterm.id = secterm_hier.id LEFT JOIN contacts_common contact ON contact.initem = hier.name LEFT JOIN hierarchy addr_hier ON addr_hier.parentid = contact.id AND addr_hier.primarytype = 'addressGroup' AND addr_hier.pos = 0 LEFT JOIN addressgroup ag ON ag.id = addr_hier.id @@ -78,7 +75,6 @@ INNER JOIN misc on misc.id = media.id AND misc.lifecyclestate != 'deleted' ) select owner.primarydisplayname as primarydisplayname, - owner.secondarydisplayname as secondarydisplayname, owner.addressplace1 as addressplace1, owner.addressplace2 as addressplace2, owner.addresstype as addresstype, @@ -101,11 +97,6 @@ left join related_object_media media on media.objcsid = obj.csid]]> - - - - - @@ -189,15 +180,7 @@ left join related_object_media media on media.objcsid = obj.csid]]> - - - - - - - - + - - - - - - diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.jrxml index 78f70208b..d3ed625f0 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.jrxml @@ -33,7 +33,7 @@ ELSE objectname END AS finalname, object.computedcurrentlocation, - COALESCE(loc_term.termname, org_term.termname) AS locationname, + COALESCE(loc_term.termname, place_term.termname) AS locationname, bd.item AS description, related_media.objectcsid AS mediacsid FROM collectionobjects_common object @@ -47,14 +47,14 @@ LEFT JOIN hierarchy namegroup_hier ON namegroup_hier.parentid = object.id AND na LEFT JOIN objectnamegroup namegroup ON namegroup.id = namegroup_hier.id LEFT JOIN hierarchy taxon_hier ON taxon_hier.parentid = object.id AND taxon_hier.primarytype = 'taxonomicIdentGroup' AND taxon_hier.pos = 0 LEFT JOIN taxonomicidentgroup taxon ON taxon.id = taxon_hier.id --- location +-- storage location LEFT JOIN locations_common loc ON loc.refname = object.computedcurrentlocation LEFT JOIN hierarchy loc_hier ON loc_hier.parentid = loc.id AND loc_hier.primarytype = 'locTermGroup' AND loc_hier.pos = 0 LEFT JOIN loctermgroup loc_term ON loc_term.id = loc_hier.id --- or storage if location dne -LEFT JOIN organizations_common org ON org.refname = object.computedcurrentlocation -LEFT JOIN hierarchy org_hier ON org_hier.parentid = org.id AND org_hier.primarytype = 'orgTermGroup' AND org_hier.pos = 0 -LEFT JOIN orgtermgroup org_term ON org_term.id = org_hier.id +-- or place if storage is null +LEFT JOIN places_common place ON place.refname = object.computedcurrentlocation +LEFT JOIN hierarchy place_hier ON place_hier.parentid = place.id AND place_hier.primarytype = 'placeTermGroup' AND place_hier.pos = 0 +LEFT JOIN placetermgroup place_term ON place_term.id = place_hier.id -- related media LEFT JOIN ( SELECT relation.* diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan.jrxml index 82e39f5c4..3b7b198a3 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan.jrxml @@ -1,6 +1,6 @@ - + @@ -10,7 +10,7 @@