[PATCH 1 of 2] bundu bezugswst result 2
Wald Commits
scm-commit at wald.intevation.org
Fri Jul 27 19:25:08 CEST 2018
# HG changeset patch
# User gernotbelger
# Date 1532710195 -7200
# Node ID 127638669052aecb823ede13ba9af5bfb179bd30
# Parent 0a0937f33bb5568ef6f5f6df47d3b631cefbdee9
bundu bezugswst result 2
diff -r 0a0937f33bb5 -r 127638669052 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml
--- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Fri Jul 27 17:19:27 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Fri Jul 27 18:49:55 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-27T17:10:54 -->
+<!-- 2018-07-27T18:45:12 -->
<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"/>
@@ -126,7 +126,7 @@
</reportElement>
<box padding="2"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"/>
- <textFieldExpression><![CDATA[$F{meta:bezugswst_header}]]></textFieldExpression>
+ <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"/>
@@ -156,7 +156,7 @@
<reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="266" y="0" width="50" height="24"/>
<box padding="2"/>
<textElement textAlignment="Left" verticalAlignment="Bottom"/>
- <textFieldExpression><![CDATA[$F{meta:channel_lower_edge_header}]]></textFieldExpression>
+ <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"/>
diff -r 0a0937f33bb5 -r 127638669052 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result2.jrxml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result2.jrxml Fri Jul 27 18:49:55 2018 +0200
@@ -0,0 +1,364 @@
+<?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-27T18:33:37 -->
+<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>
+ <summary>
+ <band height="30" splitType="Stretch"/>
+ </summary>
+</jasperReport>
diff -r 0a0937f33bb5 -r 127638669052 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Fri Jul 27 17:19:27 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Fri Jul 27 18:49:55 2018 +0200
@@ -204,34 +204,33 @@
}
};
- public static final BunduResultType field = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.field") {
- private static final long serialVersionUID = 1L; // unit steht in der zelle jedesmal: z.B. 1125 [m³] / 1912.5 [t] (Dezimaltrennzeichen bwt)
- // ist warscheinlich schwierig mit dem Replacement von "{0}"
-
- @Override
- public String exportValue(final CallContext context, final Object value) {
- final double doubleValue = asDouble(value);
- return exportDoubleValue(context, doubleValue);
- }
-
- @Override
- protected NumberFormat createFormatter(final CallContext context) {
- return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
- }
- };
-
public static final BunduResultType meanBedheight = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.mean_bedheight") {
private static final long serialVersionUID = 1L; // unit steht in der zelle jedesmal: z.B. 1125 [m³] / 1912.5 [t] (Dezimaltrennzeichen bwt)
@Override
public String exportValue(final CallContext context, final Object value) {
- final double doubleValue = asDouble(value);
- return exportDoubleValue(context, doubleValue);
+ return exportStringValue(value);
}
@Override
protected NumberFormat createFormatter(final CallContext context) {
- return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
+ throw new UnsupportedOperationException();
}
};
+
+ // RESULT TYPE FIELDS
+ public static final BunduResultType fields = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.field") {
+ private static final long serialVersionUID = 1L; // unit steht in der zelle jedesmal: z.B. 1125 [m³] / 1912.5 [t] (Dezimaltrennzeichen bwt)
+
+ @Override
+ public String exportValue(final CallContext context, final Object value) {
+ return exportStringValue(value);
+ }
+
+ @Override
+ protected NumberFormat createFormatter(final CallContext context) {
+ throw new UnsupportedOperationException();
+ }
+ };
+
}
\ No newline at end of file
diff -r 0a0937f33bb5 -r 127638669052 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Fri Jul 27 17:19:27 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Fri Jul 27 18:49:55 2018 +0200
@@ -78,7 +78,7 @@
// missing volume calculation
if (access.getMissingVolFrom() != null) {
-
+ /// FIRST RESULT
final List<ResultRow> listResult1 = new ArrayList<>();
final ResultRow rowResult1 = ResultRow.create();
rowResult1.putValue(BunduResultType.bezugswst, 45.15);
@@ -103,6 +103,32 @@
final BezugswstMissVolCalculationResult1 r1 = new BezugswstMissVolCalculationResult1(
Resources.getMsg(m, "bundu.export.csv.title.bezugswst.result1"), listResult1);
results.addResult(r1, null);
+
+ // SECOND RESULT
+ final List<ResultRow> listResult2 = new ArrayList<>();
+ final ResultRow rowResult2 = ResultRow.create();
+
+ rowResult2.putValue(GeneralResultType.station, 890);
+ final List<String> fieldValues = new ArrayList<>();
+ fieldValues.add("444 [m³] / 765 [t]");
+ fieldValues.add("4.444 [m³] / 1.765 [t]");
+ fieldValues.add("444 [m³] / 765 [t]");
+ fieldValues.add("");
+ fieldValues.add("");
+ fieldValues.add("");
+ fieldValues.add("");
+ fieldValues.add("");
+ fieldValues.add("");
+ fieldValues.add("444 [m³] / 765 [t]");
+ rowResult2.putValue(BunduResultType.fields, fieldValues);
+ rowResult2.putValue(BunduResultType.meanBedheight, "9.444 [m³] / 8.765 [t]");
+
+ listResult2.add(rowResult2);
+
+ final BezugswstMissVolCalculationResult2 r2 = new BezugswstMissVolCalculationResult2(
+ Resources.getMsg(m, "bundu.export.csv.title.bezugswst.result2"), listResult2);
+ results.addResult(r2, null);
+
}
return new CalculationResult(results, null);// problems);
diff -r 0a0937f33bb5 -r 127638669052 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMainCalculationResult.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMainCalculationResult.java Fri Jul 27 17:19:27 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMainCalculationResult.java Fri Jul 27 18:49:55 2018 +0200
@@ -139,6 +139,7 @@
/* column headings */
exportContextPDF.addJRMetadata(source, "station_header", GeneralResultType.station);
exportContextPDF.addJRMetadata(source, "bezugswst_header", BunduResultType.bezugswst);
+ // exportContextPDF.addJRMetadata(source, " [" + river.getWstUnit() + "]");
exportContextPDF.addJRMetadata(source, "discharge_header", GeneralResultType.dischargeQwithUnit);
exportContextPDF.addJRMetadata(source, "waterlevel_name_header", GeneralResultType.waterlevelLabel);
exportContextPDF.addJRMetadata(source, "gauge_header", GeneralResultType.gaugeLabel);
diff -r 0a0937f33bb5 -r 127638669052 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult1.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult1.java Fri Jul 27 17:19:27 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult1.java Fri Jul 27 18:49:55 2018 +0200
@@ -50,7 +50,7 @@
protected String[] formatRow(final IExportContext exportContext, final ResultRow row) {
- final Collection<String> lines = new ArrayList<>(10);
+ final Collection<String> lines = new ArrayList<>(20);
lines.add(exportContext.formatRowValue(row, BunduResultType.bezugswst));
lines.add(exportContext.formatRowValue(row, GeneralResultType.dischargeQwithUnit));
@@ -86,7 +86,9 @@
header.add(exportContextCSV.formatCsvHeader(GeneralResultType.gaugeLabel));
header.add(exportContextCSV.formatCsvHeader(BunduResultType.sounding));
- header.add(exportContextCSV.formatCsvHeader(BunduResultType.channelLowerEdge));
+ header.add(exportContextCSV.formatCsvHeader(BunduResultType.channelLowerEdge) + " [" + river.getWstUnit() + "]"); // Args wäre hier auch gegangen...;
+ // beim pdf ist es ohne args deutlich
+ // einfacher, deshalb...
header.add(exportContextCSV.formatCsvHeader(BunduResultType.channelMinDepth));
header.add(exportContextCSV.formatCsvHeader(BunduResultType.hasMissingDepth));
header.add(exportContextCSV.formatCsvHeader(BunduResultType.missVolume));
diff -r 0a0937f33bb5 -r 127638669052 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java Fri Jul 27 18:49:55 2018 +0200
@@ -0,0 +1,110 @@
+/* Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
+ * Software engineering by
+ * Björnsen Beratende Ingenieure GmbH
+ * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
+ *
+ * This file is Free Software under the GNU AGPL (>=v3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out the
+ * documentation coming with Dive4Elements River for details.
+ */
+package org.dive4elements.river.artifacts.bundu.bezugswst;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.dive4elements.river.artifacts.bundu.BunduResultType;
+import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
+import org.dive4elements.river.artifacts.common.AbstractExportContext;
+import org.dive4elements.river.artifacts.common.ExportContextCSV;
+import org.dive4elements.river.artifacts.common.ExportContextPDF;
+import org.dive4elements.river.artifacts.common.GeneralResultType;
+import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource;
+import org.dive4elements.river.artifacts.common.ResultRow;
+import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
+
+/**
+ * Contains the results of a //TODO LINK{@link BezugswstCalculation}.
+ *
+ * @author Gernot Belger
+ */
+final class BezugswstMissVolCalculationResult2 extends AbstractCalculationExportableResult {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String JASPER_FILE = "/jasper/templates/bundu.bezugswst.result2.jrxml";
+ private static final String fieldMsgStr = "bundu.export.bezugswst.csv.meta.miss.field";
+ private static final int fieldSize = 10;
+
+ public BezugswstMissVolCalculationResult2(final String label, final Collection<ResultRow> rows) {
+ super(label, rows);
+
+ }
+
+ @Override
+ protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) {
+ // no metadata
+ }
+
+ @Override
+ protected String getJasperFile() {
+ return JASPER_FILE;
+ }
+
+ protected String[] formatRow(final AbstractExportContext exportContext, final ResultRow row) {
+
+ final Collection<String> lines = new ArrayList<>(20);
+
+ lines.add(exportContext.formatRowValue(row, GeneralResultType.station));
+ final List<String> fields = (List<String>) row.getValue(BunduResultType.fields);
+ assert (fields.size() == fieldSize); // immer abgleichen mit der Calculation!
+ for (final String field : fields) {
+ lines.add(field);
+ }
+ lines.add(exportContext.formatRowValue(row, BunduResultType.meanBedheight));
+
+ return lines.toArray(new String[lines.size()]);
+ }
+
+ @Override
+ public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) {
+
+ final int colSize = 15;
+ exportContextCSV.writeTitleForTabs("bundu.export.csv.title.bezugswst.result2", colSize); // Voraussetzung für Tabs ist, dass der Titel vor den Headern
+ final Collection<String> header = new ArrayList<>(colSize);
+
+ header.add(exportContextCSV.formatCsvHeader(GeneralResultType.station));
+
+ for (int i = 1; i <= fieldSize; i++) {
+ header.add(exportContextCSV.msg(fieldMsgStr, i));
+ }
+ header.add(exportContextCSV.formatCsvHeader(BunduResultType.meanBedheight));
+
+ exportContextCSV.writeCSVLine(header.toArray(new String[header.size()]));
+
+ }
+
+ @Override
+ protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) {
+
+ return this.formatRow(exportContextCSV, row);
+ }
+
+ @Override
+ protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) {
+
+ return this.formatRow(exportContextPDF, row);
+ }
+
+ @Override
+ protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) {
+ /* column headings */
+
+ exportContextPDF.addJRMetadata(source, "station_header", GeneralResultType.station);
+ for (int i = 1; i <= fieldSize; i++) {
+ exportContextPDF.addJRMetadata(source, "field_header" + String.valueOf(i), exportContextPDF.msg(fieldMsgStr, i));
+ }
+ exportContextPDF.addJRMetadata(source, "mean_bedheight_header", BunduResultType.meanBedheight);
+
+ }
+}
\ No newline at end of file
diff -r 0a0937f33bb5 -r 127638669052 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduWstExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduWstExporter.java Fri Jul 27 17:19:27 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduWstExporter.java Fri Jul 27 18:49:55 2018 +0200
@@ -40,9 +40,10 @@
@Override
protected void configureDesign(final AbstractCalculationExportableResult result, final JasperDesigner design) {
- if (result instanceof BezugswstMissVolCalculationResult1 // || result intanceof BezugswstMiss...2,3 TODO
+ if (result instanceof BezugswstMissVolCalculationResult1 || result instanceof BezugswstMissVolCalculationResult2)// || result intanceof
+ // BezugswstMiss...2,3 TODO
- ) {
+ {
design.getSource().addMetaData("bezugswst_result_header", result.getLabel()); // globalMeta? wrong place. only one result expected, so it works
}
}
diff -r 0a0937f33bb5 -r 127638669052 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties Fri Jul 27 17:19:27 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties Fri Jul 27 18:49:55 2018 +0200
@@ -924,8 +924,8 @@
bundu.export.bezugswst.pdf.meta.miss.exists = Fehl-tiefe vor-handen?
bundu.export.bezugswst.csv.meta.miss.channel.min_depth = Zu gew\u00e4hrleistende Fahrrinnentiefe [m]
bundu.export.bezugswst.pdf.meta.miss.channel.min_depth = Zu gew\u00e4hr-leistende Fahrrinnen-tiefe [m]
-bundu.export.bezugswst.csv.meta.miss.channel.lower_edge = Unterkante Fahrrinnenkasten [{0}]
-bundu.export.bezugswst.pdf.meta.miss.channel.lower_edge = Unterkante Fahrrinnen-kasten [{0}]
+bundu.export.bezugswst.csv.meta.miss.channel.lower_edge = Unterkante Fahrrinnenkasten
+bundu.export.bezugswst.pdf.meta.miss.channel.lower_edge = Unterkante Fahrrinnen-kasten
bundu.export.bezugswst.csv.meta.miss.sounding = Peilung
bundu.export.bezugswst.csv.meta.miss.field = Feld {0} Fehlvolumen/-masse
bundu.export.bezugswst.csv.meta.miss.mean_bedheight = Mittlere Sohlh\u00f6he Fehlvolumen/-masse
diff -r 0a0937f33bb5 -r 127638669052 artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties Fri Jul 27 17:19:27 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties Fri Jul 27 18:49:55 2018 +0200
@@ -924,8 +924,8 @@
bundu.export.bezugswst.pdf.meta.miss.exists = Fehl-tiefe vor-handen?
bundu.export.bezugswst.csv.meta.miss.channel.min_depth = Zu gew\u00e4hrleistende Fahrrinnentiefe [m]
bundu.export.bezugswst.pdf.meta.miss.channel.min_depth = Zu gew\u00e4hr-leistende Fahrrinnen-tiefe [m]
-bundu.export.bezugswst.csv.meta.miss.channel.lower_edge = Unterkante Fahrrinnenkasten [{0}]
-bundu.export.bezugswst.pdf.meta.miss.channel.lower_edge = Unterkante Fahrrinnen-kasten [{0}]
+bundu.export.bezugswst.csv.meta.miss.channel.lower_edge = Unterkante Fahrrinnenkasten
+bundu.export.bezugswst.pdf.meta.miss.channel.lower_edge = Unterkante Fahrrinnen-kasten
bundu.export.bezugswst.csv.meta.miss.sounding = Peilung
bundu.export.bezugswst.csv.meta.miss.field = Feld {0} Fehlvolumen/-masse
bundu.export.bezugswst.csv.meta.miss.mean_bedheight = Mittlere Sohlh\u00f6he Fehlvolumen/-masse
More information about the Dive4Elements-commits
mailing list