Mercurial > dive4elements > river
changeset 9120:2fb72a0aa313
pdf layout condensed
| author | gernotbelger |
|---|---|
| date | Tue, 05 Jun 2018 11:44:05 +0200 |
| parents | 36c80c7fd02f |
| children | 8675912c7f48 |
| files | artifacts/contrib/fonts/roboto.jar artifacts/contrib/fonts/simply_glamorous.jar artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml artifacts/doc/conf/jasper/templates/uinfo.inundationduration.jrxml artifacts/doc/conf/jasper/templates/uinfo.salixline.jrxml artifacts/doc/conf/jasper/templates/uinfo.vegetationzones.jrxml artifacts/pom-oracle.xml artifacts/pom.xml artifacts/src/main/resources/roboto.jar artifacts/src/main/resources/simply_glamorous.jar |
| diffstat | 13 files changed, 212 insertions(+), 182 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml Tue Jun 05 10:25:48 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml Tue Jun 05 11:44:05 2018 +0200 @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 --> -<!-- 2018-06-01T17:12:29 --> +<!-- 2018-06-05T11:33:35 --> <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="842" pageHeight="595" 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"/> - <style name="htmlStyle" markup="html" fontName="Roboto"/> + <style name="htmlStyle" markup="html" fontName="Roboto"> + <box topPadding="2" leftPadding="5" rightPadding="5"/> + </style> <field name="meta:totalpagesoffset" class="java.lang.Integer"/> <field name="meta:startpageoffset" class="java.lang.Integer"/> <field name="meta:header" class="java.lang.String"/> @@ -109,9 +111,7 @@ <textField isStretchWithOverflow="true"> <reportElement key="0" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="-5" y="0" width="55" height="24"/> <box padding="5"/> - <textElement textAlignment="Right" verticalAlignment="Bottom"> - - </textElement> + <textElement textAlignment="Right" verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:station_header}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> @@ -179,91 +179,94 @@ </band> </columnHeader> <detail> - <band height="20" splitType="Prevent"> + <band height="15" splitType="Prevent"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="0" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="0" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right" verticalAlignment="Top"> <font isBold="false"/> </textElement> <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="1" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="55" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="1" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="55" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right" verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="flowdepthtkh" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="105" y="0" width="54" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="flowdepthtkh" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="105" y="0" width="54" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right" verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="tkh" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="159" y="0" width="36" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="tkh" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="159" y="0" width="36" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right" verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="4" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="195" y="0" width="60" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="4" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="195" y="0" width="60" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right" verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="5" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="255" y="0" width="40" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="5" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="255" y="0" width="40" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right" verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement key="6" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="295" y="0" width="80" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="6" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="295" y="0" width="80" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement key="7" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="375" y="0" width="110" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="7" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="375" y="0" width="110" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="8" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="485" y="0" width="60" height="20"/> - <box topPadding="5" leftPadding="5" rightPadding="5"/> + <reportElement key="8" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="485" y="0" width="60" height="15"/> + <box topPadding="2" leftPadding="5" rightPadding="5"/> <textElement textAlignment="Right" verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement key="9" style="htmlStyle" positionType="Float" x="545" y="0" width="95" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="9" style="htmlStyle" positionType="Float" x="545" y="0" width="95" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:9}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement key="10" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="640" y="0" width="122" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="10" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="640" y="0" width="122" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement verticalAlignment="Top"/> <textFieldExpression><![CDATA[$F{data:10}]]></textFieldExpression> </textField> </band> </detail> <pageFooter> - <band height="29" splitType="Stretch"> + <band height="15" splitType="Stretch"> <textField evaluationTime="Report"> - <reportElement style="htmlStyle" x="705" y="9" width="57" height="20"/> - <textFieldExpression><![CDATA[" / " +( $V{PAGE_NUMBER} +(($F{meta:totalpagesoffset} != null) ? $F{meta:totalpagesoffset} : 0) )]]></textFieldExpression> + <reportElement style="htmlStyle" x="705" y="0" width="57" height="15"/> + <box leftPadding="0"/> + <textElement textAlignment="Left"/> + <textFieldExpression><![CDATA["/ " +( $V{PAGE_NUMBER} +(($F{meta:totalpagesoffset} != null) ? $F{meta:totalpagesoffset} : 0) )]]></textFieldExpression> </textField> <textField> - <reportElement style="htmlStyle" x="650" y="9" width="55" height="20"/> + <reportElement style="htmlStyle" x="650" y="0" width="55" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="3"/> <textElement textAlignment="Right"/> - <textFieldExpression><![CDATA[$V{PAGE_NUMBER}+ (($F{meta:startpageoffset} != null) ? $F{meta:startpageoffset} : 0 )]]></textFieldExpression> + <textFieldExpression><![CDATA[$V{PAGE_NUMBER} +(($F{meta:startpageoffset} != null) ? $F{meta:startpageoffset} : 0 ) ]]></textFieldExpression> </textField> </band> </pageFooter> <summary> - <band height="42" splitType="Stretch"/> + <band height="30" splitType="Stretch"/> </summary> </jasperReport>
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml Tue Jun 05 10:25:48 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepthdevelopment.jrxml Tue Jun 05 11:44:05 2018 +0200 @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 --> -<!-- 2018-06-01T17:31:11 --> +<!-- 2018-06-05T11:35:39 --> <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="842" pageHeight="595" 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"/> - <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto"/> + <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto"> + <box topPadding="2" leftPadding="5" rightPadding="5"/> + </style> <field name="meta:header" class="java.lang.String"/> <field name="meta:calcMode" class="java.lang.String"/> <field name="meta:version_label" class="java.lang.String"/> @@ -177,7 +179,7 @@ <textFieldExpression><![CDATA[$F{meta:flowdepthhistorical_header2}]]></textFieldExpression> </textField> <textField> - <reportElement style="htmlStyle" x="560" y="0" width="191" height="75"/> + <reportElement style="htmlStyle" x="560" y="0" width="202" height="75"/> <box padding="5"/> <textElement verticalAlignment="Bottom"/> <textFieldExpression><![CDATA[$F{meta:location_header}]]></textFieldExpression> @@ -205,70 +207,72 @@ </band> </columnHeader> <detail> - <band height="20" splitType="Stretch"> + <band height="15" splitType="Stretch"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="475" y="0" width="85" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="475" y="0" width="85" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="560" y="0" width="191" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="560" y="0" width="202" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="390" y="0" width="85" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="390" y="0" width="85" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="0" y="0" width="60" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="0" y="0" width="60" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="60" y="0" width="80" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="60" y="0" width="80" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="140" y="0" width="80" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="140" y="0" width="80" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="TEST" style="htmlStyle" stretchType="RelativeToBandHeight" x="220" y="0" width="85" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="TEST" style="htmlStyle" stretchType="RelativeToBandHeight" x="220" y="0" width="85" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="305" y="0" width="85" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="305" y="0" width="85" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression> </textField> </band> </detail> <pageFooter> - <band height="29" splitType="Stretch"> + <band height="15" splitType="Stretch"> <textField evaluationTime="Report"> - <reportElement style="htmlStyle" x="705" y="9" width="57" height="20"/> - <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression> + <reportElement style="htmlStyle" x="705" y="0" width="57" height="15"/> + <box leftPadding="0"/> + <textFieldExpression><![CDATA["/ " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField> - <reportElement style="htmlStyle" x="650" y="9" width="55" height="20"/> + <reportElement style="htmlStyle" x="650" y="0" width="55" height="15"/> + <box rightPadding="3"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <summary> - <band height="42" splitType="Stretch"/> + <band height="30" splitType="Stretch"/> </summary> </jasperReport>
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml Tue Jun 05 10:25:48 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepthminmax.jrxml Tue Jun 05 11:44:05 2018 +0200 @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 --> -<!-- 2018-06-01T17:04:03 --> +<!-- 2018-06-05T11:37:40 --> <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="842" pageHeight="595" 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"/> - <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto"/> + <style name="htmlStyle" isDefault="true" mode="Transparent" markup="html" fontName="Roboto"> + <box topPadding="2" leftPadding="5" rightPadding="5"/> + </style> <field name="meta:header" class="java.lang.String"/> <field name="meta:calcMode" class="java.lang.String"/> <field name="meta:version_label" class="java.lang.String"/> @@ -184,81 +186,83 @@ </band> </columnHeader> <detail> - <band height="20" splitType="Stretch"> + <band height="15" splitType="Stretch"> <textField isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="370" y="0" width="90" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="370" y="0" width="90" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Left"/> <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="460" y="0" width="81" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="460" y="0" width="81" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="290" y="0" width="80" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="290" y="0" width="80" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Left"/> <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="50" y="0" width="60" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="50" y="0" width="60" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="110" y="0" width="60" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="110" y="0" width="60" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="170" y="0" width="70" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="170" y="0" width="70" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="240" y="0" width="50" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement key="" style="htmlStyle" stretchType="RelativeToBandHeight" x="240" y="0" width="50" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="541" y="0" width="100" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="541" y="0" width="100" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textFieldExpression><![CDATA[$F{data:8}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="641" y="0" width="120" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"/> + <reportElement style="htmlStyle" stretchType="RelativeToBandHeight" x="641" y="0" width="120" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"/> <textFieldExpression><![CDATA[$F{data:9}]]></textFieldExpression> </textField> </band> </detail> <pageFooter> - <band height="30" splitType="Stretch"> + <band height="15" splitType="Stretch"> <textField evaluationTime="Report"> - <reportElement style="htmlStyle" x="705" y="9" width="57" height="20"/> - <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression> + <reportElement style="htmlStyle" x="705" y="0" width="57" height="15"/> + <box leftPadding="0"/> + <textFieldExpression><![CDATA["/ " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField> - <reportElement style="htmlStyle" x="650" y="9" width="55" height="20"/> + <reportElement style="htmlStyle" x="650" y="0" width="55" height="15"/> + <box rightPadding="3"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <summary> - <band height="42" splitType="Stretch"/> + <band height="30" splitType="Stretch"/> </summary> </jasperReport>
--- a/artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml Tue Jun 05 10:25:48 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/sinfo.tkh.jrxml Tue Jun 05 11:44:05 2018 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 --> -<!-- 2018-06-01T17:01:11 --> +<!-- 2018-06-05T11:42:06 --> <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="842" pageHeight="595" columnWidth="515" leftMargin="60" rightMargin="20" topMargin="20" bottomMargin="20"> <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> @@ -188,10 +188,10 @@ </band> </columnHeader> <detail> - <band height="20" splitType="Prevent"> + <band height="15" splitType="Prevent"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="370" y="0" width="100" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="370" y="0" width="100" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -201,8 +201,8 @@ <textFieldExpression><![CDATA[$F{data:6}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="470" y="0" width="120" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="470" y="0" width="120" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -211,8 +211,8 @@ <textFieldExpression><![CDATA[$F{data:7}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="270" y="0" width="100" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="270" y="0" width="100" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -222,8 +222,8 @@ <textFieldExpression><![CDATA[$F{data:5}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="-5" y="0" width="55" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -233,8 +233,8 @@ <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="50" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="50" y="0" width="50" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -244,8 +244,8 @@ <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="100" y="0" width="60" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="100" y="0" width="60" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -255,8 +255,8 @@ <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="0" width="60" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="160" y="0" width="60" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -266,8 +266,8 @@ <textFieldExpression><![CDATA[$F{data:3}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="220" y="0" width="50" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="220" y="0" width="50" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -277,8 +277,8 @@ <textFieldExpression><![CDATA[$F{data:4}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="590" y="0" width="160" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="590" y="0" width="160" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -289,19 +289,21 @@ </band> </detail> <pageFooter> - <band height="30" splitType="Stretch"> + <band height="15" splitType="Stretch"> <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" x="615" y="10" width="55" height="20"/> + <reportElement style="htmlStyle" x="615" y="0" width="55" height="15"/> + <box topPadding="2" rightPadding="3"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" evaluationTime="Report"> - <reportElement style="htmlStyle" x="671" y="10" width="57" height="20"/> - <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression> + <reportElement style="htmlStyle" x="671" y="0" width="57" height="15"/> + <box topPadding="2"/> + <textFieldExpression><![CDATA["/ " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <summary> - <band height="42" splitType="Stretch"/> + <band height="30" splitType="Stretch"/> </summary> </jasperReport>
--- a/artifacts/doc/conf/jasper/templates/uinfo.inundationduration.jrxml Tue Jun 05 10:25:48 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/uinfo.inundationduration.jrxml Tue Jun 05 11:44:05 2018 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 --> -<!-- 2018-06-01T13:55:18 --> +<!-- 2018-06-05T11:41:41 --> <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="545" leftMargin="30" rightMargin="20" topMargin="20" bottomMargin="20"> <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> @@ -144,10 +144,10 @@ </band> </columnHeader> <detail> - <band height="20" splitType="Prevent"> + <band height="15" splitType="Prevent"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="80" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="80" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -157,8 +157,8 @@ <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="90" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="90" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -168,8 +168,8 @@ <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="380" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="380" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -181,19 +181,21 @@ </band> </detail> <pageFooter> - <band height="30" splitType="Stretch"> + <band height="15" splitType="Stretch"> <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" x="437" y="10" width="55" height="20"/> + <reportElement style="htmlStyle" x="437" y="0" width="55" height="15"/> + <box topPadding="2" rightPadding="3"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" evaluationTime="Report"> - <reportElement style="htmlStyle" x="493" y="10" width="57" height="20"/> - <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression> + <reportElement style="htmlStyle" x="493" y="0" width="57" height="15"/> + <box topPadding="2" rightPadding="3"/> + <textFieldExpression><![CDATA["/ " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <summary> - <band height="42" splitType="Stretch"/> + <band height="30" splitType="Stretch"/> </summary> </jasperReport>
--- a/artifacts/doc/conf/jasper/templates/uinfo.salixline.jrxml Tue Jun 05 10:25:48 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/uinfo.salixline.jrxml Tue Jun 05 11:44:05 2018 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 --> -<!-- 2018-06-01T13:48:24 --> +<!-- 2018-06-05T11:40:37 --> <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="545" leftMargin="30" rightMargin="20" topMargin="20" bottomMargin="20"> <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> @@ -148,10 +148,10 @@ </band> </columnHeader> <detail> - <band height="20" splitType="Prevent"> + <band height="15" splitType="Prevent"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="80" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="80" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -161,8 +161,8 @@ <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="90" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="80" y="0" width="90" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -172,8 +172,8 @@ <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="140" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="170" y="0" width="140" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -183,8 +183,8 @@ <textFieldExpression><![CDATA[$F{data:2}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="310" y="0" width="140" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="310" y="0" width="140" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -196,19 +196,21 @@ </band> </detail> <pageFooter> - <band height="30" splitType="Stretch"> + <band height="15" splitType="Stretch"> <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" x="437" y="10" width="55" height="20"/> + <reportElement style="htmlStyle" x="437" y="0" width="55" height="15"/> + <box topPadding="2" rightPadding="3"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" evaluationTime="Report"> - <reportElement style="htmlStyle" x="493" y="10" width="57" height="20"/> - <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression> + <reportElement style="htmlStyle" x="493" y="0" width="57" height="15"/> + <box topPadding="2"/> + <textFieldExpression><![CDATA["/ " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <summary> - <band height="42" splitType="Stretch"/> + <band height="30" splitType="Stretch"/> </summary> </jasperReport>
--- a/artifacts/doc/conf/jasper/templates/uinfo.vegetationzones.jrxml Tue Jun 05 10:25:48 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/uinfo.vegetationzones.jrxml Tue Jun 05 11:44:05 2018 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 4.5.0 --> -<!-- 2018-06-01T14:30:28 --> +<!-- 2018-06-05T11:38:43 --> <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="545" leftMargin="30" rightMargin="20" topMargin="20" bottomMargin="20"> <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> @@ -147,10 +147,10 @@ </band> </columnHeader> <detail> - <band height="20" splitType="Prevent"> + <band height="15" splitType="Prevent"> <textField isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="267" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="267" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -160,8 +160,8 @@ <textFieldExpression><![CDATA[$F{data:0}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="267" y="0" width="140" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="267" y="0" width="140" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -171,8 +171,8 @@ <textFieldExpression><![CDATA[$F{data:1}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="407" y="0" width="140" height="20"/> - <box topPadding="5" leftPadding="5" bottomPadding="0" rightPadding="5"> + <reportElement key="" style="htmlStyle" positionType="Float" stretchType="RelativeToBandHeight" x="407" y="0" width="140" height="15"/> + <box topPadding="2" leftPadding="5" bottomPadding="0" rightPadding="5"> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -184,19 +184,21 @@ </band> </detail> <pageFooter> - <band height="30" splitType="Stretch"> + <band height="15" splitType="Stretch"> <textField isStretchWithOverflow="true"> - <reportElement style="htmlStyle" x="437" y="10" width="55" height="20"/> + <reportElement style="htmlStyle" x="437" y="0" width="55" height="15"/> + <box topPadding="2" rightPadding="3"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" evaluationTime="Report"> - <reportElement style="htmlStyle" x="493" y="10" width="57" height="20"/> - <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression> + <reportElement style="htmlStyle" x="493" y="0" width="57" height="15"/> + <box topPadding="2" leftPadding="0" bottomPadding="0" rightPadding="0"/> + <textFieldExpression><![CDATA["/ " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> </band> </pageFooter> <summary> - <band height="42" splitType="Stretch"/> + <band height="30" splitType="Stretch"/> </summary> </jasperReport>
--- a/artifacts/pom-oracle.xml Tue Jun 05 10:25:48 2018 +0200 +++ b/artifacts/pom-oracle.xml Tue Jun 05 11:44:05 2018 +0200 @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.dive4elements.river</groupId> @@ -17,13 +16,13 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -47,6 +46,20 @@ <dependencies> <dependency> + <groupId>simply_glamorous.jar</groupId> + <artifactId>simply_glamorous</artifactId> + <version>0</version> + <scope>system</scope> + <systemPath>${project.basedir}/contrib/fonts/simply_glamorous.jar</systemPath> + </dependency> + <dependency> + <groupId>roboto.jar</groupId> + <artifactId>roboto</artifactId> + <version>0</version> + <scope>system</scope> + <systemPath>${project.basedir}/contrib/fonts/roboto.jar</systemPath> + </dependency> + <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache-core</artifactId> <version>2.4.2</version> @@ -113,9 +126,9 @@ <version>1.3.158</version> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> </dependency> <dependency> <groupId>org.geotools</groupId> @@ -171,9 +184,9 @@ </dependencies> <repositories> <repository> - <id>jboss-repo2</id> - <name>JBoss repo2</name> - <url>http://repository.jboss.org/nexus/content/groups/public/</url> + <id>jboss-repo2</id> + <name>JBoss repo2</name> + <url>http://repository.jboss.org/nexus/content/groups/public/</url> </repository> <repository> <id>gt2.repo</id>
--- a/artifacts/pom.xml Tue Jun 05 10:25:48 2018 +0200 +++ b/artifacts/pom.xml Tue Jun 05 11:44:05 2018 +0200 @@ -65,22 +65,20 @@ </plugins> </build> - <dependencies> - - <dependency> - <groupId>simply_glamorous.jar</groupId> - <artifactId>simply_glamorous</artifactId> - <version>0</version> - <scope>system</scope> - <systemPath>${project.basedir}/src/main/resources/simply_glamorous.jar</systemPath> + <dependencies> + <dependency> + <groupId>simply_glamorous.jar</groupId> + <artifactId>simply_glamorous</artifactId> + <version>0</version> + <scope>system</scope> + <systemPath>${project.basedir}/contrib/fonts/simply_glamorous.jar</systemPath> </dependency> - <dependency> - <groupId>roboto.jar</groupId> - <artifactId>roboto</artifactId> - <version>0</version> - <scope>system</scope> - <systemPath>${project.basedir}/src/main/resources/roboto.jar</systemPath> + <groupId>roboto.jar</groupId> + <artifactId>roboto</artifactId> + <version>0</version> + <scope>system</scope> + <systemPath>${project.basedir}/contrib/fonts/roboto.jar</systemPath> </dependency> <dependency> <groupId>net.sf.ehcache</groupId>