From 5aa93d765b25b315ad11efccadda38cec5daccb6 Mon Sep 17 00:00:00 2001 From: julio Date: Fri, 30 Oct 2015 12:39:38 +0000 Subject: [PATCH] bug #6669 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49626 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioHistoricoComissao.java | 29 ++ .../RelatorioHistoricoComissao.jasper | Bin 0 -> 43673 bytes .../RelatorioHistoricoComissao.jrxml | 457 ++++++++++++++++++ .../BusquedaHistoricoComissaoController.java | 130 +++++ .../comissao/ItemMenuHistoricoComissao.java | 23 + web/WEB-INF/i3-label_es_MX.label | 5 + web/WEB-INF/i3-label_pt_BR.label | 5 + .../comissao/RelatorioCalculoComissao.jasper | Bin 61750 -> 0 bytes .../comissao/RelatorioCalculoComissao.jrxml | 67 --- .../comissao/busquedaHistoricoComissao.zul | 75 +++ 10 files changed, 724 insertions(+), 67 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoComissao.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoComissao.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoComissao.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaHistoricoComissaoController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/comissao/ItemMenuHistoricoComissao.java delete mode 100644 web/gui/comissao/RelatorioCalculoComissao.jasper delete mode 100644 web/gui/comissao/RelatorioCalculoComissao.jrxml create mode 100644 web/gui/comissao/busquedaHistoricoComissao.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoComissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoComissao.java new file mode 100644 index 000000000..a850630e5 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoComissao.java @@ -0,0 +1,29 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +public class RelatorioHistoricoComissao extends Relatorio { + + public RelatorioHistoricoComissao(Map parametros, Connection conexao) { + super(parametros, conexao); + + List historico = (List) parametros.get("historico"); + setLsDadosRelatorio(historico); + } + + public void setLsDadosRelatorio(List historico) { + this.setCollectionDataSource(new JRBeanCollectionDataSource(historico)); + } + + @Override + protected void processaParametros() throws Exception { + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoComissao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoComissao.jasper new file mode 100644 index 0000000000000000000000000000000000000000..a85edb1f3ec9bde6411f11e1267fc6b634238753 GIT binary patch literal 43673 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoComissao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoComissao.jrxml new file mode 100644 index 000000000..952b97ba7 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoComissao.jrxml @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="87" splitType="Stretch"> + <staticText> + <reportElement x="0" y="63" width="74" height="23" uuid="561c23fd-d89a-462e-a2fb-dda3fce61209"/> + <textElement verticalAlignment="Middle"> + <font size="11" isBold="true"/> + </textElement> + <text><![CDATA[Agência:]]></text> + </staticText> + <staticText> + <reportElement x="0" y="0" width="428" height="20" uuid="38c91d2c-209c-40e6-a819-1163a0243bc9"/> + <textElement verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <text><![CDATA[Histórico de Comissão]]></text> + </staticText> + <staticText> + <reportElement x="0" y="40" width="74" height="23" uuid="9ac23ceb-5a19-4212-90e1-d239548b0269"/> + <textElement verticalAlignment="Middle"> + <font size="11" isBold="true"/> + </textElement> + <text><![CDATA[Empresa:]]></text> + </staticText> + <staticText> + <reportElement x="0" y="20" width="74" height="20" uuid="d153c887-fd98-4eed-af4c-05466ae5c40d"/> + <textElement verticalAlignment="Middle"> + <font size="11" isBold="true"/> + </textElement> + <text><![CDATA[Período:]]></text> + </staticText> + <textField> + <reportElement x="74" y="40" width="728" height="23" isPrintWhenDetailOverflows="true" uuid="c61ce766-52c3-4120-8cdc-6b7356175b9e"/> + <textElement> + <font size="11"/> + </textElement> + <textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="74" y="63" width="728" height="23" isPrintWhenDetailOverflows="true" uuid="3477f25b-85ea-48bf-b4fc-8d111cdf6dee"/> + <textFieldExpression><![CDATA[$P{puntoventa}]]></textFieldExpression> + </textField> + <textField pattern="MMMMM, yyyy"> + <reportElement x="74" y="20" width="95" height="20" isPrintWhenDetailOverflows="true" uuid="dd5d9d0c-0a2f-4132-bf57-0a54529a5a82"/> + <textElement> + <font size="11"/> + </textElement> + <textFieldExpression><![CDATA[$P{periodoInicial}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm"> + <reportElement x="428" y="0" width="374" height="20" uuid="42848541-f8f7-4e8d-b5db-d368f48d7423"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField pattern="MMMMM, yyyy"> + <reportElement x="240" y="20" width="111" height="20" isPrintWhenDetailOverflows="true" uuid="c2d0883c-32fa-4215-b481-122b797d1ed4"/> + <textElement> + <font size="11"/> + </textElement> + <textFieldExpression><![CDATA[$P{periodoFinal}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="169" y="20" width="71" height="20" uuid="94739e6c-51ed-42bd-9a08-841a29d97814"/> + <textElement textAlignment="Center" verticalAlignment="Top"> + <font size="11" isBold="true"/> + </textElement> + <text><![CDATA[até]]></text> + </staticText> + <line> + <reportElement x="0" y="86" width="802" height="1" uuid="8ea1d196-daed-4f98-a2f1-f1679b8d4840"/> + </line> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaHistoricoComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaHistoricoComissaoController.java new file mode 100644 index 000000000..afb8eb637 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaHistoricoComissaoController.java @@ -0,0 +1,130 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.comissao; + +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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.zk.ui.Component; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Messagebox; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioHistoricoComissao; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.ComissaoService; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.vo.comissao.HistoricoComissao; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +@Scope("prototype") +@Controller("busquedaHistoricoComissaoController") +public class BusquedaHistoricoComissaoController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + private static final Logger log = LoggerFactory.getLogger(BusquedaHistoricoComissaoController.class); + + @Autowired + private ComissaoService comissaoService; + + @Autowired + private EmpresaService empresaService; + + @Autowired + private DataSource dataSourceRead; + + private Combobox cmbEmpresa; + private List lsEmpresas; + private List lsPuntoVenta; + private MyComboboxPuntoVenta cmbPuntoVenta; + private Datebox datMesInicio; + private Datebox datMesFim; + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + + lsEmpresas = empresaService.obtenerTodos(); + lsPuntoVenta = new ArrayList(); + } + + public void onClick$btnRelatorio(Event ev) throws SQLException, InterruptedException { + + try { + PuntoVenta puntoVenta = (PuntoVenta) (cmbPuntoVenta.getSelectedItem() != null ? cmbPuntoVenta.getSelectedItem().getValue() : null); + Empresa empresa = (Empresa) (cmbEmpresa.getSelectedItem() != null ? cmbEmpresa.getSelectedItem().getValue() : null); + Date periodoInicial = datMesInicio.getValue(); + Date periodoFinal = datMesFim.getValue(); + + List historico = comissaoService.buscaHistoricoComissao(puntoVenta.getPuntoventaId(), empresa.getEmpresaId(), periodoInicial, periodoFinal); + + Map parametros = new HashMap(); + parametros.put("puntoventa", puntoVenta.getNombpuntoventa()); + parametros.put("empresa", empresa.getNombempresa()); + parametros.put("periodoInicial", periodoInicial); + parametros.put("periodoFinal", periodoFinal); + parametros.put("historico", historico); + + Relatorio relatorio = new RelatorioHistoricoComissao(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioAcompanhamentoEquivalentesController.window.title"), args, MODAL); + + } catch (Exception e) { + log.error("", e); + Messagebox.show(e.getMessage(), Labels.getLabel("busquedaHistoricoComissaoController.window.title"), + Messagebox.OK, Messagebox.ERROR); + } + + } + + public Combobox getCmbEmpresa() { + return cmbEmpresa; + } + + public void setCmbEmpresa(Combobox cmbEmpresa) { + this.cmbEmpresa = cmbEmpresa; + } + + public List getLsEmpresas() { + return lsEmpresas; + } + + public void setLsEmpresas(List lsEmpresas) { + this.lsEmpresas = lsEmpresas; + } + + public List getLsPuntoVenta() { + return lsPuntoVenta; + } + + public void setLsPuntoVenta(List lsPuntoVenta) { + this.lsPuntoVenta = lsPuntoVenta; + } + + public MyComboboxPuntoVenta getCmbPuntoVenta() { + return cmbPuntoVenta; + } + + public void setCmbPuntoVenta(MyComboboxPuntoVenta cmbPuntoVenta) { + this.cmbPuntoVenta = cmbPuntoVenta; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/comissao/ItemMenuHistoricoComissao.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/comissao/ItemMenuHistoricoComissao.java new file mode 100644 index 000000000..b8bfa1bdd --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/comissao/ItemMenuHistoricoComissao.java @@ -0,0 +1,23 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.comissao; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; + +public class ItemMenuHistoricoComissao extends DefaultItemMenuSistema { + public ItemMenuHistoricoComissao() { + super("indexController.mniHistoricoComissao.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.COMISSAO.MENU.HISTORICOCOMISSAO"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/comissao/busquedaHistoricoComissao.zul", + Labels.getLabel("busquedaHistoricoComissaoController.window.title"), getArgs(), desktop); + } +} \ No newline at end of file diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 94a250833..5c9bbb129 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -262,6 +262,7 @@ indexController.mniManutencaoPacote.label=Manutenção Pacote indexController.mnSubMenuComissao.label=Comisión indexController.mniCalculoComissao.label=Cálculo Comisión +indexController.mniHistoricoComissao.label=Historia de Comisión indexController.mniItemDesconto.label=Elemento de Descuento indexController.mniConferenciaComissao.label=Comisión el Conferencia @@ -5803,6 +5804,10 @@ busquedaCalculoComissaoController.comissao.exception = No hay registro cálculo busquedaCalculoComissaoController.comissao.msg = El registro de cálculo de comisiones para el período seleccionado ha sido cancelada busquedaCalculoComissaoController.registro.comissao.msg = Con éxito registrado el cálculo de comisiones para el período seleccionado +# Historico Comissao +busquedaHistoricoComissaoController.window.title = Historia de Comisión +busquedaHistoricoComissaoController.lbRelatorio.value = Relatório de Histórico + # Busqueda Item Desconto busquedaItemDescontoController.window.title = Elemento de Descuento busquedaItemDescontoController.btnRefresh.tooltiptext = Actualizar diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 62497594d..3208ea6a0 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -274,6 +274,7 @@ indexController.mniManutencaoPacote.label=Manutenção Pacote indexController.mnSubMenuComissao.label=Comissão indexController.mniCalculoComissao.label=Cálculo Comissão +indexController.mniHistoricoComissao.label=Histórico Comissão indexController.mniItemDesconto.label=Item Desconto indexController.mniConferenciaComissao.label=Conferência Comissão @@ -5944,6 +5945,10 @@ busquedaCalculoComissaoController.comissao.exception = Não existe registro de c busquedaCalculoComissaoController.comissao.msg = O registro de cálculo de comissão para o período selecionado foi cancelado busquedaCalculoComissaoController.registro.comissao.msg = Foi registrado com sucesso o cálculo de comissão para o período selecionado +# Historico Comissao +busquedaHistoricoComissaoController.window.title = Histórico Comissão +busquedaHistoricoComissaoController.lbRelatorio.value = Relatório de Histórico + # Busqueda Item Desconto busquedaItemDescontoController.window.title = Item Desconto busquedaItemDescontoController.btnRefresh.tooltiptext = Atualizar diff --git a/web/gui/comissao/RelatorioCalculoComissao.jasper b/web/gui/comissao/RelatorioCalculoComissao.jasper deleted file mode 100644 index 6aec2e2720ad1e6c598edc6b32495d8b920144ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 61750 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 diff --git a/web/gui/comissao/RelatorioCalculoComissao.jrxml b/web/gui/comissao/RelatorioCalculoComissao.jrxml deleted file mode 100644 index 63692ebbc..000000000 --- a/web/gui/comissao/RelatorioCalculoComissao.jrxml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <band height="79" splitType="Stretch"/> - - - - - - - - - - - - - - - - - - - - diff --git a/web/gui/comissao/busquedaHistoricoComissao.zul b/web/gui/comissao/busquedaHistoricoComissao.zul new file mode 100644 index 000000000..d6f0d4ffc --- /dev/null +++ b/web/gui/comissao/busquedaHistoricoComissao.zul @@ -0,0 +1,75 @@ + + + + + + + + + + +