+ <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> +

# HG changeset patch # User gernotbelger # Date 1532712297 -7200 # Node ID c64de8cc4e9711d4a5a3e8563a68a4b17785ab66 # Parent 127638669052aecb823ede13ba9af5bfb179bd30 bundu.bezugswst missing volume calcResult3 diff -r 127638669052 -r c64de8cc4e97 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml --- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Fri Jul 27 18:49:55 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml Fri Jul 27 19:24:57 2018 +0200 @@ -1,6 +1,6 @@ - + diff -r 127638669052 -r c64de8cc4e97 artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml Fri Jul 27 19:24:57 2018 +0200 @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <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 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Fri Jul 27 18:49:55 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Fri Jul 27 19:24:57 2018 +0200 @@ -233,4 +233,16 @@ } }; + public static final BunduResultType stationForMiss = new BunduResultType(I18NStrings.UNIT_KM, I18NStrings.CSV_KM_HEADER) { + @Override + public String exportValue(final CallContext context, final Object value) { + return exportStringValue(value); // leider doof... + } + + @Override + protected NumberFormat createFormatter(final CallContext context) { + throw new UnsupportedOperationException(); + } + }; + } \ No newline at end of file diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Fri Jul 27 18:49:55 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Fri Jul 27 19:24:57 2018 +0200 @@ -129,6 +129,20 @@ Resources.getMsg(m, "bundu.export.csv.title.bezugswst.result2"), listResult2); results.addResult(r2, null); + // Third RESULT + final List listResult3 = new ArrayList<>(); + final ResultRow rowResult3 = ResultRow.create(); + + rowResult3.putValue(BunduResultType.stationForMiss, "650 - 651"); + rowResult3.putValue(BunduResultType.missVolume, 52950); + rowResult3.putValue(BunduResultType.missMass, 91491); + + listResult3.add(rowResult3); + + final BezugswstMissVolCalculationResult3 r3 = new BezugswstMissVolCalculationResult3( + Resources.getMsg(m, "bundu.export.csv.title.bezugswst.result3"), listResult3); + results.addResult(r3, null); + } return new CalculationResult(results, null);// problems); diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult1.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult1.java Fri Jul 27 18:49:55 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult1.java Fri Jul 27 19:24:57 2018 +0200 @@ -27,7 +27,7 @@ * * @author Gernot Belger */ -final class BezugswstMissVolCalculationResult1 extends AbstractCalculationExportableResult { +final class BezugswstMissVolCalculationResult1 extends AbstractCalculationExportableResult implements BunduWstExporter.MissResultType { private static final long serialVersionUID = 1L; diff -r 127638669052 -r c64de8cc4e97 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 Fri Jul 27 18:49:55 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java Fri Jul 27 19:24:57 2018 +0200 @@ -28,7 +28,7 @@ * * @author Gernot Belger */ -final class BezugswstMissVolCalculationResult2 extends AbstractCalculationExportableResult { +final class BezugswstMissVolCalculationResult2 extends AbstractCalculationExportableResult implements BunduWstExporter.MissResultType { private static final long serialVersionUID = 1L; @@ -69,7 +69,7 @@ @Override public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) { - final int colSize = 15; + final int colSize = fieldSize + 2; exportContextCSV.writeTitleForTabs("bundu.export.csv.title.bezugswst.result2", colSize); // Voraussetzung für Tabs ist, dass der Titel vor den Headern final Collection header = new ArrayList<>(colSize); diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult3.java Fri Jul 27 19:24:57 2018 +0200 @@ -0,0 +1,96 @@ +/* Copyright (C) 2017 by Bundesanstalt für Gewässerkunde + * Software engineering by + * Björnsen Beratende Ingenieure GmbH + * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt + * + * This file is Free Software under the GNU AGPL (>=v3) + * and comes with ABSOLUTELY NO WARRANTY! Check out the + * documentation coming with Dive4Elements River for details. + */ +package org.dive4elements.river.artifacts.bundu.bezugswst; + +import java.util.ArrayList; +import java.util.Collection; + +import org.dive4elements.river.artifacts.bundu.BunduResultType; +import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult; +import org.dive4elements.river.artifacts.common.AbstractExportContext; +import org.dive4elements.river.artifacts.common.ExportContextCSV; +import org.dive4elements.river.artifacts.common.ExportContextPDF; +import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource; +import org.dive4elements.river.artifacts.common.ResultRow; +import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; + +/** + * Contains the results of a //TODO LINK{@link BezugswstCalculation}. + * + * @author Gernot Belger + */ +final class BezugswstMissVolCalculationResult3 extends AbstractCalculationExportableResult implements BunduWstExporter.MissResultType { + + private static final long serialVersionUID = 1L; + + private static final String JASPER_FILE = "/jasper/templates/bundu.bezugswst.result3.jrxml"; + + public BezugswstMissVolCalculationResult3(final String label, final Collection rows) { + super(label, rows); + + } + + @Override + protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) { + // no metadata + } + + @Override + protected String getJasperFile() { + return JASPER_FILE; + } + + protected String[] formatRow(final AbstractExportContext exportContext, final ResultRow row) { + + final Collection lines = new ArrayList<>(20); + + lines.add(exportContext.formatRowValue(row, BunduResultType.stationForMiss)); + lines.add(exportContext.formatRowValue(row, BunduResultType.missVolume)); + lines.add(exportContext.formatRowValue(row, BunduResultType.missMass)); + return lines.toArray(new String[lines.size()]); + } + + @Override + public void writeCSVHeader(final ExportContextCSV exportContextCSV, final RiverInfo river) { + + final int colSize = 3; + exportContextCSV.writeTitleForTabs("bundu.export.csv.title.bezugswst.result3", colSize); // Voraussetzung für Tabs ist, dass der Titel vor den Headern + final Collection header = new ArrayList<>(colSize); + + header.add(exportContextCSV.formatCsvHeader(BunduResultType.stationForMiss)); + header.add(exportContextCSV.formatCsvHeader(BunduResultType.missVolume)); + header.add(exportContextCSV.formatCsvHeader(BunduResultType.missMass)); + + exportContextCSV.writeCSVLine(header.toArray(new String[header.size()])); + + } + + @Override + protected String[] formatCSVRow(final ExportContextCSV exportContextCSV, final ResultRow row) { + + return this.formatRow(exportContextCSV, row); + } + + @Override + protected String[] formatPDFRow(final ExportContextPDF exportContextPDF, final ResultRow row) { + + return this.formatRow(exportContextPDF, row); + } + + @Override + protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) { + /* column headings */ + + exportContextPDF.addJRMetadata(source, "station_header", BunduResultType.stationForMiss); + exportContextPDF.addJRMetadata(source, "channel_miss_volume_header", BunduResultType.missVolume); + exportContextPDF.addJRMetadata(source, "channel_miss_mass_header", BunduResultType.missMass); + + } +} \ No newline at end of file diff -r 127638669052 -r c64de8cc4e97 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduWstExporter.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduWstExporter.java Fri Jul 27 18:49:55 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduWstExporter.java Fri Jul 27 19:24:57 2018 +0200 @@ -24,6 +24,10 @@ */ public class BunduWstExporter extends AbstractCommonExporter { + public interface MissResultType { + // missuse for casting + } + /** The log used in this exporter. */ private static Logger log = Logger.getLogger(BunduWstExporter.class); @@ -40,10 +44,7 @@ @Override protected void configureDesign(final AbstractCalculationExportableResult result, final JasperDesigner design) { - if (result instanceof BezugswstMissVolCalculationResult1 || result instanceof BezugswstMissVolCalculationResult2)// || result intanceof - // BezugswstMiss...2,3 TODO - - { + if (result instanceof MissResultType) { design.getSource().addMetaData("bezugswst_result_header", result.getLabel()); // globalMeta? wrong place. only one result expected, so it works } }