From 99540bbf5959e3fe740223eb841f379ea4019d72 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 16 Jul 2013 18:42:01 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@29147 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioPassageirosViajar.java | 26 ++ .../RelatorioPassageirosViajar.jasper | Bin 0 -> 36020 bytes .../RelatorioPassageirosViajar.jrxml | 240 +++++++++++++++ .../RelatorioPassageirosViajarController.java | 275 ++++++++++++++++++ .../ItemMenuRelatorioPassageirosViajar.java | 25 ++ .../render/RenderCategoriaSimple.java | 31 ++ src/java/spring-config.xml | 14 +- web/WEB-INF/i3-label_pt_BR.label | 17 +- .../filtroRelatorioPassageirosViajar.zul | 103 +++++++ 9 files changed, 722 insertions(+), 9 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassageirosViajar.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioPassageirosViajar.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCategoriaSimple.java create mode 100644 web/gui/relatorios/filtroRelatorioPassageirosViajar.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassageirosViajar.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassageirosViajar.java new file mode 100644 index 000000000..8c8d89fb2 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassageirosViajar.java @@ -0,0 +1,26 @@ +/** + * + */ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.util.Map; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; + +/** + * @author Padovani + * + */ +public class RelatorioPassageirosViajar extends Relatorio { + + public RelatorioPassageirosViajar(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + } + + @Override + protected void processaParametros() throws Exception { + // TODO Auto-generated method stub + + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jasper new file mode 100644 index 0000000000000000000000000000000000000000..a79a0e3d7bd8eb7c2fdca71953f3c9cde6008e7c GIT binary patch literal 36020 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 DL5o#7 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml new file mode 100644 index 000000000..597d8321c --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioPassageirosViajar.jrxml @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + 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.feccorrida between $P{DATA_INICIO} and $P{DATA_FINAL} + and ((to_char(cj.tipoventa_id) = $P{EMPRESA_ID}) or ($P{PASSAGEM_ABERTA} = 'T')) + order by em.nombempresa, es.cveestado, cj.fechorventa]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 000000000..5b7f202a9 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassageirosViajarController.java @@ -0,0 +1,275 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Checkbox; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Paging; +import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.Categoria; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioPassageirosViajar; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.CategoriaService; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject; +import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCategoriaSimple; +import com.trg.search.Filter; + +/** + * + * @author Administrador + */ +@Controller("relatorioPassageirosViajarController") +@Scope("prototype") +public class RelatorioPassageirosViajarController extends MyGenericForwardComposer { + + @Autowired + private EmpresaService empresaService; + @Autowired + private CategoriaService categoriaService; + @Autowired + private DataSource dataSource; + private List lsEmpresa; + private ArrayList lsNumCategoria = new ArrayList(); + @Autowired + private transient PagedListWrapper plwCategoria; + private MyListbox categoriaList; + private MyListbox categoriaSelList; + private Paging pagingCategoria; + private Textbox txtPalavraPesquisa; + private Combobox cmbEmpresa; + private Combobox cmbCategoria; + private Datebox datInicial; + private Datebox datFinal; + private Checkbox chkPassageiroAberto; + + public Datebox getDatInicial() { + return datInicial; + } + + public void setDatInicial(Datebox datInicial) { + this.datInicial = datInicial; + } + + public Datebox getDatFinal() { + return datFinal; + } + + public void setDatFinal(Datebox datFinal) { + this.datFinal = datFinal; + } + + public Paging getPagingCategoria() { + return pagingCategoria; + } + + public void setPagingCategoria(Paging pagingCategoria) { + this.pagingCategoria = pagingCategoria; + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } + + public ArrayList getLsNumCategoria() { + return lsNumCategoria; + } + + public void setLsNumCategoria(ArrayList lsNumCategoria) { + this.lsNumCategoria = lsNumCategoria; + } + + public MyListbox getCategoriaList() { + return categoriaList; + } + + public void setCategoriaList(MyListbox categoriaList) { + this.categoriaList = categoriaList; + } + + public MyListbox getCategoriaSelList() { + return categoriaSelList; + } + + public void setCategoriaSelList(MyListbox categoriaSelList) { + this.categoriaSelList = categoriaSelList; + } + + public Combobox getCmbEmpresa() { + return cmbEmpresa; + } + + public void setCmbEmpresa(Combobox cmbEmpresa) { + this.cmbEmpresa = cmbEmpresa; + } + + public Combobox getCmbCategoria() { + return cmbCategoria; + } + + public void setCmbCategoria(Combobox cmbCategoria) { + this.cmbCategoria = cmbCategoria; + } + + public Checkbox getChkPassageiroAberto() { + return chkPassageiroAberto; + } + + public void setChkPassageiroAberto(Checkbox chkPassageiroAberto) { + this.chkPassageiroAberto = chkPassageiroAberto; + } + + public Textbox getTxtPalavraPesquisa() { + return txtPalavraPesquisa; + } + + public void setTxtPalavraPesquisa(Textbox txtPalavraPesquisa) { + this.txtPalavraPesquisa = txtPalavraPesquisa; + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(); + } + + public void onDoubleClick$categoriaList(Event ev) { + + Categoria categoriaSel = (Categoria) categoriaList.getSelected(); + Boolean bExiste = false; + + for (Categoria objCategoria : lsNumCategoria) { + if (objCategoria.equals(categoriaSel)) + bExiste = true; + } + + if (!bExiste) { + lsNumCategoria.add(categoriaSel); + categoriaSelList.setData(lsNumCategoria); + } + + } + + public void onSelect$categoriaList(Event ev) { + + } + + public void onClick$btnLimpar(Event ev) { + limparPesquisa(); + } + + public void onClick$btnPesquisa(Event ev) { + executarPesquisa(); + } + + /** + * + */ + private void limparPesquisa() { + lsNumCategoria.clear(); + categoriaSelList.setData(lsNumCategoria); + + } + + /** + * + */ + private void executarPesquisa() { + 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); + + if (categoriaList.getData().length == 0) { + try { + Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), + Labels.getLabel("relatorioPassageirosViajarController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + } catch (InterruptedException ex) { + } + } + } + + /** + * @throws Exception + * + */ + private void executarRelatorio() throws Exception { + + Map parametros = new HashMap(); + SimpleDateFormat fd = new SimpleDateFormat("dd/MM/yyyy"); + + parametros.put("DATA_INICIO", fd.format(datInicial.getValue())); + parametros.put("DATA_FINAL", fd.format(datFinal.getValue())); + String passagemAberta = ""; + if (chkPassageiroAberto.isChecked()) { + passagemAberta = "9"; + } else { + passagemAberta = "T"; + } + parametros.put("PASSAGEM_ABERTA", passagemAberta); + Empresa e = (Empresa) cmbEmpresa.getSelectedItem().getValue(); + parametros.put("EMPRESA_ID", e.getEmpresaId().toString()); + + StringBuilder strNumCategoria = new StringBuilder(); + for (Categoria c : lsNumCategoria){ + strNumCategoria.append(' ' + c.getCategoriaId().toString() + ','); + } + parametros.put("LS_CATEGORIA", strNumCategoria.toString()); + parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + Relatorio relatorio = new RelatorioPassageirosViajar(parametros, dataSource.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioPassageirosViajarController.window.title"), args, MODAL); + + } + + @Override + public void doAfterCompose(Component comp) throws Exception { + lsEmpresa = empresaService.obtenerTodos(); + super.doAfterCompose(comp); + + categoriaList.setItemRenderer(new RenderCategoriaSimple()); + categoriaSelList.setItemRenderer(new RenderCategoriaSimple()); + + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioPassageirosViajar.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioPassageirosViajar.java new file mode 100644 index 000000000..d984f835a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioPassageirosViajar.java @@ -0,0 +1,25 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; + +public class ItemMenuRelatorioPassageirosViajar extends DefaultItemMenuSistema { + + public ItemMenuRelatorioPassageirosViajar() { + super("indexController.mniRelatorioPassageirosViajar.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOPASSAGEIROSVIAJAR"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioPassageirosViajar.zul", + Labels.getLabel("relatorioPassageirosViajarController.window.title"), null,desktop); + + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCategoriaSimple.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCategoriaSimple.java new file mode 100644 index 000000000..956222cfd --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCategoriaSimple.java @@ -0,0 +1,31 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.utilerias.render; + +import com.rjconsultores.ventaboletos.entidad.Categoria; +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +/** + * + * @author Administrador + */ +public class RenderCategoriaSimple implements ListitemRenderer { + + public void render(Listitem lstm, Object o) throws Exception { + Categoria categoria = (Categoria) o; + + Listcell lc = new Listcell(); + + lc = new Listcell(categoria.getCategoriaId().toString()); + lc.setParent(lstm); + + lc = new Listcell(categoria.getDesccategoria()); + lc.setParent(lstm); + + lstm.setAttribute("data", categoria); + } +} diff --git a/src/java/spring-config.xml b/src/java/spring-config.xml index baf8662a8..9372980f6 100644 --- a/src/java/spring-config.xml +++ b/src/java/spring-config.xml @@ -329,13 +329,13 @@ - - - - - - - + + + + + + + diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index e1fbb5acf..bbd172dde 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_20130715_1RC175 +versao = ADM_20130716_1RC176 # MSG Defaut: MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100 @@ -215,6 +215,7 @@ indexController.mniRelatorioAproveitamento.label = Relatório de Aproveitamento indexController.mniRelatorioReceitaDiariaAgencia.label = Relatório de Receita Diária por Agência indexController.mniRelatorioLinhaOperacional.label = Relatório de Linha Operacional indexController.mniRelatorioTrechoVendido.label = Relatório de Trecho Vendido Por Agência +indexController.mniRelatorioPassageirosViajar.label = Passageiros a Viajar #PARTE REALIZADA POR MANUEL indexController.mnCortesias.label = Cortesias Para Funcionários @@ -4301,4 +4302,16 @@ relatorioLinhaOperacionalController.chkAgruparAno.value = Ano relatorioLinhaOperacionalController.MSG.selecionarlinha = Selecione alguma linha para gerar o relatório. relatorioLinhaOperacionalController.MSG.datainvalida = Data de inicio não pode ser maior que final. relatorioLinhaOperacionalController.lblEmpresa.value = Empresa -relatorioLinhaOperacionalController.lblEspecie.value = Espécie \ No newline at end of file +relatorioLinhaOperacionalController.lblEspecie.value = Espécie + +#Relatorio Pasajeiros Viajar +relatorioPassageirosViajarController.window.title = Pasajeiros a viajar +relatorioPassageirosViajarController.lbDataIni.value = Data Inicial +relatorioPassageirosViajarController.lbDataFin.value = Data Final +relatorioPassageirosViajarController.lbEmpresa.value = Empresa +relatorioPassageirosViajarController.lbCategoria.value = Categoria +relatorioPassageirosViajarController.btnPesquisa.label = Pesquisa +relatorioPassageirosViajarController.btnLimpar.label = Limpar +relatorioPassageirosViajarController.lbPassagemAberto.label = Somente passagens em aberto +relatorioPassageirosViajarController.lhCodigo.label = Código +relatorioPassageirosViajarController.lhDescricao.label = Descrição diff --git a/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul b/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul new file mode 100644 index 000000000..dc91302cf --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioPassageirosViajar.zul @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + +