diff artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml @ 9353:217e8e59c386

sinfo flowdepth multiple pairs allowed; bugfix arrayOutOfRange hasTkh==false && useTkh==true
author gernotbelger
date Tue, 31 Jul 2018 17:53:41 +0200
parents a8d1784ad8e8
children ba1e2e8f05d1
line wrap: on
line diff
--- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml	Tue Jul 31 17:17:46 2018 +0200
+++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml	Tue Jul 31 17:53:41 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-07-31T13:59:08 -->
+<!-- 2018-07-31T17:35:59 -->
 <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"/>
@@ -8,7 +8,7 @@
 	<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:totalpages" class="java.lang.Integer"/>
 	<field name="meta:startpageoffset" class="java.lang.Integer"/>
 	<field name="meta:header" class="java.lang.String"/>
 	<field name="meta:calcMode" class="java.lang.String"/>
@@ -259,7 +259,7 @@
 				<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>
+				<textFieldExpression><![CDATA["/ " + ( $V{PAGE_NUMBER}+( ($F{meta:totalpages} != null) ? $F{meta:totalpages} -$V{PAGE_NUMBER} : 0 ) )]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true">
 				<reportElement style="htmlStyle" x="650" y="0" width="55" height="15"/>

http://dive4elements.wald.intevation.org