[PATCH 3 of 3] Work on SINFO Exporters
Wald Commits
scm-commit at wald.intevation.org
Fri Apr 6 13:53:53 CEST 2018
# HG changeset patch
# User gernotbelger
# Date 1523015617 -7200
# Node ID 7c1611b5a59eff66b7b045c3b1109dbe1a8eceb0
# Parent 16df9f7a98153f2bb40fce79d38c42c81cf62329
Work on SINFO Exporters
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/doc/conf/jasper/sinfo.flowdepth.jasper
Binary file artifacts/doc/conf/jasper/sinfo.flowdepth.jasper has changed
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/doc/conf/jasper/sinfo.flowdepthdevelopment.jasper
Binary file artifacts/doc/conf/jasper/sinfo.flowdepthdevelopment.jasper has changed
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/doc/conf/jasper/sinfo.flowdepthminmax.jasper
Binary file artifacts/doc/conf/jasper/sinfo.flowdepthminmax.jasper has changed
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/doc/conf/jasper/sinfo.tkh.jasper
Binary file artifacts/doc/conf/jasper/sinfo.tkh.jasper has changed
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml Fri Apr 06 13:53:11 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml Fri Apr 06 13:53:37 2018 +0200
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
+<!-- 2018-04-06T11:41: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" columnWidth="515" 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" markup="html" />
-
+ <style name="htmlStyle" markup="html"/>
<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"/>
@@ -18,7 +18,6 @@
<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:station_header" class="java.lang.String"/>
<field name="meta:flowdepth_header" class="java.lang.String"/>
<field name="meta:flowdepth_tkh_header" class="java.lang.String"/>
@@ -31,7 +30,6 @@
<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="data:0" class="java.lang.String"/>
<field name="data:1" class="java.lang.String"/>
<field name="data:2" class="java.lang.String"/>
@@ -43,22 +41,11 @@
<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: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"/>
--->
-
<background>
<band splitType="Stretch"/>
</background>
<title>
- <band height="182" splitType="Stretch">
-
+ <band height="170" splitType="Stretch">
<textField>
<reportElement x="0" y="1" width="515" height="30"/>
<textElement>
@@ -66,188 +53,193 @@
</textElement>
<textFieldExpression><![CDATA[$F{meta:header} + " " + $F{meta:river}]]></textFieldExpression>
</textField>
-
<textField>
<reportElement x="0" y="40" width="165" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:calcMode}]]></textFieldExpression>
</textField>
-
<textField>
<reportElement x="0" y="70" width="123" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:version_label} + ":"]]></textFieldExpression>
</textField>
<textField>
<reportElement x="123" y="70" width="392" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:version}]]></textFieldExpression>
</textField>
-
<textField>
<reportElement x="0" y="90" width="123" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:user_label} + ":"]]></textFieldExpression>
</textField>
<textField>
<reportElement x="123" y="90" width="392" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:user}]]></textFieldExpression>
</textField>
-
<textField>
<reportElement x="0" y="110" width="123" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:date_label} + ":"]]></textFieldExpression>
</textField>
<textField>
<reportElement x="123" y="110" width="392" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:date}]]></textFieldExpression>
</textField>
-
<textField>
<reportElement x="0" y="130" width="123" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:river_label} + ":"]]></textFieldExpression>
</textField>
<textField>
<reportElement x="123" y="130" width="392" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:river}]]></textFieldExpression>
</textField>
-
<textField>
<reportElement x="0" y="150" width="123" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:range_label} + ":"]]></textFieldExpression>
</textField>
-
-
<textField>
<reportElement x="123" y="150" width="392" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[$F{meta:range}]]></textFieldExpression>
</textField>
</band>
</title>
<columnHeader>
- <band height="30" splitType="Stretch">
+ <band height="25" splitType="Stretch">
<line>
- <reportElement x="0" y="29" width="762" height="1"/>
+ <reportElement positionType="FixRelativeToBottom" x="0" y="24" width="762" height="1"/>
</line>
- <textField>
- <reportElement x="0" y="0" width="50" height="30" style="htmlStyle"/>
- <textElement/>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression>
</textField>
- <textField>
- <reportElement x="50" y="0" width="50" height="30" style="htmlStyle"/>
- <textElement />
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="55" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:flowdepth_header} + "<br/>[m]"]]></textFieldExpression>
</textField>
- <textField>
- <reportElement x="100" y="0" width="85" height="30" style="htmlStyle"/>
- <textElement/>
- <textFieldExpression><![CDATA[$F{meta:flowdepth_tkh_header} + "<br/>[m]"]]></textFieldExpression>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="105" y="0" width="54" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepth_tkh_header} + " [m]"]]></textFieldExpression>
</textField>
- <textField>
- <reportElement x="185" y="0" width="25" height="30" style="htmlStyle"/>
- <textElement/>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="159" y="0" width="31" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:tkh_header} + "<br/>[cm]"]]></textFieldExpression>
</textField>
- <textField>
- <reportElement x="210" y="0" width="65" height="30" style="htmlStyle"/>
- <textElement/>
- <textFieldExpression><![CDATA[$F{meta:waterlevel_header} + "[" + $F{meta:river_unit} + "]"]]></textFieldExpression>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="190" y="0" width="60" height="24"/>
+ <box padding="5">
+ <pen lineStyle="Solid"/>
+ </box>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:waterlevel_header} + "<br/>[" + $F{meta:river_unit} + "]"]]></textFieldExpression>
</textField>
- <textField>
- <reportElement x="275" y="0" width="40" height="30" style="htmlStyle"/>
- <textElement/>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="250" y="0" width="40" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:discharge_header} + "<br/>[m³/s]"]]></textFieldExpression>
</textField>
- <textField>
- <reportElement x="315" y="0" width="85" height="30" style="htmlStyle"/>
- <textElement/>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="290" y="0" width="80" height="24"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:waterlevel_name_header}]]></textFieldExpression>
</textField>
- <textField>
- <reportElement x="400" y="0" width="100" height="30" style="htmlStyle"/>
- <textElement/>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="370" y="0" width="115" height="24"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:gauge_header}]]></textFieldExpression>
</textField>
- <textField>
- <reportElement x="500" y="0" width="65" height="30" style="htmlStyle"/>
- <textElement/>
- <textFieldExpression><![CDATA[$F{meta:bedheight_header} + "[" + $F{meta:river_unit} + "]"]]></textFieldExpression>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="485" y="0" width="60" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:bedheight_header} + "<br/>[" + $F{meta:river_unit} + "]"]]></textFieldExpression>
</textField>
- <textField>
- <reportElement x="565" y="0" width="85" height="30" style="htmlStyle"/>
- <textElement/>
- <textFieldExpression><![CDATA[$F{meta:sounding_name_header}]]></textFieldExpression>
- </textField>
- <textField>
- <reportElement x="650" y="0" width="110" height="30" style="htmlStyle"/>
- <textElement/>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="545" y="0" width="85" height="24"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:sounding_name_header}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="630" y="0" width="132" height="24"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
<textFieldExpression><![CDATA[$F{meta:location_header}]]></textFieldExpression>
</textField>
</band>
</columnHeader>
<detail>
- <band height="14" splitType="Stretch">
- <textField isBlankWhenNull="true">
- <reportElement x="0" y="0" width="40" height="14"/>
- <textElement textAlignment="Right"/>
+ <band height="20" splitType="Prevent">
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="50" y="0" width="40" height="14" />
- <textElement textAlignment="Right"/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="55" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="100" y="0" width="75" height="14"/>
- <textElement textAlignment="Right"/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="105" y="0" width="54" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="185" y="0" width="15" height="14"/>
- <textElement textAlignment="Right"/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="159" y="0" width="31" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="210" y="0" width="55" height="14"/>
- <textElement textAlignment="Right"/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="190" y="0" width="60" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="275" y="0" width="30" height="14"/>
- <textElement textAlignment="Right"/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="250" y="0" width="40" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="315" y="0" width="85" height="14"/>
- <textElement/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="290" y="0" width="80" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="400" y="0" width="100" height="14"/>
- <textElement/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="370" y="0" width="115" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="500" y="0" width="55" height="14"/>
- <textElement textAlignment="Right"/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="485" y="0" width="60" height="20"/>
+ <box topPadding="5" leftPadding="5" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="565" y="0" width="85" height="14"/>
- <textElement/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="545" y="0" width="85" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:9}]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="650" y="0" width="110" height="14" stretchType="RelativeToBandHeight"/>
- <textElement/>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="630" y="0" width="132" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement verticalAlignment="Top"/>
<textFieldExpression><![CDATA[$F{data:10}]]></textFieldExpression>
</textField>
</band>
@@ -256,7 +248,6 @@
<band height="29" splitType="Stretch">
<textField evaluationTime="Report">
<reportElement x="705" y="9" width="57" height="20"/>
- <textElement/>
<textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField>
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml Fri Apr 06 13:53:37 2018 +0200
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
+<!-- 2018-04-05T10:22:02 -->
+<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" columnWidth="515" 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"/>
+ <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html"/>
+ <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: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: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: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="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"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <title>
+ <band height="222" splitType="Stretch">
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="1" width="515" height="30"/>
+ <textElement>
+ <font size="18"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{meta:header} + " " + $F{meta:river}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="40" width="165" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:calcMode}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="70" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:version_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="70" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:version}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="90" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:user_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="90" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:user}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="110" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:date_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="110" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:date}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="130" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:river_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="130" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:river}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="150" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:range_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="150" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:range}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="170" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthdevelopment_header_label}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="170" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthdevelopment}]]></textFieldExpression>
+ </textField>
+ </band>
+ </title>
+ <columnHeader>
+ <band height="75" splitType="Stretch">
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="0" width="60" height="75"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="60" y="0" width="80" height="75"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthdevelopment_header} + "<br/>[cm]"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement key="" style="htmlStyle" x="140" y="0" width="80" height="75"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthdevelopmentperyear_header} + "<br/>[cm/a]"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement key="" style="htmlStyle" x="220" y="40" width="85" height="35"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:waterleveldifference_header2}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement key="" style="htmlStyle" x="305" y="0" width="85" height="40"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:bedheightdifference_header} + "<br/>[m³/s]"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement key="" style="htmlStyle" x="305" y="40" width="85" height="35"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:bedheightdifference_header2}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="390" y="0" width="85" height="40"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthcurrent_header} + "<br/>[" + $F{meta:river_unit} + "]"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="390" y="40" width="85" height="35"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthcurrent_header2}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="475" y="0" width="85" height="40"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthhistorical_header}+"<br/>[" + $F{meta:river_unit} + "]"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="475" y="40" width="85" height="35"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthhistorical_header2}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="560" y="0" width="180" height="75"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:location_header}]]></textFieldExpression>
+ </textField>
+ <line>
+ <reportElement style="htmlStyle" x="0" y="74" width="762" height="1"/>
+ </line>
+ <textField>
+ <reportElement key="" style="htmlStyle" x="220" y="0" width="85" height="40"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom">
+ <font pdfEncoding=""/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{meta:waterleveldifference_header}+"<br/>["+$F{meta:river_unit}+"]"]]></textFieldExpression>
+ </textField>
+ </band>
+ </columnHeader>
+ <detail>
+ <band height="20" splitType="Stretch">
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="475" y="0" width="85" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="560" y="0" width="180" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="390" y="0" width="85" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="0" y="0" width="60" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="60" y="0" width="80" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" x="140" y="0" width="80" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" x="220" y="0" width="85" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" x="305" y="0" width="85" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression>
+ </textField>
+ </band>
+ </detail>
+ <pageFooter>
+ <band height="30" splitType="Stretch">
+ <textField evaluationTime="Report">
+ <reportElement style="htmlStyle" x="705" y="9" width="57" height="20"/>
+ <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="650" y="9" width="55" height="20"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+ </textField>
+ </band>
+ </pageFooter>
+ <summary>
+ <band height="42" splitType="Stretch"/>
+ </summary>
+</jasperReport>
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml Fri Apr 06 13:53:37 2018 +0200
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
+<!-- 2018-04-05T16:21:40 -->
+<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" columnWidth="515" 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"/>
+ <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html"/>
+ <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: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: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="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"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <title>
+ <band height="180" splitType="Stretch">
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="1" width="515" height="30"/>
+ <textElement>
+ <font size="18"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{meta:header} + " " + $F{meta:river}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="40" width="165" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:calcMode}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="70" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:version_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="70" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:version}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="90" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:user_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="90" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:user}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="110" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:date_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="110" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:date}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="130" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:river_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="130" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:river}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="150" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:range_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="150" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:range}]]></textFieldExpression>
+ </textField>
+ </band>
+ </title>
+ <columnHeader>
+ <band height="75" splitType="Stretch">
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="0" width="50" height="75"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="50" y="0" width="60" height="74"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthmin_header} + "<br/>[m]"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement key="" style="htmlStyle" x="110" y="0" width="60" height="75"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:flowdepthmax_header} + "<br/>[m]"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement key="" style="htmlStyle" x="170" y="0" width="70" height="75"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:waterlevel_header}+ "<br/>[" + $F{meta:river_unit} + "]"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement key="" style="htmlStyle" x="240" y="0" width="50" height="75"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:discharge_header}+ "<br/>[m³/s]"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="290" y="0" width="80" height="75"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:waterlevel_name_header}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="370" y="0" width="90" height="75"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:gauge_header}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="641" y="0" width="120" height="74"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:location_header}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="541" y="0" width="100" height="74"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:sounding_name_header}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="460" y="0" width="81" height="74"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:bedheight_header}+ "<br/>[" + $F{meta:river_unit} + "]"]]></textFieldExpression>
+ </textField>
+ <line>
+ <reportElement style="htmlStyle" x="0" y="74" width="762" height="1"/>
+ </line>
+ </band>
+ </columnHeader>
+ <detail>
+ <band height="20" splitType="Stretch">
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="370" y="0" width="90" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="460" y="0" width="81" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="290" y="0" width="80" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="0" y="0" width="50" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="50" y="0" width="60" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" x="110" y="0" width="60" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" x="170" y="0" width="70" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" x="240" y="0" width="50" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="541" y="0" width="100" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement style="htmlStyle" x="641" y="0" width="120" height="20"/>
+ <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/>
+ <textFieldExpression><![CDATA[$F{data:9}]]></textFieldExpression>
+ </textField>
+ </band>
+ </detail>
+ <pageFooter>
+ <band height="30" splitType="Stretch">
+ <textField evaluationTime="Report">
+ <reportElement style="htmlStyle" x="705" y="9" width="57" height="20"/>
+ <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="650" y="9" width="55" height="20"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+ </textField>
+ </band>
+ </pageFooter>
+ <summary>
+ <band height="42" splitType="Stretch"/>
+ </summary>
+</jasperReport>
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml Fri Apr 06 13:53:37 2018 +0200
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 -->
+<!-- 2018-04-06T11:26:49 -->
+<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"/>
+ <property name="ireport.y" value="0"/>
+ <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+ <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html"/>
+ <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="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"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <title>
+ <band height="189" splitType="Stretch">
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="0" width="515" height="30"/>
+ <textElement>
+ <font size="18"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{meta:header} + " " + $F{meta:river}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="39" width="165" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:calcMode}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="69" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:version_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="69" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:version}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="89" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:user_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="89" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:user}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="109" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:date_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="109" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:date}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="129" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:river_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="129" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:river}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="149" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:range_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="149" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:range}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="0" y="169" width="123" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:calculation_label} + ":"]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement style="htmlStyle" x="123" y="169" width="392" height="20"/>
+ <textFieldExpression><![CDATA[$F{meta:calculation_name}]]></textFieldExpression>
+ </textField>
+ </band>
+ </title>
+ <columnHeader>
+ <band height="25" splitType="Stretch">
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="50" height="24"/>
+ <box padding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:tkh_header} + "<br/>[cm]"]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="100" y="0" width="60" height="24"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:tkhkind_header}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="0" width="60" height="24"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:waterlevel_header}+ "<br/>[NHN + m]"]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="220" y="0" width="50" height="24"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:discharge_header}+ "<br/>[m³/s]"]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="270" y="0" width="70" height="24"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:waterlevel_name_header}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="340" y="0" width="70" height="24"/>
+ <box topPadding="0" leftPadding="5" bottomPadding="5" rightPadding="5"/>
+ <textElement textAlignment="Right" verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:gauge_header}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="470" y="0" width="80" height="24"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:location_header}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="410" y="0" width="60" height="24"/>
+ <box padding="5"/>
+ <textElement verticalAlignment="Bottom"/>
+ <textFieldExpression><![CDATA[$F{meta:bedheight_header}+ "<br/>[NHN + m]"]]></textFieldExpression>
+ </textField>
+ <line>
+ <reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="0" y="24" width="550" height="1"/>
+ </line>
+ </band>
+ </columnHeader>
+ <detail>
+ <band height="20" splitType="Prevent">
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="340" y="0" width="70" height="20"/>
+ <box topPadding="5" 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"/>
+ <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="410" y="0" width="60" height="20"/>
+ <box topPadding="5" 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>
+ <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="270" y="0" width="70" height="20"/>
+ <box topPadding="5" 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"/>
+ <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="20"/>
+ <box topPadding="5" 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:0}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="50" height="20"/>
+ <box topPadding="5" 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"/>
+ <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="100" y="0" width="60" height="20"/>
+ <box topPadding="5" 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="Left"/>
+ <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="0" width="60" height="20"/>
+ <box topPadding="5" 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"/>
+ <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="220" y="0" width="50" height="20"/>
+ <box topPadding="5" 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"/>
+ <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" isBlankWhenNull="true">
+ <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="470" y="0" width="80" height="20"/>
+ <box topPadding="5" 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>
+ <textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression>
+ </textField>
+ </band>
+ </detail>
+ <pageFooter>
+ <band height="30" splitType="Stretch">
+ <textField isStretchWithOverflow="true">
+ <reportElement style="htmlStyle" x="437" y="10" width="55" height="20"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true" evaluationTime="Report">
+ <reportElement style="htmlStyle" x="493" y="10" width="57" height="20"/>
+ <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
+ </textField>
+ </band>
+ </pageFooter>
+ <summary>
+ <band height="42" splitType="Stretch"/>
+ </summary>
+</jasperReport>
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/doc/conf/jasper/waterlevel.jasper
Binary file artifacts/doc/conf/jasper/waterlevel.jasper has changed
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/SInfoI18NStrings.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/SInfoI18NStrings.java Fri Apr 06 13:53:11 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/SInfoI18NStrings.java Fri Apr 06 13:53:37 2018 +0200
@@ -70,6 +70,8 @@
String CSV_FLOWDEPTH_DEVELOPMENT_HEADER = "sinfo.export.csv.header.flowdepth.development";
+ String PDF_FLOWDEPTH_DEVELOPMENT_HEADER = "sinfo.export.pdf.header.flowdepth.development";
+
String CSV_FLOWDEPTH_DEVELOPMENT_PER_YEAR_HEADER = "sinfo.export.csv.header.flowdepth.development.per.year";
String CSV_WATERLEVEL_DIFFERENCE_HEADER = "sinfo.export.csv.header.waterlevel.difference";
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoExporter.java Fri Apr 06 13:53:11 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoExporter.java Fri Apr 06 13:53:37 2018 +0200
@@ -305,5 +305,9 @@
final String rangeValue = String.format("%s - %s", kmFormatter.format(calcRange.getMinimumDouble()), kmFormatter.format(calcRange.getMaximumDouble()));
source.addMetaData("range_label", msg(SInfoI18NStrings.CSV_META_RANGE_LABEL));
source.addMetaData("range", rangeValue);
+
+
+ source.addMetaData("calculation_label",msg( "sinfo.export.flow_depth.pdf.meta.calculation.label" ));
+ source.addMetaData("calculation_name",msg( "sinfo.export.flow_depth.pdf.meta.calculation.name" ));
}
}
\ No newline at end of file
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java Fri Apr 06 13:53:11 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java Fri Apr 06 13:53:37 2018 +0200
@@ -43,7 +43,7 @@
}
},
- waterlevel(null, SInfoI18NStrings.CSV_WATERLEVEL_HEADER) {
+ waterlevel(null, SInfoI18NStrings.CSV_WATERLEVEL_HEADER,"sinfo.export.flow_depth.pdf.header.waterlevel") {
@Override
public String exportValue(final CallContext context, final Object value) {
final double doubleValue = asDouble(value);
@@ -159,7 +159,7 @@
}
},
- soilkind(SInfoI18NStrings.UNIT_NONE, SInfoI18NStrings.CSV_TKHKIND_HEADER) {
+ soilkind(SInfoI18NStrings.UNIT_NONE, SInfoI18NStrings.CSV_TKHKIND_HEADER, "sinfo.export.tkh.pdf.header.tkhkind") {
@Override
public String exportValue(final CallContext context, final Object value) {
@@ -281,7 +281,8 @@
return Formatter.getFlowDepth(context);
}
},
- flowdepthDevelopment(SInfoI18NStrings.UNIT_CM, SInfoI18NStrings.CSV_FLOWDEPTH_DEVELOPMENT_HEADER) {
+
+ flowdepthDevelopment(SInfoI18NStrings.UNIT_CM, SInfoI18NStrings.CSV_FLOWDEPTH_DEVELOPMENT_HEADER, SInfoI18NStrings.PDF_FLOWDEPTH_DEVELOPMENT_HEADER) {
@Override
public String exportValue(final CallContext context, final Object value) {
final double doubleValue = asDouble(value);
@@ -305,7 +306,7 @@
return Formatter.getFlowDepthDevelopmentPerYear(context);
}
},
- waterlevelDifference(SInfoI18NStrings.UNIT_CM, SInfoI18NStrings.CSV_WATERLEVEL_DIFFERENCE_HEADER) {
+ waterlevelDifference(SInfoI18NStrings.UNIT_CM, SInfoI18NStrings.CSV_WATERLEVEL_DIFFERENCE_HEADER, "sinfo.export.pdf.header.waterlevel.difference") {
@Override
public String exportValue(final CallContext context, final Object value) {
final double doubleValue = asDouble(value);
@@ -317,7 +318,7 @@
return Formatter.getTkh(context);
}
},
- bedHeightDifference(SInfoI18NStrings.UNIT_CM, SInfoI18NStrings.CSV_MEAN_BED_HEIGHT_DIFFERENCE_HEADER) {
+ bedHeightDifference(SInfoI18NStrings.UNIT_CM, SInfoI18NStrings.CSV_MEAN_BED_HEIGHT_DIFFERENCE_HEADER, "sinfo.export.pdf.header.mean_bed_height.difference") {
@Override
public String exportValue(final CallContext context, final Object value) {
final double doubleValue = asDouble(value);
@@ -420,6 +421,10 @@
public final String getCsvHeader() {
return this.csvHeader;
}
+
+ public final String getCsvHeader(final CallMeta meta) {
+ return Resources.getMsg(meta, this.csvHeader, this.csvHeader);
+ }
public final String getPdfHeader(final CallMeta meta) {
return Resources.getMsg(meta, this.pdfHeader, this.pdfHeader);
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentExporter.java Fri Apr 06 13:53:11 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentExporter.java Fri Apr 06 13:53:37 2018 +0200
@@ -40,7 +40,7 @@
/** The log used in this exporter. */
private static Logger log = Logger.getLogger(FlowDepthDevelopmentExporter.class);
- private static final String JASPER_FILE = "/jasper/sinfo.flowdepthminmax.jasper";
+ private static final String JASPER_FILE = "/jasper/sinfo.flowdepthdevelopment.jasper";
@Override
protected Logger getLog() {
@@ -138,23 +138,25 @@
super.addJRMetaDataDefaults(source, results);
final FlowDepthDevelopmentCalculationResult result = results.getResult();
+ source.addMetaData("flowdepthdevelopment", result.getLabel());
+ source.addMetaData("flowdepthdevelopment_header_label",SInfoResultType.flowdepthDevelopment.getCsvHeader(this.context.getMeta()));//(this.context.getMeta()));
/* column headings */
source.addMetaData("station_header", SInfoResultType.station.getPdfHeader(this.context.getMeta()));
- source.addMetaData("flowdeptdevelopment_header", SInfoResultType.flowdepthDevelopment.getPdfHeader(this.context.getMeta()));
- source.addMetaData("flowdeptdevelopmentperyear_header", SInfoResultType.flowdepthDevelopmentPerYear.getPdfHeader(this.context.getMeta()));
+ source.addMetaData("flowdepthdevelopment_header", SInfoResultType.flowdepthDevelopment.getPdfHeader(this.context.getMeta()));
+ source.addMetaData("flowdepthdevelopmentperyear_header", SInfoResultType.flowdepthDevelopmentPerYear.getPdfHeader(this.context.getMeta()));
source.addMetaData("waterleveldifference_header", SInfoResultType.waterlevelDifference.getPdfHeader(this.context.getMeta()));
- source.addMetaData("waterleveldifference_header_label", result.getWaterlevelDifferenceLabel());
+ source.addMetaData("waterleveldifference_header2", result.getWaterlevelDifferenceLabel());
source.addMetaData("bedheightdifference_header", SInfoResultType.bedHeightDifference.getPdfHeader(this.context.getMeta()));
- source.addMetaData("bedheightdifference_header_label", result.getBedHeightDifferenceLabel());
+ source.addMetaData("bedheightdifference_header2", result.getBedHeightDifferenceLabel());
source.addMetaData("flowdepthcurrent_header", SInfoResultType.flowdepthCurrent.getPdfHeader(this.context.getMeta()));
- source.addMetaData("flowdepthcurrent_header_label", result.getFlowDepthCurrentLabel());
+ source.addMetaData("flowdepthcurrent_header2", result.getFlowDepthCurrentLabel());
source.addMetaData("flowdepthhistorical_header", SInfoResultType.flowdepthHistorical.getPdfHeader(this.context.getMeta()));
- source.addMetaData("flowdepthhistorical_header_label", result.getFlowDepthHistoricalLabel());
+ source.addMetaData("flowdepthhistorical_header2", result.getFlowDepthHistoricalLabel());
source.addMetaData("location_header", SInfoResultType.location.getPdfHeader(this.context.getMeta()));
}
diff -r 16df9f7a9815 -r 7c1611b5a59e artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java Fri Apr 06 13:53:11 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhExporter.java Fri Apr 06 13:53:37 2018 +0200
@@ -38,7 +38,7 @@
private static final String CSV_META_CALCULATION_FORMULA = "sinfo.export.tkh.calculation.formula";
- private static final String JASPER_FILE = "/jasper/sinfo.flowdepth.jasper";
+ private static final String JASPER_FILE = "/jasper/sinfo.tkh.jasper";
@Override
protected Logger getLog() {
@@ -140,13 +140,17 @@
/* general metadata */
super.addJRMetaDataDefaults(source, results);
+ source.addMetaData("calculation_label",msg( "sinfo.export.flow_depth.pdf.meta.calculation.label" ));
+ source.addMetaData("calculation_name",msg( "sinfo.export.flow_depth.pdf.meta.calculation.name" ));
+
/* column headings */
source.addMetaData("station_header", SInfoResultType.station.getPdfHeader(this.context.getMeta()));
source.addMetaData("tkh_header", SInfoResultType.tkh.getPdfHeader(this.context.getMeta()));
+ source.addMetaData("tkhkind_header", SInfoResultType.soilkind.getPdfHeader(this.context.getMeta()));
source.addMetaData("bedheight_header", SInfoResultType.meanBedHeight.getPdfHeader(this.context.getMeta()));
source.addMetaData("waterlevel_header", SInfoResultType.waterlevel.getPdfHeader(this.context.getMeta()));
source.addMetaData("discharge_header", SInfoResultType.discharge.getPdfHeader(this.context.getMeta()));
-
+
// REMARK: actually the column makes no sense if description header is null. But (software symmetry...) WINFO also
// writes an empty column into the pdf in that case (most probably to avoid the need for two jasper templates).
final String descriptionHeader = results.getDescriptionHeader();
More information about the Dive4Elements-commits
mailing list