Mercurial > dive4elements > river
changeset 9539:4deb6b24f072
PDF-Export zu 2.8 Nachtrag
author | gernotbelger |
---|---|
date | Wed, 17 Oct 2018 16:00:38 +0200 |
parents | fb80fc7ec610 |
children | 0c114309d2a0 482d76aded80 |
files | artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml artifacts/doc/conf/jasper/templates/bundu.bezugswst.result2.jrxml artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractResultType.java artifacts/src/main/resources/messages.properties |
diffstat | 5 files changed, 86 insertions(+), 443 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Wed Oct 17 13:57:34 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Wed Oct 17 16:00:38 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-31T13:53:18 --> +<!-- Created with Jaspersoft Studio version 6.6.0.final using JasperReports Library version 4.5.0 --> +<!-- 2018-10-17T15:28:23 --> <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="842" pageHeight="595" orientation="Landscape" columnWidth="762" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20"> <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> @@ -99,6 +99,7 @@ <field name="data:12" class="java.lang.String"/> <field name="data:13" class="java.lang.String"/> <field name="data:14" class="java.lang.String"/> + <field name="data:15" class="java.lang.String"/> <background> <band splitType="Stretch"/> </background> @@ -119,7 +120,7 @@ <reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="-36" y="24" width="805" height="1"/> </line> <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-36" y="0" width="50" height="24"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-3" y="0" width="50" height="24"> <property name="net.sf.jasperreports.text.hyphenation" value="true"/> <property name="net.sf.jasperreports.text.save.line.breaks" value="true"/> <property name="net.sf.jasperreports.export.xls.wrap.text" value="true"/> @@ -129,95 +130,105 @@ <textFieldExpression><![CDATA[$F{meta:bezugswst_header} + "</br> [ "+$F{meta:river_unit}+"]"]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="14" y="0" width="40" height="24"/> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="47" y="0" width="40" height="24"/> <box padding="2"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:discharge_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="54" y="0" width="50" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="87" y="0" width="50" height="24"/> <box padding="2"/> <textElement textAlignment="Left" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:waterlevel_name_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="104" y="0" width="66" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="137" y="0" width="66" height="24"/> <box padding="2"/> <textElement textAlignment="Left" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:gauge_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="96" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="203" y="0" width="96" height="24"/> <box padding="2"/> <textElement textAlignment="Left" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:sounding_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="266" y="0" width="50" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="299" y="0" width="50" height="24"/> <box padding="2"/> <textElement textAlignment="Left" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:channel_lower_edge_header}+ "</br> [ "+$F{meta:river_unit}+"]"]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="316" y="0" width="45" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="349" y="0" width="45" height="24"/> <box padding="2"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:channel_min_depth_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="361" y="0" width="35" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="394" y="0" width="35" height="24"/> <box padding="2"/> <textElement textAlignment="Left" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:channel_miss_depth_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="396" y="0" width="50" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="429" y="0" width="50" height="24"/> <box padding="2"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:channel_miss_volume_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="446" y="0" width="50" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="479" y="0" width="50" height="24"/> <box padding="2"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:channel_miss_mass_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="496" y="0" width="50" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="529" y="0" width="50" height="24"/> <box padding="2"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:excavation_volume_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="546" y="0" width="50" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="579" y="0" width="50" height="24"/> <box padding="2"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:excavation_costs_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="596" y="0" width="50" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="629" y="0" width="50" height="24"/> <box padding="2"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:channel_width_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="646" y="0" width="50" height="24"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="679" y="0" width="50" height="24"/> <box padding="2"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:density_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="wOpt" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="696" y="0" width="75" height="24"/> + <reportElement key="wOpt" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="729" y="0" width="40" height="24"/> <box padding="2"/> <textElement textAlignment="Left" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:location_header}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-43" y="0" width="40" height="24"> + <property name="net.sf.jasperreports.text.hyphenation" value="true"/> + <property name="net.sf.jasperreports.text.save.line.breaks" value="true"/> + <property name="net.sf.jasperreports.export.xls.wrap.text" value="true"/> + </reportElement> + <box padding="2"/> + <textElement textAlignment="Right" verticalAlignment="Bottom"/> + <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression> + </textField> </band> </columnHeader> <detail> <band height="15" splitType="Prevent"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-36" y="0" width="50" height="15"/> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-3" y="0" width="50" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -225,10 +236,10 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Right" verticalAlignment="Top"/> - <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="14" y="0" width="40" height="15"/> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="47" y="0" width="40" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -236,21 +247,10 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Right"/> - <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="54" y="0" width="50" height="15"/> - <box padding="2"> - <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="Left"/> <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="104" y="0" width="66" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="87" y="0" width="50" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -261,7 +261,7 @@ <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="96" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="137" y="0" width="66" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -272,7 +272,7 @@ <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="266" y="0" width="50" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="203" y="0" width="96" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -283,7 +283,18 @@ <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="316" y="0" width="45" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="299" y="0" width="50" height="15"/> + <box padding="2"> + <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="Left"/> + <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="349" y="0" width="45" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -291,10 +302,10 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Right"/> - <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="361" y="0" width="35" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="394" y="0" width="35" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -302,21 +313,10 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Left"/> - <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="396" y="0" width="50" height="15"/> - <box padding="2"> - <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"/> <textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="446" y="0" width="50" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="429" y="0" width="50" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -327,7 +327,7 @@ <textFieldExpression><![CDATA[$F{data:9}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="496" y="0" width="50" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="479" y="0" width="50" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -338,7 +338,7 @@ <textFieldExpression><![CDATA[$F{data:10}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="546" y="0" width="50" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="529" y="0" width="50" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -349,7 +349,7 @@ <textFieldExpression><![CDATA[$F{data:11}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="596" y="0" width="50" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="579" y="0" width="50" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -360,7 +360,7 @@ <textFieldExpression><![CDATA[$F{data:12}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="646" y="0" width="50" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="629" y="0" width="50" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -371,7 +371,18 @@ <textFieldExpression><![CDATA[$F{data:13}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="wOpt" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="696" y="0" width="75" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="679" y="0" width="50" height="15"/> + <box padding="2"> + <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"/> + <textFieldExpression><![CDATA[$F{data:14}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="wOpt" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="729" y="0" width="40" height="15"/> <box padding="2"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -379,7 +390,18 @@ <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> </box> <textElement textAlignment="Left"/> - <textFieldExpression><![CDATA[$F{data:14}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{data:15}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="wOpt" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-43" y="0" width="40" height="15"/> + <box padding="2"> + <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"/> + <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> </band> </detail>
--- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result2.jrxml Wed Oct 17 13:57:34 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,361 +0,0 @@ -<?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-31T13:53:15 --> -<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="842" pageHeight="595" orientation="Landscape" columnWidth="762" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20"> - <property name="ireport.zoom" value="1.0"/> - <property name="ireport.x" value="0"/> - <property name="ireport.y" value="0"/> - <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto" fontSize="8"> - <paragraph lineSpacing="Single"/> - </style> - <field name="meta:totalpages" class="java.lang.Integer"/> - <field name="meta:startpageoffset" class="java.lang.Integer"/> - <field name="meta:header" class="java.lang.String"/> - <field name="meta:calcMode" class="java.lang.String"/> - <field name="meta:version_label" class="java.lang.String"/> - <field name="meta:version" class="java.lang.String"/> - <field name="meta:user_label" class="java.lang.String"/> - <field name="meta:user" class="java.lang.String"/> - <field name="meta:date_label" class="java.lang.String"/> - <field name="meta:date" class="java.lang.String"/> - <field name="meta:river_label" class="java.lang.String"/> - <field name="meta:river" class="java.lang.String"/> - <field name="meta:range_label" class="java.lang.String"/> - <field name="meta:range" class="java.lang.String"/> - <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:flowdepthdevelopment_header" class="java.lang.String"/> - <field name="meta:flowdepthdevelopmentperyear_header" class="java.lang.String"/> - <field name="meta:waterleveldifference_header" class="java.lang.String"/> - <field name="meta:waterleveldifference_header2" class="java.lang.String"/> - <field name="meta:waterleveldifference_header_label" class="java.lang.String"/> - <field name="meta:bedheightdifference_header" class="java.lang.String"/> - <field name="meta:bedheightdifference_header2" class="java.lang.String"/> - <field name="meta:bedheightdifference_header_label" class="java.lang.String"/> - <field name="meta:flowdepthcurrent_header" class="java.lang.String"/> - <field name="meta:flowdepthcurrent_header2" class="java.lang.String"/> - <field name="meta:flowdepthhistorical_header" class="java.lang.String"/> - <field name="meta:flowdepthhistorical_header2" class="java.lang.String"/> - <field name="meta:flowdepthcurrent_header_label" class="java.lang.String"/> - <field name="meta:flowdepthhistorical_header_label" class="java.lang.String"/> - <field name="meta:flowdepth_header" class="java.lang.String"/> - <field name="meta:flowdepthdevelopment" class="java.lang.String"/> - <field name="meta:flowdepthmin_header" class="java.lang.String"/> - <field name="meta:flowdepthmax_header" class="java.lang.String"/> - <field name="meta:flowdepthdevelopment_header_label" class="java.lang.String"/> - <field name="meta:flowdepth_tkh_header" class="java.lang.String"/> - <field name="meta:tkh_header" class="java.lang.String"/> - <field name="meta:tkhkind_header" class="java.lang.String"/> - <field name="meta:waterlevel_header" class="java.lang.String"/> - <field name="meta:discharge_header" class="java.lang.String"/> - <field name="meta:waterlevel_name_header" class="java.lang.String"/> - <field name="meta:gauge_header" class="java.lang.String"/> - <field name="meta:bedheight_header" class="java.lang.String"/> - <field name="meta:sounding_name_header" class="java.lang.String"/> - <field name="meta:location_header" class="java.lang.String"/> - <field name="meta:river_unit" class="java.lang.String"/> - <field name="meta:riverside_header" class="java.lang.String"/> - <field name="meta:inundationduration_header" class="java.lang.String"/> - <field name="meta:inundationduration_q_header" class="java.lang.String"/> - <field name="meta:infrastructure_height_header" class="java.lang.String"/> - <field name="meta:infrastructure_type_header" class="java.lang.String"/> - <field name="meta:w_1_header" class="java.lang.String"/> - <field name="meta:q_1_header" class="java.lang.String"/> - <field name="meta:bezeichnung_1_header" class="java.lang.String"/> - <field name="meta:duration_1_header" class="java.lang.String"/> - <field name="meta:w_2_header" class="java.lang.String"/> - <field name="meta:q_2_header" class="java.lang.String"/> - <field name="meta:bezeichnung_2_header" class="java.lang.String"/> - <field name="meta:duration_2_header" class="java.lang.String"/> - <field name="meta:w_3_header" class="java.lang.String"/> - <field name="meta:q_3_header" class="java.lang.String"/> - <field name="meta:bezeichnung_3_header" class="java.lang.String"/> - <field name="meta:duration_3_header" class="java.lang.String"/> - <field name="meta:bezugswst_result_header" class="java.lang.String"/> - <field name="meta:bezugswst_header" class="java.lang.String"/> - <field name="meta:sounding_header" class="java.lang.String"/> - <field name="meta:channel_lower_edge_header" class="java.lang.String"/> - <field name="meta:channel_min_depth_header" class="java.lang.String"/> - <field name="meta:channel_miss_depth_header" class="java.lang.String"/> - <field name="meta:channel_miss_volume_header" class="java.lang.String"/> - <field name="meta:channel_miss_mass_header" class="java.lang.String"/> - <field name="meta:excavation_volume_header" class="java.lang.String"/> - <field name="meta:excavation_costs_header" class="java.lang.String"/> - <field name="meta:channel_width_header" class="java.lang.String"/> - <field name="meta:density_header" class="java.lang.String"/> - <field name="meta:mean_bedheight_header" class="java.lang.String"/> - <field name="meta:field_header1" class="java.lang.String"/> - <field name="meta:field_header2" class="java.lang.String"/> - <field name="meta:field_header3" class="java.lang.String"/> - <field name="meta:field_header4" class="java.lang.String"/> - <field name="meta:field_header5" class="java.lang.String"/> - <field name="meta:field_header6" class="java.lang.String"/> - <field name="meta:field_header7" class="java.lang.String"/> - <field name="meta:field_header8" class="java.lang.String"/> - <field name="meta:field_header9" class="java.lang.String"/> - <field name="meta:field_header10" class="java.lang.String"/> - <field name="data:0" class="java.lang.String"/> - <field name="data:1" class="java.lang.String"/> - <field name="data:2" class="java.lang.String"/> - <field name="data:3" class="java.lang.String"/> - <field name="data:4" class="java.lang.String"/> - <field name="data:5" class="java.lang.String"/> - <field name="data:6" class="java.lang.String"/> - <field name="data:7" class="java.lang.String"/> - <field name="data:8" class="java.lang.String"/> - <field name="data:9" class="java.lang.String"/> - <field name="data:10" class="java.lang.String"/> - <field name="data:11" class="java.lang.String"/> - <field name="data:12" class="java.lang.String"/> - <field name="data:13" class="java.lang.String"/> - <field name="data:14" class="java.lang.String"/> - <background> - <band splitType="Stretch"/> - </background> - <title> - <band height="30" splitType="Stretch"> - <textField> - <reportElement style="htmlStyle" x="0" y="0" width="515" height="30"/> - <textElement> - <font size="18"/> - </textElement> - <textFieldExpression><![CDATA[$F{meta:bezugswst_result_header}]]></textFieldExpression> - </textField> - </band> - </title> - <columnHeader> - <band height="25" splitType="Stretch"> - <line> - <reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="-36" y="24" width="805" height="1"/> - </line> - <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-36" y="0" width="65" height="24"> - <property name="net.sf.jasperreports.text.hyphenation" value="true"/> - <property name="net.sf.jasperreports.text.save.line.breaks" value="true"/> - <property name="net.sf.jasperreports.export.xls.wrap.text" value="true"/> - </reportElement> - <box padding="2"/> - <textElement textAlignment="Right" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="29" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header1}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="94" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header2}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="159" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header3}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="224" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header4}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="289" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header5}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="354" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header6}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="419" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header7}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="484" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header8}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="549" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header9}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="614" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:field_header10}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="679" y="0" width="65" height="24"/> - <box padding="2"/> - <textElement textAlignment="Left" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[$F{meta:mean_bedheight_header}]]></textFieldExpression> - </textField> - </band> - </columnHeader> - <detail> - <band height="15" splitType="Prevent"> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-36" y="0" width="65" height="15"/> - <box padding="2"> - <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:0}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="29" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="94" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="159" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="224" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="289" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="354" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="419" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="484" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="549" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:9}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="614" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:10}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="679" y="0" width="65" height="15"/> - <box padding="2"> - <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="Left"/> - <textFieldExpression><![CDATA[$F{data:11}]]></textFieldExpression> - </textField> - </band> - </detail> - <pageFooter> - <band height="15" splitType="Stretch"> - <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" x="634" y="0" width="55" height="15"/> - <box topPadding="2" rightPadding="3"/> - <textElement textAlignment="Right"/> - <textFieldExpression><![CDATA[$V{PAGE_NUMBER} +(($F{meta:startpageoffset} != null) ? $F{meta:startpageoffset} : 0 )]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" evaluationTime="Report"> - <reportElement style="htmlStyle" x="690" y="0" width="57" height="15"/> - <box topPadding="2" leftPadding="0" bottomPadding="0" rightPadding="0"/> - <textFieldExpression><![CDATA["/ " + ( $V{PAGE_NUMBER}+( ($F{meta:totalpages} != null) ? $F{meta:totalpages} -$V{PAGE_NUMBER} : 0 ) )]]></textFieldExpression> - </textField> - </band> - </pageFooter> -</jasperReport>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java Wed Oct 17 13:57:34 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java Wed Oct 17 16:00:38 2018 +0200 @@ -33,7 +33,6 @@ private static final long serialVersionUID = 1L; - private static final String JASPER_FILE = "/jasper/templates/bundu.bezugswst.result2.jrxml"; private static final String fieldBedheightMsgKey = "bundu.export.bezugswst.csv.meta.miss.bedheight.field"; private static final String fieldFlowdepthMsgKey = "bundu.export.bezugswst.csv.meta.miss.flowdepth.field"; private static final String fieldVolumeMsgKey = "bundu.export.bezugswst.csv.meta.miss.volume.field"; @@ -56,7 +55,7 @@ @Override protected String getJasperFile() { - return JASPER_FILE; + throw new UnsupportedOperationException(); } protected String[] formatRow(final AbstractExportContext exportContext, final ResultRow row) { @@ -127,22 +126,12 @@ @Override protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) { - - return this.formatRow(exportContextPDF, row); + throw new UnsupportedOperationException(); } @Override - protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) { - /* column headings */ + protected void addJRTableHeader(final ExportContextPDF exportContext, final MetaAndTableJRDataSource source) { + throw new UnsupportedOperationException(); + } - // TODO Auftrennung jeder Volumen+Masse-Spalte in zwei getrennte Volumen- und Masse-Spalten - exportContextPDF.addJRMetadata(source, "station_header", GeneralResultType.station); - for (int i = 1; i <= fieldSize(); i++) { - exportContextPDF.addJRMetadata(source, "field_header" + String.valueOf(i), exportContextPDF.msg(fieldVolumeMsgKey, i)); - exportContextPDF.addJRMetadata(source, "field_header" + String.valueOf(i), exportContextPDF.msg(fieldMassMsgKey, i)); - } - exportContextPDF.addJRMetadata(source, "mean_bedheight_header", BunduResultType.missVolumeMeanBed); - exportContextPDF.addJRMetadata(source, "mean_bedheight_header", BunduResultType.missMassMeanBed); - - } } \ No newline at end of file
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractResultType.java Wed Oct 17 13:57:34 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractResultType.java Wed Oct 17 16:00:38 2018 +0200 @@ -35,9 +35,6 @@ private final String pdfHeader; - private static String YES = null; - private static String NO = null; - protected AbstractResultType(final String unit, final String csvHeader, final String pdfHeader) { this.unit = unit; this.csvHeader = csvHeader; @@ -68,13 +65,9 @@ throw new IllegalStateException(); if ((boolean) value) { - if (YES == null) - YES = Resources.getMsg(context.getMeta(), String.valueOf(value)); - return YES; + return Resources.getMsg(context.getMeta(), String.valueOf(value)); } else { - if (NO == null) - NO = Resources.getMsg(context.getMeta(), String.valueOf(value)); - return NO; + return Resources.getMsg(context.getMeta(), String.valueOf(value)); } }
--- a/artifacts/src/main/resources/messages.properties Wed Oct 17 13:57:34 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Wed Oct 17 16:00:38 2018 +0200 @@ -938,8 +938,8 @@ bundu.export.bezugswst.csv.meta.miss.channel.lower_edge = Lower Edge of Channel bundu.export.bezugswst.pdf.meta.miss.channel.lower_edge = Lower Edge of Channel bundu.export.bezugswst.csv.meta.miss.sounding = Sounding -bundu.export.bezugswst.csv.meta.miss.bedheight.field = Feld {0} Geodetic Altitude -bundu.export.bezugswst.csv.meta.miss.flowdepth.field = Feld {0} Flow Depth [m] +bundu.export.bezugswst.csv.meta.miss.bedheight.field = Field {0} Geodetic Altitude +bundu.export.bezugswst.csv.meta.miss.flowdepth.field = Field {0} Flow Depth [m] bundu.export.bezugswst.csv.meta.miss.mass.field = Field {0} Missing Mass [t] bundu.export.bezugswst.csv.meta.miss.volume.field = Field {0} Missing Volume [m\u00b3] bundu.export.bezugswst.csv.meta.miss.height.mean_bed = Mean Bed Height Geodetic Altitude