[PATCH 1 of 2] pdf export result 3 miss vol
Wald Commits
scm-commit at wald.intevation.org
Thu Aug 23 11:02:57 CEST 2018
# HG changeset patch
# User gernotbelger
# Date 1535014914 -7200
# Node ID af163ce96eb4719b585982e0ee645338c20fed0e
# Parent 7e1fb8d0cb0da8673cbd2a635ddf938e0c32fe80
pdf export result 3 miss vol
diff -r 7e1fb8d0cb0d -r af163ce96eb4 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml
--- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml Wed Aug 22 19:12:51 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml Thu Aug 23 11:01:54 2018 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
-<!-- 2018-07-31T17:35:45 -->
+<!-- 2018-08-23T10:59:52 -->
<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="flysreport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="545" leftMargin="30" rightMargin="20" topMargin="20" bottomMargin="20">
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
@@ -25,6 +25,8 @@
<field name="meta:calculation_label" class="java.lang.String"/>
<field name="meta:calculation_name" class="java.lang.String"/>
<field name="meta:station_header" class="java.lang.String"/>
+ <field name="meta:station_from_header" class="java.lang.String"/>
+ <field name="meta:station_to_header" class="java.lang.String"/>
<field name="meta:flowdepthdevelopment_header" class="java.lang.String"/>
<field name="meta:flowdepthdevelopmentperyear_header" class="java.lang.String"/>
<field name="meta:waterleveldifference_header" class="java.lang.String"/>
@@ -125,7 +127,7 @@
</band>
</title>
<columnHeader>
- <band height="25" splitType="Stretch">
+ <band height="29" splitType="Stretch">
<line>
<reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="0" y="24" width="550" height="1"/>
</line>
@@ -133,26 +135,32 @@
<reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="80" height="24"/>
<box padding="5"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"/>
- <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$F{meta:station_from_header}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="150" height="24"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="0" width="150" height="24"/>
<box padding="5"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:channel_miss_volume_header}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="230" y="0" width="150" height="24"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="310" y="0" width="150" height="24"/>
<box padding="5"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:channel_miss_mass_header}]]></textFieldExpression>
</textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="80" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:station_to_header}]]></textFieldExpression>
+ </textField>
</band>
</columnHeader>
<detail>
- <band height="15" splitType="Prevent">
+ <band height="11" splitType="Prevent">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="80" height="15"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="-4" width="80" height="15"/>
<box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -163,7 +171,29 @@
<textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="150" height="15"/>
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="-4" width="150" height="15"/>
+ <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
+ <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="310" y="-4" width="150" height="15"/>
+ <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
+ <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="-4" width="80" height="15"/>
<box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -173,17 +203,6 @@
<textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression>
</textField>
- <textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="230" y="0" width="150" height="15"/>
- <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5">
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement textAlignment="Right" verticalAlignment="Top"/>
- <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression>
- </textField>
</band>
</detail>
<pageFooter>
diff -r 7e1fb8d0cb0d -r af163ce96eb4 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Wed Aug 22 19:12:51 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Thu Aug 23 11:01:54 2018 +0200
@@ -127,8 +127,7 @@
}
};
- public static final BunduResultType missMassTotal = new BunduResultType(I18NStrings.UNIT_TON, "bundu.export.bezugswst.csv.meta.miss.mass.total",
- "bundu.export.bezugswst.csv.meta.miss.mass") {
+ public static final BunduResultType missMassTotal = new BunduResultType(I18NStrings.UNIT_TON, "bundu.export.bezugswst.csv.meta.miss.mass.total") {
private static final long serialVersionUID = 1L;
@Override
@@ -404,7 +403,7 @@
}
};
- public static final BunduResultType missStationRangeFrom = new BunduResultType(I18NStrings.UNIT_KM, "bundu.export.bezugswst.csv.meta.miss.mass.km_from") {
+ public static final BunduResultType missStationRangeFrom = new BunduResultType(I18NStrings.UNIT_KM, "bundu.export.bezugswst.csv.meta.miss.km_from") {
private static final long serialVersionUID = 1L;
@@ -420,7 +419,7 @@
}
};
- public static final BunduResultType missStationRangeTo = new BunduResultType(I18NStrings.UNIT_KM, "bundu.export.bezugswst.csv.meta.miss.mass.km_to") {
+ public static final BunduResultType missStationRangeTo = new BunduResultType(I18NStrings.UNIT_KM, "bundu.export.bezugswst.csv.meta.miss.km_to") {
private static final long serialVersionUID = 1L;
diff -r 7e1fb8d0cb0d -r af163ce96eb4 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java Wed Aug 22 19:12:51 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java Thu Aug 23 11:01:54 2018 +0200
@@ -90,8 +90,8 @@
protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) {
/* column headings */
- exportContextPDF.addJRMetadata(source, "station_header", BunduResultType.missStationRangeFrom);
- exportContextPDF.addJRMetadata(source, "station_header", BunduResultType.missStationRangeTo);
+ exportContextPDF.addJRMetadata(source, "station_from_header", BunduResultType.missStationRangeFrom);
+ exportContextPDF.addJRMetadata(source, "station_to_header", BunduResultType.missStationRangeTo);
exportContextPDF.addJRMetadata(source, "channel_miss_volume_header", BunduResultType.missVolumeTotal);
exportContextPDF.addJRMetadata(source, "channel_miss_mass_header", BunduResultType.missMassTotal);
More information about the Dive4Elements-commits
mailing list