# HG changeset patch # User gernotbelger # Date 1539784838 -7200 # Node ID 4deb6b24f0723d1433d31bed5f000f8cbe4bd5fb # Parent fb80fc7ec610ca2108de15b2dd691d9ce0333948 PDF-Export zu 2.8 Nachtrag diff -r fb80fc7ec610 -r 4deb6b24f072 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml --- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Wed Oct 17 13:57:34 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Wed Oct 17 16:00:38 2018 +0200 @@ -1,6 +1,6 @@ - - + + @@ -99,6 +99,7 @@ + @@ -119,7 +120,7 @@ - + @@ -129,95 +130,105 @@ [ "+$F{meta:river_unit}+"]"]]> - + - + - + - + - + [ "+$F{meta:river_unit}+"]"]]> - + - + - + - + - + - + - + - + - + + + + + + + + + + + - + @@ -225,10 +236,10 @@ - + - + @@ -236,21 +247,10 @@ - - - - - - - - - - - - + @@ -261,7 +261,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -283,7 +283,18 @@ - + + + + + + + + + + + + @@ -291,10 +302,10 @@ - + - + @@ -302,21 +313,10 @@ - - - - - - - - - - - - + @@ -327,7 +327,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -371,7 +371,18 @@ - + + + + + + + + + + + + @@ -379,7 +390,18 @@ - + + + + + + + + + + + + diff -r fb80fc7ec610 -r 4deb6b24f072 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result2.jrxml --- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result2.jrxml Wed Oct 17 13:57:34 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,361 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="30" splitType="Stretch"> - <textField> - <reportElement style="htmlStyle" x="0" y="0" width="515" height="30"/> - <textElement> - <font size="18"/> - </textElement> - <textFieldExpression><![CDATA[$F{meta:bezugswst_result_header}]]></textFieldExpression> - </textField> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r fb80fc7ec610 -r 4deb6b24f072 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java Wed Oct 17 13:57:34 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java Wed Oct 17 16:00:38 2018 +0200 @@ -33,7 +33,6 @@ private static final long serialVersionUID = 1L; - private static final String JASPER_FILE = "/jasper/templates/bundu.bezugswst.result2.jrxml"; private static final String fieldBedheightMsgKey = "bundu.export.bezugswst.csv.meta.miss.bedheight.field"; private static final String fieldFlowdepthMsgKey = "bundu.export.bezugswst.csv.meta.miss.flowdepth.field"; private static final String fieldVolumeMsgKey = "bundu.export.bezugswst.csv.meta.miss.volume.field"; @@ -56,7 +55,7 @@ @Override protected String getJasperFile() { - return JASPER_FILE; + throw new UnsupportedOperationException(); } protected String[] formatRow(final AbstractExportContext exportContext, final ResultRow row) { @@ -127,22 +126,12 @@ @Override protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) { - - return this.formatRow(exportContextPDF, row); + throw new UnsupportedOperationException(); } @Override - protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) { - /* column headings */ + protected void addJRTableHeader(final ExportContextPDF exportContext, final MetaAndTableJRDataSource source) { + throw new UnsupportedOperationException(); + } - // TODO Auftrennung jeder Volumen+Masse-Spalte in zwei getrennte Volumen- und Masse-Spalten - exportContextPDF.addJRMetadata(source, "station_header", GeneralResultType.station); - for (int i = 1; i <= fieldSize(); i++) { - exportContextPDF.addJRMetadata(source, "field_header" + String.valueOf(i), exportContextPDF.msg(fieldVolumeMsgKey, i)); - exportContextPDF.addJRMetadata(source, "field_header" + String.valueOf(i), exportContextPDF.msg(fieldMassMsgKey, i)); - } - exportContextPDF.addJRMetadata(source, "mean_bedheight_header", BunduResultType.missVolumeMeanBed); - exportContextPDF.addJRMetadata(source, "mean_bedheight_header", BunduResultType.missMassMeanBed); - - } } \ No newline at end of file diff -r fb80fc7ec610 -r 4deb6b24f072 artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractResultType.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractResultType.java Wed Oct 17 13:57:34 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/common/AbstractResultType.java Wed Oct 17 16:00:38 2018 +0200 @@ -35,9 +35,6 @@ private final String pdfHeader; - private static String YES = null; - private static String NO = null; - protected AbstractResultType(final String unit, final String csvHeader, final String pdfHeader) { this.unit = unit; this.csvHeader = csvHeader; @@ -68,13 +65,9 @@ throw new IllegalStateException(); if ((boolean) value) { - if (YES == null) - YES = Resources.getMsg(context.getMeta(), String.valueOf(value)); - return YES; + return Resources.getMsg(context.getMeta(), String.valueOf(value)); } else { - if (NO == null) - NO = Resources.getMsg(context.getMeta(), String.valueOf(value)); - return NO; + return Resources.getMsg(context.getMeta(), String.valueOf(value)); } } diff -r fb80fc7ec610 -r 4deb6b24f072 artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Wed Oct 17 13:57:34 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Wed Oct 17 16:00:38 2018 +0200 @@ -938,8 +938,8 @@ bundu.export.bezugswst.csv.meta.miss.channel.lower_edge = Lower Edge of Channel bundu.export.bezugswst.pdf.meta.miss.channel.lower_edge = Lower Edge of Channel bundu.export.bezugswst.csv.meta.miss.sounding = Sounding -bundu.export.bezugswst.csv.meta.miss.bedheight.field = Feld {0} Geodetic Altitude -bundu.export.bezugswst.csv.meta.miss.flowdepth.field = Feld {0} Flow Depth [m] +bundu.export.bezugswst.csv.meta.miss.bedheight.field = Field {0} Geodetic Altitude +bundu.export.bezugswst.csv.meta.miss.flowdepth.field = Field {0} Flow Depth [m] bundu.export.bezugswst.csv.meta.miss.mass.field = Field {0} Missing Mass [t] bundu.export.bezugswst.csv.meta.miss.volume.field = Field {0} Missing Volume [m\u00b3] bundu.export.bezugswst.csv.meta.miss.height.mean_bed = Mean Bed Height Geodetic Altitude