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