Mercurial > dive4elements > river
changeset 7979:6fef38a526c7 3.1.4
There is no year/epoche choice anymore for bed differences.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 27 Jun 2014 19:25:29 +0200 |
| parents | a1a918f63bb4 |
| children | cacff0246a81 |
| files | artifacts/doc/conf/jasper/beddifference.jasper artifacts/doc/conf/jasper/beddifference.jrxml artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDifferenceJRDataSource.java artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java |
| diffstat | 4 files changed, 2 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/jasper/beddifference.jrxml Fri Jun 27 18:47:55 2014 +0200 +++ b/artifacts/doc/conf/jasper/beddifference.jrxml Fri Jun 27 19:25:29 2014 +0200 @@ -9,7 +9,6 @@ <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="diffheader" class="java.lang.String"/> <field name="diffpairheader" class="java.lang.String"/> <field name="diffpair" class="java.lang.String"/> @@ -65,25 +64,15 @@ <textFieldExpression><![CDATA[$F{date}]]></textFieldExpression> </textField> <staticText> - <reportElement x="0" y="130" width="123" height="20"/> + <reportElement x="0" y="109" width="123" height="20"/> <textElement/> <text><![CDATA[Differenzen:]]></text> </staticText> <textField isStretchWithOverflow="true"> - <reportElement stretchType="RelativeToTallestObject" x="123" y="130" width="392" height="20"/> + <reportElement stretchType="RelativeToTallestObject" x="123" y="109" 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>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDifferenceJRDataSource.java Fri Jun 27 18:47:55 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDifferenceJRDataSource.java Fri Jun 27 19:25:29 2014 +0200 @@ -53,9 +53,6 @@ else if ("calculation".equals(fieldName)) { value = metaData.get("calculation"); } - else if ("ye_mode".equals(fieldName)) { - value = metaData.get("ye_mode"); - } else if ("date".equals(fieldName)) { value = metaData.get("date"); }
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Fri Jun 27 18:47:55 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Fri Jun 27 19:25:29 2014 +0200 @@ -153,9 +153,6 @@ // Now the dynamic parts BedDifferencesAccess access = new BedDifferencesAccess(arti); - source.addMetaData("ye_mode", Resources.getMsg(locale, - "state.minfo." + access.getYearEpoch(), - access.getYearEpoch())); source.addMetaData("differences", StringUtils.join( access.getDifferenceArtifactNamePairs(), "\n"));