From d1e5131b282bd8ae1e4449b043112384a01ae234 Mon Sep 17 00:00:00 2001 From: edgar Date: Thu, 16 Jun 2016 13:44:22 +0000 Subject: [PATCH] fixes bug #0007445 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@56996 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTripulacao.java | 10 +++-- .../RelatorioTripulacao_es.properties | 17 +++++--- .../RelatorioTripulacao_pt.properties | 3 +- .../templates/RelatorioTripulacao.jasper | Bin 36995 -> 37525 bytes .../templates/RelatorioTripulacao.jrxml | 11 ++++- .../RelatorioTripulacaoController.java | 41 ++++++++++-------- .../relatorios/ItemRelatorioTripulacao.java | 2 +- 7 files changed, 52 insertions(+), 32 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java index 61aca4b42..4d0e3e9a9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTripulacao.java @@ -5,18 +5,21 @@ import java.util.Date; import java.sql.ResultSet; import java.sql.SQLException; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.commons.lang.time.DateUtils; + import com.rjconsultores.ventaboletos.entidad.Empleado; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.TipoEmpleado; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioTripulacaoBean; +import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; @@ -77,9 +80,8 @@ public class RelatorioTripulacao extends Relatorio { sql.append(getWhereClause()); NamedParameterStatement stmt = new NamedParameterStatement(conexaoRelatorio, sql.toString()); - - stmt.setDate("fecInicio", new java.sql.Date(fecInicio.getTime())); - stmt.setDate("fecFinal", new java.sql.Date(fecFinal.getTime())); + stmt.setDate("fecInicio", new java.sql.Date((DateUtil.inicioFecha(fecInicio)).getTime())); + stmt.setDate("fecFinal", new java.sql.Date((DateUtil.fimFecha(fecFinal).getTime()))); stmt.setString("tipoEmpleado", tipoEmpleado != null ? tipoEmpleado.getDescTipo() : null); stmt.setLong("empleadoId", empleado != null ? empleado.getEmpleadoId() : 0); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties index 0d04e037b..8eaef076d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_es.properties @@ -1,17 +1,24 @@ #geral -msg.noData=No se pudo obtener datos con los parámetros reportados. +label.noData=No se pudo obtener datos con los parâmetros reportados. msg.a=a #Labels header +header.pagina=Página\: +header.data.hora=Data/Hora\: +label.empleadoId=Empleado +label.empleadoNome=Nombre +label.tipoEmpregado=Tipo #Labels detail -detail.nomeEmpleado=Empleado -datail.tipoEmpleado=Tipo Empleado detail.fecha=Fecha detail.nomeOrigem=Origen detail.nomeDestino=Destino detail.hora=Hora -detail.distanciaKm=Kmts +detail.distanciaKm=Distância Km detail.corridaId=Corrida -linhas=Lineas \ No newline at end of file +#filtros +filtro.periodo=Período +filtro.empregado=Empleado +filtro.empresa=Empresa +filtro.tipoEmpregado=Tipo Empregado diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_pt.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_pt.properties index 52ba002f7..433585c12 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_pt.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTripulacao_pt.properties @@ -1,5 +1,5 @@ #geral -msg.noData=No se pudo obtener datos con los parámetros reportados. +label.noData=Não há dados a serem apresentados para os filtros selecionados. msg.a=a #Labels header @@ -22,4 +22,3 @@ filtro.periodo=Per filtro.empregado=Empregado filtro.empresa=Empresa filtro.tipoEmpregado=Tipo Empregado -linhas=Lineas diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jasper index 051f62f0047fd32585435b536708c98b86f3820b..e9b64e76cd342f4e0be3e32dc10b1a9b60317af3 100644 GIT binary patch delta 6197 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 Bi!=ZL diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml index 8b04d50a1..41154bb6d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTripulacao.jrxml @@ -1,7 +1,7 @@ - + @@ -288,4 +288,13 @@ + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTripulacaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTripulacaoController.java index ec7bb5e4f..5464afa18 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTripulacaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTripulacaoController.java @@ -1,6 +1,5 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; -import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.List; @@ -12,11 +11,8 @@ import org.springframework.stereotype.Controller; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zkplus.databind.BindingListModelList; import org.zkoss.zul.Combobox; -import org.zkoss.zul.Comboitem; -import org.zkoss.zul.ComboitemRenderer; -import org.zkoss.zul.ListModel; -import org.zkoss.zul.ListModelList; import org.zkoss.zul.api.Datebox; import com.rjconsultores.ventaboletos.entidad.Empleado; @@ -82,12 +78,21 @@ public class RelatorioTripulacaoController extends MyGenericForwardComposer { } - public void onSelect$cmbEmpresa(Event ev) throws Exception { - empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue(); + public void onBlur$cmbEmpresa(Event ev) throws Exception { + empresa = cmbEmpresa.getSelectedItem() != null ? (Empresa) cmbEmpresa.getSelectedItem().getValue() : null; + if (empresa != null) { + lsEmpleado = empleadoService.pesquisaEmpresa(empresa); + } else { + lsEmpleado = empleadoService.obtenerTodos(); + } + + BindingListModelList l = new BindingListModelList(lsEmpleado, true); + cmbEmpleado.setModel(l); + cmbEmpleado.setSelectedItem(null); } - public void onSelect$cmbEmpleado(Event ev) throws Exception { - empleado = (Empleado) cmbEmpleado.getSelectedItem().getValue(); + public void onBlur$cmbEmpleado(Event ev) throws Exception { + empleado = cmbEmpleado.getSelectedItem() != null ? (Empleado) cmbEmpleado.getSelectedItem().getValue() : null; } public void onClick$btnExecutarRelatorio(Event ev) throws Exception { @@ -104,11 +109,11 @@ public class RelatorioTripulacaoController extends MyGenericForwardComposer { parametros.put("empresa", empresa); parametros.put("empleado", empleado); parametros.put("tipoEmpleado", tipoEmpleado); - + parametros.put("fecInicio", datInicial.getValue()); parametros.put("fecFinal", datFinal.getValue()); - - parametros.put("nomeEmpresa", empresa != null ? empresa.getNombempresa() :""); + + parametros.put("nomeEmpresa", empresa != null ? empresa.getNombempresa() : ""); parametros.put("nomeEmpleado", empleado != null ? empleado.getNombEmpleado() : ""); parametros.put("tipoEmpleadoDesc", tipoEmpleado != null ? tipoEmpleado.getDescTipo() : ""); @@ -118,12 +123,10 @@ public class RelatorioTripulacaoController extends MyGenericForwardComposer { Labels.getLabel("relatorioTripulacao.label"), parametros, MODAL); } - private class EmpleadoRenderer implements ComboitemRenderer { - @Override - public void render(Comboitem combo, Object object) throws Exception { - Empleado empleado = (Empleado) object; - combo.setLabel(empleado.getNombEmpleado()); - } - } + /* + * private class EmpleadoRenderer implements ComboitemRenderer { + * + * @Override public void render(Comboitem combo, Object object) throws Exception { Empleado empleado = (Empleado) object; combo.setLabel(empleado.getNombEmpleado()); } } + */ } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemRelatorioTripulacao.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemRelatorioTripulacao.java index 1b4cd312a..241abac1a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemRelatorioTripulacao.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemRelatorioTripulacao.java @@ -8,7 +8,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; public class ItemRelatorioTripulacao extends DefaultItemMenuSistema { public ItemRelatorioTripulacao() { - super("Relatório Tripulação"); + super("relatorioTripulacao.label"); }