Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculationResult.java @ 9318:7b2b086e45f0
collision pdf details, ResultType refactoring, bezugswst result
author | gernotbelger |
---|---|
date | Fri, 27 Jul 2018 10:11:23 +0200 |
parents | 6ffcbb4f35d5 |
children | 86d2cbfe7f7f |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculationResult.java Thu Jul 26 17:37:23 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculationResult.java Fri Jul 27 10:11:23 2018 +0200 @@ -12,6 +12,7 @@ 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.ExportContextCSV; import org.dive4elements.river.artifacts.common.ExportContextPDF; @@ -47,6 +48,7 @@ @Override protected void writeCSVResultMetadata(final ExportContextCSV exportContextCSV) { + // TODO: wenn wst und peilung vorhanden sind, sollte dieser Teil wieder einkommentiert werden // exportContextCSV.writeCSVSoundingMetadata(this.sounding, " "); // exportContextCSV.writeBlankLine(); // exportContextCSV.writeCSVWaterlevelMetadata(wst); @@ -63,9 +65,11 @@ final Collection<String> lines = new ArrayList<>(10); lines.add(exportContext.formatRowValue(row, GeneralResultType.station)); + lines.add(exportContext.formatRowValue(row, BunduResultType.bezugswst)); lines.add(exportContext.formatRowValue(row, GeneralResultType.dischargeQwithUnit)); - // lines.add(exportContext.formatRowValue(row, SInfoResultType.flowdepthDevelopment)); + lines.add(exportContext.formatRowValue(row, GeneralResultType.waterlevelLabel)); + lines.add(exportContext.formatRowValue(row, GeneralResultType.gaugeLabel)); lines.add(exportContext.formatRowValue(row, GeneralResultType.location)); return lines.toArray(new String[lines.size()]); @@ -77,11 +81,10 @@ final Collection<String> header = new ArrayList<>(11); header.add(exportContextCSV.formatCsvHeader(GeneralResultType.station)); + header.add(exportContextCSV.formatCsvHeader(BunduResultType.bezugswst)); header.add(exportContextCSV.formatCsvHeader(GeneralResultType.dischargeQwithUnit)); - // header.add(exportContextCSV.msgUnitCSV(SInfoResultType.flowdepthDevelopment, - // SInfoResultType.flowdepthDevelopment.getUnit())); - // header.add(exportContextCSV.msgUnitCSV(SInfoResultType.flowdepthDevelopmentPerYear, - // SInfoResultType.flowdepthDevelopmentPerYear.getUnit())); + header.add(exportContextCSV.formatCsvHeader(GeneralResultType.waterlevelLabel)); + header.add(exportContextCSV.formatCsvHeader(GeneralResultType.gaugeLabel)); header.add(exportContextCSV.formatCsvHeader(GeneralResultType.location)); exportContextCSV.writeCSVLine(header.toArray(new String[header.size()])); @@ -104,11 +107,10 @@ protected void addJRTableHeader(final ExportContextPDF exportContextPDF, final MetaAndTableJRDataSource source) { /* column headings */ exportContextPDF.addJRMetadata(source, "station_header", GeneralResultType.station); - exportContextPDF.addJRMetadata(source, "TODO_MAKE_JASPER_REPORT...", GeneralResultType.dischargeQwithUnit); - // exportContextPDF.addJRMetadata(source, "flowdepthdevelopment_header", SInfoResultType.flowdepthDevelopment); - // exportContextPDF.addJRMetadata(source, "flowdepthdevelopmentperyear_header", - // SInfoResultType.flowdepthDevelopmentPerYear); - + exportContextPDF.addJRMetadata(source, "bezugswst_header", BunduResultType.bezugswst); + exportContextPDF.addJRMetadata(source, "discharge_header", GeneralResultType.dischargeQwithUnit); + exportContextPDF.addJRMetadata(source, "waterlevel_name_header", GeneralResultType.waterlevelLabel); + exportContextPDF.addJRMetadata(source, "gauge_header", GeneralResultType.gaugeLabel); exportContextPDF.addJRMetadata(source, "location_header", GeneralResultType.location); }