From c6b9d43531222bea5fa237d7b23eb7b6e8da4f33 Mon Sep 17 00:00:00 2001 From: rodrigo Date: Tue, 10 Sep 2013 19:27:27 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30814 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../templates/RelatorioOrigemDestino.jasper | Bin 73154 -> 73133 bytes .../templates/RelatorioOrigemDestino.jrxml | 84 +++++++++--------- .../RelatorioOrigemDestinoController.java | 36 +++----- .../RenderRelatorioOrigemDestinoCorrida.java | 11 --- ...torioOrigemDestinoCorridaSelecionadas.java | 7 -- src/java/versionADM.info | 2 +- .../filtroRelatorioOrigemDestino.zul | 15 +--- 7 files changed, 58 insertions(+), 97 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper index deffa24e9bf0c77567bc25cbeaedc55c0ac62a47..3b5d8d2feb017a78a35b937691edaa1bfcb9eefd 100644 GIT binary patch delta 845 zcmZuuUr1A76u;-X<;F4>Hx`u{CR^O1wK(8^ZkCmbIy0ZnQ6s? zX~kr{wt%gz#m&Jzq)VGQrgSsZFmR5?3#WdpWIxaHc=Pn~N|x~P`0z{~++?arP=gyA zJUppyZc|A30GjE3o}83u{jzW|UYJK8e^w93c8JV??-G8bAD znRB6X^1ky4z@QXPU;Y4WK7`SIyQ0rDWTyKLtGl0lyCre>`^yvilj$#ej|>Y!B*+{< zZ%G-6Uae;7RP+htTf`xk_F=lkKs?uKfHoZJF;a)aJv{l^tE3|!eIO~n-dPMBiQm!# zbx&{a7F{kTWvX~FC{>N#ppopnJI5At42Wx@W?~q4j!VNlDN9tc;6(3$9Se9ra!<$l+w|M(J^j=oFj~K^>QeLC4-_A$hkO5sT{5| ziUi=)4Q{)vjEgP*Z63q)45unQ>1z+SHg^zVJgd-wN$fQrW(v$kDO?CMU?QFgpHB04 znqo`H3$jhHXh>s=ZBdJG#8fOn-}ULm$%D%zOJK9X!ZMozW|Wb6j%TN delta 849 zcmZutUr3Wt6u;-&rhPMUBp4H`Su7jj`o3+>X)KYVhlLN3u>NQ{a5b0MbQ6<8oew=p zl&92!TF&f61m#G9W@WP^>^X=aNC?!xhw35hp}u>k{j>9M?>WEU@0{PgXLL&cd`drd z#H80*yk0c56j7@wbr@?>n=o3p8_)Vzc}}6@+kqz##7e&vCr*49@S~FrGWe*lzE5xP zF~)jOX|&>G^LECZ%x+V1n|SQaY{mee)uu#WWvX=F0i#E_&NK z4GiFP8QO&%jFXIFj8lu zuN@WXvEsc{+vOF{r)0bcG)W?Eqc7bCop3(NzeGE)wC14QZ=}JS1t5~SJ~QBtu#uMg z*AUaK3^2;offl=^Dsa(`UBRv7zCA8s&NDfKDU87jJbl+jJMOq7sKB}&E4C*p`7pU# z+YS%lD1A;GlCWx67L
l9ucK8O#KXpFJUW5K3aL;VGAV-O-f9NUr=S@CApVGu_r z1_pCI={geCU?^rRRUOgdmnNPj+#3lTAILSYHESKBzkI#76PwG5F*vlEb%T!*N3XC; z*Z;BmllaRnO$fU+%?7(({BS>nE01MrdoZoH>C_S@w_S{}Evnt=RF&W1@Ni}+#&oL7 zL%xw<9$zGQX>ukB+Ets{1BMlCrCtoAY(%qGz)Q16SwI?m025EFWO_LwnN*j%)a6#n rJZIDrx5uGi%|a - + - + @@ -176,32 +176,32 @@ - + - + - + - + - + @@ -214,7 +214,7 @@ - + @@ -225,10 +225,10 @@ - + - + @@ -239,15 +239,8 @@ - - - - - - - - + @@ -256,6 +249,13 @@ + + + + + + + @@ -320,28 +320,28 @@ - + - + - + - + @@ -386,7 +386,7 @@ - + @@ -410,35 +410,35 @@ - + - + - + - + - + @@ -446,7 +446,7 @@ - + @@ -455,28 +455,28 @@ - + - + - + - + @@ -493,24 +493,24 @@ - + - + - + - + @@ -520,7 +520,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -569,19 +569,19 @@ - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOrigemDestinoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOrigemDestinoController.java index fd61b8f70..bcf769e9b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOrigemDestinoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOrigemDestinoController.java @@ -24,7 +24,6 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.ComboitemRenderer; import org.zkoss.zul.Datebox; import org.zkoss.zul.Intbox; -import org.zkoss.zul.Paging; import com.rjconsultores.ventaboletos.entidad.Corrida; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -32,6 +31,7 @@ import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioOrigemDestino; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.CorridaService; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.RutaService; import com.rjconsultores.ventaboletos.utilerias.DateUtil; @@ -39,11 +39,8 @@ 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.paginacion.HibernateSearchObject; -import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioOrigemDestinoCorrida; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioOrigemDestinoCorridaSelecionadas; -import com.trg.search.Filter; @Controller("relatorioOrigemDestinoController") @Scope("prototype") @@ -53,17 +50,16 @@ public class RelatorioOrigemDestinoController extends MyGenericForwardComposer { @Autowired private DataSource dataSource; @Autowired - private transient PagedListWrapper plwCorrida; - @Autowired private EmpresaService empresaService; @Autowired private RutaService rutaService; + @Autowired + private CorridaService corridaService; private List lsEmpresa; private Datebox datInicial; private Datebox datFinal; private Intbox txtCorridaId; private Intbox txtCodLinha; - private Paging pagingCorrida; private MyListbox corridaList; private MyListbox corridaSelList; private Combobox cmbEmpresa; @@ -124,43 +120,35 @@ public class RelatorioOrigemDestinoController extends MyGenericForwardComposer { } private void executarPesquisa() { - HibernateSearchObject rutaBusqueda = - new HibernateSearchObject(Corrida.class, pagingCorrida.getPageSize()); - Comboitem cbiOrigem = cmbParadaOrigem.getSelectedItem(); + Integer iorigem = null; if (cbiOrigem != null) { Parada origem = (Parada) cbiOrigem.getValue(); - rutaBusqueda.addFilterEqual("origem", origem); + iorigem = origem.getParadaId(); } Comboitem cbiDestino = cmbParadaDestino.getSelectedItem(); + Integer idestino = null; if (cbiDestino != null) { Parada destino = (Parada) cbiDestino.getValue(); - rutaBusqueda.addFilterEqual("destino", destino); + idestino = destino.getParadaId(); } Comboitem cbiRuta = cmbRuta.getSelectedItem(); + Integer iruta = null; if (cbiRuta != null) { Ruta ruta = (Ruta) cbiRuta.getValue(); - rutaBusqueda.addFilterEqual("ruta", ruta); + iruta = ruta.getRutaId(); } Integer codLinha = txtCodLinha.getValue(); - if (codLinha != null) { - rutaBusqueda.addFilterEqual("ruta.numRuta", codLinha); - } Date dataDe = DateUtil.normalizar(datInicial.getValue()); Date dataAte = DateUtil.normalizar(datFinal.getValue()); - rutaBusqueda.addFilterEqual("id.corridaId", txtCorridaId.getValue()); - rutaBusqueda.addFilterAnd(Filter.greaterOrEqual("id.feccorrida", dataDe), Filter.lessOrEqual("id.feccorrida", dataAte)); - - rutaBusqueda.addSortAsc("id.corridaId"); - - rutaBusqueda.addFilterEqual("activo", Boolean.TRUE); - - plwCorrida.init(rutaBusqueda, corridaList, pagingCorrida); + Integer corridaId = txtCorridaId.getValue(); + List ls = corridaService.buscarGroupCorrridaId(corridaId, iorigem, idestino, iruta, codLinha, dataDe, dataAte); + corridaList.setData(ls); if (corridaList.getData().length == 0) { try { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorrida.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorrida.java index 0bf823e07..00a212101 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorrida.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorrida.java @@ -1,7 +1,5 @@ package com.rjconsultores.ventaboletos.web.utilerias.render; -import java.text.SimpleDateFormat; - import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -10,21 +8,12 @@ import com.rjconsultores.ventaboletos.entidad.Corrida; public class RenderRelatorioOrigemDestinoCorrida implements ListitemRenderer { - private SimpleDateFormat sdfHora = new SimpleDateFormat("HH:mm"); - private SimpleDateFormat sdfDia = new SimpleDateFormat("dd/MM/yyyy"); - public void render(Listitem lstm, Object o) throws Exception { Corrida corrida = (Corrida) o; Listcell lc = new Listcell(corrida.getId().getCorridaId().toString()); lc.setParent(lstm); - lc = new Listcell(sdfDia.format(corrida.getId().getFeccorrida())); - lc.setParent(lstm); - - lc = new Listcell(sdfHora.format(corrida.getFechorsalida())); - lc.setParent(lstm); - lc = new Listcell(corrida.getOrigem().getDescparada()); lc.setParent(lstm); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorridaSelecionadas.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorridaSelecionadas.java index 3df9919e8..150895bef 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorridaSelecionadas.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorridaSelecionadas.java @@ -1,7 +1,5 @@ package com.rjconsultores.ventaboletos.web.utilerias.render; -import java.text.SimpleDateFormat; - import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zul.Button; @@ -14,17 +12,12 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class RenderRelatorioOrigemDestinoCorridaSelecionadas implements ListitemRenderer { - private SimpleDateFormat sdfDia = new SimpleDateFormat("dd/MM/yyyy"); - public void render(Listitem lstm, Object o) throws Exception { Corrida corrida = (Corrida) o; Listcell lc = new Listcell(corrida.getId().getCorridaId().toString()); lc.setParent(lstm); - lc = new Listcell(sdfDia.format(corrida.getId().getFeccorrida())); - lc.setParent(lstm); - lc = new Listcell(corrida.getOrigem().getDescparada()); lc.setParent(lstm); diff --git a/src/java/versionADM.info b/src/java/versionADM.info index 1774df3b3..92f5f3420 100644 --- a/src/java/versionADM.info +++ b/src/java/versionADM.info @@ -1 +1 @@ -ADM_20130910_1RC231 +ADM_20130910_1RC232 diff --git a/web/gui/relatorios/filtroRelatorioOrigemDestino.zul b/web/gui/relatorios/filtroRelatorioOrigemDestino.zul index 7356b1e98..99189003d 100644 --- a/web/gui/relatorios/filtroRelatorioOrigemDestino.zul +++ b/web/gui/relatorios/filtroRelatorioOrigemDestino.zul @@ -126,12 +126,6 @@ - - - + width="40%" /> - + width="40%" /> +