changeset 7932:b1393f96c153

Add unit for Q in SQ relation exports.
author "Tom Gottfried <tom@intevation.de>"
date Fri, 13 Jun 2014 16:34:29 +0200
parents b4117b8adb79
children 900299ab8e6e
files artifacts/doc/conf/jasper/sqrelation.jasper artifacts/doc/conf/jasper/sqrelation.jrxml artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties artifacts/src/main/resources/messages_de_DE.properties artifacts/src/main/resources/messages_en.properties
diffstat 6 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
Binary file artifacts/doc/conf/jasper/sqrelation.jasper has changed
--- a/artifacts/doc/conf/jasper/sqrelation.jrxml	Thu Jun 12 19:43:02 2014 +0200
+++ b/artifacts/doc/conf/jasper/sqrelation.jrxml	Fri Jun 13 16:34:29 2014 +0200
@@ -1,8 +1,8 @@
 <?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.5"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="197"/>
+	<property name="ireport.x" value="54"/>
+	<property name="ireport.y" value="670"/>
 	<subDataset name="dataset1"/>
 	<field name="river" class="java.lang.String"/>
 	<field name="periods" class="java.lang.String"/>
@@ -254,7 +254,7 @@
 					<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<text><![CDATA[Q<sub>max,gemessen</sub>]]></text>
+				<text><![CDATA[Q<sub>max</sub>]]></text>
 			</staticText>
 			<staticText>
 				<reportElement x="109" y="422" width="265" height="19"/>
@@ -366,7 +366,7 @@
 			<staticText>
 				<reportElement x="265" y="0" width="60" height="20"/>
 				<textElement verticalAlignment="Middle" markup="styled"/>
-				<text><![CDATA[Q<sub>max,gemessen</sub>]]></text>
+				<text><![CDATA[Q<sub>max</sub> [m³/s]]]></text>
 			</staticText>
 			<staticText>
 				<reportElement x="391" y="0" width="44" height="20"/>
--- a/artifacts/src/main/resources/messages.properties	Thu Jun 12 19:43:02 2014 +0200
+++ b/artifacts/src/main/resources/messages.properties	Fri Jun 13 16:34:29 2014 +0200
@@ -438,7 +438,7 @@
 export.sqrelation.csv.header.c.duan = C (Duan)
 export.sqrelation.csv.header.c.ferguson = C (Ferguson)
 export.sqrelation.csv.header.sd = Standard error
-export.sqrelation.csv.header.qmax = Q max,measured
+export.sqrelation.csv.header.qmax = Q max, measured [m\u00b3/s]
 export.sqrelation.pdf.file = /jasper/sqrelation_en.jasper
 export.sqrelation.pdf.mode = Load Discharge Relation
 export.minfo.bedquality.km = km
--- a/artifacts/src/main/resources/messages_de.properties	Thu Jun 12 19:43:02 2014 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Fri Jun 13 16:34:29 2014 +0200
@@ -440,7 +440,7 @@
 export.sqrelation.csv.header.c.duan = C (Duan)
 export.sqrelation.csv.header.c.ferguson = C (Ferguson)
 export.sqrelation.csv.header.sd = Standardfehler
-export.sqrelation.csv.header.qmax = Q max,gemessen
+export.sqrelation.csv.header.qmax = Q max, gemessen [m\u00b3/s]
 export.sqrelation.pdf.file = /jasper/sqrelation.jasper
 export.sqrelation.pdf.mode = Transport-Abfluss Beziehung
 export.minfo.bedquality.km = km
--- a/artifacts/src/main/resources/messages_de_DE.properties	Thu Jun 12 19:43:02 2014 +0200
+++ b/artifacts/src/main/resources/messages_de_DE.properties	Fri Jun 13 16:34:29 2014 +0200
@@ -436,7 +436,7 @@
 export.sqrelation.csv.header.c.duan = C (Duan)
 export.sqrelation.csv.header.c.ferguson = C (Ferguson)
 export.sqrelation.csv.header.sd = Standardfehler
-export.sqrelation.csv.header.qmax = Q max,gemessen
+export.sqrelation.csv.header.qmax = Q max, gemessen [m\u00b3/s]
 export.sqrelation.pdf.file = /jasper/sqrelation.jasper
 export.sqrelation.pdf.mode = Transport-Abfluss Beziehung
 export.minfo.bedquality.km = km
--- a/artifacts/src/main/resources/messages_en.properties	Thu Jun 12 19:43:02 2014 +0200
+++ b/artifacts/src/main/resources/messages_en.properties	Fri Jun 13 16:34:29 2014 +0200
@@ -442,7 +442,7 @@
 export.sqrelation.csv.header.c.duan = C (Duan)
 export.sqrelation.csv.header.c.ferguson = C (Ferguson)
 export.sqrelation.csv.header.sd = Standard error
-export.sqrelation.csv.header.qmax = Q max,measured
+export.sqrelation.csv.header.qmax = Q max, measured [m\u00b3/s]
 export.sqrelation.pdf.file = /jasper/sqrelation_en.jasper
 export.sqrelation.pdf.mode = Load Discharge Relation
 export.minfo.bedquality.km = km

http://dive4elements.wald.intevation.org