diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcDetailResult.java @ 9318:7b2b086e45f0

collision pdf details, ResultType refactoring, bezugswst result
author gernotbelger
date Fri, 27 Jul 2018 10:11:23 +0200
parents a4121ec450d6
children 8b457ca70512
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcDetailResult.java	Thu Jul 26 17:37:23 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcDetailResult.java	Fri Jul 27 10:11:23 2018 +0200
@@ -53,10 +53,10 @@
         final Collection<String> header = new ArrayList<>(colSize);
 
         header.add(exportContextCSV.formatCsvHeader(GeneralResultType.station));
-        header.add(exportContextCSV.formatCsvHeader(GeneralResultType.date));
+        header.add(exportContextCSV.formatCsvHeader(GeneralResultType.dateShort));
         header.add(exportContextCSV.msgUnitCSV(SInfoResultType.collisionGaugeW, SInfoResultType.collisionGaugeW.getUnit()));
-        header.add(exportContextCSV.formatCsvHeader(SInfoResultType.gaugeLabel));
-        header.add(exportContextCSV.msgUnitCSV(SInfoResultType.discharge, SInfoResultType.discharge.getUnit()));
+        header.add(exportContextCSV.formatCsvHeader(GeneralResultType.gaugeLabelCm));
+        header.add(exportContextCSV.msgUnitCSV(SInfoResultType.dischargeLong, SInfoResultType.dischargeLong.getUnit()));
         header.add(exportContextCSV.formatCsvHeader(SInfoResultType.dischargeZone));
 
         exportContextCSV.writeCSVLine(header.toArray(new String[colSize]));
@@ -71,7 +71,7 @@
     protected String[] formatPDFRow(final ExportContextPDF exportContextCSV, final ResultRow row) {
         /*
          * final Collection<String> lines = new ArrayList<>(6);
-         * lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.station));
+         * lines.add(exportContextCSV.formatRowValue(row, BunduResultType.station));
          * return lines.toArray(new String[lines.size()]);
          */
         return formatRow(exportContextCSV, row);
@@ -82,10 +82,10 @@
         final Collection<String> lines = new ArrayList<>(6);
 
         lines.add(exportContext.formatRowValue(row, GeneralResultType.station));
-        lines.add(exportContext.formatRowValue(row, GeneralResultType.date));
+        lines.add(exportContext.formatRowValue(row, GeneralResultType.dateShort));
         lines.add(exportContext.formatRowValue(row, SInfoResultType.collisionGaugeW));
-        lines.add(exportContext.formatRowValue(row, SInfoResultType.gaugeLabel));
-        lines.add(exportContext.formatRowValue(row, SInfoResultType.discharge));
+        lines.add(exportContext.formatRowValue(row, GeneralResultType.gaugeLabelCm));
+        lines.add(exportContext.formatRowValue(row, SInfoResultType.dischargeLong));
         lines.add(exportContext.formatRowValue(row, SInfoResultType.dischargeZone));
 
         return lines.toArray(new String[lines.size()]);
@@ -101,10 +101,10 @@
 
         /* column headings */
         exportContextCSV.addJRMetadata(source, "station_header", GeneralResultType.station);
-        exportContextCSV.addJRMetadata(source, "date_header", GeneralResultType.date);
+        exportContextCSV.addJRMetadata(source, "date_header", GeneralResultType.dateShort);
         exportContextCSV.addJRMetadata(source, "gaugew_header", SInfoResultType.collisionGaugeW);
-        exportContextCSV.addJRMetadata(source, "gauge_header", SInfoResultType.gaugeLabel);
-        exportContextCSV.addJRMetadata(source, "discharge_header", SInfoResultType.discharge);
+        exportContextCSV.addJRMetadata(source, "gauge_header", GeneralResultType.gaugeLabelCm);
+        exportContextCSV.addJRMetadata(source, "discharge_header", SInfoResultType.dischargeLong);
         exportContextCSV.addJRMetadata(source, "dischargezone_header", SInfoResultType.dischargeZone);
     }
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org