From e013a255383863e393c84b5d970287f92ec4c191 Mon Sep 17 00:00:00 2001 From: julio Date: Tue, 27 Dec 2016 22:09:01 +0000 Subject: [PATCH] bug #8122 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64238 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioImpressaoRMD.java | 27 +++ .../RelatorioImpressaoRMD_es.properties | 2 + .../RelatorioImpressaoRMD_pt_BR.properties | 2 + .../templates/RelatorioImpressaoRMD.jasper | Bin 0 -> 30457 bytes .../templates/RelatorioImpressaoRMD.jrxml | 221 ++++++++++++++++++ ...BusquedaRegionMetropolitanaController.java | 104 +++++++++ .../EditarRegionMetropolitanaController.java | 171 ++++++++++++++ .../BusquedaImpressaoRMDController.java | 162 +++++++++++++ .../ItemMenuRegionMetropolitana.java | 26 +++ .../ItemMenuExportacaoFiscalECF.java | 2 +- .../impressaofiscal/ItemMenuImpressaoRMD.java | 29 +++ .../utilerias/menu/menu_original.properties | 1 + .../render/RenderRegionMetropolitana.java | 23 ++ src/java/spring-config.xml | 1 + web/WEB-INF/i3-label_es_MX.label | 11 + web/WEB-INF/i3-label_pt_BR.label | 17 ++ .../catalogos/busquedaRegionMetropolitana.zul | 55 +++++ .../catalogos/editarRegionMetropolitana.zul | 116 +++++++++ .../impressaofiscal/busquedaImpressaoRMD.zul | 72 ++++++ 19 files changed, 1041 insertions(+), 1 deletion(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRMD.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaRegionMetropolitanaController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/catalogos/ItemMenuRegionMetropolitana.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImpressaoRMD.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRegionMetropolitana.java create mode 100644 web/gui/catalogos/busquedaRegionMetropolitana.zul create mode 100644 web/gui/catalogos/editarRegionMetropolitana.zul create mode 100644 web/gui/impressaofiscal/busquedaImpressaoRMD.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRMD.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRMD.java new file mode 100644 index 000000000..eeef0e547 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRMD.java @@ -0,0 +1,27 @@ +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.utilerias.impressaormd.vo.ImpressaoRMD; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +public class RelatorioImpressaoRMD extends Relatorio { + + @SuppressWarnings("unchecked") + public RelatorioImpressaoRMD(final Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + + List list = (List) parametros.get("list"); + + this.setCollectionDataSource(new JRBeanCollectionDataSource(list)); + } + + @Override + protected void processaParametros() throws Exception { + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_es.properties new file mode 100644 index 000000000..99c440382 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_es.properties @@ -0,0 +1,2 @@ +#geral +msg.noData=No se pudo obtener datos con los parámetros reportados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_pt_BR.properties new file mode 100644 index 000000000..57daa3700 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioImpressaoRMD_pt_BR.properties @@ -0,0 +1,2 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jasper new file mode 100644 index 0000000000000000000000000000000000000000..6a54cd2fdc8039ad2aadd3b773f67f3ef9b0e52c GIT binary patch literal 30457 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 Up6~rB&#PkvPC|OL??vkW0nN+8ZU6uP literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jrxml new file mode 100644 index 000000000..98bdf58cb --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRMD.jrxml @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="102" splitType="Stretch"> + <textField> + <reportElement x="278" y="1" width="343" height="20" uuid="76bd1c26-ed5d-4155-916b-f90dbdb2b9dc"/> + <textElement> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="278" y="21" width="343" height="20" uuid="1bc67f62-16e9-4681-891c-4d2680466d91"/> + <textElement> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{enderecoEmpresa}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="278" y="61" width="343" height="20" uuid="fe223feb-b29e-4f97-b359-272aa857ce87"/> + <textElement> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{ieEmpresa}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="278" y="41" width="343" height="20" uuid="cc73dace-ff3e-40cf-8292-9519af0108d4"/> + <textElement> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{cnpjEmpresa}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy"> + <reportElement x="278" y="81" width="343" height="20" uuid="b716c82c-1944-4691-b907-1d194b41ecfd"/> + <textElement> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField> + <reportElement x="676" y="21" width="100" height="20" uuid="1c447225-9f55-4f72-a269-d29c272ef2a4"/> + <textElement> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{rmd}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="621" y="81" width="155" height="20" uuid="6de6219d-29c1-43bb-91be-718a93ee5e7b"/> + <textElement> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{naturezaOperacao}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaRegionMetropolitanaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaRegionMetropolitanaController.java new file mode 100644 index 000000000..1a6059da8 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaRegionMetropolitanaController.java @@ -0,0 +1,104 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; + +import java.util.HashMap; +import java.util.Map; + +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.zk.ui.event.EventListener; +import org.zkoss.zul.Paging; +import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; +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.RenderRegionMetropolitana; + +@Controller("busquedaRegionMetropolitanaController") +@Scope("prototype") +public class BusquedaRegionMetropolitanaController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + + @Autowired + private transient PagedListWrapper plwRegionMetropolitana; + private MyListbox regionMetropolitanaList; + private Paging pagingRegionMetropolitana; + private Textbox txtRegion; + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + + regionMetropolitanaList.setItemRenderer(new RenderRegionMetropolitana()); + regionMetropolitanaList.addEventListener("onDoubleClick", new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + RegionMetropolitana r = (RegionMetropolitana) regionMetropolitanaList.getSelected(); + verRegionMetropolitana(r); + } + }); + + refreshLista(); + + txtRegion.focus(); + + } + + private void verRegionMetropolitana(RegionMetropolitana r) { + if (r == null) { + return; + } + + Map args = new HashMap(); + args.put("regionMetropolitana", r); + args.put("regionMetropolitanaList", regionMetropolitanaList); + + openWindow("/gui/catalogos/editarRegionMetropolitana.zul", + Labels.getLabel("editarRegionMetropolitanaController.window.title"), args, MODAL); + } + + private void refreshLista() { + HibernateSearchObject regionMetropolitanaBusqueda = new HibernateSearchObject(RegionMetropolitana.class, + pagingRegionMetropolitana.getPageSize()); + + regionMetropolitanaBusqueda.addFilterLike("descRegion", "%" + txtRegion.getText().trim().concat("%")); + regionMetropolitanaBusqueda.addFilterEqual("activo", Boolean.TRUE); + regionMetropolitanaBusqueda.addSortAsc("descRegion"); + + plwRegionMetropolitana.init(regionMetropolitanaBusqueda, regionMetropolitanaList, pagingRegionMetropolitana); + + if (regionMetropolitanaList.getData().length == 0) { + try { + Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), + Labels.getLabel("busquedaArticuloController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + } catch (InterruptedException ex) { + } + } + } + + public void onClick$btnPesquisa(Event ev) { + refreshLista(); + } + + public void onClick$btnRefresh(Event ev) { + refreshLista(); + } + + public void onClick$btnNovo(Event ev) { + verRegionMetropolitana(new RegionMetropolitana()); + } +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java new file mode 100644 index 000000000..0e90bc39c --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java @@ -0,0 +1,171 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; + +import java.util.List; + +import org.apache.log4j.Logger; +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.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; + +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.ParadaService; +import com.rjconsultores.ventaboletos.service.RegionMetropolitanaService; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve; +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.render.RenderCatalogoDeParadas; + +/** + * + * @author Administrador + */ +@Controller("editarRegionMetropolitanaController") +@Scope("prototype") +public class EditarRegionMetropolitanaController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + private static Logger log = Logger.getLogger(EditarRegionMetropolitanaController.class); + + @Autowired + private ParadaService paradaService; + @Autowired + private RegionMetropolitanaService regionMetropolitanaService; + private RegionMetropolitana regionMetropolitana; + private MyListbox regionMetropolitanaList; + private Button btnApagar; + private MyTextbox txtDesc; + + private MyComboboxParada cmbParada; + private MyComboboxParadaCve cmbParadaCve; + + private MyListbox paradaList; + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + + regionMetropolitana = (RegionMetropolitana) Executions.getCurrent().getArg().get("regionMetropolitana"); + regionMetropolitanaList = (MyListbox) Executions.getCurrent().getArg().get("regionMetropolitanaList"); + + if (regionMetropolitana.getRegionMetropolitanaId() == null) { + btnApagar.setVisible(Boolean.FALSE); + } else { + + List paradas = paradaService.buscaParadaRegionMetropolitana(regionMetropolitana); + paradaList.setItemRenderer(new RenderCatalogoDeParadas()); + paradaList.setData(paradas); + } + + txtDesc.focus(); + txtDesc.setValue(regionMetropolitana.getDescRegion()); + } + + public void onSelect$cmbParadaCve(Event ev) { + if (cmbParadaCve.getSelectedItem() != null) { + cmbParada.setComboItemByParada((Parada) cmbParadaCve.getSelectedItem().getValue()); + } + } + + public void onSelect$cmbParada(Event ev) { + if (cmbParada.getSelectedItem() != null) + cmbParadaCve.setComboItemByParada((Parada) cmbParada.getSelectedItem().getValue()); + } + + public void onClick$btnSalvar(Event ev) throws InterruptedException { + txtDesc.getValue(); + + try { + if (regionMetropolitana.getRegionMetropolitanaId() == null) { + regionMetropolitanaService.suscribir(regionMetropolitana); + regionMetropolitanaList.addItemNovo(regionMetropolitana); + // regionMetropolitanaList.addItem(regionMetropolitana); + } else { + regionMetropolitanaService.actualizacion(regionMetropolitana); + regionMetropolitanaList.updateItem(regionMetropolitana); + } + + Messagebox.show( + Labels.getLabel("editarRegionMetropolitanaController.MSG.suscribirOK"), + Labels.getLabel("editarRegionMetropolitanaController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + + closeWindow(); + } catch (Exception ex) { + log.error("editarRegionMetropolitanaController: " + ex); + Messagebox.show( + Labels.getLabel("MSG.Error"), + Labels.getLabel("editarRegionMetropolitanaController.window.title"), + Messagebox.OK, Messagebox.ERROR); + } + } + + public void onClick$btnApagar(Event ev) throws InterruptedException { + + int resp = Messagebox.show( + Labels.getLabel("editarRegionMetropolitanaController.MSG.borrarPergunta"), + Labels.getLabel("editarRegionMetropolitanaController.window.title"), + Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); + + if (resp == Messagebox.YES) { + + regionMetropolitanaService.borrar(regionMetropolitana); + + Messagebox.show( + Labels.getLabel("editarRegionMetropolitanaController.MSG.borrarOK"), + Labels.getLabel("editarRegionMetropolitanaController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + + regionMetropolitanaList.removeItem(regionMetropolitana); + + closeWindow(); + } + } + + public void onClick$btnNovaParada(Event ev) throws InterruptedException { + + Parada parada = (Parada) cmbParada.getSelectedItem().getValue(); + parada.setRegionMetropolitana(regionMetropolitana); + paradaList.addItemNovo(parada); + + try { + paradaService.suscribirActualizar(parada); + } catch (BusinessException e) { + log.error("", e); + } + } + + public void onClick$btnApagarParada(Event ev) throws InterruptedException { + Parada parada = (Parada) paradaList.getSelected(); + parada.setRegionMetropolitana(null); + + paradaList.removeItem(parada); + try { + paradaService.suscribirActualizar(parada); + } catch (BusinessException e) { + log.error("", e); + } + } + + public MyTextbox getTxtDesc() { + return txtDesc; + } + + public void setTxtDesc(MyTextbox txtDesc) { + this.txtDesc = txtDesc; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java new file mode 100644 index 000000000..fe1ebaa73 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java @@ -0,0 +1,162 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.impressaofiscal; + +import java.sql.SQLException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + +import org.hornetq.core.logging.Logger; +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.WrongValueException; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zkplus.databind.BindingListModelList; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Datebox; + +import com.rjconsultores.ventaboletos.entidad.Aidf; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Estado; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioImpressaoRMD; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.AidfService; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.service.EstadoService; +import com.rjconsultores.ventaboletos.service.FiscalService; +import com.rjconsultores.ventaboletos.utilerias.impressaormd.vo.ImpressaoRMD; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +@Controller("busquedaImpressaoRMDController") +@Scope("prototype") +public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { + private static final long serialVersionUID = 1L; + + private static Logger log = Logger.getLogger(BusquedaImpressaoRMDController.class); + + @Autowired + private DataSource dataSourceRead; + + @Autowired + private FiscalService fiscalService; + + @Autowired + private EmpresaService empresaService; + + @Autowired + private EstadoService estadoService; + + @Autowired + private AidfService aidfService; + + private List lsEmpresa; + private List lsEstado; + private List lsAidf; + + private Datebox datInicial; + private Datebox datFinal; + + private MyComboboxEstandar cmbEmpresa; + private MyComboboxEstandar cmbEstado; + private MyComboboxEstandar cmbAidf; + + @Override + public void doAfterCompose(Component comp) throws Exception { + lsEmpresa = empresaService.obtenerTodos(); + lsEstado = estadoService.obtenerTodos(); + + super.doAfterCompose(comp); + } + + public void onSelect$cmbEmpresa(Event ev) { + Empresa empresa = null; + Estado estado = null; + + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + Comboitem itemEstado = cmbEstado.getSelectedItem(); + + if (itemEmpresa != null) { + empresa = (Empresa) itemEmpresa.getValue(); + } + + if (itemEstado != null) { + estado = (Estado) itemEstado.getValue(); + } + + lsAidf = aidfService.buscaAidfRMD(empresa.getEmpresaId(), estado.getEstadoId()); + cmbAidf.setModel(new BindingListModelList(lsAidf, true)); + + + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void onClick$btnExecutar(Event ev) throws InterruptedException { + Empresa empresa = null; + Estado estado = null; + Aidf aidf = null; + + Comboitem itemEmpresa = cmbEmpresa.getSelectedItem(); + Comboitem itemEstado = cmbEstado.getSelectedItem(); + Comboitem itemAidf = cmbAidf.getSelectedItem(); + + if (itemEmpresa != null) { + empresa = (Empresa) itemEmpresa.getValue(); + } + + if (itemEstado != null) { + estado = (Estado) itemEstado.getValue(); + } + if (itemAidf != null) { + aidf = (Aidf) itemAidf.getValue(); + } + + if (empresa != null && estado != null) { + try { + String rmd = null; + if (aidf != null) + rmd = aidf.getSerie() + aidf.getSubserie(); + + List list = fiscalService.getRegistroImpressaoRMDTipoDVB(dataSourceRead.getConnection(), + datInicial.getValue(), datFinal.getValue(), empresa, estado, rmd); + + Map parametros = new HashMap(); + parametros.put("list", list); + + Relatorio relatorio = new RelatorioImpressaoRMD(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("indexController.mnImpressaoRMD.label"), args, MODAL); + + } catch (WrongValueException e) { + log.error("", e); + } catch (SQLException e) { + log.error("", e); + } catch (Exception e) { + log.error("", e); + } + + } + + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + public List getLsEstado() { + return lsEstado; + } + + public List getLsAidf() { + return lsAidf; + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/catalogos/ItemMenuRegionMetropolitana.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/catalogos/ItemMenuRegionMetropolitana.java new file mode 100644 index 000000000..6c80a9aa0 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/catalogos/ItemMenuRegionMetropolitana.java @@ -0,0 +1,26 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.catalogos; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; + +public class ItemMenuRegionMetropolitana extends DefaultItemMenuSistema { + + public ItemMenuRegionMetropolitana() { + super("indexController.mniRegionMetropolitana.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.CATALOGO.MENU.REGIONMETROPOLITANA"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/catalogos/busquedaRegionMetropolitana.zul", + Labels.getLabel("busquedaRegionMetropolitanaController.window.title"), + getArgs() ,desktop); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuExportacaoFiscalECF.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuExportacaoFiscalECF.java index 739f756dd..0095c8845 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuExportacaoFiscalECF.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuExportacaoFiscalECF.java @@ -15,7 +15,7 @@ public class ItemMenuExportacaoFiscalECF extends DefaultItemMenuSistema { @Override public String getClaveMenu() { - return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.EXPORTACAO.RMDECF"; + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.IMPRESSAORMD"; } @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImpressaoRMD.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImpressaoRMD.java new file mode 100644 index 000000000..351c5f904 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/impressaofiscal/ItemMenuImpressaoRMD.java @@ -0,0 +1,29 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal; + +import java.util.HashMap; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; +import com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.impressaofiscal.TipoImportacaoFiscal.TipoImportacao; + +public class ItemMenuImpressaoRMD extends DefaultItemMenuSistema { + public ItemMenuImpressaoRMD() { + super("indexController.mnImpressaoRMD.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.IMPRESSAORMD"; + } + + @Override + public void ejecutar() { + @SuppressWarnings("unchecked") + HashMap map = TipoImportacaoFiscal.selecionaTipoImportacao(TipoImportacao.ECF, (HashMap) getArgs()); + + PantallaUtileria.openWindow("/gui/impressaofiscal/busquedaImpressaoRMD.zul", + Labels.getLabel("indexController.mnImpressaoRMD.label"), map, 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 9c85db0a3..ed6a60df8 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 @@ -26,6 +26,7 @@ catalogos.turno=com.rjconsultores.ventaboletos.web.utilerias.menu.item.catalogos catalogos.ocdParam=com.rjconsultores.ventaboletos.web.utilerias.menu.item.catalogos.ItemMenuBusquedaOCDParam catalogos.empleado=com.rjconsultores.ventaboletos.web.utilerias.menu.item.catalogos.ItemMenuEmpleado catalogos.pracaPedagio=com.rjconsultores.ventaboletos.web.utilerias.menu.item.tarifas.ItemMenuPracaPedagio +catalogos.regionMetropolitana=com.rjconsultores.ventaboletos.web.utilerias.menu.item.catalogos.ItemMenuRegionMetropolitana gr=com.rjconsultores.ventaboletos.web.utilerias.menu.item.gr.MenuGr gr.aidf=com.rjconsultores.ventaboletos.web.utilerias.menu.item.gr.ItemMenuAidf gr.movimentacionBilhetes=com.rjconsultores.ventaboletos.web.utilerias.menu.item.gr.ItemMenuMovimentacionBilhetes diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRegionMetropolitana.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRegionMetropolitana.java new file mode 100644 index 000000000..9b9d3603d --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRegionMetropolitana.java @@ -0,0 +1,23 @@ +package com.rjconsultores.ventaboletos.web.utilerias.render; + +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; + +public class RenderRegionMetropolitana implements ListitemRenderer { + + public void render(Listitem lstm, Object o) throws Exception { + RegionMetropolitana regionMetropolitana = (RegionMetropolitana) o; + + Listcell lc = new Listcell(regionMetropolitana.getRegionMetropolitanaId().toString()); + lc.setParent(lstm); + + lc = new Listcell(regionMetropolitana.getDescRegion()); + lc.setParent(lstm); + + lstm.setAttribute("data", regionMetropolitana); + } + +} diff --git a/src/java/spring-config.xml b/src/java/spring-config.xml index d611e3acb..07ed7c2f5 100644 --- a/src/java/spring-config.xml +++ b/src/java/spring-config.xml @@ -22,6 +22,7 @@ + com.rjconsultores.ventaboletos.entidad.RegionMetropolitana com.rjconsultores.ventaboletos.entidad.Comissao com.rjconsultores.ventaboletos.entidad.ClienteCurso com.rjconsultores.ventaboletos.entidad.PacoteTarifa diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 7dfb506b5..1b45ae72b 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -113,6 +113,7 @@ indexController.mniMotivoReimpresion.label = Motivo de la reimpresión indexController.mniCategoria.label = Tipo de pasaje indexController.mniPuntoVenta.label = Punto de venta (Agencias) indexController.mniEmpresa.label = Empresa +indexController.mniRegionMetropolitana.label = Region Metropolitana indexController.mniTipoServicio.label = Tipo de servicio indexController.mniTipoVenta.label = Modalidad de venta indexController.mniDiagramaAutoBus.label = Tipos de autobus @@ -4222,6 +4223,16 @@ editarColoniaController.lhCodPostal.label = Cod Postal editarColoniaController.lhCiudad.label = Ciudad editarColoniaController.lhEquivalencia.label = Equivalencia +# Pesquisa Region Metropolitana +busquedaRegionMetropolitanaController.window.title = Region Metropolitana +busquedaRegionMetropolitanaController.btnRefresh.tooltiptext = Actualización +busquedaRegionMetropolitanaController.btnNovo.tooltiptext = Incluir +busquedaRegionMetropolitanaController.btnCerrar.tooltiptext = Cerrar +busquedaRegionMetropolitanaController.txtRegion.label = Region Metropolitana +busquedaRegionMetropolitanaController.btnPesquisa.label = Búsqueda +busquedaRegionMetropolitanaController.lhId.label = ID +busquedaRegionMetropolitanaController.lhRegion.label = Region Metropolitana +editarRegionMetropolitanaController.lhParada.label = Cuidad # Búsqueda Artículo busquedaArticuloController.window.title = Articulo diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 1bdb2bf1b..53fbd56c8 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -115,6 +115,7 @@ indexController.mniMotivoReimpresion.label = Motivo da Reimpressão indexController.mniCategoria.label = Tipo de Passagem indexController.mniPuntoVenta.label = Ponto de Venda (Agências) indexController.mniEmpresa.label = Empresa +indexController.mniRegionMetropolitana.label = Região Metropolitana indexController.mniTipoServicio.label = Tipo de Serviço indexController.mniTipoVenta.label = Modalidade de Venda indexController.mniDiagramaAutoBus.label = Tipos de Carro @@ -313,6 +314,8 @@ indexController.mnSubMenuExportacaoFiscal.label=Exportação Fiscal indexController.mniExportacaoFiscalECF.label=ECF indexController.mniExportacaoFiscalRMD.label=RMD +indexController.mnImpressaoRMD.label=Impressão RMD + indexController.mniSubMenuClientePacote.label=Pacote indexController.mniManutencaoPacote.label=Manutenção Pacote @@ -4295,6 +4298,20 @@ editarColoniaController.lhCodPostal.label = Cod Postal editarColoniaController.lhCiudad.label = Cidade editarColoniaController.lhEquivalencia.label = Equivalencia +# Pesquisa Região Metropolitana +busquedaRegionMetropolitanaController.window.title = Região Metropolitana +busquedaRegionMetropolitanaController.btnRefresh.tooltiptext = Atualização +busquedaRegionMetropolitanaController.btnNovo.tooltiptext = Incluir +busquedaRegionMetropolitanaController.btnCerrar.tooltiptext = Fechar +busquedaRegionMetropolitanaController.txtRegion.label = Região Metropolitana +busquedaRegionMetropolitanaController.btnPesquisa.label = Pesquisa +busquedaRegionMetropolitanaController.lhId.label = ID +busquedaRegionMetropolitanaController.lhRegion.label = Região Metropolitana +editarRegionMetropolitanaController.lhParada.label = Cidade +editarRegionMetropolitanaController.window.title = Região Metropolitana +editarRegionMetropolitanaController.MSG.suscribirOK = Região Metropolitana Registrado com Sucesso. +editarRegionMetropolitanaController.MSG.borrarPergunta = Eliminar a Região Metropolitana? +editarRegionMetropolitanaController.MSG.borrarOK = Região Metropolitana Excluido com Sucesso. # Pesquisa Artigo busquedaArticuloController.window.title = Artigo diff --git a/web/gui/catalogos/busquedaRegionMetropolitana.zul b/web/gui/catalogos/busquedaRegionMetropolitana.zul new file mode 100644 index 000000000..14e4f97ce --- /dev/null +++ b/web/gui/catalogos/busquedaRegionMetropolitana.zul @@ -0,0 +1,55 @@ + + + + + + + + + +