Skip to content

Commit d61556b

Browse files
author
Continuous integration
committed
Upgrade to master
1 parent 4a75134 commit d61556b

18 files changed

Lines changed: 761 additions & 1407 deletions

‎CONST_CHANGELOG.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Information
2323
Changes to apply
2424
================
2525

26+
1. Update your jasper report project files by following those instructions:
27+
https://github.com/mapfish/mapfish-print/releases/tag/4.0.0
2628

2729
=============
2830
Version 2.9.0

‎CONST_create_template/docker-compose-lib.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ services:
6767
- HAPROXY_LOGGING_OPTIONS
6868

6969
print:
70-
image: ghcr.io/camptocamp/mapfish_print:3.33
70+
image: ghcr.io/camptocamp/mapfish_print:4.0
7171
user: www-data
7272
restart: unless-stopped
7373
environment:

‎CONST_create_template/print/print-apps/geomapfish/A3_Landscape.jrxml‎

Lines changed: 92 additions & 169 deletions
Large diffs are not rendered by default.

‎CONST_create_template/print/print-apps/geomapfish/A3_Portrait.jrxml‎

Lines changed: 81 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 6.6.0 -->
3-
<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="gmf16_A3_portrait" pageWidth="842" pageHeight="1191" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="041e6c80-82d5-4055-a560-dd402f39361f">
1+
<jasperReport name="gmf16_A3_portrait" language="java" pageWidth="842" pageHeight="1191" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="041e6c80-82d5-4055-a560-dd402f39361f">
42
<parameter name="title" class="java.lang.String"/>
53
<parameter name="username" class="java.lang.String"/>
64
<parameter name="comments" class="java.lang.String"/>
@@ -13,173 +11,105 @@
1311
<parameter name="northArrowSubReport" class="java.lang.String"/>
1412
<parameter name="timezone" class="java.lang.String"/>
1513
<parameter name="jrDataSource" class="net.sf.jasperreports.engine.JRDataSource"/>
16-
<pageHeader>
17-
<band height="28">
18-
<staticText>
19-
<reportElement x="709" y="0" width="92" height="24" uuid="d350aa9e-8da5-4a43-94a5-ea4a6deaec36">
20-
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
21-
</reportElement>
22-
<textElement textAlignment="Right">
23-
<font size="6"/>
24-
</textElement>
25-
<text><![CDATA[En-tête, sur chaque page]]></text>
26-
</staticText>
27-
<image>
28-
<reportElement x="0" y="0" width="180" height="24" uuid="9ea240ba-e965-4d07-bc48-5b2d093382f9"/>
29-
<imageExpression><![CDATA["logo.png"]]></imageExpression>
30-
</image>
31-
<textField>
32-
<reportElement x="185" y="0" width="360" height="23" uuid="7ce8d781-d008-4256-a075-ebd0bebbb83e"/>
33-
<textElement>
34-
<font size="16" isBold="true"/>
35-
</textElement>
36-
<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
37-
</textField>
38-
<textField>
39-
<reportElement x="545" y="0" width="255" height="20" uuid="5b782d9b-59cf-441b-ae26-1693d11a534f"/>
40-
<textElement textAlignment="Right">
41-
<font size="8"/>
42-
</textElement>
43-
<textFieldExpression><![CDATA[
44-
$R{date_pre} + " " + java.time.ZonedDateTime.now().format(
14+
<pageHeader height="28">
15+
<element kind="staticText" uuid="d350aa9e-8da5-4a43-94a5-ea4a6deaec36" x="709" y="0" width="92" height="24" fontSize="6.0" hTextAlign="Right">
16+
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
17+
<text><![CDATA[En-tête, sur chaque page]]></text>
18+
</element>
19+
<element kind="image" uuid="9ea240ba-e965-4d07-bc48-5b2d093382f9" x="0" y="0" width="180" height="24">
20+
<expression><![CDATA["logo.png"]]></expression>
21+
</element>
22+
<element kind="textField" uuid="7ce8d781-d008-4256-a075-ebd0bebbb83e" x="185" y="0" width="360" height="23" fontSize="16.0" bold="true">
23+
<expression><![CDATA[$P{title}]]></expression>
24+
</element>
25+
<element kind="textField" uuid="5b782d9b-59cf-441b-ae26-1693d11a534f" x="545" y="0" width="255" height="20" fontSize="8.0" hTextAlign="Right">
26+
<expression><![CDATA[$R{date_pre} + " " + java.time.ZonedDateTime.now().format(
4527
java.time.format.DateTimeFormatter.
4628
ofPattern("EEEE dd MMMM yyyy HH:mm").
4729
withLocale($P{REPORT_LOCALE}).
4830
withZone(java.time.ZoneId.of($P{timezone}))
49-
)
50-
]]></textFieldExpression>
51-
</textField>
52-
<line>
53-
<reportElement x="0" y="25" width="800" height="1" forecolor="#FA7500" uuid="ce77e4cd-7737-4406-bb3e-8186f123125e">
54-
<property name="local_mesure_unitwidth" value="pixel"/>
55-
<property name="com.jaspersoft.studio.unit.width" value="px"/>
56-
</reportElement>
57-
</line>
58-
<line>
59-
<reportElement x="0" y="27" width="800" height="1" forecolor="#FA7500" uuid="8acdb708-4911-463c-b130-cfc9b7586fef">
60-
<property name="local_mesure_unitwidth" value="pixel"/>
61-
<property name="com.jaspersoft.studio.unit.width" value="px"/>
62-
</reportElement>
63-
</line>
64-
</band>
31+
)]]></expression>
32+
</element>
33+
<element kind="line" uuid="ce77e4cd-7737-4406-bb3e-8186f123125e" x="0" y="25" width="800" height="1" forecolor="#FA7500">
34+
<property name="local_mesure_unitwidth" value="pixel"/>
35+
<property name="com.jaspersoft.studio.unit.width" value="px"/>
36+
</element>
37+
<element kind="line" uuid="8acdb708-4911-463c-b130-cfc9b7586fef" x="0" y="27" width="800" height="1" forecolor="#FA7500">
38+
<property name="local_mesure_unitwidth" value="pixel"/>
39+
<property name="com.jaspersoft.studio.unit.width" value="px"/>
40+
</element>
6541
</pageHeader>
6642
<detail>
6743
<band height="717" splitType="Stretch">
68-
<staticText>
69-
<reportElement x="706" y="0" width="95" height="20" uuid="23f391a6-adcb-40c0-8370-b5fe12c11232">
70-
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
71-
</reportElement>
72-
<textElement textAlignment="Right">
73-
<font size="6"/>
74-
</textElement>
44+
<element kind="staticText" uuid="23f391a6-adcb-40c0-8370-b5fe12c11232" x="706" y="0" width="95" height="20" fontSize="6.0" hTextAlign="Right">
45+
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
7546
<text><![CDATA[Detail band 1]]></text>
76-
</staticText>
77-
<subreport>
78-
<reportElement mode="Transparent" x="0" y="1" width="800" height="675" uuid="c30e77bd-7173-4e4d-85a3-219f8d59c297">
79-
<property name="local_mesure_unitwidth" value="pixel"/>
80-
<property name="com.jaspersoft.studio.unit.width" value="px"/>
81-
</reportElement>
82-
<subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression>
83-
</subreport>
84-
<subreport>
85-
<reportElement x="758" y="630" width="40" height="40" uuid="0fae1157-6844-4e51-9e64-b0cf1fdfcc86"/>
86-
<subreportExpression><![CDATA[$P{northArrowSubReport}]]></subreportExpression>
87-
</subreport>
88-
<subreport>
89-
<reportElement x="5" y="650" width="150" height="20" uuid="756bf319-bd30-49bd-9e3d-631b5b6f2b6b"/>
90-
<subreportExpression><![CDATA[$P{scalebarSubReport}]]></subreportExpression>
91-
</subreport>
92-
<textField textAdjust="StretchHeight">
93-
<reportElement x="0" y="680" width="798" height="37" uuid="ea3e251d-bbb2-48ac-b144-4505165208e0"/>
94-
<textFieldExpression><![CDATA[$P{comments}]]></textFieldExpression>
95-
</textField>
96-
<break>
97-
<reportElement x="0" y="716" width="100" height="1" uuid="a7951507-1c38-49a8-b66b-47fa957727f5"/>
98-
</break>
47+
</element>
48+
<element kind="subreport" uuid="c30e77bd-7173-4e4d-85a3-219f8d59c297" x="0" y="1" width="800" height="675" mode="Transparent">
49+
<property name="local_mesure_unitwidth" value="pixel"/>
50+
<property name="com.jaspersoft.studio.unit.width" value="px"/>
51+
<expression><![CDATA[$P{mapSubReport}]]></expression>
52+
</element>
53+
<element kind="subreport" uuid="0fae1157-6844-4e51-9e64-b0cf1fdfcc86" x="758" y="630" width="40" height="40">
54+
<expression><![CDATA[$P{northArrowSubReport}]]></expression>
55+
</element>
56+
<element kind="subreport" uuid="756bf319-bd30-49bd-9e3d-631b5b6f2b6b" x="5" y="650" width="150" height="20">
57+
<expression><![CDATA[$P{scalebarSubReport}]]></expression>
58+
</element>
59+
<element kind="textField" uuid="ea3e251d-bbb2-48ac-b144-4505165208e0" x="0" y="680" width="798" height="37" textAdjust="StretchHeight">
60+
<expression><![CDATA[$P{comments}]]></expression>
61+
</element>
62+
<element kind="break" uuid="a7951507-1c38-49a8-b66b-47fa957727f5" x="0" y="716" width="100" height="1"/>
9963
</band>
10064
<band height="65">
10165
<printWhenExpression><![CDATA[!($P{jrDataSource} instanceof net.sf.jasperreports.engine.JREmptyDataSource)]]></printWhenExpression>
102-
<staticText>
103-
<reportElement x="704" y="0" width="95" height="20" uuid="74616956-d129-46f0-9fc1-52ee8c578503">
104-
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
105-
</reportElement>
106-
<textElement textAlignment="Right">
107-
<font size="6"/>
108-
</textElement>
66+
<element kind="staticText" uuid="74616956-d129-46f0-9fc1-52ee8c578503" x="704" y="0" width="95" height="20" fontSize="6.0" hTextAlign="Right">
67+
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
10968
<text><![CDATA[Detail band 2]]></text>
110-
</staticText>
111-
<subreport>
112-
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="888" height="42" uuid="1fb53a3e-a3c6-4765-9b64-0e5f306c217f"/>
69+
</element>
70+
<element kind="subreport" uuid="1fb53a3e-a3c6-4765-9b64-0e5f306c217f" x="0" y="0" width="888" height="42" stretchType="ElementGroupHeight">
11371
<dataSourceExpression><![CDATA[$P{jrDataSource}]]></dataSourceExpression>
114-
<subreportExpression><![CDATA["results.jasper"]]></subreportExpression>
115-
</subreport>
72+
<expression><![CDATA["results.jasper"]]></expression>
73+
</element>
11674
</band>
11775
<band height="82" splitType="Stretch">
11876
<printWhenExpression><![CDATA[$P{numberOfLegendRows} != 0]]></printWhenExpression>
119-
<line>
120-
<reportElement x="0" y="0" width="1" height="1" forecolor="#FFFFFF" uuid="0fb0a59f-b15a-40ff-8c77-50fd77a3abc3"/>
121-
</line>
122-
<staticText>
123-
<reportElement positionType="FixRelativeToBottom" x="703" y="0" width="95" height="20" uuid="094e2564-2140-41ea-8541-b95a3f5a6666">
124-
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
125-
</reportElement>
126-
<textElement textAlignment="Right">
127-
<font size="6"/>
128-
</textElement>
77+
<element kind="line" uuid="0fb0a59f-b15a-40ff-8c77-50fd77a3abc3" x="0" y="0" width="1" height="1" forecolor="#FFFFFF"/>
78+
<element kind="staticText" uuid="094e2564-2140-41ea-8541-b95a3f5a6666" x="703" y="0" width="95" height="20" positionType="FixRelativeToBottom" fontSize="6.0" hTextAlign="Right">
79+
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
12980
<text><![CDATA[Detail band 3]]></text>
130-
</staticText>
131-
<textField>
132-
<reportElement x="0" y="2" width="460" height="20" forecolor="#424242" uuid="29fb8881-15f4-4235-8d78-003175bd408f"/>
133-
<textElement>
134-
<font size="16" isBold="true"/>
135-
</textElement>
136-
<textFieldExpression><![CDATA[$R{legend}]]></textFieldExpression>
137-
</textField>
138-
<subreport>
139-
<reportElement stretchType="RelativeToTallestObject" x="0" y="26" width="800" height="56" uuid="4c32d050-9b4f-448e-97f0-072a4606c164">
140-
<property name="local_mesure_unitwidth" value="pixel"/>
141-
<property name="com.jaspersoft.studio.unit.width" value="px"/>
142-
</reportElement>
81+
</element>
82+
<element kind="textField" uuid="29fb8881-15f4-4235-8d78-003175bd408f" x="0" y="2" width="460" height="20" forecolor="#424242" fontSize="16.0" bold="true">
83+
<expression><![CDATA[$R{legend}]]></expression>
84+
</element>
85+
<element kind="subreport" uuid="4c32d050-9b4f-448e-97f0-072a4606c164" x="0" y="26" width="800" height="56" stretchType="ElementGroupHeight">
86+
<property name="local_mesure_unitwidth" value="pixel"/>
87+
<property name="com.jaspersoft.studio.unit.width" value="px"/>
14388
<dataSourceExpression><![CDATA[$P{legendDataSource}]]></dataSourceExpression>
144-
<subreportExpression><![CDATA[$P{legendSubReport}]]></subreportExpression>
145-
</subreport>
89+
<expression><![CDATA[$P{legendSubReport}]]></expression>
90+
</element>
14691
</band>
14792
</detail>
148-
<pageFooter>
149-
<band height="55">
150-
<line>
151-
<reportElement x="0" y="0" width="800" height="1" forecolor="#FA7500" uuid="34cbcce8-ca61-41ae-9c1d-cae2e371031d">
152-
<property name="local_mesure_unitwidth" value="pixel"/>
153-
<property name="com.jaspersoft.studio.unit.width" value="px"/>
154-
</reportElement>
155-
</line>
156-
<staticText>
157-
<reportElement positionType="FixRelativeToBottom" x="705" y="0" width="95" height="20" uuid="61f9a30e-2aaa-4209-91ea-b9d844908ee1">
158-
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
159-
</reportElement>
160-
<textElement textAlignment="Right">
161-
<font size="6"/>
162-
</textElement>
163-
<text><![CDATA[Pied de page, sur chaque page]]></text>
164-
</staticText>
165-
<textField>
166-
<reportElement x="0" y="1" width="300" height="14" uuid="323e51d1-9bf3-4a1b-961f-69c339a07d28"/>
167-
<textFieldExpression><![CDATA[$R{info}]]></textFieldExpression>
168-
</textField>
169-
<textField>
170-
<reportElement x="738" y="21" width="38" height="30" uuid="e0567a18-8d1d-4e04-9658-0eb2fb648f2f"/>
171-
<textElement textAlignment="Right" verticalAlignment="Bottom"/>
172-
<textFieldExpression><![CDATA[$R{page} + " " + $V{PAGE_NUMBER}]]></textFieldExpression>
173-
</textField>
174-
<textField evaluationTime="Report">
175-
<reportElement x="776" y="21" width="22" height="30" uuid="4574386a-cbc9-4529-896b-c402fb4236c1"/>
176-
<textElement verticalAlignment="Bottom"/>
177-
<textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
178-
</textField>
179-
<textField>
180-
<reportElement x="0" y="15" width="300" height="15" uuid="f2fb034e-297f-4107-a5f5-da84722deb70"/>
181-
<textFieldExpression><![CDATA[$P{username}]]></textFieldExpression>
182-
</textField>
183-
</band>
93+
<pageFooter height="55">
94+
<element kind="line" uuid="34cbcce8-ca61-41ae-9c1d-cae2e371031d" x="0" y="0" width="800" height="1" forecolor="#FA7500">
95+
<property name="local_mesure_unitwidth" value="pixel"/>
96+
<property name="com.jaspersoft.studio.unit.width" value="px"/>
97+
</element>
98+
<element kind="staticText" uuid="61f9a30e-2aaa-4209-91ea-b9d844908ee1" x="705" y="0" width="95" height="20" positionType="FixRelativeToBottom" fontSize="6.0" hTextAlign="Right">
99+
<printWhenExpression><![CDATA[$P{debug}]]></printWhenExpression>
100+
<text><![CDATA[Pied de page, sur chaque page]]></text>
101+
</element>
102+
<element kind="textField" uuid="323e51d1-9bf3-4a1b-961f-69c339a07d28" x="0" y="1" width="300" height="14">
103+
<expression><![CDATA[$R{info}]]></expression>
104+
</element>
105+
<element kind="textField" uuid="e0567a18-8d1d-4e04-9658-0eb2fb648f2f" x="738" y="21" width="38" height="30" hTextAlign="Right" vTextAlign="Bottom">
106+
<expression><![CDATA[$R{page} + " " + $V{PAGE_NUMBER}]]></expression>
107+
</element>
108+
<element kind="textField" uuid="4574386a-cbc9-4529-896b-c402fb4236c1" x="776" y="21" width="22" height="30" evaluationTime="Report" vTextAlign="Bottom">
109+
<expression><![CDATA[" / " + $V{PAGE_NUMBER}]]></expression>
110+
</element>
111+
<element kind="textField" uuid="f2fb034e-297f-4107-a5f5-da84722deb70" x="0" y="15" width="300" height="15">
112+
<expression><![CDATA[$P{username}]]></expression>
113+
</element>
184114
</pageFooter>
185115
</jasperReport>

0 commit comments

Comments
 (0)