From e5e832a0f053916c1e314714e670738fbb1ad1d9 Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 4 Apr 2014 13:25:58 +0000
Subject: [PATCH] =?UTF-8?q?Relat=C3=B3rio=20SISDAP=20-=20Falta=20t=C3=ADtu?=
 =?UTF-8?q?lo=20(fixed=20bug=20#5144)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@34566 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/RelatorioSisdapController.java  | 18 +++++++++++++-----
 web/WEB-INF/i3-label_es_MX.label               |  2 ++
 web/WEB-INF/i3-label_pt_BR.label               |  3 +++
 web/gui/relatorios/filtroRelatorioSisdap.zul   | 10 +++-------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java
index e8510c906..a9367faf0 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java
@@ -105,10 +105,18 @@ public class RelatorioSisdapController extends MyGenericForwardComposer {
 
 	public void export(Date fecInicio, Date fecFinal) {
 
-		List<String> movimentoLinhas = sisdapService.getMovimentoLinhas(fecInicio, fecFinal, empresa.getEmpresaId());
-		List<String> movimentoSecoes = sisdapService.getMovimentoSecoes(fecInicio, fecFinal, empresa.getEmpresaId());
-
-		try {
+		try{
+			List<String> movimentoLinhas = sisdapService.getMovimentoLinhas(fecInicio, fecFinal, empresa.getEmpresaId());
+			List<String> movimentoSecoes = sisdapService.getMovimentoSecoes(fecInicio, fecFinal, empresa.getEmpresaId());
+	
+			if (movimentoLinhas.size() <= 1 && movimentoSecoes.size() <= 1){
+				// N鉶 retornou dados
+				Messagebox.show(Labels.getLabel("relatorioSisdapController.MSG.nenhumRegistro"),
+						Labels.getLabel("filtroRelatorioSisdap.window.title"),
+						Messagebox.OK, Messagebox.INFORMATION);
+						return;
+			}
+		
 			FileWriter writer = new FileWriter("movimentoLinhas.txt");
 			for (String str : movimentoLinhas) {
 				writer.write(str + "\r\n");
@@ -127,7 +135,7 @@ public class RelatorioSisdapController extends MyGenericForwardComposer {
 			FileInputStream is = new FileInputStream("sisdap.zip");
 			Filedownload.save(is, "application/zip", "sisdap.zip");
 
-		} catch (IOException e) {
+		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 4ce1ea3dd..8db735aa3 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -385,11 +385,13 @@ relatorioTaxasLinhaController.lbCidadeDestino.value = Parada destino
 relatorioTaxasLinhaController.lbPuntoVenta.value = Punto de venta
 
 # Relatorio Sisdap
+relatorioSisdapController.window.title=Reporte SISDAP
 relatorioSisdapController.lbDatInicio.value=Fecha Inicio
 relatorioSisdapController.lbDatFinal.value=Fecha Final
 relatorioSisdapController.lbEmpresa.value=Empresa
 relatorioSisdapController.btnCerrar.tooltiptext=Sair
 relatorioSisdapController.MSG.empresaErro=Debe de seleccionar una Empresa
+relatorioSisdapController.MSG.nenhumRegistro=No se encontr贸 ning煤n registro
 
 filtroRelatorioSisdap.window.title=Relat贸rio SISDAP
 
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 48db99076..7e5869083 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -271,6 +271,7 @@ editarGrupoRutaController.MSG.borrarOK = Grupo de linha excluido com sucesso.
 
 #Relat贸rios
 
+
 #Resumo de linhas
 relatorioResumoLinhasController.window.title = Relat贸rio Resumo de Linhas
 relatorioResumoLinhasController.lbRuta.value = Linha
@@ -414,11 +415,13 @@ relatorioTaxasLinhaController.lbCidadeDestino.value = Localidade Destino
 relatorioTaxasLinhaController.lbPuntoVenta.value = Ag锚ncia
 
 # Relatorio Sisdap
+relatorioSisdapController.window.title=Relat贸rio SISDAP
 relatorioSisdapController.lbDatInicio.value=Data Inicio
 relatorioSisdapController.lbDatFinal.value=Data Final
 relatorioSisdapController.lbEmpresa.value=Empresa
 relatorioSisdapController.btnCerrar.tooltiptext=Sair
 relatorioSisdapController.MSG.empresaErro=Deve selecionar uma empresa!
+relatorioSisdapController.MSG.nenhumRegistro=Nenhum registro encontrado para o relat贸rio
 
 filtroRelatorioSisdap.window.title=Relat贸rio SISDAP
 
diff --git a/web/gui/relatorios/filtroRelatorioSisdap.zul b/web/gui/relatorios/filtroRelatorioSisdap.zul
index 986af1845..6331e9f51 100644
--- a/web/gui/relatorios/filtroRelatorioSisdap.zul
+++ b/web/gui/relatorios/filtroRelatorioSisdap.zul
@@ -6,13 +6,9 @@
 
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winFiltroRelatorioSisdap"
-		apply="${relatorioSisdapController}" contentStyle="overflow:auto"
-		height="260px" width="550px" border="normal">
-		<toolbar>
-			<button id="btnCerrar" onClick="winFiltroRelatorioSisdap.detach()"
-				image="/gui/img/exit.png" width="35px"
-				tooltiptext="${c:l('relatorioSisdapController.btnCerrar.tooltiptext')}" />
-		</toolbar>
+		apply="${relatorioSisdapController}" 
+		contentStyle="overflow:auto" height="260px" width="550px" 
+		border="normal" closable="true">
 		<grid fixedLayout="true">
 			<columns>
 				<column width="100%" />