[PATCH 1 of 5] (issue1753) Align data columns to the right side

Wald Commits scm-commit at wald.intevation.org
Tue Mar 24 11:09:20 CET 2015


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1426874318 -3600
# Node ID c985b27e3a8cec9d7063dfb63b6bc684797787d8
# Parent  b0e5a2ce0b09341858554c58a20be89ba721a12f
(issue1753) Align data columns to the right side.

diff -r b0e5a2ce0b09 -r c985b27e3a8c artifacts/doc/conf/jasper/sqmeasurements.jasper
Binary file artifacts/doc/conf/jasper/sqmeasurements.jasper has changed
diff -r b0e5a2ce0b09 -r c985b27e3a8c artifacts/doc/conf/jasper/sqmeasurements.jrxml
--- a/artifacts/doc/conf/jasper/sqmeasurements.jrxml	Fri Mar 20 18:42:00 2015 +0100
+++ b/artifacts/doc/conf/jasper/sqmeasurements.jrxml	Fri Mar 20 18:58:38 2015 +0100
@@ -1,7 +1,7 @@
 <?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="167"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<subDataset name="dataset1"/>
 	<field name="date" class="java.lang.String"/>
@@ -34,18 +34,18 @@
 				<text><![CDATA[Parameter]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="60" y="0" width="115" height="20"/>
-				<textElement verticalAlignment="Middle"/>
+				<reportElement x="60" y="0" width="100" height="20"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<text><![CDATA[Transport in [kg/s]]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="175" y="0" width="115" height="20"/>
-				<textElement verticalAlignment="Middle"/>
+				<reportElement x="160" y="0" width="100" height="20"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<text><![CDATA[Abfluss in [m³/s]]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="288" y="0" width="104" height="20"/>
-				<textElement verticalAlignment="Middle" markup="styled"/>
+				<reportElement x="260" y="0" width="122" height="20"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle" markup="styled"/>
 				<text><![CDATA[Datum der Messung]]></text>
 			</staticText>
 			<staticText>
@@ -58,8 +58,8 @@
 	<detail>
 		<band height="17" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="288" y="0" width="104" height="14"/>
-				<textElement verticalAlignment="Middle"/>
+				<reportElement stretchType="RelativeToBandHeight" x="260" y="0" width="122" height="14"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{date}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
@@ -68,13 +68,13 @@
 				<textFieldExpression><![CDATA[$F{param}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="60" y="0" width="115" height="14"/>
-				<textElement verticalAlignment="Middle"/>
+				<reportElement x="60" y="0" width="100" height="14"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{transport}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="175" y="0" width="113" height="14"/>
-				<textElement verticalAlignment="Middle"/>
+				<reportElement stretchType="RelativeToBandHeight" x="160" y="0" width="100" height="14"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{discharge}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
diff -r b0e5a2ce0b09 -r c985b27e3a8c artifacts/doc/conf/jasper/sqmeasurements_en.jasper
Binary file artifacts/doc/conf/jasper/sqmeasurements_en.jasper has changed
diff -r b0e5a2ce0b09 -r c985b27e3a8c artifacts/doc/conf/jasper/sqmeasurements_en.jrxml
--- a/artifacts/doc/conf/jasper/sqmeasurements_en.jrxml	Fri Mar 20 18:42:00 2015 +0100
+++ b/artifacts/doc/conf/jasper/sqmeasurements_en.jrxml	Fri Mar 20 18:58:38 2015 +0100
@@ -1,7 +1,7 @@
 <?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="55"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<subDataset name="dataset1"/>
 	<field name="date" class="java.lang.String"/>
@@ -35,17 +35,17 @@
 			</staticText>
 			<staticText>
 				<reportElement x="60" y="0" width="115" height="20"/>
-				<textElement verticalAlignment="Middle"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<text><![CDATA[Transport in [kg/s]]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="175" y="0" width="115" height="20"/>
-				<textElement verticalAlignment="Middle"/>
+				<reportElement x="175" y="0" width="102" height="20"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<text><![CDATA[Discharge in [m³/s]]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="288" y="0" width="104" height="20"/>
-				<textElement verticalAlignment="Middle" markup="styled"/>
+				<reportElement x="277" y="0" width="104" height="20"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle" markup="styled"/>
 				<text><![CDATA[Measurement Date]]></text>
 			</staticText>
 			<staticText>
@@ -58,8 +58,8 @@
 	<detail>
 		<band height="17" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="288" y="0" width="104" height="14"/>
-				<textElement verticalAlignment="Middle"/>
+				<reportElement stretchType="RelativeToBandHeight" x="277" y="0" width="104" height="14"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{date}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
@@ -69,12 +69,12 @@
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="60" y="0" width="115" height="14"/>
-				<textElement verticalAlignment="Middle"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{transport}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToBandHeight" x="175" y="0" width="113" height="14"/>
-				<textElement verticalAlignment="Middle"/>
+				<reportElement stretchType="RelativeToBandHeight" x="175" y="0" width="102" height="14"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{discharge}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">


More information about the Dive4Elements-commits mailing list