From 150214542d51479e30ee95633253ea174483ad9b Mon Sep 17 00:00:00 2001 From: frederico Date: Fri, 19 Jul 2019 18:50:10 +0000 Subject: [PATCH] fixed bug#14845 qua:Wallysson dev:Valdir git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@95960 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioTrocoSimples.java | 112 +++++++ .../RelatorioTrocoSimples_es_MX.properties | 19 ++ .../RelatorioTrocoSimples_pt_BR.properties | 19 ++ .../templates/RelatorioTrocoSimples.jasper | Bin 0 -> 29767 bytes .../templates/RelatorioTrocoSimples.jrxml | 188 ++++++++++++ .../RelatorioTrocoSimplesController.java | 281 ++++++++++++++++++ .../ItemMenuRelatorioTrocoSimples.java | 26 ++ .../utilerias/menu/menu_original.properties | 1 + web/WEB-INF/i3-label_es_MX.label | 5 + web/WEB-INF/i3-label_pt_BR.label | 10 + .../filtroRelatorioTrocoSimples.zul | 113 +++++++ 11 files changed, 774 insertions(+) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTrocoSimples.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTrocoSimples_es_MX.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTrocoSimples_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrocoSimples.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrocoSimples.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrocoSimplesController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/esquemaoperacional/ItemMenuRelatorioTrocoSimples.java create mode 100644 web/gui/relatorios/filtroRelatorioTrocoSimples.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTrocoSimples.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTrocoSimples.java new file mode 100644 index 000000000..443bdc9ac --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTrocoSimples.java @@ -0,0 +1,112 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.util.Date; +import java.sql.ResultSet; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +public class RelatorioTrocoSimples extends Relatorio { + + public RelatorioTrocoSimples(Map parametros, Connection conexao) throws Exception { + + super(parametros, conexao); + + this.setCustomDataSource(new ArrayDataSource(this) { + + public void initDados() throws Exception { + Connection conexao = this.relatorio.getConexao(); + Map parametros = this.relatorio.getParametros(); + + String sql = getSql(parametros); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + ResultSet rset = stmt.executeQuery(); + + while (rset.next()) { + Map dataResult = new HashMap(); + + dataResult.put("valorTroco", rset.getBigDecimal("valorTroco")); + dataResult.put("puntoVenta", rset.getString("puntoVenta")); + dataResult.put("bilhetero", getNombUsuarioCompleto(rset.getString("bilhetero"), rset.getString("paterno"), rset.getString("materno"))); + dataResult.put("boleto", rset.getString("boleto")); + dataResult.put("transacao", rset.getString("transacao")); + + this.dados.add(dataResult); + } + + this.resultSet = rset; + } + }); + } + + @Override + protected void processaParametros() throws Exception { + } + + private String getSql(Map parametros) { + + StringBuilder sql = new StringBuilder(); + + String formatToDate = ("'dd/MM/yyyy hh24:mi:ss'"); + SimpleDateFormat formatSemHora = new SimpleDateFormat("dd/MM/yyyy"); + + Date dataInicial = (Date) parametros.get("DATA_INICIAL"); + Date dataFinal = (Date) parametros.get("DATA_FINAL"); + Integer empresaId = (Integer) parametros.get("EMPRESA_ID"); + String puntoVentas = (String) parametros.get("NUMPUNTOVENTA"); + Integer usuarioId = (Integer) parametros.get("BILHETEIRO_ID"); + + sql.append("SELECT ee.impingreso as valorTroco, "); + sql.append("pv.nombpuntoventa as puntoVenta, "); + sql.append("u.nombusuario as bilhetero, "); + sql.append("u.nombpaterno as paterno, "); + sql.append("u.nombmaterno as materno, "); + sql.append("ee.boleto_id AS boleto, "); + sql.append("ee.descinfo AS transacao "); + sql.append("FROM TIPO_EVENTO_EXTRA tee "); + sql.append("INNER JOIN EVENTO_EXTRA ee ON ee.tipoeventoextra_id = tee.tipoeventoextra_id "); + sql.append("INNER JOIN PUNTO_VENTA pv ON pv.puntoventa_id = ee.puntoventa_id "); + sql.append("INNER JOIN USUARIO u ON u.USUARIO_ID = ee.USUARIO_ID "); + + sql.append("WHERE tee.cvesistema = 'TIPO_EVENTO_EXTRA_TROCO_SIMPLES' "); + + if (empresaId != null) { + sql.append(" AND ee.empresa_id = " + empresaId); + } + if (dataInicial != null && dataFinal != null) { + sql.append(" AND ee.fechoringreso BETWEEN TO_DATE('" + formatSemHora.format(dataInicial) + " 00:00:00', " + formatToDate + ") " + + "AND TO_DATE('" + formatSemHora.format(dataFinal) + " 23:59:59', " + formatToDate + ") "); + } + if (puntoVentas != null && !puntoVentas.isEmpty()) { + sql.append(" AND pv.puntoventa_id IN (" + puntoVentas + ") "); + } + if(usuarioId != null) { + sql.append(" AND ee.usuario_id = " + usuarioId); + } + + return sql.toString(); + } + + public String getNombUsuarioCompleto(String nome, String nomePaterno, String nomeMaterno) { + StringBuilder sNome = new StringBuilder(nome); + if(StringUtils.isNotBlank(nomePaterno)) { + sNome.append(" ") + .append(nomePaterno); + } + if(StringUtils.isNotBlank(nomeMaterno)) { + sNome.append(" ") + .append(nomeMaterno); + } + + return sNome.toString(); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTrocoSimples_es_MX.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTrocoSimples_es_MX.properties new file mode 100644 index 000000000..54c894657 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTrocoSimples_es_MX.properties @@ -0,0 +1,19 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: + +label.puntoVenta=Agência +label.bilheteiro=Bilheteiro +label.valorTroco=Valor Troco +label.boleto=Boleto +label.transacao=Transação +label.totalTroco=Total Troco: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTrocoSimples_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTrocoSimples_pt_BR.properties new file mode 100644 index 000000000..54c894657 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTrocoSimples_pt_BR.properties @@ -0,0 +1,19 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: + +label.puntoVenta=Agência +label.bilheteiro=Bilheteiro +label.valorTroco=Valor Troco +label.boleto=Boleto +label.transacao=Transação +label.totalTroco=Total Troco: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrocoSimples.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrocoSimples.jasper new file mode 100644 index 0000000000000000000000000000000000000000..6bd239d4b50a4e22f5b76432d75af09b22201cff GIT binary patch literal 29767 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 L^L$vJ8E5|={U?$m literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrocoSimples.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrocoSimples.jrxml new file mode 100644 index 000000000..64a0fb763 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTrocoSimples.jrxml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + <band height="91" splitType="Stretch"> + <line> + <reportElement uuid="54719d85-3e16-47ba-8a7d-50d626129e3d" x="0" y="68" width="554" height="1"/> + </line> + <textField> + <reportElement uuid="abfa62bc-56f8-4add-8903-0b64e8dbac7a" x="265" y="0" width="186" height="25"/> + <textElement textAlignment="Right"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> + </textField> + <textField pattern="" isBlankWhenNull="false"> + <reportElement uuid="1a6a5b3b-d765-4d73-98d5-bd050b49dcf3" mode="Transparent" x="451" y="41" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> + </textField> + <line> + <reportElement uuid="9f8fb8ed-d527-4abf-9a65-791a8a9ce032" positionType="Float" x="0" y="84" width="554" height="1"/> + </line> + <textField pattern="" isBlankWhenNull="false"> + <reportElement uuid="942f5b46-6e12-4ef7-8f5f-28c8b90062e1" mode="Transparent" x="265" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression> + </textField> + <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> + <reportElement uuid="2acc421d-eff6-44d3-a35d-23d25afbba1a" mode="Transparent" x="533" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> + <reportElement uuid="54330d46-2a96-4065-b0ee-7d80265e78b0" mode="Transparent" x="451" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="852c6b40-a6cd-4a7d-9067-57114f688220" x="0" y="69" width="555" height="15"/> + <textElement verticalAlignment="Middle"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> + </textField> + <textField pattern="" isBlankWhenNull="false"> + <reportElement uuid="16fc4ee9-a895-4859-831b-4f609ff16d50" mode="Transparent" x="0" y="0" width="265" height="41" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrocoSimplesController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrocoSimplesController.java new file mode 100644 index 000000000..34072fb4f --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrocoSimplesController.java @@ -0,0 +1,281 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +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.Bandbox; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Paging; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioTrocoSimples; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; +import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject; +import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendasBilheteiro; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendasBilheteiroSelecionados; + +@Controller("relatorioTrocoSimplesController") +@Scope("prototype") +public class RelatorioTrocoSimplesController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + + private Datebox dtInicial; + private Datebox dtFinal; + + private MyComboboxEstandar cmbEmpresa; + private List lsEmpresa; + + @Autowired + private transient PagedListWrapper plwPuntoVenta; + private MyTextbox txtNombrePuntoVenta; + private Bandbox bbPesquisaPuntoVenta; + private Paging pagingPuntoVenta; + private MyListbox puntoVentaList; + private MyListbox puntoVentaSelList; + + private MyComboboxUsuario cmbUsuario; + + @Autowired + private EmpresaService empresaService; + @Autowired + private DataSource dataSourceRead; + + @Override + public void doAfterCompose(Component comp) throws Exception { + lsEmpresa = empresaService.obtenerTodos(); + super.doAfterCompose(comp); + + puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiro()); + puntoVentaSelList.setItemRenderer(new RenderRelatorioVendasBilheteiroSelecionados()); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private void executarRelatorio() throws Exception { + Relatorio relatorio; + Map parametros = new HashMap(); + StringBuilder filtro = new StringBuilder(); + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); + + if (!validar()) { + return; + } + + if (dtInicial.getValue() != null) { + filtro.append("Período: ") + .append(format.format(dtInicial.getValue())) + .append(" - ") + .append(format.format(dtFinal.getValue())) + .append(";"); + } + + filtro.append("Agência: "); + String puntoVentaIds = ""; + String puntoVentas = ""; + List lsPuntoVentaSelecionados = new ArrayList(Arrays.asList(puntoVentaSelList.getData())); + if (lsPuntoVentaSelecionados.size() > 0) { + for (int i = 0; i < lsPuntoVentaSelecionados.size(); i++) { + PuntoVenta puntoVenta = lsPuntoVentaSelecionados.get(i); + puntoVentas = puntoVentas + puntoVenta.getNombpuntoventa() + ","; + puntoVentaIds = puntoVentaIds + puntoVenta.getPuntoventaId() + ","; + } + + puntoVentaIds = puntoVentaIds.substring(0, puntoVentaIds.length() - 1); + puntoVentas = puntoVentas.substring(0, puntoVentas.length() - 1); + parametros.put("NUMPUNTOVENTA", puntoVentaIds); + } else { + filtro.append("Todas "); + } + + filtro.append(puntoVentas).append(";"); + + + filtro.append("Bilheteiro: "); + Comboitem itemUsuario = cmbUsuario.getSelectedItem(); + if (itemUsuario != null) { + Usuario usuario = (Usuario) itemUsuario.getValue(); + if(usuario.getUsuarioId() != -1) { + parametros.put("BILHETEIRO_ID", usuario.getUsuarioId()); + filtro.append(usuario.getNombusuario() + ";"); + }else { + filtro.append(" Todos; "); + } + } else { + filtro.append(" Todos; "); + } + + parametros.put("DATA_INICIAL", (java.util.Date) dtInicial.getValue()); + parametros.put("DATA_FINAL", (java.util.Date) dtFinal.getValue()); + + parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioTrocoSimples.window.title")); + parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario()); + + + filtro.append("Empresa: "); + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + if (itemEmpresa != null) { + Empresa empresa = (Empresa) itemEmpresa.getValue(); + parametros.put("EMPRESA_ID", empresa.getEmpresaId()); + filtro.append(empresa.getNombempresa() + ";"); + } else { + filtro.append(" Todas; "); + } + + parametros.put("FILTROS", filtro.toString()); + relatorio = new RelatorioTrocoSimples(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioTrocoSimples.window.title"), args, MODAL); + } + + private boolean validar() { + try { + if (dtInicial.getValue() == null || dtFinal.getValue() == null) { + Messagebox.show(Labels.getLabel("relatorioTrocoSimples.MSG.informarDatas"), + Labels.getLabel("relatorioTrocoSimples.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + return false; + } + } catch (InterruptedException ex) { + return false; + } + return true; + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(); + } + + private void executarPesquisa() { + HibernateSearchObject puntoVentaBusqueda = new HibernateSearchObject(PuntoVenta.class, pagingPuntoVenta.getPageSize()); + + puntoVentaBusqueda.addFilterILike("nombpuntoventa", "%" + txtNombrePuntoVenta.getValue() + "%"); + puntoVentaBusqueda.addFilterEqual("activo", Boolean.TRUE); + puntoVentaBusqueda.addFilterNotEqual("puntoventaId", -1); + puntoVentaBusqueda.addSortAsc("nombpuntoventa"); + puntoVentaBusqueda.addFilterEqual("activo", Boolean.TRUE); + plwPuntoVenta.init(puntoVentaBusqueda, puntoVentaList, pagingPuntoVenta); + + if (puntoVentaList.getData().length == 0) { + try { + Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), + Labels.getLabel("relatorioVendasBilheteiroController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + } + } + + public void onClick$btnPesquisa(Event ev) { + executarPesquisa(); + } + + public void onDoubleClick$puntoVentaSelList(Event ev) { + PuntoVenta puntoVenta = (PuntoVenta) puntoVentaSelList.getSelected(); + puntoVentaSelList.removeItem(puntoVenta); + } + + public void onDoubleClick$puntoVentaList(Event ev) { + PuntoVenta puntoVenta = (PuntoVenta) puntoVentaList.getSelected(); + puntoVentaSelList.addItemNovo(puntoVenta); + } + + public void onClick$btnLimpar(Event ev) { + puntoVentaList.setData(new ArrayList()); + bbPesquisaPuntoVenta.setText(""); + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } + + public MyComboboxEstandar getCmbEmpresa() { + return cmbEmpresa; + } + + public void setCmbEmpresa(MyComboboxEstandar cmbEmpresa) { + this.cmbEmpresa = cmbEmpresa; + } + + public PagedListWrapper getPlwPuntoVenta() { + return plwPuntoVenta; + } + + public void setPlwPuntoVenta(PagedListWrapper plwPuntoVenta) { + this.plwPuntoVenta = plwPuntoVenta; + } + + public MyTextbox getTxtNombrePuntoVenta() { + return txtNombrePuntoVenta; + } + + public void setTxtNombrePuntoVenta(MyTextbox txtNombrePuntoVenta) { + this.txtNombrePuntoVenta = txtNombrePuntoVenta; + } + + public MyListbox getPuntoVentaList() { + return puntoVentaList; + } + + public void setPuntoVentaList(MyListbox puntoVentaList) { + this.puntoVentaList = puntoVentaList; + } + + public MyListbox getPuntoVentaSelList() { + return puntoVentaSelList; + } + + public void setPuntoVentaSelList(MyListbox puntoVentaSelList) { + this.puntoVentaSelList = puntoVentaSelList; + } + + public Datebox getDtVendaInicial() { + return dtInicial; + } + + public void setDtVendaInicial(Datebox dtVendaInicial) { + this.dtInicial = dtVendaInicial; + } + + public Datebox getDtVendaFinal() { + return dtFinal; + } + + public void setDtVendaFinal(Datebox dtVendaFinal) { + this.dtFinal = dtVendaFinal; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/esquemaoperacional/ItemMenuRelatorioTrocoSimples.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/esquemaoperacional/ItemMenuRelatorioTrocoSimples.java new file mode 100644 index 000000000..3a631c847 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/esquemaoperacional/ItemMenuRelatorioTrocoSimples.java @@ -0,0 +1,26 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.constantes.ConstantesFuncionSistema; +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; + +public class ItemMenuRelatorioTrocoSimples extends DefaultItemMenuSistema { + + public ItemMenuRelatorioTrocoSimples() { + super("indexController.mniTrocoSimples.mniRelatorioTrocoSimples.label"); + } + + @Override + public String getClaveMenu() { + return ConstantesFuncionSistema.CLAVE_RELATORIO_TROCO_SIMPLES; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioTrocoSimples.zul", + Labels.getLabel("relatorioTrocoSimples.window.title"), getArgs() ,desktop); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties index 23a1c773e..b19420b56 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties @@ -94,6 +94,7 @@ esquemaOperacional.configuracaoVendaEmbarcada=com.rjconsultores.ventaboletos.web esquemaOperacional.configuracaoVendaEmbarcada.ItemMenuCadastroOperadorEmbarcada=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.ItemMenuCadastroOperadorEmbarcada esquemaOperacional.trocoSimples=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.SubMenuTrocoSimples esquemaOperacional.trocoSimples.ItemMenuCadastroEmpresaTrocoSimples=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.ItemMenuCadastroEmpresaTrocoSimples +esquemaOperacional.trocoSimples.ItemMenuRelatorioTrocoSimples=com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional.ItemMenuRelatorioTrocoSimples tarifasOficial=com.rjconsultores.ventaboletos.web.utilerias.menu.item.tarifasOficial.MenuTarifasOficial tarifasOficial.seguroKm=com.rjconsultores.ventaboletos.web.utilerias.menu.item.tarifasOficial.ItemMenuSeguroKm tarifasOficial.seguroTarifa=com.rjconsultores.ventaboletos.web.utilerias.menu.item.tarifasOficial.ItemMenuSeguroTarifa diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index afaa9a68e..b29b78a96 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -8218,6 +8218,11 @@ editarEmpresaTrocoSimples.valorSugerir=Valor para Sugestão de Troco Simples editarEmpresaTrocoSimples.token=Token editarEmpresaTrocoSimples.MSG.suscribirOK = Cadastro da empresa no Troco Simples registrado com sucesso. editarEmpresaTrocoSimples.MSG.cadastroExistente = Já existe uma configuração para esta Empresa. +editarEmpresaTrocoSimples.MSG.borrarPergunta = Remover configurações do troco simples para empresa? +editarEmpresaTrocoSimples.MSG.borrarOK = Configuração removida com Sucesso. +editarConvenioController.MSG.erro= Erro ao salvar +busquedaEmpresaTrocoSimples.valorSugerir= Valor Sugerido + editarEmpresaTrocoSimples.MSG.borrarPergunta = Remover configurações do troco simples para empresa? editarEmpresaTrocoSimples.MSG.borrarOK = Configuração removida com Sucesso. diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index f6b5f0b38..84a4f81f8 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -8725,6 +8725,16 @@ editarEmpresaTrocoSimples.MSG.borrarOK = Configuração removida com Sucesso. editarConvenioController.MSG.erro= Erro ao salvar busquedaEmpresaTrocoSimples.valorSugerir= Valor Sugerido +indexController.mniTrocoSimples.mniRelatorioTrocoSimples.label=Relatório Troco Simples +relatorioTrocoSimples.window.title=Relatório Troco Simples +relatorioTrocoSimples.dataInicial.label=Data Inicial +relatorioTrocoSimples.dataFinal.label=Data Final +relatorioTrocoSimples.empresa.label=Empresa +relatorioTrocoSimples.puntoVenta.label=Agência +relatorioTrocoSimples.bilheteiro.label=Bilheteiro +relatorioTrocoSimples.MSG.informarDatas=Favor informar Data Inicial e Data Final. + + #viewTestEmailController viewTestEmailController.window.title= Testar configurações da conta viewTestEmailController.btnFechar.tooltiptext = Apagar diff --git a/web/gui/relatorios/filtroRelatorioTrocoSimples.zul b/web/gui/relatorios/filtroRelatorioTrocoSimples.zul new file mode 100644 index 000000000..19da7dc67 --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioTrocoSimples.zul @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + +