From c5fc8bbf2de7248c60b94b411de6c4172de24fbd Mon Sep 17 00:00:00 2001 From: "bruno.neves" Date: Wed, 5 Apr 2017 18:35:19 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#0008450=20-Foi=20criado=20o=20no?= =?UTF-8?q?vo=20relat=C3=B3rio,=20com=20as=20informa=C3=A7=C3=B5es=20solic?= =?UTF-8?q?itadas=20pelo=20cliente.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@67733 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioKmProgramada_pt_BR.properties | 13 + .../templates/RelatorioKMProgramadaa.jrxml | 27 + .../templates/RelatorioKmProgramada.jasper | Bin 0 -> 32859 bytes .../templates/RelatorioKmProgramada.jrxml | 251 ++++++++++ .../templates/RelatorioKmProgramada1.jasper | Bin 0 -> 94478 bytes .../templates/RelatorioKmProgramada1.jrxml | 465 ++++++++++++++++++ .../EditarFechamentoParamgeralController.java | 1 + .../RelatorioKmProgramadaController.java | 167 +++++++ .../ItemMenuRelatorioKmProgramada.java | 25 + .../utilerias/menu/menu_original.properties | 1 + 10 files changed, 950 insertions(+) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioKmProgramada_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKMProgramadaa.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada1.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada1.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioKmProgramadaController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioKmProgramada.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioKmProgramada_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioKmProgramada_pt_BR.properties new file mode 100644 index 000000000..01f6ecc2b --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioKmProgramada_pt_BR.properties @@ -0,0 +1,13 @@ +#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: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKMProgramadaa.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKMProgramadaa.jrxml new file mode 100644 index 000000000..3d6911ab5 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKMProgramadaa.jrxml @@ -0,0 +1,27 @@ + + + + + + + <band height="79" splitType="Stretch"/> + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada.jasper new file mode 100644 index 0000000000000000000000000000000000000000..fdb4e1ab355778a3224516eac6ff9ba18a5391ae GIT binary patch literal 32859 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada.jrxml new file mode 100644 index 000000000..b0da223f0 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada.jrxml @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="73" splitType="Stretch"> + <staticText> + <reportElement x="0" y="0" width="247" height="20" uuid="68f4ea28-b08b-4655-ab65-5f181721909f"/> + <textElement> + <font size="14" isBold="true"/> + </textElement> + <text><![CDATA[Kilometragem Programada]]></text> + </staticText> + <textField pattern="dd/MM/yyyy HH:mm"> + <reportElement x="403" y="0" width="152" height="20" uuid="d0203404-283e-4281-a85f-9fe7c3f0e121"/> + <textElement textAlignment="Right"> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="31" width="291" height="20" uuid="7adb9127-4696-4a5a-9ebb-ab4430744550"/> + <textElement verticalAlignment="Middle"> + <font isBold="true"/> + </textElement> + <textFieldExpression><![CDATA["Período: " + $P{DATA_INICIAL} + " a " + $P{DATA_FINAL}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="0" y="51" width="46" height="20" uuid="4edc7c1b-38fc-4738-a3eb-a8002b23ae18"/> + <textElement verticalAlignment="Middle"> + <font isBold="true"/> + </textElement> + <text><![CDATA[Filtros:]]></text> + </staticText> + <line> + <reportElement positionType="Float" x="0" y="71" width="555" height="1" uuid="001cfcc7-c18f-4b8f-9bd1-01568512ca0c"/> + </line> + <textField> + <reportElement x="46" y="51" width="509" height="20" uuid="9b9ca6f0-2531-42dc-8d40-e54c9dba2064"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada1.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada1.jasper new file mode 100644 index 0000000000000000000000000000000000000000..d248ca4ce4de6932800d6a883d12c0c9f08e5325 GIT binary patch literal 94478 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada1.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada1.jrxml new file mode 100644 index 000000000..7332125ca --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioKmProgramada1.jrxml @@ -0,0 +1,465 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamgeralController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamgeralController.java index 64dcbe7bc..1f125a353 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamgeralController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamgeralController.java @@ -30,6 +30,7 @@ public class EditarFechamentoParamgeralController extends MyGenericForwardCompos private enum BancosSuportados { ITAU("341", "Itaú"), + SANTANDER("033", "Santander"), BRADESCO("237", "Bradesco"); private String codBanco; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioKmProgramadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioKmProgramadaController.java new file mode 100644 index 000000000..d0d2df1ef --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioKmProgramadaController.java @@ -0,0 +1,167 @@ +/* + * 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.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.zk.ui.Component; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Datebox; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.GrupoRuta; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioKmProgramada; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.service.GrupoRutaService; +import com.rjconsultores.ventaboletos.service.RutaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +/** + * + * @author Administrador + */ +@Controller("relatorioKmProgramadaController") +@Scope("prototype") +public class RelatorioKmProgramadaController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + + @Autowired + private DataSource dataSourceRead; + @Autowired + private EmpresaService empresaService; + @Autowired + private RutaService rutaService; + @Autowired + private GrupoRutaService grupoRutaService; + @Autowired + private ConstanteService constanteService; + + private List lsRuta; + private List lsEmpresa; + private List lsGrupoRuta; + + private Datebox fecCorridaIni; + private Datebox fecCorridaFin; + private MyComboboxEstandar cmbRuta; + private MyComboboxEstandar cmbEmpresa; + + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(); + } + + /** + * @throws Exception + * + */ + @SuppressWarnings({ "rawtypes", "unchecked" }) + private void executarRelatorio() throws Exception { + + Relatorio relatorio; + Map parametros = new HashMap(); + StringBuilder filtro = new StringBuilder(); + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + + parametros.put("DATA_INICIAL", sdf.format((java.util.Date) this.fecCorridaIni.getValue())); + parametros.put("DATA_FINAL", sdf.format((java.util.Date) this.fecCorridaFin.getValue())); + parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioResumoLinhasController.window.title")); + parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); + + Comboitem itemRuta = cmbRuta.getSelectedItem(); + + filtro.append("Linha: "); + if (itemRuta != null) { + Ruta ruta = (Ruta) itemRuta.getValue(); + parametros.put("RUTA_ID", ruta.getRutaId()); + filtro.append(ruta.getDescruta() + ";"); + } + else + filtro.append("Todas;"); + + + + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + filtro.append(" Empresa: "); + if (itemEmpresa != null) { + Empresa empresa = (Empresa) itemEmpresa.getValue(); + parametros.put("EMPRESA_ID", empresa.getEmpresaId()); + parametros.put("EMPRESA", empresa.getNombempresa()); + filtro.append(empresa.getNombempresa()); + }else{ + parametros.put("EMPRESA_ID", null); + filtro.append("Todas;"); + } + + parametros.put("FILTROS", filtro.toString()); + + relatorio = new RelatorioKmProgramada(parametros, dataSourceRead.getConnection(), constanteService); + + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioKmProgramadaController.window.title"), args, MODAL); + + } + + @Override + public void doAfterCompose(Component comp) throws Exception { + setLsRuta(rutaService.obtenerTodos()); + lsEmpresa = empresaService.obtenerTodos(); + lsGrupoRuta = grupoRutaService.obtenerTodos(); + + super.doAfterCompose(comp); + } + + public List getLsRuta() { + return lsRuta; + } + + public void setLsRuta(List lsRuta) { + this.lsRuta = lsRuta; + } + + public MyComboboxEstandar getCmbRuta() { + return cmbRuta; + } + + public void setCmbRuta(MyComboboxEstandar cmbRuta) { + this.cmbRuta = cmbRuta; + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + public void setLsEmpresa(List lsEmpresa) { + this.lsEmpresa = lsEmpresa; + } + + public List getLsGrupoRuta() { + return lsGrupoRuta; + } + + public void setLsGrupoRuta(List lsGrupoRuta) { + this.lsGrupoRuta = lsGrupoRuta; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioKmProgramada.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioKmProgramada.java new file mode 100644 index 000000000..e54a50a6c --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioKmProgramada.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 ItemMenuRelatorioKmProgramada extends DefaultItemMenuSistema { + + public ItemMenuRelatorioKmProgramada() { + super("indexController.mniRelatorioKmProgramada.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOKMPROGRAMADA"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioKmProgramada.zul", + Labels.getLabel("relatorioKmProgramadaController.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 4dc1538df..3a4695a43 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 @@ -133,6 +133,7 @@ analitico.gerenciais.trip=com.rjconsultores.ventaboletos.web.utilerias.menu.item analitico.gerenciais.operacionais=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.gerenciais.operacionais.SubMenuRelatorioOperacionais analitico.gerenciais.operacionais.aproveitamento=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioAproveitamento analitico.gerenciais.operacionais.resumoLinhas=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioResumoLinhas +analitico.gerenciais.operacionais.kmProgramada=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioKmProgramada analitico.gerenciais.operacionais.acompanhamentoEquivalentes=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioAcompanhamentoEquivalentes analitico.gerenciais.operacionais.linhasHorario=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioLinhasHorario analitico.gerenciais.operacionais.demandas=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioDemandas