fixed bug #7437 - Relatório Numeração Lógica: adição 'Total Intermediária' e 'Total Agência'

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@56867 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_es_MX.properties

@@ -27,4 +27,6 @@ pedagio.label=PEDAGIO
 seguro.label=SEGURO
 total.label=TOTAL
 totalGeral.label=TOTAL GERAL:
+totalIntermediaria.label=TOTAL INTERMEDIÁRIA:
+totalAgencia.label=TOTAL AGÊNCIA:
 serie.label=SÉRIE

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioPosicaoCaixaAnalitico_pt_BR.properties

@@ -27,4 +27,6 @@ pedagio.label=PEDAGIO
 seguro.label=SEGURO
 total.label=TOTAL
 totalGeral.label=TOTAL GERAL:
+totalIntermediaria.label=TOTAL INTERMEDIÁRIA:
+totalAgencia.label=TOTAL AGÊNCIA:
 serie.label=SÉRIE

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPosicaoCaixaAnalitico.jrxml

@@ -1,8 +1,8 @@
 <?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="RelatorioPosicaoCaixaAnalitico" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioPosicaoCaixaAnalitico" uuid="b911a1ae-6fda-4c13-9428-5b873b39e8bc">
-	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.zoom" value="2.3579476910000023"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="658"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="338"/>
 	<parameter name="fecInicio" class="java.lang.String"/>
 	<parameter name="empresa" class="java.lang.String"/>
 	<parameter name="puntoVenta" class="java.lang.String"/>
@@ -24,6 +24,12 @@
 	<variable name="totalGeral" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$V{total}]]></variableExpression>
 	</variable>
+	<variable name="totalIntermediario" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{numSerie}.contains("UNIC") ? $V{total} : new BigDecimal(0)]]></variableExpression>
+	</variable>
+	<variable name="totalAgencia" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{numSerie} == null || !$F{numSerie}.contains("UNIC") ? $V{total} : new BigDecimal(0)]]></variableExpression>
+	</variable>
 	<group name="Serie">
 		<groupExpression><![CDATA[$F{numSerie}]]></groupExpression>
 		<groupHeader>
@@ -315,21 +321,49 @@
 		</band>
 	</detail>
 	<summary>
-		<band height="42" splitType="Stretch">
+		<band height="60" splitType="Stretch">
 			<textField pattern="###0.00">
-				<reportElement uuid="4519c2ac-c38a-42d2-ac77-3a65a0af4d77" positionType="Float" x="455" y="10" width="100" height="20"/>
+				<reportElement uuid="4519c2ac-c38a-42d2-ac77-3a65a0af4d77" positionType="Float" x="455" y="40" width="95" height="20"/>
 				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalGeral}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="78e5c1d5-2431-40f0-9b31-0d4cff5b24f0" positionType="Float" x="400" y="10" width="55" height="20"/>
+				<reportElement uuid="78e5c1d5-2431-40f0-9b31-0d4cff5b24f0" positionType="Float" x="316" y="40" width="139" height="20"/>
-				<textElement>
+				<textElement textAlignment="Right">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{totalGeral.label}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="a6acf959-107c-4d1d-9e55-0364269caf90" positionType="Float" x="316" y="0" width="139" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{totalIntermediaria.label}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="a2b21d19-fff9-4db1-9bb4-6516a494cc5f" positionType="Float" x="316" y="20" width="139" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{totalAgencia.label}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0.00">
+				<reportElement uuid="9da42156-8edb-4574-b8ee-c6868c8296ee" x="455" y="0" width="95" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{totalIntermediario}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0.00">
+				<reportElement uuid="fc8f6aa6-c44a-4696-9fc0-95dc0ae27d38" x="455" y="20" width="95" height="20"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{totalAgencia}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 	<noData>