Skip to content

Commit 3d85d00

Browse files
remilletremillet
authored
Merge pull request collectionspace#406 from lkvoong/CSC-2269ucb
CSC-2269ucb: add/update Exhibition Checklist report jrxml and payload files
2 parents 65f84e9 + a631ef8 commit 3d85d00

8 files changed

Lines changed: 436 additions & 13 deletions

‎services/report/3rdparty/jasper-cs-report/src/main/resources/tenants/bampfa/bampfaExhibitionChecklist.jrxml‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="bampfaExhibitionChecklist" language="groovy" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0ab8c86a-1229-415f-be1b-6ffb7c15b660">
3+
<parameter name="csid" class="java.lang.String">
4+
<defaultValueExpression><![CDATA["d0b6211b-8f83-4639-b441"]]></defaultValueExpression>
5+
</parameter>
6+
<queryString>
7+
<![CDATA[select
8+
ec.title exhTitle,
9+
ec.curatorialnote curatorialNote,
10+
hrc.name exhCSID,
11+
coc.objectnumber accnNumber,
12+
cob.sortableEffectiveObjectNumber accnNumberSort,
13+
con.numbervalue otherNumber,
14+
utils.getdispl(boppg.bampfaobjectproductionperson) artist,
15+
case when (cob.artistdisplayoverride is null or cob.artistdisplayoverride='') then utils.concat_artists(hrc.name)
16+
else cob.artistdisplayoverride end as artistCalc,
17+
btg.bampfaformattedtitle title,
18+
coc.physicaldescription materials,
19+
replace(mpg.dimensionsummary, '-', ' ') measurementSummary,
20+
cob.creditline,
21+
sdg.datedisplaydate dateMade,
22+
(SELECT 'https://webapps' || case when get_deplname() ~ 'qa' then '-qa' else '' end || '.cspace.berkeley.edu/bampfa/imageserver/blobs/' || mc.blobcsid || '/derivatives/Thumbnail/content'
23+
FROM relations_common rcmc
24+
LEFT OUTER JOIN hierarchy hmc ON (hmc.name = rcmc.subjectcsid)
25+
LEFT OUTER JOIN media_common mc ON (hmc.id = mc.id)
26+
LEFT OUTER JOIN media_bampfa mb ON (mc.id = mb.id)
27+
LEFT OUTER JOIN misc mmc ON (mmc.id = mc.id)
28+
LEFT OUTER JOIN collectionspace_core csc ON (mc.id = csc.id)
29+
WHERE hrc.name = rcmc.objectcsid
30+
AND rcmc.subjectdocumenttype = 'Media'
31+
AND mmc.lifecyclestate <> 'deleted'
32+
ORDER BY coalesce(mb.primarydisplay::integer, 0) DESC, csc.updatedat DESC LIMIT 1) AS imagefilepath
33+
from
34+
exhibitions_common ec
35+
INNER JOIN hierarchy hec ON (ec.id = hec.id)
36+
INNER JOIN relations_common rc ON (hec.name = rc.objectcsid)
37+
INNER JOIN hierarchy hrc ON (rc.subjectcsid = hrc.name)
38+
INNER JOIN collectionobjects_common coc ON (hrc.id = coc.id)
39+
INNER JOIN misc m ON (
40+
coc.id = m.id
41+
AND m.lifecyclestate <> 'deleted')
42+
LEFT OUTER JOIN collectionobjects_bampfa cob ON (coc.id = cob.id)
43+
LEFT OUTER JOIN hierarchy hcon ON (
44+
coc.id = hcon.parentid
45+
AND hcon.name = 'collectionobjects_common:otherNumberList'
46+
AND hcon.pos = 0)
47+
LEFT OUTER JOIN othernumber con ON (hcon.id = con.id)
48+
LEFT OUTER JOIN hierarchy hboppg ON (
49+
coc.id = hboppg.parentid
50+
AND hboppg.name = 'collectionobjects_bampfa:bampfaObjectProductionPersonGroupList'
51+
AND hboppg.pos = 0)
52+
LEFT OUTER JOIN bampfaobjectproductionpersongroup boppg ON (hboppg.id = boppg.id)
53+
LEFT OUTER JOIN hierarchy hbtg ON (
54+
coc.id = hbtg.parentid
55+
AND hbtg.name = 'collectionobjects_bampfa:bampfaTitleGroupList'
56+
AND hbtg.pos = 0)
57+
LEFT OUTER JOIN bampfatitlegroup btg ON (hbtg.id = btg.id)
58+
LEFT OUTER JOIN hierarchy hmpg ON (
59+
coc.id = hmpg.parentid
60+
AND hmpg.name = 'collectionobjects_common:measuredPartGroupList'
61+
AND hmpg.pos = 0)
62+
LEFT OUTER JOIN measuredpartgroup mpg ON (hmpg.id = mpg.id)
63+
LEFT OUTER JOIN hierarchy h2
64+
ON (h2.parentid = coc.id AND h2.name='collectionobjects_common:objectProductionDateGroupList' and h2.pos=0)
65+
LEFT OUTER JOIN structuredDateGroup sdg ON (h2.id = sdg.id)
66+
WHERE hec.name = $P{csid}
67+
order by artist, sdg.dateearliestscalarvalue, btg.bampfaformattedtitle, accnNumberSort]]>
68+
</queryString>
69+
<field name="exhtitle" class="java.lang.String"/>
70+
<field name="curatorialnote" class="java.lang.String"/>
71+
<field name="exhcsid" class="java.lang.String"/>
72+
<field name="accnnumber" class="java.lang.String"/>
73+
<field name="accnnumbersort" class="java.lang.String"/>
74+
<field name="othernumber" class="java.lang.String"/>
75+
<field name="artist" class="java.lang.String"/>
76+
<field name="artistcalc" class="java.lang.String"/>
77+
<field name="title" class="java.lang.String"/>
78+
<field name="materials" class="java.lang.String"/>
79+
<field name="measurementsummary" class="java.lang.String"/>
80+
<field name="creditline" class="java.lang.String"/>
81+
<field name="datemade" class="java.lang.String"/>
82+
<field name="imagefilepath" class="java.lang.String"/>
83+
<background>
84+
<band splitType="Stretch"/>
85+
</background>
86+
<title>
87+
<band height="72" splitType="Stretch">
88+
<staticText>
89+
<reportElement mode="Transparent" x="72" y="0" width="500" height="60" forecolor="#000000" backcolor="#006DEB" uuid="3638b213-eeba-4372-9405-798dfc760774"/>
90+
<textElement verticalAlignment="Middle" markup="none">
91+
<font fontName="SansSerif" size="16" isBold="true"/>
92+
</textElement>
93+
<text><![CDATA[UC Berkeley Art Museum and Pacific Film Archive (BAMPFA)]]></text>
94+
</staticText>
95+
<image>
96+
<reportElement x="0" y="0" width="72" height="60" uuid="3cc17746-a0d5-4ae7-8ea2-ece450b52e48">
97+
<property name="com.jaspersoft.studio.unit.width" value="px"/>
98+
</reportElement>
99+
<imageExpression><![CDATA["https://raw.githubusercontent.com/cspace-deployment/services/master/services/report/3rdparty/jasper-cs-report/src/main/resources/tenants/bampfa/images/bampfaLogo5.png"]]></imageExpression>
100+
</image>
101+
</band>
102+
</title>
103+
<columnHeader>
104+
<band height="61" splitType="Stretch">
105+
<textField isBlankWhenNull="true">
106+
<reportElement uuid="a69b575d-66e8-4e63-8c4a-1f0e21eb7801" x="0" y="0" width="563" height="20"/>
107+
<textElement>
108+
<font size="14" isBold="true"/>
109+
</textElement>
110+
<textFieldExpression><![CDATA[$F{exhtitle}]]></textFieldExpression>
111+
</textField>
112+
<textField isBlankWhenNull="true">
113+
<reportElement uuid="7a4697db-9db9-4d60-b3c0-d1ee3646e021" x="0" y="20" width="563" height="41"/>
114+
<textElement>
115+
<font size="14"/>
116+
</textElement>
117+
<textFieldExpression><![CDATA[$F{curatorialnote}]]></textFieldExpression>
118+
</textField>
119+
</band>
120+
</columnHeader>
121+
<detail>
122+
<band height="149" splitType="Stretch">
123+
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
124+
<reportElement uuid="a0fa3706-6a91-4436-8fa8-f216e96f8881" x="0" y="2" width="376" height="18"/>
125+
<textElement>
126+
<font size="12" isBold="false"/>
127+
</textElement>
128+
<textFieldExpression><![CDATA[$F{artistcalc}]]></textFieldExpression>
129+
</textField>
130+
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
131+
<reportElement uuid="a16519ac-beee-4940-a59f-9bf1026d76b3" positionType="Float" x="0" y="20" width="376" height="18" isRemoveLineWhenBlank="true"/>
132+
<textElement markup="html">
133+
<font size="12"/>
134+
</textElement>
135+
<textFieldExpression><![CDATA[$F{title}]]></textFieldExpression>
136+
</textField>
137+
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
138+
<reportElement uuid="a1890a0e-9cf0-403d-bc4f-75b8f1ee0ab9" positionType="Float" x="0" y="38" width="376" height="18" isRemoveLineWhenBlank="true"/>
139+
<textElement>
140+
<font size="12"/>
141+
</textElement>
142+
<textFieldExpression><![CDATA[$F{datemade}]]></textFieldExpression>
143+
</textField>
144+
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
145+
<reportElement uuid="b224d0c7-42e3-4224-b66e-d656406ef02c" positionType="Float" x="0" y="56" width="376" height="18" isRemoveLineWhenBlank="true"/>
146+
<textElement>
147+
<font size="12"/>
148+
</textElement>
149+
<textFieldExpression><![CDATA[$F{materials}]]></textFieldExpression>
150+
</textField>
151+
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
152+
<reportElement uuid="fb18dc65-e481-45c7-b554-8f74f6e63c99" positionType="Float" x="0" y="74" width="376" height="18" isRemoveLineWhenBlank="true"/>
153+
<textElement>
154+
<font size="12"/>
155+
</textElement>
156+
<textFieldExpression><![CDATA[$F{measurementsummary}]]></textFieldExpression>
157+
</textField>
158+
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
159+
<reportElement uuid="ddd3499a-a9db-404a-be08-b7ac36b1d692" positionType="Float" x="0" y="92" width="376" height="18" isRemoveLineWhenBlank="true"/>
160+
<textElement>
161+
<font size="12"/>
162+
</textElement>
163+
<textFieldExpression><![CDATA[$F{creditline}]]></textFieldExpression>
164+
</textField>
165+
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
166+
<reportElement uuid="fa8879e7-2329-440f-a1d7-70f6dcb0db65" positionType="Float" x="0" y="110" width="376" height="18" isRemoveLineWhenBlank="true"/>
167+
<textElement>
168+
<font size="12"/>
169+
</textElement>
170+
<textFieldExpression><![CDATA[$F{accnnumber}]]></textFieldExpression>
171+
</textField>
172+
<line>
173+
<reportElement uuid="ff59ac77-e327-4c0a-9738-94af445c6901" x="0" y="1" width="572" height="1"/>
174+
</line>
175+
<image onErrorType="Blank">
176+
<reportElement uuid="b16495a5-80af-4b77-ae76-11314f16c07d" positionType="Float" x="403" y="7" width="168" height="137"/>
177+
<imageExpression><![CDATA[$F{imagefilepath}]]></imageExpression>
178+
</image>
179+
</band>
180+
</detail>
181+
<pageFooter>
182+
<band height="31" splitType="Stretch">
183+
<textField>
184+
<reportElement uuid="ef99fe65-38bd-4e69-ae03-73e5b0d2f984" x="451" y="7" width="80" height="20"/>
185+
<textElement textAlignment="Right"/>
186+
<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
187+
</textField>
188+
<textField evaluationTime="Report">
189+
<reportElement uuid="a4634996-9d1a-4f6b-bcf6-6a9ec8e86366" x="531" y="7" width="40" height="20"/>
190+
<textElement/>
191+
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
192+
</textField>
193+
<textField pattern="MM/dd/yyyy">
194+
<reportElement uuid="b5afac7d-1ca0-4052-a5fe-5ce574591638" x="0" y="7" width="177" height="20"/>
195+
<textElement/>
196+
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
197+
</textField>
198+
</band>
199+
</pageFooter>
200+
</jasperReport>

‎services/report/3rdparty/jasper-cs-report/src/main/resources/tenants/bampfa/bampfaExhibitionChecklistGroup.jrxml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="bampfaExhibitionChecklistGroup" language="groovy" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0ab8c86a-1229-415f-be1b-6ffb7c15b660">
3-
<property name="ireport.zoom" value="1.0"/>
4-
<property name="ireport.x" value="0"/>
5-
<property name="ireport.y" value="0"/>
63
<parameter name="groupcsid" class="java.lang.String">
74
<defaultValueExpression><![CDATA["d0b6211b-8f83-4639-b441"]]></defaultValueExpression>
85
</parameter>
@@ -22,7 +19,7 @@
2219
replace(mpg.dimensionsummary, '-', ' ') measurementSummary,
2320
cob.creditline,
2421
sdg.datedisplaydate dateMade,
25-
(SELECT 'https://webapps' || case when get_deplname() ~ 'qa' then '-qa' else '' end || '.cspace.berkeley.edu/bampfa/imageserver/blobs/' || mc.blobcsid || '/derivatives/Medium/content'
22+
(SELECT 'https://webapps' || case when get_deplname() ~ 'qa' then '-qa' else '' end || '.cspace.berkeley.edu/bampfa/imageserver/blobs/' || mc.blobcsid || '/derivatives/Thumbnail/content'
2623
FROM relations_common rcmc
2724
LEFT OUTER JOIN hierarchy hmc ON (hmc.name = rcmc.subjectcsid)
2825
LEFT OUTER JOIN media_common mc ON (hmc.id = mc.id)
@@ -99,7 +96,7 @@ order by artist, sdg.dateearliestscalarvalue, btg.bampfaformattedtitle, accnNumb
9996
<reportElement x="0" y="0" width="72" height="60" uuid="3cc17746-a0d5-4ae7-8ea2-ece450b52e48">
10097
<property name="com.jaspersoft.studio.unit.width" value="px"/>
10198
</reportElement>
102-
<imageExpression><![CDATA["https://raw.githubusercontent.com/cspace-deployment/services/master/services/report/3rdparty/jasper-cs-report/src/main/resources/tenants/bampfa/images/bampfaLogo2.svg"]]></imageExpression>
99+
<imageExpression><![CDATA["https://raw.githubusercontent.com/cspace-deployment/services/master/services/report/3rdparty/jasper-cs-report/src/main/resources/tenants/bampfa/images/bampfaLogo5.png"]]></imageExpression>
103100
</image>
104101
</band>
105102
</title>

‎services/report/3rdparty/jasper-cs-report/src/main/resources/tenants/bampfa/bampfaExhibitionChecklistGroupSingleArtist.jrxml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="bampfaExhibitionChecklistGroup" language="groovy" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0ab8c86a-1229-415f-be1b-6ffb7c15b660">
3-
<property name="ireport.zoom" value="1.0"/>
4-
<property name="ireport.x" value="0"/>
5-
<property name="ireport.y" value="0"/>
2+
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="bampfaExhibitionChecklistGroupSingleArtist" language="groovy" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0ab8c86a-1229-415f-be1b-6ffb7c15b660">
63
<parameter name="groupcsid" class="java.lang.String">
74
<defaultValueExpression><![CDATA["d0b6211b-8f83-4639-b441"]]></defaultValueExpression>
85
</parameter>
@@ -22,7 +19,7 @@
2219
replace(mpg.dimensionsummary, '-', ' ') measurementSummary,
2320
cob.creditline,
2421
sdg.datedisplaydate dateMade,
25-
(SELECT 'https://webapps' || case when get_deplname() ~ 'qa' then '-qa' else '' end || '.cspace.berkeley.edu/bampfa/imageserver/blobs/' || mc.blobcsid || '/derivatives/Medium/content'
22+
(SELECT 'https://webapps' || case when get_deplname() ~ 'qa' then '-qa' else '' end || '.cspace.berkeley.edu/bampfa/imageserver/blobs/' || mc.blobcsid || '/derivatives/Thumbnail/content'
2623
FROM relations_common rcmc
2724
LEFT OUTER JOIN hierarchy hmc ON (hmc.name = rcmc.subjectcsid)
2825
LEFT OUTER JOIN media_common mc ON (hmc.id = mc.id)
@@ -97,7 +94,7 @@ order by sdg.dateearliestscalarvalue, btg.bampfaformattedtitle, accnNumberSort]]
9794
</staticText>
9895
<image>
9996
<reportElement x="0" y="0" width="72" height="60" uuid="1220223e-942a-4027-954c-2676ef7ce1bc"/>
100-
<imageExpression><![CDATA["https://raw.githubusercontent.com/cspace-deployment/services/master/services/report/3rdparty/jasper-cs-report/src/main/resources/tenants/bampfa/images/bampfaLogo2.svg"]]></imageExpression>
97+
<imageExpression><![CDATA["https://raw.githubusercontent.com/cspace-deployment/services/master/services/report/3rdparty/jasper-cs-report/src/main/resources/tenants/bampfa/images/bampfaLogo5.png"]]></imageExpression>
10198
</image>
10299
</band>
103100
</title>

0 commit comments

Comments
 (0)