Skip to content

Commit b74f273

Browse files
denys1204denys1204
committed
[ODRC-129] Enlarge the requisition print header, summary and category text
QA asked for the whole printed requisition to be larger, not just the table. Bump the header block, the summary block and the category (section) header from 8pt to 12pt so the fixed text matches the largest table font. Grow the fixed cells so the taller text fits, and widen the long French summary cost-labels so they no longer truncate. At 12pt the header values no longer fit their old field widths, so the header fields are spread across the full width of the grey box instead of being packed on the left. The reporting-period column is widened enough to keep the label and the period on one line, using the space that used to be empty on the right, and it is sized for the longest French labels so it holds in either language. The grey box still reaches the band bottom, so a value that does wrap stays inside the box. The 14pt section titles are unchanged; the table stays at its column-count size (down to 8pt at the densest, a page-width limit).
1 parent 2d4f685 commit b74f273

3 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Upcoming Version / WIP
33
* [OLMIS-8176](https://openlmis.atlassian.net/browse/OLMIS-8176): Added a Pack Size column to the requisition printed report.
44

55
Improvements:
6-
* [ODRC-129](https://openlmis.atlassian.net/browse/ODRC-129): Scale the printed requisition table font to the number of displayed columns (8pt for the very densest tables, scaling up to 12pt for sparse ones) so it is readable while still fitting the page.
6+
* [ODRC-129](https://openlmis.atlassian.net/browse/ODRC-129): Enlarge the printed requisition font — the table scales with the displayed column count (8pt at the densest up to 12pt), the header, summary and category text are 12pt, and the header fields span the full width so the reporting period stays on one line in any language.
77

88
8.6.0 / 2026-08-13
99
==================

‎src/main/resources/jasperTemplates/requisition.jrxml‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -75,74 +75,74 @@
7575
<textFieldExpression><![CDATA[msg($R{report.header.reportAndRequisitionFor}, $F{programName}, $F{facilityTypeName})]]></textFieldExpression>
7676
</textField>
7777
<rectangle>
78-
<reportElement mode="Opaque" stretchType="RelativeToBandHeight" x="10" y="125" width="1142" height="50" backcolor="#C0C0C0" uuid="65fe1d4d-8334-48d2-b383-ee533c8d5742"/>
78+
<reportElement mode="Opaque" stretchType="RelativeToBandHeight" x="10" y="125" width="1142" height="55" backcolor="#C0C0C0" uuid="65fe1d4d-8334-48d2-b383-ee533c8d5742"/>
7979
<graphicElement>
8080
<pen lineWidth="0.0"/>
8181
</graphicElement>
8282
</rectangle>
8383
<textField isStretchWithOverflow="true">
84-
<reportElement x="20" y="135" width="185" height="10" uuid="9ff435e1-2db7-4309-8a64-0111b0a6decb">
84+
<reportElement x="20" y="135" width="283" height="10" uuid="9ff435e1-2db7-4309-8a64-0111b0a6decb">
8585
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
8686
</reportElement>
8787
<textElement>
88-
<font size="8" isBold="false"/>
88+
<font size="12" isBold="false"/>
8989
</textElement>
9090
<textFieldExpression><![CDATA[msg($R{report.pattern.labelledValue}, $R{report.header.facility}, " " + $F{facilityName})]]></textFieldExpression>
9191
</textField>
9292
<textField isStretchWithOverflow="true">
93-
<reportElement positionType="Float" x="20" y="155" width="185" height="10" uuid="7e9768e7-2cc9-4f1b-814f-865b39566a13"/>
93+
<reportElement positionType="Float" x="20" y="155" width="283" height="10" uuid="7e9768e7-2cc9-4f1b-814f-865b39566a13"/>
9494
<textElement>
95-
<font size="8" isBold="false"/>
95+
<font size="12" isBold="false"/>
9696
</textElement>
9797
<textFieldExpression><![CDATA[msg($R{report.pattern.labelledValue}, $R{report.header.facilityCode}, " " + $F{facilityCode})]]></textFieldExpression>
9898
</textField>
9999
<textField isStretchWithOverflow="true">
100-
<reportElement x="210" y="135" width="200" height="10" uuid="bfb9d50e-e0e4-46cc-aa4a-ea1a0f52b906">
100+
<reportElement x="313" y="135" width="282" height="10" uuid="bfb9d50e-e0e4-46cc-aa4a-ea1a0f52b906">
101101
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
102102
</reportElement>
103103
<textElement>
104-
<font size="8" isBold="false"/>
104+
<font size="12" isBold="false"/>
105105
</textElement>
106106
<textFieldExpression><![CDATA[msg($R{report.pattern.labelledValue}, $R{report.header.program}, " " + $F{programName})]]></textFieldExpression>
107107
</textField>
108108
<textField isStretchWithOverflow="true">
109-
<reportElement positionType="Float" x="210" y="155" width="200" height="10" uuid="4b3a6dad-2836-4ee3-bc07-2a1da8e16314">
109+
<reportElement positionType="Float" x="313" y="155" width="282" height="10" uuid="4b3a6dad-2836-4ee3-bc07-2a1da8e16314">
110110
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
111111
</reportElement>
112112
<textElement>
113-
<font size="8" isBold="false"/>
113+
<font size="12" isBold="false"/>
114114
</textElement>
115115
<textFieldExpression><![CDATA[msg($R{report.pattern.labelledValue}, $R{report.header.zone}, " " + $F{zoneName})]]></textFieldExpression>
116116
</textField>
117117
<textField isStretchWithOverflow="true">
118-
<reportElement x="420" y="135" width="215" height="10" uuid="f01ca8e1-24ca-4e6e-8ae5-148769220580"/>
118+
<reportElement x="605" y="135" width="345" height="10" uuid="f01ca8e1-24ca-4e6e-8ae5-148769220580"/>
119119
<textElement>
120-
<font size="8" isBold="false"/>
120+
<font size="12" isBold="false"/>
121121
</textElement>
122122
<textFieldExpression><![CDATA[msg($R{report.pattern.labelledValue}, $R{report.header.creationDate}, " " + $F{initiatedDate})]]></textFieldExpression>
123123
</textField>
124124
<textField isStretchWithOverflow="true">
125-
<reportElement positionType="Float" x="420" y="155" width="215" height="10" uuid="8195bd81-f503-402c-99fd-79861348d2ec">
125+
<reportElement positionType="Float" x="605" y="155" width="345" height="10" uuid="8195bd81-f503-402c-99fd-79861348d2ec">
126126
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
127127
</reportElement>
128128
<textElement>
129-
<font size="8" isBold="false"/>
129+
<font size="12" isBold="false"/>
130130
</textElement>
131131
<textFieldExpression><![CDATA[msg($R{report.pattern.labelledValue}, $R{report.header.reportingPeriod}, " " + $F{reportingPeriod})]]></textFieldExpression>
132132
</textField>
133133
<textField isStretchWithOverflow="true">
134-
<reportElement x="640" y="135" width="250" height="10" uuid="150c310a-e719-4dfa-a6d3-000dd5f634ac">
134+
<reportElement x="960" y="135" width="185" height="10" uuid="150c310a-e719-4dfa-a6d3-000dd5f634ac">
135135
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
136136
</reportElement>
137137
<textElement>
138-
<font size="8" isBold="false"/>
138+
<font size="12" isBold="false"/>
139139
</textElement>
140140
<textFieldExpression><![CDATA[msg($R{report.pattern.labelledValue}, $R{report.header.type}, " " + ($F{emergency} ? $R{report.value.emergency} : $R{report.value.regular}))]]></textFieldExpression>
141141
</textField>
142142
<textField isStretchWithOverflow="true">
143-
<reportElement positionType="Float" x="640" y="155" width="250" height="10" uuid="5a51fb8c-f965-48ea-9f59-7a04b8ea4688"/>
143+
<reportElement positionType="Float" x="960" y="155" width="185" height="10" uuid="5a51fb8c-f965-48ea-9f59-7a04b8ea4688"/>
144144
<textElement>
145-
<font size="8" isBold="false"/>
145+
<font size="12" isBold="false"/>
146146
</textElement>
147147
<textFieldExpression><![CDATA[msg($R{report.pattern.labelledValue}, $R{report.header.status}, " " + (str("report.value.status." + $F{status}.toLowerCase()) == null || str("report.value.status." + $F{status}.toLowerCase()).isEmpty() ? $F{status} : str("report.value.status." + $F{status}.toLowerCase())))]]></textFieldExpression>
148148
</textField>
@@ -183,14 +183,14 @@
183183
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
184184
</reportElement>
185185
<textElement textAlignment="Right">
186-
<font size="8"/>
186+
<font size="12"/>
187187
</textElement>
188188
<textFieldExpression><![CDATA[msg($R{report.controls.pageNumber}, $V{PAGE_NUMBER})]]></textFieldExpression>
189189
</textField>
190190
<textField evaluationTime="Report">
191191
<reportElement x="800" y="10" width="30" height="10" uuid="5ded44a2-6687-46fd-b29e-205ba278ca50"/>
192192
<textElement>
193-
<font size="8"/>
193+
<font size="12"/>
194194
</textElement>
195195
<textFieldExpression><![CDATA[msg($R{report.controls.pageTotal}, $V{PAGE_NUMBER})]]></textFieldExpression>
196196
</textField>
@@ -200,7 +200,7 @@
200200
<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
201201
</reportElement>
202202
<textElement textAlignment="Left" verticalAlignment="Middle">
203-
<font fontName="SansSerif" size="8"/>
203+
<font fontName="SansSerif" size="12"/>
204204
<paragraph lineSpacing="Single"/>
205205
</textElement>
206206
<textFieldExpression><![CDATA[DateTimeFormatter.ofPattern($P{dateFormat}).format(LocalDate.now())]]></textFieldExpression>
@@ -218,76 +218,76 @@
218218
<textFieldExpression><![CDATA[$R{report.title.summary}]]></textFieldExpression>
219219
</textField>
220220
<textField>
221-
<reportElement x="20" y="40" width="130" height="10" uuid="a035b2b6-8c32-4db2-89fd-6444a109b1d7"/>
221+
<reportElement x="20" y="40" width="420" height="20" uuid="a035b2b6-8c32-4db2-89fd-6444a109b1d7"/>
222222
<textElement>
223-
<font size="8"/>
223+
<font size="12"/>
224224
</textElement>
225225
<textFieldExpression><![CDATA[$R{report.summary.totalCostFullSupply}]]></textFieldExpression>
226226
</textField>
227227
<textField>
228-
<reportElement x="20" y="60" width="150" height="10" uuid="ec47a93b-983c-447f-85cf-4775e800330a"/>
228+
<reportElement x="20" y="60" width="420" height="20" uuid="ec47a93b-983c-447f-85cf-4775e800330a"/>
229229
<textElement>
230-
<font size="8"/>
230+
<font size="12"/>
231231
</textElement>
232232
<textFieldExpression><![CDATA[$R{report.summary.totalCostNonFullSupply}]]></textFieldExpression>
233233
</textField>
234234
<textField>
235-
<reportElement x="20" y="80" width="50" height="10" uuid="08e7b43c-4f44-4e33-88f6-92324585772e"/>
235+
<reportElement x="20" y="80" width="420" height="20" uuid="08e7b43c-4f44-4e33-88f6-92324585772e"/>
236236
<textElement>
237-
<font size="8"/>
237+
<font size="12"/>
238238
</textElement>
239239
<textFieldExpression><![CDATA[$R{report.summary.totalCost}]]></textFieldExpression>
240240
</textField>
241241
<textField isStretchWithOverflow="true" pattern="">
242-
<reportElement x="250" y="40" width="240" height="10" uuid="35a72954-5841-4f9b-abf2-711eea0bd17f"/>
242+
<reportElement x="450" y="40" width="240" height="10" uuid="35a72954-5841-4f9b-abf2-711eea0bd17f"/>
243243
<textElement>
244-
<font size="8" isBold="false"/>
244+
<font size="12" isBold="false"/>
245245
</textElement>
246246
<textFieldExpression><![CDATA[$F{fullSupplyTotalCost}]]></textFieldExpression>
247247
</textField>
248248
<textField isStretchWithOverflow="true" pattern="">
249-
<reportElement x="250" y="60" width="240" height="10" uuid="a6e8c1b3-5480-4e60-a44a-0c1c29e21473"/>
249+
<reportElement x="450" y="60" width="240" height="10" uuid="a6e8c1b3-5480-4e60-a44a-0c1c29e21473"/>
250250
<textElement>
251-
<font size="8" isBold="false"/>
251+
<font size="12" isBold="false"/>
252252
</textElement>
253253
<textFieldExpression><![CDATA[$F{nonFullSupplyTotalCost}]]></textFieldExpression>
254254
</textField>
255255
<textField isStretchWithOverflow="true" pattern="">
256-
<reportElement x="250" y="80" width="240" height="10" uuid="526378e0-d374-40c9-a7ec-3a20c4337a25"/>
256+
<reportElement x="450" y="80" width="240" height="10" uuid="526378e0-d374-40c9-a7ec-3a20c4337a25"/>
257257
<textElement>
258-
<font size="8" isBold="false"/>
258+
<font size="12" isBold="false"/>
259259
</textElement>
260260
<textFieldExpression><![CDATA[$F{totalCost}]]></textFieldExpression>
261261
</textField>
262262
<textField>
263-
<reportElement x="20" y="110" width="60" height="10" uuid="c7929aee-d4b2-4b69-86ea-26ffd9ea0be0"/>
263+
<reportElement x="20" y="110" width="130" height="20" uuid="c7929aee-d4b2-4b69-86ea-26ffd9ea0be0"/>
264264
<textElement>
265-
<font size="8"/>
265+
<font size="12"/>
266266
</textElement>
267267
<textFieldExpression><![CDATA[msg($R{report.pattern.label}, $R{report.summary.createdBy})]]></textFieldExpression>
268268
</textField>
269269
<textField>
270-
<reportElement x="20" y="130" width="60" height="10" uuid="09833b2c-ae0d-4a34-a608-bfeaf297a414">
270+
<reportElement x="20" y="130" width="130" height="20" uuid="09833b2c-ae0d-4a34-a608-bfeaf297a414">
271271
<printWhenExpression><![CDATA[$F{submittedBy} != null]]></printWhenExpression>
272272
</reportElement>
273273
<textElement>
274-
<font size="8"/>
274+
<font size="12"/>
275275
</textElement>
276276
<textFieldExpression><![CDATA[msg($R{report.pattern.label}, $R{report.summary.submittedBy})]]></textFieldExpression>
277277
</textField>
278278
<textField>
279-
<reportElement x="20" y="150" width="60" height="10" uuid="9544c075-f57c-4a86-8d1b-6a21f3a93963">
279+
<reportElement x="20" y="150" width="130" height="20" uuid="9544c075-f57c-4a86-8d1b-6a21f3a93963">
280280
<printWhenExpression><![CDATA[$F{authorizedBy} != null]]></printWhenExpression>
281281
</reportElement>
282282
<textElement>
283-
<font size="8"/>
283+
<font size="12"/>
284284
</textElement>
285285
<textFieldExpression><![CDATA[msg($R{report.pattern.label}, $R{report.summary.authorizedBy})]]></textFieldExpression>
286286
</textField>
287287
<textField isStretchWithOverflow="true" pattern="">
288288
<reportElement x="140" y="110" width="350" height="10" uuid="d95d5f81-476d-4445-a53c-5ebee7846625"/>
289289
<textElement>
290-
<font size="8" isBold="false"/>
290+
<font size="12" isBold="false"/>
291291
</textElement>
292292
<textFieldExpression><![CDATA[msg($R{report.message.userOnDate}, $F{initiatedBy}, $F{initiatedDate})]]></textFieldExpression>
293293
</textField>
@@ -296,7 +296,7 @@
296296
<printWhenExpression><![CDATA[$F{submittedBy} != null]]></printWhenExpression>
297297
</reportElement>
298298
<textElement>
299-
<font size="8" isBold="false"/>
299+
<font size="12" isBold="false"/>
300300
</textElement>
301301
<textFieldExpression><![CDATA[msg($R{report.message.userOnDate}, $F{submittedBy}, $F{submittedDate})]]></textFieldExpression>
302302
</textField>
@@ -305,7 +305,7 @@
305305
<printWhenExpression><![CDATA[$F{authorizedBy} != null]]></printWhenExpression>
306306
</reportElement>
307307
<textElement>
308-
<font size="8" isBold="false"/>
308+
<font size="12" isBold="false"/>
309309
</textElement>
310310
<textFieldExpression><![CDATA[msg($R{report.message.userOnDate}, $F{authorizedBy}, $F{authorizedDate})]]></textFieldExpression>
311311
</textField>

‎src/main/resources/jasperTemplates/requisitionLines.jrxml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@
6464
<group name="OrderableDisplayCategory">
6565
<groupExpression><![CDATA[$F{categoryDisplayName}]]></groupExpression>
6666
<groupHeader>
67-
<band height="10">
67+
<band height="20">
6868
<rectangle>
69-
<reportElement x="9" y="0" width="1142" height="10" backcolor="#CCCCCC" uuid="7079c950-9a76-43ee-954f-0349c39803cd">
69+
<reportElement x="9" y="0" width="1142" height="20" backcolor="#CCCCCC" uuid="7079c950-9a76-43ee-954f-0349c39803cd">
7070
<property name="com.jaspersoft.studio.unit.y" value="px"/>
7171
<property name="com.jaspersoft.studio.unit.x" value="px"/>
7272
<property name="com.jaspersoft.studio.unit.width" value="px"/>
7373
</reportElement>
7474
</rectangle>
7575
<textField isBlankWhenNull="true">
76-
<reportElement x="9" y="0" width="1142" height="10" uuid="29f84432-f48e-467d-b3fb-fc018b725111">
76+
<reportElement x="9" y="0" width="1142" height="20" uuid="29f84432-f48e-467d-b3fb-fc018b725111">
7777
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
7878
<property name="com.jaspersoft.studio.unit.y" value="px"/>
7979
<property name="com.jaspersoft.studio.unit.x" value="px"/>
8080
<property name="com.jaspersoft.studio.unit.width" value="px"/>
8181
</reportElement>
8282
<textElement textAlignment="Center">
83-
<font size="8"/>
83+
<font size="12"/>
8484
</textElement>
8585
<textFieldExpression><![CDATA[$F{categoryDisplayName}]]></textFieldExpression>
8686
</textField>

0 commit comments

Comments
 (0)