[PATCH] Fixed flys/issue1628. Made "unit" a configurable field in PDF export
Wald Commits
scm-commit at wald.intevation.org
Tue Jun 3 15:43:38 CEST 2014
# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1401802969 -7200
# Node ID df9ac27d6b74e5bc755a003e2c1702a7d71cc470
# Parent b3534220aac783900bfc82c7ff7af458e242cce4
Fixed flys/issue1628. Made "unit" a configurable field in PDF export.
diff -r b3534220aac7 -r df9ac27d6b74 artifacts/doc/conf/jasper/beddifference.jasper
Binary file artifacts/doc/conf/jasper/beddifference.jasper has changed
diff -r b3534220aac7 -r df9ac27d6b74 artifacts/doc/conf/jasper/beddifference.jrxml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/jasper/beddifference.jrxml Tue Jun 03 15:42:49 2014 +0200
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="flysreport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20">
+ <property name="ireport.zoom" value="1.0"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="0"/>
+ <field name="river" class="java.lang.String"/>
+ <field name="meter" class="java.lang.String"/>
+ <field name="date" class="java.lang.String"/>
+ <field name="calculation" class="java.lang.String"/>
+ <field name="differences" class="java.lang.String"/>
+ <field name="km" class="java.lang.String"/>
+ <field name="ye_mode" class="java.lang.String"/>
+ <field name="unit" class="java.lang.String"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <title>
+ <band height="161" splitType="Stretch">
+ <staticText>
+ <reportElement x="0" y="1" width="155" height="30"/>
+ <textElement>
+ <font size="18"/>
+ </textElement>
+ <text><![CDATA[Ergebnisausgabe]]></text>
+ </staticText>
+ <textField>
+ <reportElement x="155" y="0" width="360" height="31"/>
+ <textElement>
+ <font size="18"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{river}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="0" y="31" width="515" height="26"/>
+ <textElement>
+ <font size="14"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{calculation}]]></textFieldExpression>
+ </textField>
+ <staticText>
+ <reportElement x="0" y="70" width="123" height="20"/>
+ <textElement/>
+ <text><![CDATA[Gewässer:]]></text>
+ </staticText>
+ <textField>
+ <reportElement x="123" y="70" width="392" height="20"/>
+ <textElement/>
+ <textFieldExpression><![CDATA[$F{river}]]></textFieldExpression>
+ </textField>
+ <staticText>
+ <reportElement x="0" y="90" width="123" height="20"/>
+ <textElement/>
+ <text><![CDATA[Datum der Erstellung:]]></text>
+ </staticText>
+ <textField>
+ <reportElement x="123" y="90" width="392" height="20"/>
+ <textElement/>
+ <textFieldExpression><![CDATA[$F{date}]]></textFieldExpression>
+ </textField>
+ <staticText>
+ <reportElement x="0" y="130" width="123" height="20"/>
+ <textElement/>
+ <text><![CDATA[Differenzen:]]></text>
+ </staticText>
+ <textField isStretchWithOverflow="true">
+ <reportElement stretchType="RelativeToTallestObject" x="123" y="130" width="392" height="20"/>
+ <textElement/>
+ <textFieldExpression><![CDATA[$F{differences}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement stretchType="RelativeToTallestObject" x="123" y="110" width="392" height="20"/>
+ <textElement/>
+ <textFieldExpression><![CDATA[$F{ye_mode}]]></textFieldExpression>
+ </textField>
+ <staticText>
+ <reportElement x="0" y="110" width="123" height="20"/>
+ <textElement/>
+ <text><![CDATA[Jahr/Epoche:]]></text>
+ </staticText>
+ </band>
+ </title>
+ <columnHeader>
+ <band height="24" splitType="Stretch">
+ <line>
+ <reportElement x="0" y="19" width="515" height="1"/>
+ </line>
+ <staticText>
+ <reportElement x="0" y="0" width="155" height="20"/>
+ <textElement/>
+ <text><![CDATA[Fluss-Km]]></text>
+ </staticText>
+ <textField>
+ <reportElement x="155" y="0" width="150" height="20"/>
+ <textElement markup="none"/>
+ <textFieldExpression><![CDATA[$F{unit}]]></textFieldExpression>
+ </textField>
+ </band>
+ </columnHeader>
+ <detail>
+ <band height="14" splitType="Stretch">
+ <textField isBlankWhenNull="true">
+ <reportElement x="0" y="0" width="155" height="14"/>
+ <textElement/>
+ <textFieldExpression><![CDATA[$F{km}]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="155" y="0" width="150" height="14"/>
+ <textElement/>
+ <textFieldExpression><![CDATA[$F{meter}]]></textFieldExpression>
+ </textField>
+ </band>
+ </detail>
+ <pageFooter>
+ <band height="29" splitType="Stretch">
+ <textField evaluationTime="Report">
+ <reportElement x="457" y="9" width="57" height="20"/>
+ <textElement/>
+ <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="402" y="9" width="55" height="20"/>
+ <textElement textAlignment="Right"/>
+ <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+ </textField>
+ </band>
+ </pageFooter>
+ <summary>
+ <band height="42" splitType="Stretch"/>
+ </summary>
+</jasperReport>
diff -r b3534220aac7 -r df9ac27d6b74 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Sun Jun 01 08:26:37 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Tue Jun 03 15:42:49 2014 +0200
@@ -149,6 +149,8 @@
source.addMetaData("differences", StringUtils.join(
access.getDifferenceArtifactNamePairs(), "\n"));
+
+ source.addMetaData("unit", msg(CSV_HEADER_DIFF, "cm"));
}
More information about the Dive4Elements-commits
mailing list