diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper
index e8bac7970..84c561a19 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
index 295a741ee..258d36666 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml
@@ -34,7 +34,7 @@
and pa.ciudad_id = ci.ciudad_id
and ci.estado_id = es.estado_id
and nvl(cj.empresacorrida_id, ma.empresa_id) = $P{EMPRESA_ID}
- and INSTR($P{LS_CATEGORIA}, '_' || cj.categoria_id || '_') > 0
+ $P!{LS_CATEGORIA}
and trunc(cj.fechorventa) between trunc($P{DATA_INICIO}) and trunc($P{DATA_FINAL})
and ((cj.feccorrida is null) or ($P{PASSAGEM_ABERTA} = 'T'))
order by em.nombempresa, es.cveestado, cj.fechorventa]]>
@@ -75,12 +75,12 @@
-
+
-
+
@@ -185,32 +185,32 @@ new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date())]]>
-
+
-
+
-
+
-
+
-
+
-
+
@@ -219,12 +219,12 @@ new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date())]]>
-
+
-
+
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 346c4b1ad..be230e206 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
@@ -13,6 +13,7 @@ import java.util.Map;
import javax.sql.DataSource;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller;
@@ -186,15 +187,12 @@ public class RelatorioPassageirosViajarController extends MyGenericForwardCompos
*
*/
private void executarPesquisa() {
- HibernateSearchObject categoriaBusqueda =
- new HibernateSearchObject(Categoria.class,
- pagingCategoria.getPageSize());
+ HibernateSearchObject categoriaBusqueda =new HibernateSearchObject(Categoria.class,pagingCategoria.getPageSize());
categoriaBusqueda.addFilterOr(Filter.like("desccategoria", "%" + txtPalavraPesquisa.getText().trim().toUpperCase().concat("%")),
Filter.like("desccategoria", "%" + txtPalavraPesquisa.getText().trim().toUpperCase().concat("%")));
categoriaBusqueda.addSortAsc("desccategoria");
-
categoriaBusqueda.addFilterEqual("activo", Boolean.TRUE);
plwCategoria.init(categoriaBusqueda, categoriaList, pagingCategoria);
@@ -227,13 +225,22 @@ public class RelatorioPassageirosViajarController extends MyGenericForwardCompos
Empresa e = (Empresa) cmbEmpresa.getSelectedItem().getValue();
parametros.put("EMPRESA_ID", e.getEmpresaId().toString());
- lsNumCategoria = new ArrayList(Arrays.asList(categoriaSelList.getData()));
- StringBuilder strNumCategoria = new StringBuilder();
- strNumCategoria.append("_");
- for (Categoria c : lsNumCategoria) {
- strNumCategoria.append(c.getCategoriaId().toString() + '_');
+ String strNumCategoria="";
+
+ StringBuilder sbCategoria = new StringBuilder("");
+ if (categoriaSelList.getData().length != 0){
+
+ lsNumCategoria = new ArrayList(Arrays.asList(categoriaSelList.getData()));
+
+ sbCategoria = new StringBuilder(" and cj.categoria_id in ( ");
+ for (Categoria c : lsNumCategoria) {
+ sbCategoria.append(c.getCategoriaId().toString()).append(",");
+ }
+ sbCategoria.delete(sbCategoria.length()-1,sbCategoria.length());
+ sbCategoria.append(")");
}
- parametros.put("LS_CATEGORIA", strNumCategoria.toString());
+
+ parametros.put("LS_CATEGORIA", sbCategoria.toString());
parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId());
Relatorio relatorio = new RelatorioPassageirosViajar(parametros, dataSource.getConnection());
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 105b81c3b..d35667372 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -7,7 +7,7 @@
# . . = XXX
#Versao do VentaBoleto:
-versao = ADM_20130825_1RC208
+versao = ADM_20130826_1RC209
# MSG Defaut:
MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100
diff --git a/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul b/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul
index e07e6b8b0..5a66a41a8 100644
--- a/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul
+++ b/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul
@@ -34,7 +34,7 @@