Mercurial > dive4elements > river

changeset 9623:677ff7ed9a60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dnt_bjoernsen <d.tironi@bjoernsen.de>
date Thu, 10 Oct 2019 17:33:56 +0200
parents 36d201244529 (diff) 387822d7d5e8 (current diff)
children 02ca823ec9c6
files artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java
diffstat 7 files changed, 12 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml	Thu Oct 10 17:21:19 2019 +0200
+++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result1.jrxml	Thu Oct 10 17:33:56 2019 +0200
@@ -59,7 +59,7 @@
 	<field name="meta:inundationduration_header" class="java.lang.String"/>
 	<field name="meta:inundationduration_q_header" class="java.lang.String"/>
 	<field name="meta:infrastructure_height_header" class="java.lang.String"/>
-	<field name="meta:infrastructure_type_header" class="java.lang.String"/>
+	<field name="meta:infrastructure_group_header" class="java.lang.String"/>
 	<field name="meta:w_1_header" class="java.lang.String"/>
 	<field name="meta:q_1_header" class="java.lang.String"/>
 	<field name="meta:bezeichnung_1_header" class="java.lang.String"/>
--- a/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml	Thu Oct 10 17:21:19 2019 +0200
+++ b/artifacts/doc/conf/jasper/templates/bundu.bezugswst.result3.jrxml	Thu Oct 10 17:33:56 2019 +0200
@@ -61,7 +61,7 @@
 	<field name="meta:inundationduration_header" class="java.lang.String"/>
 	<field name="meta:inundationduration_q_header" class="java.lang.String"/>
 	<field name="meta:infrastructure_height_header" class="java.lang.String"/>
-	<field name="meta:infrastructure_type_header" class="java.lang.String"/>
+	<field name="meta:infrastructure_group_header" class="java.lang.String"/>
 	<field name="meta:w_1_header" class="java.lang.String"/>
 	<field name="meta:q_1_header" class="java.lang.String"/>
 	<field name="meta:bezeichnung_1_header" class="java.lang.String"/>
--- a/artifacts/doc/conf/jasper/templates/sinfo.collision.detail.jrxml	Thu Oct 10 17:21:19 2019 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.collision.detail.jrxml	Thu Oct 10 17:33:56 2019 +0200
@@ -59,7 +59,7 @@
 	<field name="meta:inundationduration_header" class="java.lang.String"/>
 	<field name="meta:inundationduration_q_header" class="java.lang.String"/>
 	<field name="meta:infrastructure_height_header" class="java.lang.String"/>
-	<field name="meta:infrastructure_type_header" class="java.lang.String"/>
+	<field name="meta:infrastructure_group_header" class="java.lang.String"/>
 	<field name="meta:w_1_header" class="java.lang.String"/>
 	<field name="meta:q_1_header" class="java.lang.String"/>
 	<field name="meta:bezeichnung_1_header" class="java.lang.String"/>
--- a/artifacts/doc/conf/jasper/templates/sinfo.collision.overview.jrxml	Thu Oct 10 17:21:19 2019 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.collision.overview.jrxml	Thu Oct 10 17:33:56 2019 +0200
@@ -59,7 +59,7 @@
 	<field name="meta:inundationduration_header" class="java.lang.String"/>
 	<field name="meta:inundationduration_q_header" class="java.lang.String"/>
 	<field name="meta:infrastructure_height_header" class="java.lang.String"/>
-	<field name="meta:infrastructure_type_header" class="java.lang.String"/>
+	<field name="meta:infrastructure_group_header" class="java.lang.String"/>
 	<field name="meta:w_1_header" class="java.lang.String"/>
 	<field name="meta:q_1_header" class="java.lang.String"/>
 	<field name="meta:bezeichnung_1_header" class="java.lang.String"/>
--- a/artifacts/doc/conf/jasper/templates/sinfo.floodduration.jrxml	Thu Oct 10 17:21:19 2019 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.floodduration.jrxml	Thu Oct 10 17:33:56 2019 +0200
@@ -57,8 +57,8 @@
 	<field name="meta:inundationduration_header" class="java.lang.String"/>
 	<field name="meta:inundationduration_q_header" class="java.lang.String"/>
 	<field name="meta:infrastructure_height_header" class="java.lang.String"/>
+	<field name="meta:infrastructure_group_header" class="java.lang.String"/>
 	<field name="meta:infrastructure_type_header" class="java.lang.String"/>
-	<field name="meta:infrastructure_part_header" class="java.lang.String"/>
 	<field name="meta:w_1_header" class="java.lang.String"/>
 	<field name="meta:q_1_header" class="java.lang.String"/>
 	<field name="meta:bezeichnung_1_header" class="java.lang.String"/>
@@ -193,13 +193,13 @@
 				<reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="264" y="0" width="60" height="24"/>
 				<box padding="5"/>
 				<textElement textAlignment="Left" verticalAlignment="Bottom"/>
-				<textFieldExpression><![CDATA[$F{meta:infrastructure_type_header}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{meta:infrastructure_group_header}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="324" y="0" width="60" height="24"/>
 				<box padding="5"/>
 				<textElement textAlignment="Left" verticalAlignment="Bottom"/>
-				<textFieldExpression><![CDATA[$F{meta:infrastructure_part_header}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{meta:infrastructure_type_header}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement key="wOpt" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="384" y="0" width="60" height="24"/>
--- a/artifacts/doc/conf/jasper/templates/sinfo.floodduration2.jrxml	Thu Oct 10 17:21:19 2019 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.floodduration2.jrxml	Thu Oct 10 17:33:56 2019 +0200
@@ -57,8 +57,8 @@
 	<field name="meta:inundationduration_header" class="java.lang.String"/>
 	<field name="meta:inundationduration_q_header" class="java.lang.String"/>
 	<field name="meta:infrastructure_height_header" class="java.lang.String"/>
+	<field name="meta:infrastructure_group_header" class="java.lang.String"/>
 	<field name="meta:infrastructure_type_header" class="java.lang.String"/>
-	<field name="meta:infrastructure_part_header" class="java.lang.String"/>
 	<field name="meta:w_1_header" class="java.lang.String"/>
 	<field name="meta:q_1_header" class="java.lang.String"/>
 	<field name="meta:bezeichnung_1_header" class="java.lang.String"/>
@@ -193,13 +193,13 @@
 				<reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="132" y="0" width="40" height="24"/>
 				<box padding="2"/>
 				<textElement textAlignment="Left" verticalAlignment="Bottom"/>
-				<textFieldExpression><![CDATA[$F{meta:infrastructure_type_header}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{meta:infrastructure_group_header}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="172" y="0" width="40" height="24"/>
 				<box padding="2"/>
 				<textElement textAlignment="Left" verticalAlignment="Bottom"/>
-				<textFieldExpression><![CDATA[$F{meta:infrastructure_part_header}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{meta:infrastructure_type_header}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="212" y="0" width="40" height="24"/>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java	Thu Oct 10 17:21:19 2019 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java	Thu Oct 10 17:33:56 2019 +0200
@@ -239,9 +239,8 @@
         exportContextPDF.addJRMetadata(source, "inundationduration_header", SInfoResultType.floodDuration);
         exportContextPDF.addJRMetadata(source, "inundationduration_q_header", SInfoResultType.floodDischarge);
         exportContextPDF.addJRMetadata(source, "infrastructure_height_header", SInfoResultType.infrastructureHeight);
-        // FIXME Tironi: report-keys ..type => ..group und ..part => ..type umbenennen zwecks Einheitlichkeit
-        exportContextPDF.addJRMetadata(source, "infrastructure_type_header", SInfoResultType.infrastructuregroup);
-        exportContextPDF.addJRMetadata(source, "infrastructure_part_header", SInfoResultType.infrastructuretype);
+        exportContextPDF.addJRMetadata(source, "infrastructure_group_header", SInfoResultType.infrastructuregroup);
+        exportContextPDF.addJRMetadata(source, "infrastructure_type_header", SInfoResultType.infrastructuretype);
 
         for (int i = 1; i <= this.getWaterlevelCount(); i++) {
http://dive4elements.wald.intevation.org