From 68c748ecd0c634e7527ec3363725b952a0e1b119 Mon Sep 17 00:00:00 2001
From: marcus <marcus@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 30 Jul 2013 21:09:02 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29589
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 .../RelatorioPassageirosViajar.jasper         | Bin 36033 -> 36080 bytes
 .../RelatorioPassageirosViajar.jrxml          |   8 ++++----
 .../RelatorioPassageirosViajarController.java |   3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper
index f531fb34a3be322858102b62af30c7ddc807d889..2711ecd67e14d6464391a135bf8995929a4722d1 100644
GIT binary patch
delta 285
zcmX>&lj*}urVUj-^3FO6>hbCdH8l#!S$fHdC8_E8MVX25nJFM4_4vt?d|VhmPoCi;
zKlz)_O5>8E(!691pvtt=<c$2HvedkiM4$mKj*;q`3Q4IY<*BK83J^sF#f1!YOd?E^
zKe`J`GKnyjFbKm{Cg!C;RZYI*E6=G5li2*n*N%tv3j+hA>1O+=bVeo*kIgHhWw|Za
zp8B_I9|Hq}9%CRQgK9xyadBdLYGzS>aad+zR$@`Sp|QECk)esHiK(%fLA-^LiID+2
r10y4Y&g4Q?naK-^*f%SspXLJ@_rA1UOiTouhLXvQmU5F<_lN-iK@M5=

delta 225
zcmew`lj-10rVUj-5;i&t$ys{Ii6yD&`9+zD@tG+KH8l$AI+JJmxG>(IJl{ut@?W2o
z;y^WNsmU4nMP;dZC5Z}2sU_v9sd);MFZwF5u_`3yr6^2h^^<2*-K^_p$HO|Efq`+-
z=7OknMy8C6%{QZExvkcn`nPKz0|SE|V<01gT0vrQabkLEW>J1|SY~2YVo|)IvAKzb
zi7AjYG&GAhF*h=_uwZ9kWMt5pT*xXj`9cx<=AiV`d?54W%i6`nMX~BAnapS@H~ChN
F7yxfkNU{I`

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
index 7a1125085..e96262495 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
@@ -26,14 +26,14 @@
        ciudad ci,
        estado es
  where cj.activo = 1
-   and INSTR($P{LS_CATEGORIA}, cj.categoria_id || ',') > 0
+   and INSTR($P{LS_CATEGORIA}, '_' || cj.categoria_id || '_') > 0
    and cj.empresacorrida_id = $P{EMPRESA_ID}
    and cj.empresacorrida_id = em.empresa_id
    and cj.puntoventa_id = pv.puntoventa_id
    and pv.parada_id = pa.parada_id
    and pa.ciudad_id = ci.ciudad_id
    and ci.estado_id = es.estado_id
-   and cj.fechorventa between $P{DATA_INICIO} and $P{DATA_FINAL}
+   and trunc(cj.fechorventa, 'DAY') between trunc($P{DATA_INICIO}, 'DAY') and trunc($P{DATA_FINAL}, 'DAY')
    and ((cj.feccorrida is null) or ($P{PASSAGEM_ABERTA} = 'T'))
  order by em.nombempresa, es.cveestado, cj.fechorventa]]>
 	</queryString>
@@ -116,10 +116,10 @@
 				<textFieldExpression><![CDATA["Período: De " + new SimpleDateFormat("dd/MM/yyyy ").format($P{DATA_INICIO}) + " a " + new SimpleDateFormat("dd/MM/yyyy ").format($P{DATA_FINAL})]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f892d882-409f-4f4f-b0d2-1628abb65e6f" x="402" y="9" width="151" height="13"/>
+				<reportElement uuid="f892d882-409f-4f4f-b0d2-1628abb65e6f" x="309" y="9" width="244" height="13"/>
 				<textElement textAlignment="Right" markup="none"/>
 				<textFieldExpression><![CDATA["Data/Hora: " +
-new SimpleDateFormat("dd/MM/yyyy hh:mm:ss").format(new Date())]]></textFieldExpression>
+new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement uuid="1a4a2cbf-c63b-4e5b-b4f0-fcdc9ac79c0e" x="402" y="44" width="151" height="13"/>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java
index da889c0be..346c4b1ad 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java
@@ -229,8 +229,9 @@ public class RelatorioPassageirosViajarController extends MyGenericForwardCompos
 
 		lsNumCategoria = new ArrayList(Arrays.asList(categoriaSelList.getData()));
 		StringBuilder strNumCategoria = new StringBuilder();
+		strNumCategoria.append("_");
 		for (Categoria c : lsNumCategoria) {
-			strNumCategoria.append(' ' + c.getCategoriaId().toString() + ',');
+			strNumCategoria.append(c.getCategoriaId().toString() + '_');
 		}
 		parametros.put("LS_CATEGORIA", strNumCategoria.toString());
 		parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId());