Mercurial > dive4elements > river
changeset 9172:3ace6db2f87b
collision details+pdf-export
author | gernotbelger |
---|---|
date | Fri, 22 Jun 2018 14:34:33 +0200 |
parents | f1be005f0c46 |
children | 2ec912345359 |
files | artifacts/doc/conf/jasper/templates/sinfo.collision.detail.jrxml artifacts/doc/conf/jasper/templates/sinfo.collision.overview.jrxml artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcDetailResult.java artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java artifacts/src/main/resources/messages_de.properties |
diffstat | 5 files changed, 149 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/jasper/templates/sinfo.collision.detail.jrxml Fri Jun 22 11:02:59 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/sinfo.collision.detail.jrxml Fri Jun 22 14:34:33 2018 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 --> -<!-- 2018-06-13T17:02:35 --> -<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"> +<!-- 2018-06-22T14:12:56 --> +<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="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"/> @@ -72,6 +72,8 @@ <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:gaugew_header" class="java.lang.String"/> + <field name="meta:dischargezone_header" 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"/> @@ -110,7 +112,7 @@ <columnHeader> <band height="25" splitType="Stretch"> <line> - <reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="0" y="24" width="762" height="1"/> + <reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="0" y="24" width="515" height="1"/> </line> <textField isStretchWithOverflow="true"> <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="60" height="24"> @@ -123,24 +125,54 @@ <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="68" y="-1" width="60" height="24"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="60" y="0" width="90" 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="5"/> + <textElement textAlignment="Left" verticalAlignment="Bottom"/> + <textFieldExpression><![CDATA[$F{meta:date_label}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="60" 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="5"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA["TEST"]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{meta:gaugew_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="-1" width="180" height="24"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="210" y="0" width="140" 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="5"/> + <textElement textAlignment="Left" verticalAlignment="Bottom"/> + <textFieldExpression><![CDATA[$F{meta:gauge_header}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="350" y="0" width="60" 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="5"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[""+$F{meta:startpageoffset}+";" + $F{meta:totalpages}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{meta:discharge_header}+" [m³/s]"]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="410" y="0" width="105" 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="5"/> + <textElement textAlignment="Left" verticalAlignment="Bottom"/> + <textFieldExpression><![CDATA[$F{meta:dischargezone_header}]]></textFieldExpression> </textField> </band> </columnHeader> @@ -157,18 +189,73 @@ <textElement textAlignment="Right" verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="60" y="0" width="90" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement textAlignment="Left" verticalAlignment="Top"/> + <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="60" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement textAlignment="Right" verticalAlignment="Top"/> + <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="210" y="0" width="140" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement textAlignment="Left" verticalAlignment="Top"/> + <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="350" y="0" width="60" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement textAlignment="Right" verticalAlignment="Top"/> + <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="410" y="0" width="105" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement textAlignment="Left" verticalAlignment="Top"/> + <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression> + </textField> </band> </detail> <pageFooter> <band height="15" splitType="Stretch"> <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" x="634" y="0" width="55" height="15"/> + <reportElement style="htmlStyle" x="402" 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"/> + <reportElement style="htmlStyle" x="458" 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>
--- a/artifacts/doc/conf/jasper/templates/sinfo.collision.overview.jrxml Fri Jun 22 11:02:59 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/sinfo.collision.overview.jrxml Fri Jun 22 14:34:33 2018 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 --> -<!-- 2018-06-13T17:02:44 --> -<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"> +<!-- 2018-06-22T12:00:53 --> +<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="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"/> @@ -72,6 +72,8 @@ <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:collision_years_header" class="java.lang.String"/> + <field name="meta:collision_count_header" 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"/> @@ -152,12 +154,12 @@ </band> </title> <columnHeader> - <band height="29" splitType="Stretch"> + <band height="25" splitType="Stretch"> <line> - <reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="0" y="24" width="762" height="1"/> + <reportElement style="htmlStyle" positionType="FixRelativeToBottom" x="0" y="24" width="515" height="1"/> </line> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="60" height="24"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" 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"/> @@ -167,21 +169,31 @@ <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="180" height="24"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="90" y="0" width="90" 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="5"/> + <textElement textAlignment="Left" verticalAlignment="Bottom"/> + <textFieldExpression><![CDATA[$F{meta:collision_years_header}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="180" y="0" width="100" 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="5"/> <textElement textAlignment="Right" verticalAlignment="Bottom"/> - <textFieldExpression><![CDATA[""+$F{meta:startpageoffset}+ ", "+ $F{meta:totalpages}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{meta:collision_count_header}]]></textFieldExpression> </textField> </band> </columnHeader> <detail> <band height="15" splitType="Prevent"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="60" height="15"/> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="15"/> <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -191,18 +203,40 @@ <textElement textAlignment="Right" verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="90" y="0" width="90" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement textAlignment="Left" verticalAlignment="Top"/> + <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="180" y="0" width="100" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + </box> + <textElement textAlignment="Right" verticalAlignment="Top"/> + <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> + </textField> </band> </detail> <pageFooter> <band height="15" splitType="Stretch"> <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" x="634" y="0" width="55" height="15"/> + <reportElement style="htmlStyle" x="402" 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"/> + <reportElement style="htmlStyle" x="458" 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>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcDetailResult.java Fri Jun 22 11:02:59 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcDetailResult.java Fri Jun 22 14:34:33 2018 +0200 @@ -37,7 +37,7 @@ @Override protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results) { - exportContextCSV.writeBlankLine(); + // do nothing so far } @Override @@ -54,7 +54,7 @@ header.add(exportContextCSV.formatCsvHeader(GeneralResultType.date)); header.add(exportContextCSV.formatCsvHeader(SInfoResultType.collisionGaugeW)); header.add(exportContextCSV.formatCsvHeader(SInfoResultType.gaugeLabel)); - header.add(exportContextCSV.formatCsvHeader(SInfoResultType.discharge)); + header.add(exportContextCSV.msgUnitCSV(SInfoResultType.discharge)); header.add(exportContextCSV.formatCsvHeader(SInfoResultType.dischargeZone)); exportContextCSV.writeCSVLine(header.toArray(new String[colSize])); @@ -101,7 +101,7 @@ exportContextCSV.addJRMetadata(source, "station_header", GeneralResultType.station); exportContextCSV.addJRMetadata(source, "date_header", GeneralResultType.date); exportContextCSV.addJRMetadata(source, "gaugew_header", SInfoResultType.collisionGaugeW); - exportContextCSV.addJRMetadata(source, "gaugelabel_header", SInfoResultType.gaugeLabel); + exportContextCSV.addJRMetadata(source, "gauge_header", SInfoResultType.gaugeLabel); exportContextCSV.addJRMetadata(source, "discharge_header", SInfoResultType.discharge); exportContextCSV.addJRMetadata(source, "dischargezone_header", SInfoResultType.dischargeZone); }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java Fri Jun 22 11:02:59 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java Fri Jun 22 14:34:33 2018 +0200 @@ -37,10 +37,7 @@ @Override protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results) { - // TODO Auto-generated method stub - // final WstInfo wst = result.getWst(); - // exportContext.writeCSVWaterlevelMetadata(writer, wst); - + // do nothing so far } @Override @@ -69,9 +66,9 @@ final Collection<String> lines = new ArrayList<>(3); lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.station)); - + lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.years)); + lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.collisionCount)); return lines.toArray(new String[lines.size()]); - // return formatRow(exportContextCSV, results, row); } private String[] formatRow(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final ResultRow row) { @@ -95,7 +92,7 @@ /* column headings */ exportContextCSV.addJRMetadata(source, "station_header", GeneralResultType.station); - // exportContextCSV.addJRMetadata(source, "years_header", SInfoResultType.years); - // exportContextCSV.addJRMetadata(source, "collisioncount_header", SInfoResultType.collisionCount); + exportContextCSV.addJRMetadata(source, "collision_years_header", SInfoResultType.years); + exportContextCSV.addJRMetadata(source, "collision_count_header", SInfoResultType.collisionCount); } } \ No newline at end of file
--- a/artifacts/src/main/resources/messages_de.properties Fri Jun 22 11:02:59 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Fri Jun 22 14:34:33 2018 +0200 @@ -1113,7 +1113,7 @@ sinfo.export.csv.header.collision.count = Anzahl der Grundber\u00fchrungen collision.count.title = Grundber\u00fchrungen {0} chart.collision_count.section.yaxis.label = H\u00e4ufigkeit -sinfo.export.csv.header.collision.gaugew = W am Pegel +sinfo.export.csv.header.collision.gaugew = Pegelstand [cm] collision.gaugew.title = W am Pegel {0} sinfo.export.csv.header.discharge.zone = Abflusszustand