From 28322d98086618f81d41d6feae2aef66665c5fd7 Mon Sep 17 00:00:00 2001
From: "lucas.taia" <lucas.taia@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 2 May 2019 22:18:48 +0000
Subject: [PATCH] fixes bug#13945

dev:lucas

qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@92775 d1611594-4594-4d17-8e1d-87c2c4800839
---
 ...roDemonstrativoMovimentoPassageiros.jasper | Bin 33111 -> 33585 bytes
 ...droDemonstrativoMovimentoPassageiros.jrxml |  19 ++++++++++++------
 ...trativoMovimentoPassageirosController.java |   2 +-
 ...adroDemonstrativoMovimentoPassageiros.java |   4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageiros.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageiros.jasper
index d34b867ea0fdb1d6dfe288615e67e0f1d00f1fd3..9a6ba0aa476a24f7f1ca5d44e8bfd8f778a82578 100644
GIT binary patch
delta 5730
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

delta 5486
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageiros.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageiros.jrxml
index b77d45c68..063516ac3 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageiros.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioQuadroDemonstrativoMovimentoPassageiros.jrxml
@@ -1,7 +1,7 @@
 <?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="RelatorioBPe" pageWidth="800" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="760" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2de20ee0-535e-49d2-a7be-c24a30351d9f">
 	<property name="ireport.zoom" value="1.1269722013523664"/>
-	<property name="ireport.x" value="232"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@@ -24,13 +24,13 @@
 	<field name="km" class="java.lang.Float"/>
 	<field name="totalida" class="java.lang.Long"/>
 	<field name="totalvolta" class="java.lang.Long"/>
-	<variable name="SOMA_KM" class="java.lang.Float">
+	<variable name="SOMA_KM" class="java.lang.Float" calculation="Sum">
 		<variableExpression><![CDATA[$F{km}]]></variableExpression>
 	</variable>
-	<variable name="SOMA_IDA" class="java.lang.Long">
+	<variable name="SOMA_IDA" class="java.lang.Long" calculation="Sum">
 		<variableExpression><![CDATA[$F{totalida}]]></variableExpression>
 	</variable>
-	<variable name="SOMA_VOLTA" class="java.lang.Long">
+	<variable name="SOMA_VOLTA" class="java.lang.Long" calculation="Sum">
 		<variableExpression><![CDATA[$F{totalvolta}]]></variableExpression>
 	</variable>
 	<title>
@@ -169,7 +169,7 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="15" splitType="Stretch">
+		<band height="25" splitType="Stretch">
 			<textField isBlankWhenNull="true">
 				<reportElement x="0" y="0" width="219" height="15" uuid="e29821d0-e770-43f3-a6a2-082204e4a2c4"/>
 				<textElement>
@@ -208,7 +208,7 @@
 		</band>
 	</detail>
 	<columnFooter>
-		<band height="24">
+		<band height="27">
 			<textField isBlankWhenNull="true">
 				<reportElement x="438" y="0" width="133" height="15" uuid="dbfd6a16-9f63-4fa5-b6cf-9982ae17ef6f"/>
 				<textElement>
@@ -230,6 +230,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{SOMA_VOLTA}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement x="0" y="0" width="438" height="15" uuid="9d6b3cf8-2945-4094-bbf8-cf312abb4b3c"/>
+				<textElement textAlignment="Center">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[TOTAL]]></text>
+			</staticText>
 		</band>
 	</columnFooter>
 	<noData>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioQuadroDemonstrativoMovimentoPassageirosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioQuadroDemonstrativoMovimentoPassageirosController.java
index 72b050a32..f34d89403 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioQuadroDemonstrativoMovimentoPassageirosController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioQuadroDemonstrativoMovimentoPassageirosController.java
@@ -96,7 +96,7 @@ public class RelatorioQuadroDemonstrativoMovimentoPassageirosController extends
 		args.put("relatorio", relatorio);
 
 		openWindow("/component/reportView.zul",
-				Labels.getLabel("relatorioLinhaOperacionalController.window.title"), args, MODAL);
+				Labels.getLabel("indexController.mniRelatorioQuadroDemonstrativoMovimentoPassageiros.label"), args, MODAL);
 	}
 
 	public DataSource getDataSourceRead() {
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioQuadroDemonstrativoMovimentoPassageiros.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioQuadroDemonstrativoMovimentoPassageiros.java
index c6a637461..086b93ba6 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioQuadroDemonstrativoMovimentoPassageiros.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioQuadroDemonstrativoMovimentoPassageiros.java
@@ -13,12 +13,12 @@ public class ItemMenuRelatorioQuadroDemonstrativoMovimentoPassageiros extends De
 
 	@Override
 	public String getClaveMenu() {
-		return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOLINHAOPERACIONAL";
+		return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.QUADRODEMONSTRATIVODOMOVIMENTOPASSAGEIRO";
 	}
 
 	@Override
 	public void ejecutar() {
 		PantallaUtileria.openWindow("/gui/relatorios/filtroQuadroDemonstrativoDoMovimentoPassageiro.zul",
-				Labels.getLabel("relatorioLinhaOperacionalController.window.title"), getArgs() ,desktop);
+				Labels.getLabel("indexController.mniRelatorioQuadroDemonstrativoMovimentoPassageiros.label"), getArgs() ,desktop);
 	}
 }