# HG changeset patch # User gernotbelger # Date 1529670873 -7200 # Node ID 3ace6db2f87b6e0220cdfea58299c36b49334656 # Parent f1be005f0c46340d222745433b21c4cd953b2c49 collision details+pdf-export diff -r f1be005f0c46 -r 3ace6db2f87b artifacts/doc/conf/jasper/templates/sinfo.collision.detail.jrxml --- 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 @@ - - + + @@ -72,6 +72,8 @@ + + @@ -110,7 +112,7 @@ - + @@ -123,24 +125,54 @@ - + + + + + + + + + + + - + - + + + + + + + + + + + - + + + + + + + + + + + @@ -157,18 +189,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + diff -r f1be005f0c46 -r 3ace6db2f87b artifacts/doc/conf/jasper/templates/sinfo.collision.overview.jrxml --- 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 @@ - - + + @@ -72,6 +72,8 @@ + + @@ -152,12 +154,12 @@ - + - + - + @@ -167,21 +169,31 @@ - + + + + + + + + + + + - + - + @@ -191,18 +203,40 @@ + + + + + + + + + + + + + + + + + + + + + + - + - + diff -r f1be005f0c46 -r 3ace6db2f87b artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcDetailResult.java --- 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); } diff -r f1be005f0c46 -r 3ace6db2f87b artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java --- 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 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 diff -r f1be005f0c46 -r 3ace6db2f87b artifacts/src/main/resources/messages_de.properties --- 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