diff --git a/pom.xml b/pom.xml index 467f9fff5..adcf26eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,259 +1,259 @@ - - - 4.0.0 - br.com.rjconsultores - ventaboletosadm - 1.0.31 - war - - - 1.0.20 - 1.0.13 - - - - - rj-releases - http://52.5.53.15:8081/nexus/content/repositories/releases/ - - - - - ${project.artifactId} - src/java - - - src/java - - **/*.java - - - - - - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - ISO-8859-1 - - - - maven-war-plugin - 3.3.1 - - web - @{artifactId}@.@{extension}@ - - - - org.wildfly.plugins - wildfly-maven-plugin - 3.0.0.Final - - - - - - - - br.com.rjconsultores - ModelWeb - ${modelWeb.version} - - - - br.com.rjconsultores - Flyway - ${flyway.version} - - - - br.com.rjconsultores - IntegracaoReceitaDespesa - 1.0.1 - - - - br.com.rjconsultores - WSTotvs - 1.0.0 - - - - br.com.rjconsultores - WSAG - 1.0.0 - - - - br.com.rjconsultores - Auditador - 1.0.1 - - - - br.com.rjconsultores - GeneradorBoletosCNAB - 1.0.2 - - - - br.com.rjconsultores - silvergray - 1.0.0 - - - - org.apache.httpcomponents - httpcore - 4.4.14 - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - - org.jboss.resteasy - resteasy-jaxrs - 3.14.0.Final - provided - - - - javax.servlet - javax.servlet-api - 4.0.0 - provided - - - - commons-beanutils - commons-beanutils - 1.9.4 - - - - commons-codec - commons-codec - 1.10 - - - - org.zkoss.common - zcommon - 5.0.9 - - - org.zkoss.zk - zhtml - 5.0.9 - - - org.zkoss.zk - zk - 5.0.9 - - - org.zkoss.zk - zkplus - 5.0.9 - - - org.zkoss.zk - zul - 5.0.9 - - - org.zkoss.zkforge - ckez - 3.6.0.0 - - - org.zkoss.zkforge - fckez - 2.6.1_1 - - - org.zkoss.zk - zkspring-security - 3.0RC - - - - commons-collections - commons-collections - 3.2.1 - - - org.codehaus.jackson - jackson-core-asl - 1.9.9 - - - - com.trg - trg-search - 0.4.3 - - - opensymphony - quartz-all - 1.6.5 - - - - org.apache.xmlbeans - xmlbeans - 2.3.0-1 - - - net.sf.saxon - saxon - 8.7 - - - net.sf.saxon - saxon-dom - 8.7 - - - - com.nimbusds - nimbus-jose-jwt - jdk16 - 4.11.2 - - - - org.xhtmlrenderer - flying-saucer-pdf-itext5 - 9.1.6 - - - - net.sf.jasperreports - jasperreports - 6.0.0 - - - - com.lowagie - itext - 2.1.7 - - - - net.sourceforge.jexcelapi - jxl - 2.6.12 - - - - + + + 4.0.0 + br.com.rjconsultores + ventaboletosadm + 1.0.32 + war + + + 1.0.20 + 1.0.13 + + + + + rj-releases + http://52.5.53.15:8081/nexus/content/repositories/releases/ + + + + + ${project.artifactId} + src/java + + + src/java + + **/*.java + + + + + + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + ISO-8859-1 + + + + maven-war-plugin + 3.3.1 + + web + @{artifactId}@.@{extension}@ + + + + org.wildfly.plugins + wildfly-maven-plugin + 3.0.0.Final + + + + + + + + br.com.rjconsultores + ModelWeb + ${modelWeb.version} + + + + br.com.rjconsultores + Flyway + ${flyway.version} + + + + br.com.rjconsultores + IntegracaoReceitaDespesa + 1.0.1 + + + + br.com.rjconsultores + WSTotvs + 1.0.0 + + + + br.com.rjconsultores + WSAG + 1.0.0 + + + + br.com.rjconsultores + Auditador + 1.0.1 + + + + br.com.rjconsultores + GeneradorBoletosCNAB + 1.0.2 + + + + br.com.rjconsultores + silvergray + 1.0.0 + + + + org.apache.httpcomponents + httpcore + 4.4.14 + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + + org.jboss.resteasy + resteasy-jaxrs + 3.14.0.Final + provided + + + + javax.servlet + javax.servlet-api + 4.0.0 + provided + + + + commons-beanutils + commons-beanutils + 1.9.4 + + + + commons-codec + commons-codec + 1.10 + + + + org.zkoss.common + zcommon + 5.0.9 + + + org.zkoss.zk + zhtml + 5.0.9 + + + org.zkoss.zk + zk + 5.0.9 + + + org.zkoss.zk + zkplus + 5.0.9 + + + org.zkoss.zk + zul + 5.0.9 + + + org.zkoss.zkforge + ckez + 3.6.0.0 + + + org.zkoss.zkforge + fckez + 2.6.1_1 + + + org.zkoss.zk + zkspring-security + 3.0RC + + + + commons-collections + commons-collections + 3.2.1 + + + org.codehaus.jackson + jackson-core-asl + 1.9.9 + + + + com.trg + trg-search + 0.4.3 + + + opensymphony + quartz-all + 1.6.5 + + + + org.apache.xmlbeans + xmlbeans + 2.3.0-1 + + + net.sf.saxon + saxon + 8.7 + + + net.sf.saxon + saxon-dom + 8.7 + + + + com.nimbusds + nimbus-jose-jwt + jdk16 + 4.11.2 + + + + org.xhtmlrenderer + flying-saucer-pdf-itext5 + 9.1.6 + + + + net.sf.jasperreports + jasperreports + 6.0.0 + + + + com.lowagie + itext + 2.1.7 + + + + net.sourceforge.jexcelapi + jxl + 2.6.12 + + + + \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java index 143a52388..094b96680 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java @@ -82,7 +82,6 @@ public class RelatorioEstornoCartao extends Relatorio { dataResult.put("descmotivo", rset.getString("descmotivo")); dataResult.put("adquirente", rset.getString("adquirente")); dataResult.put("estabelecimento", rset.getString("estabelecimento")); - dataResult.put("nsuhost", rset.getString("nsuhost")); this.dados.add(dataResult); @@ -137,21 +136,7 @@ public class RelatorioEstornoCartao extends Relatorio { sql.append(" AND c.corrida_id = dec.corrida_id "); sql.append(" AND c.numfoliosistema = dec.numfoliosistema "); sql.append(" AND c.indreimpresion = 1 "); - sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo, "); - - //SubSelect para evitar duplicacao dos registros por causa do join com a caja - sql.append(" COALESCE(( select ct.nsuhost "); - sql.append(" from caja c inner join caja_formapago cfp on cfp.caja_id = c.caja_id "); - sql.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id "); - sql.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id "); - sql.append(" inner join forma_pago fp on fp.formapago_id = cfp.formapago_id "); - sql.append(" where "); - sql.append(" c.numoperacion = dec.numoperacion "); - sql.append(" AND c.origen_id = dec.origen_id "); - sql.append(" AND c.destino_id = dec.destino_id "); - sql.append(" AND c.corrida_id = dec.corrida_id "); - sql.append(" AND coalesce( ct.nsuhost, '0') <> '0' "); - sql.append(" AND rownum = 1), '') as nsuhost "); + sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo "); sql.append(" FROM "); @@ -202,7 +187,7 @@ public class RelatorioEstornoCartao extends Relatorio { } sql.append(" AND DEC.FECREGISTRO BETWEEN :data_inicial AND :data_final "); - sql.append(" ORDER BY e.nombempresa, DEC.FECREGISTRO "); + sql.append(" ORDER BY DEC.FECREGISTRO "); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java index 892baeefa..e2ffb2d62 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java @@ -139,6 +139,15 @@ public class RelatorioPdfAndExcel { List> preparedData = new ArrayList>(); Map map; map = new HashMap(); + Boolean isValid = dispositivoVendaEmbarcadaList.getPaginal() != null; + Integer paginaActual = isValid ? dispositivoVendaEmbarcadaList.getPaginal().getActivePage() : null; + + if (isValid) { + for (int i = 0; i < dispositivoVendaEmbarcadaList.getPaginal().getPageCount(); i++) { + dispositivoVendaEmbarcadaList.getPaginal().setActivePage(i); + dispositivoVendaEmbarcadaList.renderAll(); + } + } for (Integer i = 0; i < dispositivoVendaEmbarcadaList.getSize(); i++) { List list = dispositivoVendaEmbarcadaList.getItemAtIndex(i).getChildren(); @@ -150,6 +159,11 @@ public class RelatorioPdfAndExcel { } preparedData.add(map); } + + if (isValid && paginaActual != null) { + dispositivoVendaEmbarcadaList.getPaginal().setActivePage(paginaActual); + } + return new JRMapCollectionDataSource(preparedData); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties index e59e2254a..660477569 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties @@ -35,5 +35,4 @@ empresa.label=Empresa: formaPago.label=Forma de Pagamento pontoDeventa.label=Ponto de Venda estabelecimento.label=Estab. -adquirente.label=Adqui. -nsuhost.label=NSU/Host \ No newline at end of file +adquirente.label=Adquirente \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties index 5d726ed94..38f51c05d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties @@ -36,5 +36,4 @@ formaPago.label=Forma de Pagamento pontoDeventa.label=Ponto de Venda motivoCancelamento.label=Motivo Cancelamento estabelecimento.label=Estab. -adquirente.label=Adqui. -nsuhost.label=NSU/Host \ No newline at end of file +adquirente.label=Adquirente \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties index e91c4a246..a8eae1944 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_es.properties @@ -48,15 +48,12 @@ detail.rg=RG detail.status=Status detail.codOrigem=Cod. Origem detail.codDestino=Cod. Destino -detail.total=Total: +detail.total=Total detail.totalComDesconto=Total c/ desconto detail.totalSemDesconto=Total s/ desconto detail.totalVendido=Total vendido detail.ccf=CCf detail.chaveBPe=Ch. BP-e -detail.totalV=Total Vendido: -detail.totalC=Total Cobrado: -detail.totalP=Total Preço: linhas=Linhas diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties index 1e5901120..790c6df2f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidade_pt_BR.properties @@ -48,15 +48,12 @@ detail.rg=RG detail.status=Status detail.codOrigem=Cod. Origem detail.codDestino=Cod. Destino -detail.total=Total: +detail.total=Total detail.totalComDesconto=Total c/ desconto detail.totalSemDesconto=Total s/ desconto detail.totalVendido=Total vendido detail.ccf=CCf detail.chaveBPe=Ch. BP-e -detail.totalV=Total Vendido: -detail.totalC=Total Cobrado: -detail.totalP=Total Preço: linhas=Linhas diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper index eedcdbcdf..6f843fc3b 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml index 2ffd37098..326e9f6c7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml @@ -44,9 +44,6 @@ - - - @@ -186,14 +183,14 @@ - + - + @@ -221,7 +218,7 @@ - + @@ -234,13 +231,6 @@ - - - - - - - @@ -459,14 +449,14 @@ - + - + @@ -510,7 +500,7 @@ - + @@ -523,13 +513,6 @@ - - - - - - - diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper index a1d4298f8..71c8807f5 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml index 59f2d6b68..aeb7d1408 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidade.jrxml @@ -1,8 +1,8 @@ - - + + @@ -600,60 +600,29 @@ - - - + - - - + - - - - + + - - - - + + - - - - + + - - - - - - - - - - - - - - - - - - - - - diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaDispositivoVendaEmbarcadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaDispositivoVendaEmbarcadaController.java index 2f466d236..ab307a421 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaDispositivoVendaEmbarcadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaDispositivoVendaEmbarcadaController.java @@ -5,8 +5,6 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; import java.sql.SQLException; import java.text.SimpleDateFormat; @@ -37,7 +35,6 @@ import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.enums.SistemaEnum; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioPdfAndExcel; -import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio; import com.rjconsultores.ventaboletos.service.DispositivoEmbarcadaService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; @@ -72,7 +69,6 @@ public class BusquedaDispositivoVendaEmbarcadaController extends MyGenericForwar private Textbox txtRegistro; private MyComboboxEstandar cmbVersaoUltimaSinc; private Textbox txtMei; - private Paging pagingDispositivoVendaEmbarcada; private MyListbox dispositivoVendaEmbarcadaList; private Search dispositivoVendaEmbarcadaBusqueda; private Checkbox chkDispBloqueadoSim; @@ -125,8 +121,7 @@ public class BusquedaDispositivoVendaEmbarcadaController extends MyGenericForwar } private void refreshLista() { - HibernateSearchObject dispositivoEmbarcadaBusqueda = new HibernateSearchObject(DispositivoEmbarcada.class, - pagingDispositivoVendaEmbarcada.getPageSize()); + HibernateSearchObject dispositivoEmbarcadaBusqueda = new HibernateSearchObject(DispositivoEmbarcada.class); dispositivoEmbarcadaBusqueda.addFilterLike("descricao", "%" + txtDescricao.getText().trim().concat("%")); @@ -173,7 +168,7 @@ public class BusquedaDispositivoVendaEmbarcadaController extends MyGenericForwar dispositivoEmbarcadaBusqueda.addFilterEqual("puntoVenta.puntoventaId", dab.getPuntoventaId()); } - plwDispositivoVendaEmbarcada.init(dispositivoEmbarcadaBusqueda, dispositivoVendaEmbarcadaList, pagingDispositivoVendaEmbarcada); + dispositivoVendaEmbarcadaList.setData(plwDispositivoVendaEmbarcada.searchObject(dispositivoEmbarcadaBusqueda)); if (dispositivoVendaEmbarcadaList.getData().length == 0) { try { @@ -208,21 +203,15 @@ public class BusquedaDispositivoVendaEmbarcadaController extends MyGenericForwar public void excutarRelatorios(boolean isPdf) throws SQLException, Exception { -// Map parametros = new HashMap(); RelatorioPdfAndExcel r = new RelatorioPdfAndExcel(dispositivoVendaEmbarcadaList); -// File file = r.generateReport(isPdf); - InputStream mediais = new ByteArrayInputStream(r.generateReportRender(isPdf)); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH-mm"); String nomeRelatorioDownload = NOME_RELATORIO + "_" + sdf.format(Calendar.getInstance().getTime()); if(isPdf) { -// InputStream mediais = new FileInputStream(file); AMedia conteudoRelatorioXLS = new AMedia("relatorio.pdf", "pdf", null, mediais); Filedownload.save(conteudoRelatorioXLS.getStreamData(), "application/pdf", nomeRelatorioDownload + ".pdf"); }else { -// InputStream mediais = new FileInputStream(file); AMedia conteudoRelatorioXLS = new AMedia("relatorio.xls", "xls", null, mediais); Filedownload.save(conteudoRelatorioXLS.getStreamData(), "application/xls", nomeRelatorioDownload + ".xls"); } @@ -286,14 +275,6 @@ public class BusquedaDispositivoVendaEmbarcadaController extends MyGenericForwar this.txtMei = txtMei; } - public Paging getPagingDispositivoVendaEmbarcada() { - return pagingDispositivoVendaEmbarcada; - } - - public void setPagingDispositivoVendaEmbarcada(Paging pagingDispositivoVendaEmbarcada) { - this.pagingDispositivoVendaEmbarcada = pagingDispositivoVendaEmbarcada; - } - public MyListbox getDispositivoVendaEmbarcadaList() { return dispositivoVendaEmbarcadaList; } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java index 5d8fc5eb8..7e1c0da69 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java @@ -72,7 +72,7 @@ public class PagedListWrapper implements Serializable { setSearchObject(hibernateSearchObject1); } - + private void initModel() { getSearchObject().setFirstResult(0); getSearchObject().setMaxResults(getPageSize()); @@ -255,4 +255,9 @@ public class PagedListWrapper implements Serializable { this.hibernateSearchObject = hibernateSearchObject1; initModel(); } + + public List searchObject(HibernateSearchObject hibernateSearchObject1) { + List searchResult = getPagedListService().getBySearchObject(hibernateSearchObject1); + return searchResult; + } } diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index d87db8622..e1d358f51 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -6,7 +6,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - VentaBoletosAdm + ventaboletos ventaboletosadm diff --git a/web/gui/catalogos/busquedaDispositivoVendaEmbarcada.zul b/web/gui/catalogos/busquedaDispositivoVendaEmbarcada.zul index 8a5d85da7..c4fba93b1 100644 --- a/web/gui/catalogos/busquedaDispositivoVendaEmbarcada.zul +++ b/web/gui/catalogos/busquedaDispositivoVendaEmbarcada.zul @@ -116,9 +116,6 @@ image="/gui/img/find.png" label="${c:l('dispositivoVendaEmbarcadaController.btnPesquisa.label')}" /> - -