From b54634f60ef9bd756e55115661f25ea017829eb5 Mon Sep 17 00:00:00 2001 From: "thiago.clemente" Date: Thu, 5 Sep 2019 20:32:08 +0000 Subject: [PATCH] fixes bug#15199 dev: qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@97318 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioEncerramentoCheckin.java | 160 ++++++++++++++ ...RelatorioEncerramentoCheckin_es.properties | 17 ++ ...atorioEncerramentoCheckin_pt_BR.properties | 17 ++ .../RelatorioEncerramentoCheckin.jasper | Bin 0 -> 29838 bytes .../RelatorioEncerramentoCheckin.jrxml | 199 ++++++++++++++++++ .../RelatorioMovimentacaoBilhete.jasper | Bin 74070 -> 73754 bytes .../RelatorioMovimentacaoBilhete.jrxml | 63 +++--- .../RelatorioEncerramentoCheckinBean.java | 50 +++++ ...elatorioEncerramentoCheckinController.java | 123 +++++++++++ .../ItemMenuRelatorioEncerramentoCheckin.java | 24 +++ .../utilerias/menu/menu_original.properties | 1 + web/WEB-INF/i3-label_es_MX.label | 15 +- web/WEB-INF/i3-label_pt_BR.label | 15 +- .../filtroRelatorioEncerramentoCheckin.zul | 80 +++++++ 14 files changed, 734 insertions(+), 30 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEncerramentoCheckin.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEncerramentoCheckinBean.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEncerramentoCheckinController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioEncerramentoCheckin.java create mode 100644 web/gui/relatorios/filtroRelatorioEncerramentoCheckin.zul diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEncerramentoCheckin.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEncerramentoCheckin.java new file mode 100644 index 000000000..96cfe0ca8 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEncerramentoCheckin.java @@ -0,0 +1,160 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioEncerramentoCheckinBean; +import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; + +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + +public class RelatorioEncerramentoCheckin extends Relatorio { + + public static final String DATA_INICIO_SERVICO = "DATA_INICIO_SERVICO"; + public static final String DATA_FIM_SERVICO = "DATA_FIM_SERVICO"; + public static final String DATA_INICIO_ENCERRAMENTO = "DATA_INICIO_ENCERRAMENTO"; + public static final String DATA_FIM_ENCERRAMENTO = "DATA_FIM_ENCERRAMENTO"; + private List lsDadosRelatorio; + + public RelatorioEncerramentoCheckin(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + + this.setCustomDataSource(new DataSource(this) { + @Override + public void initDados() throws Exception { + + Connection conexao = this.relatorio.getConexao(); + + Map parametros = this.relatorio.getParametros(); + + String dataInicioServico = null; + if (parametros.containsKey(DATA_INICIO_SERVICO)) { + dataInicioServico = parametros.get(DATA_INICIO_SERVICO).toString() + " 00:00"; + } + + String dataFimServico = null; + if (parametros.containsKey(DATA_FIM_SERVICO)) { + dataFimServico = parametros.get(DATA_FIM_SERVICO).toString() + " 23:59"; + } + + String dataInicioEncerramento = null; + if (parametros.containsKey(DATA_INICIO_ENCERRAMENTO)) { + dataInicioEncerramento = parametros.get(DATA_INICIO_ENCERRAMENTO).toString() + " 00:00"; + } + + String dataFimEncerramento = null; + if (parametros.containsKey(DATA_FIM_ENCERRAMENTO)) { + dataFimEncerramento = parametros.get(DATA_FIM_ENCERRAMENTO).toString() + " 23:59"; + } + + Integer empresa_id = (Integer) parametros.get("empresa_id"); + Integer localidade_id = (Integer) parametros.get("localidade_id"); + + String sql = getSql(dataInicioServico, dataFimServico, dataInicioEncerramento, dataFimEncerramento, empresa_id, localidade_id); + + NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); + + if (dataInicioServico != null && dataFimServico != null) { + stmt.setString("dataInicioServico", dataInicioServico); + stmt.setString("dataFimServico", dataFimServico); + } + + if (dataInicioEncerramento != null && dataFimEncerramento != null) { + stmt.setString("dataInicioEncerramento", dataInicioEncerramento); + stmt.setString("dataFimEncerramento", dataFimEncerramento); + } + + if (empresa_id != null) { + stmt.setInt("empresa_id", empresa_id); + } + + if (localidade_id != null) { + stmt.setInt("localidade_id", localidade_id); + } + + ResultSet rs = stmt.executeQuery(); + + lsDadosRelatorio = new ArrayList(); + + SimpleDateFormat formatadorData = new SimpleDateFormat("dd/MM/yyyy"); + SimpleDateFormat formatadorDataHora = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); + + while (rs.next()) { + RelatorioEncerramentoCheckinBean bean = new RelatorioEncerramentoCheckinBean(); + bean.setServico(rs.getInt("servico")); + bean.setDataServico(formatadorData.format(rs.getDate("data_servico"))); + bean.setLocalidade(rs.getString("localidade")); + bean.setDataEncerramento(formatadorDataHora.format(rs.getDate("data_encerramento"))); + bean.setUsuario(rs.getString("usuario")); + + lsDadosRelatorio.add(bean); + } + + if (lsDadosRelatorio.size() > 0) { + setLsDadosRelatorio(lsDadosRelatorio); + } + } + }); + } + + @Override + protected void processaParametros() throws Exception { + if (parametros.containsKey(DATA_INICIO_SERVICO) && parametros.containsKey(DATA_FIM_SERVICO)) { + this.parametros.put("PERIODO_SERVICO", parametros.get(DATA_INICIO_SERVICO) + " à " + parametros.get(DATA_FIM_SERVICO)); + } + + if (parametros.containsKey(DATA_INICIO_ENCERRAMENTO) && parametros.containsKey(DATA_FIM_ENCERRAMENTO)) { + this.parametros.put("PERIODO_ENCERRAMENTO", parametros.get(DATA_INICIO_ENCERRAMENTO) + " à " + parametros.get(DATA_FIM_ENCERRAMENTO)); + } + } + + private void setLsDadosRelatorio(List lsDadosRelatorio) { + this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio)); + this.lsDadosRelatorio = lsDadosRelatorio; + } + + private String getSql(String dataInicioServico, String dataFimServico, String dataInicioEncerramento, String dataFimEncerramento, Integer empresa_id, Integer localidade_id) { + StringBuilder sb = new StringBuilder(); + sb.append("select c.corrida_id as servico, "); + sb.append("cc.feccorrida as data_servico, "); + sb.append("p.cveparada || ' - ' || p.descparada as localidade, "); + sb.append("cc.fechorcerrado as data_encerramento, "); + sb.append("u.nombusuario as usuario "); + sb.append("from checkin_cerrado cc "); + sb.append("join corrida c on c.corrida_id = cc.corrida_id "); + sb.append("join parada p on p.parada_id = cc.origen_id "); + sb.append("join usuario u on u.usuario_id = cc.usuario_id "); + + if (empresa_id!=null) { + sb.append("join marca m on m.marca_id = c.marca_id "); + } + + sb.append("where cc.activo = 1 "); + + if (dataInicioServico != null && dataFimServico != null) { + sb.append("and cc.feccorrida between to_date(:dataInicioServico, 'dd/mm/yyyy hh24:mi') and to_date(:dataFimServico, 'dd/mm/yyyy hh24:mi') "); + } + + if (dataInicioEncerramento != null && dataFimEncerramento != null) { + sb.append("and cc.fechorcerrado between to_date(:dataInicioEncerramento, 'dd/mm/yyyy hh24:mi') and to_date(:dataFimEncerramento, 'dd/mm/yyyy hh24:mi') "); + } + + if (empresa_id != null) { + sb.append("and m.empresa_id = :empresa_id "); + } + + if (localidade_id != null) { + sb.append("and p.parada_id = :localidade_id "); + } + + sb.append("order by 2, 1, 4, 3, 5"); + + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_es.properties new file mode 100644 index 000000000..0e6b93c1a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_es.properties @@ -0,0 +1,17 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. +msg.a=à + +#Labels header +header.data.hora=Data/Hora\: +header.pagina=Página\: +header.periodo.servico=Período Serviço\: +header.periodo.encerramento=Período Encerramento\: +header.empresa=Empresa\: + +#Labels detail +detail.servico=Serviço +detail.data.servico=Data Serviço +detail.localidade=Localidade +detail.data.encerramento=Data Encerramento +detail.usuario.operacao=Usuário da Operação \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_pt_BR.properties new file mode 100644 index 000000000..0e6b93c1a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEncerramentoCheckin_pt_BR.properties @@ -0,0 +1,17 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. +msg.a=à + +#Labels header +header.data.hora=Data/Hora\: +header.pagina=Página\: +header.periodo.servico=Período Serviço\: +header.periodo.encerramento=Período Encerramento\: +header.empresa=Empresa\: + +#Labels detail +detail.servico=Serviço +detail.data.servico=Data Serviço +detail.localidade=Localidade +detail.data.encerramento=Data Encerramento +detail.usuario.operacao=Usuário da Operação \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jasper new file mode 100644 index 0000000000000000000000000000000000000000..94405bf01dacba31c9fb90e873660d362d0dc72d GIT binary patch literal 29838 zcmeHwdw5(`x%azv(`1@V(=@$8TPRheP1~fUv`~vkF4JbpKmM?W4L@IefVtdM56QilRSZ89y z>=_*#OpaMpuL`FU>7k|`E0;_Uq2Od)FxQ$&l-a^xo`L(G`!fKWE)@Cx6nd5@_p3#w! zL~eJdxeLY3Ei~Ur+LW}0Ij!AH44Ap*^nhKfHkt2DS}9Z4iBfgS9JCanEmV`qCCxMd z$8(XDl`SNPhC%ftzL7MxAOoOUT{$!j@^f6k?&>5fleJr`-8F2cJ2T9|-rZRrub;usSrtz zj-Z{eYDeL~?5}Xr6i6~{D}@F?Zr-%=7A@Rb@=5FC+%pvA)(6bN#AwRuv393Si;f?s zqAZ4Ll>?@gNTxJ7lhs|1-O&@qYef}AJN1K^+(^P&o9MSPx!taW1M=jE)VChfvS^A@ zj8Q9@f*vv5Ay$%6a8@crjB24A77LCKr<##OGOasn(RgIJs8pn(mAd81v=jv0)jE%$ zZA_#_f!T>Adn?)6DqbF4JtX4y&fvs#ldZnw7&QTaqmV8`YCd zC9UREDznQRh|x63K_)&jmd%;@ytD%iCHuQR?v@39le4)DMjtC_<~tHui~OMQi-$|| z#8NcJsA4dgk^|jzC=*|6au<(J?plF8id z+4FR;sAqFZ^(;z`-I|rm%V8s$UYpG2txdz3l*txw3(e3uFzY5pfC1U}{1!S|r?Y8m zldeG5PBS+MvxiJnikl;uohGx3OSC}rceGGAo5?5H6=K@~pDl0YOsjvG@1itu7rT*B z5@Y!72Gs0w!S#X9ZQF#zE~^QyWF`lErhEMs*u0%djGGpfmLWJk9&g94h1SAe3&XI_ zW?sXal>~6YQm|x)xtlLxuPR0|19D7bnc(a4WugP6wM^7x6KwM2u*(fs#b~xCiDw3J zbI?SYe%l$D>V;50v<$bh+XK9Qc+k+qMAXMaVQ&OEj7fI5%lXb{S9!Z4$<#Z6;SF**vNv&BmeIU6ty!l0pD z3sK}))MmLqb$mD;BZC?o#y8uA3{cib4FTL1%=Wak(X;yEkyvwYbYrBiw+sKeb^FUo zSvWQL`1=;ne03*gd}^S9byp*j91*$44}W~Z>mM6=e-j4d^%PE-@TGf_LoG=wzn*GF zGS1yt_U7YvZ-4ll3lBXt=cB)zfBpK`F|-`Y@)+Atibju-f_ZaIZ)GV11=V7sDK(xk zf(pt6M_-_PwOm3bXgMguePOF4t7s{Zjmin4MN>T(W7OWKO)n&lMW>1IJT?3^b%hkjwnqZ~WeZbR6e(6u0WbDg%FaiHLNF*@2Q)0@ep ztYo&RgiEl0B4Xp5%**kaGdo99DOe(p611REGr=B7waZ|x$zHom0pa?-Dx0v-UFo+V zd#b)IAP5dkN$D?;)gq_n_)^k}m5J>cUfyAnU>|DKo!5rwC9W24v8ig=OQm@WL-u(+ ztUECwXga%r~HJIESu#t{& zO9rc-<1Np`@IVv<-ZlJey$s3CfYEiHB#mDgE&(^G+p)1@LpLg|HAEN^Eg7$A#ZqD} zF~rjdix!pS4%~RVDASt-;OYJh%Mdq(mN{vyUux8Pqz}eAxkOovV_2s9fehs`YW-6q zGTFY@a5R-9Sc+3zw_p#9SQ7P-Q|lynb)*`pep04lE?_15i=};LQHCb2wBIg?+vsgm zQaHvvU7}sJuW0 zFp{mGTikk9ihN*3`GYc^7}wC3^~myFQ?%SGSyoQFP>>_=dL3)*HeC%DbC8!iSaqTp z(bSj>6_LZ4FQst6=|o-6fMXB!r(;9I86q6vA8&`iGgdftSYf1%_mL6KtF5=@LAY63 zpC{|I7L(U2bYj>_Z0~{i%UO+13+Xf|1GAtI_~Wd&yz(BjMU_y=#m|y@BWEkc&b0#C zH^ZIK*|q5iMBDWnU8Yq;$w&@hQ=@-)G`$0k^|J965ZqQ;xe9=-l~!BsHF%WpUf(97a{{w&L6XJEf|rjQ+#bz(TYdyq#z4 zVtOPkLwv>QqkQ4}<5~(~B2{LGtilWRb)#H|hj1a&a)5f8hMG5Aj|A^;qm>Lls4Tqi ze7WyO9h<)J=rxxu`R+}%?Mv;x9UQK_I|i1qgqMf*Ezcd(_w3K6k9_^9|GMl$m&b1X z7ty|s(Uym60?<~u0cd+Od}w zX8`*9%Le^(`#L}R=SwRi|9#4-SMS->ZvBg(f099$hZ_SxSGfV8doz5Xdoz5X>x?4M zZ#*KOrHR|I z(Zh@T;|-)TtYs{Vkx&&aF%rt6ANl2;KVJ3i_pfw^Kc?8-lboox8adV0-s)15xO)`J zTwYG%_VCqei)MKj&0Cr~+xprg(RJ;;QZY`wZOgpJULX9zrRkT?`TJXUMdrFPCiB_w zSMdh#Nu@?+>Ei?}wn!jx;B8)}2Fv&rvB+BW=uH?*)SrA(&|vr=SCWT&10+}F21u?q z!za1k44>rc43OhD7x!ukol{wB(?wJ9030eiqHS%lh{yUsXt}%Y*gCyX5hh?Wyug3q z8q%qdbQjA>fDcnBC)~srW%X09IXLCrZ(hA5@zA?YU$^xS>rZfnfeYOy>D$kj57>Yl zmUZ9aV)F2K0P9q40PDONKGu0Ne5}(MAjr?U$88erGZXY^DZFO{;9bK`3_=sVJ|j0& z3iALzrUd4D?>TP6H!gpCr4Lz=09P|t%)J>t%ymW) z=0CErw$I~YJ~IIG>S9M`Jjer_nG%rSc+GFFyZ^fG18e4e?3MW|+IIgNkpG4$lZRgg zK(2BFAophYAophYAlDg1kpIet+CGm9`K$oQ>sZXO1Y6|Hj0b#xLsJ6y2cI_LLst5| z^*3F)Cb?_fvHu3}FEeHGa3}zHl^X!OH^T?KH^T?K&L{%@kPWzf9vAr80l-&jkH*`G zv@MP^Q}1zRFnsb#>XG;~I%rdkKpcWJwbcI57Q*I82X=B>Xx1)lc*V_pW;EAtb|ev- zmmccH%o>XegSeMiz~S)J9zvZOlE4 z5a?}*)5hO3;ce3ZDN-90a`GhzKC=>~5uwgj&ya50~oc>23kwT*J7d58=UHrink^zxFbyCG>DiE z6+*}>M{08FtU_x2G2w`eMW_Y-5W(SY#po>?X(dGnd0uCSoheZxt9W*AcoQ@|LNrok#pQ;_k4@j)>@)I&M!YSb@D9S72+? z&~I!;!%92rvxS0T%aFUA>nVEpMP7kX2#cukNOxDfx39IUvo~^9uaW~LB#TOEp^AFv z)qAYTs#*(Fi!*eK-Ocgljz}-wwdw0VMQ z)g)hgQ{C=$Mp}FE){nPM6(yZNKh=niq}3}LzUp;(b`@4#*c&dgS2aYt*Kor!^k!?u|t}6yV*2QXEM*iyE(E8fxE+qbs4wYMv-796yVE4hy>I|t2m-^B5eHcj`j zHP+nI(--S%Zi`@#(zTy6T$3w(f>?%MV(~R`v~FTUJl5BaC7KwdI)KXgvL)st3Ub6) zVx%3*QzGVwyX-(9L@Gd4YI@j=tc^xuZN8eGxJw?|e2=U|KVTrd4=QPNwC9T;bGV+qmTcYI z7>)OCXpTj<96_t=;~SGXYn0zqENFFlw5Kn+uCps1>FaJ@7wtr#s^5TkhF%@sU{i&a zFpDaCqrDqqUEcm3X5?KUWQ8fPebFxUrsBqE>k-tPZr6--wnpM?c{_WLpn4UU4tZ)W zgVY*XhWI6m335TR!lE!2lbeuq%W!zppZZmGNSW#4^6P2yc=u zZ(Ox}*~;b1?7!tFan4>YA{`|~_NgE5es=HJ#@UzGe(;|yTkmYY8y$qJ-_vA=t793j6 zZ}wqHx};lb0prF3W+}1qEzDQ;Z0_lebjW~)k^!i)y&_fwv{=!}!?e;Q`BGQm`iHP+ zcG}#fMm72Rm!6U=T)v1cVh!wQq_1;BM+*!zx><6NmSp)b4Irsf4T-Gl+8w*nhLO{* zlS}YopND91q(o0{?TT&a=yb^Dc0YlI8}3Wcb9tLaTx-!p=`yn0Kn#{~WY5iVD_*)M zlwW_D1UqbdG17D8=5FLe5KMPCR92M#6lQ4=l@rUauc)k+BB8u%ChxZKX{;>&8G$rb zm0w>YsU<*BDftTls8p$nUI_E4rQC5T%q5mi0z|u_b3-h~tsg77<8CC1fQ`iI_C})n zMlkb6zPKZvk^GacVr^1J@|uN?DSYxC*u0uPQfyuigwF zU%eSVzUmCn2;>7&*i>7td{R{BF#PG|*p90`lxdHHdGkoxS zGkoyt3}E7i|4%kb&bbu)M;F2mwW=GIA2ey?eW*sf^MREf&!2o+G0-zHOwK4<&ab-c z#pmYUaMjAOOMW`%qHycbzX0@`475D_EdXeh8vwL7!w0lC!w0m^00e%Z|KQiA&Vwrsg;rc1d8`n9N%{S7gW?>U;yhkHJ76d=rhpadpr@GI>=vDjDaEYN)l`O; z6}}8FE9?wVBx$jS5`&jL{eON|fDBJ8$6SX26$)_3{A4Zj_y7++38a$2mk^k;;IN$W z7n?s|F7OfI3`5mC3^5IbpD;N5w+=97m7JbRr$oL8FTW7P(-vkw|9OWjEHd>*u}Y}$ za>uO0Ke(`DC}4D(VtXv~OFWOmL>D^d)i^<6z}+nz-7Y!)kB460_4i-*e|O!jd-k>5 zVoQl;Cy)J;JP1m7gXC=qi`qH5?2pS-E|R1KfJ=?u^$X>sJu zI~YlVxwqbU7OV+zk{dr1a%4`&<{B900#|-C09?H|u%#IJ*<~Sr%co!Y=K0%?dHH?k zK0oh`k?3tUUXn~>v20_%1N~uvU(NW+!^r`_tK0zKy%|2>y%|2>bw&~JQlcC>aWO9N zlLCM*TCCG8YRutSy6%PQj*Py7cox58A1e$04_Uq$B! zo@Vocv5lw@SWa(~T(C{O%Xk@;4N}Tu{FQH=aO|qYC%?G<%-7!b)}>wN+YjR&^Ha)T z`g$fz9@+z#u5tsI?#=Kq-J9WKy3PP)er;>l>~T&^cu8%mE@V0^{7l=z#V#3~Qubx4s$z7cJ+8*(z#))e{1dR0yF#0R}M z!w0?2D1ttB#L!PJgdStPvrVI01Mxh(m%!aw7809)x%?|j+#fy^dj0;dPK|uxv7VC}?OcPmM(?1mKQ z%=CP2(w~dZT1kG2OZ47dSnl0nF$8Z8u$Tm9U^mX#+H&`+v)-r-^**n++2-By?YF*i z5cL|xTtUlA#RK&%U%Be!lb4@(%Bp3{SD)N>%8Cx=DHw-?OtV z=;)$sCx}AeV^(%tB%)B9J$ZpwXPk81rZ0>@@aIc(KxLoa4i0*f6Nw_|Shs?1(I509 zXiiZH1RCi`93j8`r6M?OgmoB_pn1g=J+T-;0C~c01iihedO#e850ap*ejjU8tU^$y z{V^y(m^tx7L7CX1Qvnw~dV*$kf{t?gWf#CljX6|6(0n&fbE6G}goTSX3aV(uSM9>Ih#IO9 zkFX?66RC0%8Ppi2Ds{CiOd)l3VwfhWtCPZ1t*%yusYYF$5~i@adS{p>tE*GPRI9E| z3)2*Jb$XcU)KyEErmCy9FxF}0bJvDxn!0Ka%o zuHs=jN?rAa5!WH>ZVb~Lb#+#l=BleLVVXzBa4*je)3NI6+%U~oSKGpLoVwZ`rUmM1 zAWUzgw{wlbF!nFx)o_^Jp{~vg(+TP-6{dyiDlPEoV+2mBkBanifU}_5{?RE zfhd?DXxT!~=aD%Sw)8DCteV-^%?2(nsJ^iNBJ?*;Ry8Oc)n%o~=fkv1C65VwR|ri& z;*fZOO1uynp@m9~4Iz3jk~mnZi8mdZKwA~P4?=^Fgb8|wek^Z{H+5}44`Ebm7I{8B zrIW(6moBcMi|7*c6nl!}4O_mEri$JV3Vb6>h&}-MRYOaNu0Z!S&7LtOL{~zab-FW{ zgy=(pypdfYx&}(Ci}{9+5M3u6|1?DZ$8F6SFhcYZ=$EeSA1Oj~JuHXLa)*czeH`3( zlQ~2+M4y1}+G(CaAw)O1UGt0vA^H@|uC5R;420;@=u?pW57DgvP8t3X-R=_axA-Bt z!|knO>O*vwo9fv35Pc30vu(FGSSv)IhwR%q+Ny`>3$SdO_5yPrqAvn*ZOcRS2!X8& z1D+SAAJb2&=`#8$@N?T#VfR(^GqAT{O~c{n&tW$Z!CPQAR861V&`Dt|r2i+Iu;<`- z6*THyC<)Q8pjG}^e29L7H2qGtL%|CG$oq13PxdKKUmLfV4=vxEr;{=c!vIzL3O zvmAI#tc{-J;a{uiHTqjMeT^SniIog9Jpe88mJhJfstNU+HDUS(y~WM^6QW>cR9>Md z*!&Sf7$_?yK-_Kq$ep5)m0l?YYSvtkki1^Y%JQBy#@-P<)H)}*c!K&gS4<3dV$SWIJ)-Y=#DIx!uhU>A+#tt3LKO;nhQ z3eK&rHk+$`O&o=XsZe(qBNJYOAwxR(3@-}vJbZs%pW#8td-zZC4DU&v;XBDQJSTaE z-z3lQn&cTilRU#?l4tl!@(gcDp5ZIWGdv}EhMy$Q@RH;iK9W4cLy~9sNAe8sNS@&v z$um47d4^vk&+v-m89tFb!y}Ss_(SpxZ%Cfu3&}G)A$f)$B+u}Ia1LRI0G=g|_`1JX z4?F}?KihDCmNtm{sfiEE`LKcyEBSCTA6D~W4Ikdchj;U#nGdaei11+@AEJCXgAW~i z=;FhfeCXlB20m=!!)88g<-<9A=;K3z5B+>F`7p$XBp-J0VT2DEUgASQGmclo|Kq*H z3V4{4;9J(htDFXZayC3k#%uxn$P?f}E`by*$K5KFUjqzIhqoAkpST{mUGNQifyZVb zaxM_*N9kc&ikP}a!u}>4v}N=j)ZR-c!pyFqE9oSEImN)aj9pz33N=v=NhVM9X#=N)PbL*&qL$Is zPc1n7g9dzOL;d^KIThlM#>GolvbqN=u3$p<&(aYbx66{ml8$FExwd9kaC+Zr2{FS z@uhSjr2^;lrQ;Gwz>@64#6Yph9H~?A&Wym zdce|N+Cm#BMH{i2x(T9l7Tp42yAP?~q^i{(3fJmol~|cgU)5qx%1Jv96FarH!Ki^8A||BkLbp}_6U8Am3eXf*L^8TqbuOdu;9|EW-5! zi~;jR$DGgN%pBvtdHB5_zw7Y32|o^0xgS4l;mH<$hVu*fy$XedxfC_{VTV-Um2|Nb zzcu(p@aw{FGk#c37KnBb7vgsXe%Ir7JAPlr?;w6p;D`2%x`*iL%@qgeM;&*F4|=Zm zc&>ANJwcTj^rUa`q<4DKTRiEj8t$V_`{|iS=vh2rA?`LicSkqW|6)HqkMz2R`d_Q7 z%7*&i$}4&kW#46&r9-$|;oLpnQ2#qs>L(5LFRH8WG}Qk=U45;g{*UVFfrk1+>gpcU zKW9I^^awrOaR=RuyMB2Gs_4VGOE`Cz;?8vLcH*wjxf_0nUfFzr{)|fJG}Qk^HQnA|&>UusA3ti$}#&@r0-sPl}o11u;v!DCQV-Vy-bw z%s1wUg^=_5|5YIIKTCnc46g$5ovT3hol+qCPAQOmSB?USnPn)DU8pPt63fXDE9i1@ zGL~^pp?%_1ET+7RZWhg0#b}|s#agTutfL3S8BmEBeO+|ZQ{qgh!3NA=H_|WgE#DXL zX{{GUA4Gf`CKLmh>zJZKBrzvB57UdZm?1J^w#bWPg(VhlsLUAK%+$^pTpGK+Mk@^`Z z&}VV=IVjK-46wN5DN4aD9}MD&{v^Ak3oUH4h4Dw3iN#_(5(Mep#NbC z^#5Z75=WP#K)O(Q3iLB5(9fYj&q0BnhXVZ;3iJXL==V^dKR|&FL4jU^0=)_a`U@23 z4JgoGp+NtD0=-4QFbsOZm_RQYRrIP6qSuTt)(R$z3S+9MG3rIFF;mPiW{KGl+hdKn zVu3MVEH#c3%Z%g28si<}G^0U8jK!keXcAqc;%sBJ=r`Ue2949ii1BWb zHCn}mMw{4Uw2Lc@sJP1L5Z4=>;szrwZZ~?woyI2dW#cTd-#A+wG|mx^8VRV%cJZV! zC|)pz#EZrbqs~Yf(~PV!#~6bG&B5r4`Kd)S0{33=Dd19X#W;J@>#=0suXm7h{}2BJ Bp@0AY literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jrxml new file mode 100644 index 000000000..56b648111 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEncerramentoCheckin.jrxml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + <band height="82" splitType="Stretch"> + <textField isBlankWhenNull="true"> + <reportElement uuid="63ce47a3-7e94-42a2-8325-eceef777fbe2" x="111" y="40" width="221" height="15"/> + <textElement verticalAlignment="Middle"> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$P{PERIODO_ENCERRAMENTO}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> + <reportElement uuid="7f5ee01d-f86d-49a4-a2a1-f1c671621ef0" x="111" y="24" width="221" height="15"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$P{PERIODO_SERVICO}]]></textFieldExpression> + </textField> + <line> + <reportElement uuid="481b2107-ee62-4815-8a89-8435d34384c8" x="0" y="76" width="555" height="1"/> + </line> + <textField pattern="dd/MM/yyyy"> + <reportElement uuid="4a51f623-fe84-4f71-8bfe-271f36619eb1" x="0" y="24" width="111" height="15"/> + <textElement textAlignment="Left" verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$R{header.periodo.servico}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy"> + <reportElement uuid="46ecd1c0-ef3e-4274-9094-1b2dbed2fc43" x="0" y="40" width="111" height="15"/> + <textElement textAlignment="Left" verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$R{header.periodo.encerramento}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy"> + <reportElement uuid="17a5536e-1cf6-48d8-91ad-53d8148af1d6" x="0" y="56" width="111" height="15"/> + <textElement textAlignment="Left" verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> + <reportElement uuid="48f1a994-4bbe-4b8e-948f-81542fa792c3" x="111" y="56" width="433" height="15"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy"> + <reportElement uuid="9bc31956-04ad-43d0-bcee-08f7b5bf1145" x="0" y="0" width="343" height="20"/> + <textElement textAlignment="Left" verticalAlignment="Top"> + <font size="14" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jasper index 051bb4235f4060f2c3a5165e4bbde1c6b49f47d7..4b634b1969e5e2a7fbe9ccd2838d5e7bbb10386e 100644 GIT binary patch delta 17262 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml index 0db1d6bc9..b3bcb7e2d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentacaoBilhete.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -95,36 +95,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -787,6 +762,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEncerramentoCheckinBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEncerramentoCheckinBean.java new file mode 100644 index 000000000..98cf4b40a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEncerramentoCheckinBean.java @@ -0,0 +1,50 @@ +package com.rjconsultores.ventaboletos.relatorios.utilitarios; + +public class RelatorioEncerramentoCheckinBean { + + private Integer servico; + private String dataServico; + private String localidade; + private String dataEncerramento; + private String usuario; + + public Integer getServico() { + return servico; + } + + public void setServico(Integer servico) { + this.servico = servico; + } + + public String getDataServico() { + return dataServico; + } + + public void setDataServico(String dataServico) { + this.dataServico = dataServico; + } + + public String getLocalidade() { + return localidade; + } + + public void setLocalidade(String localidade) { + this.localidade = localidade; + } + + public String getDataEncerramento() { + return dataEncerramento; + } + + public void setDataEncerramento(String dataEncerramento) { + this.dataEncerramento = dataEncerramento; + } + + public String getUsuario() { + return usuario; + } + + public void setUsuario(String usuario) { + this.usuario = usuario; + } +} \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEncerramentoCheckinController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEncerramentoCheckinController.java new file mode 100644 index 000000000..ad5bf9ca5 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEncerramentoCheckinController.java @@ -0,0 +1,123 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; + +import java.text.SimpleDateFormat; +import java.util.Date; +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.Datebox; + +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioEncerramentoCheckin; +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.web.utilerias.MensagensUtils; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; + +//Mantis 15199 + +@Controller("relatorioEncerramentoCheckinController") +@Scope("prototype") +@SuppressWarnings("serial") +public class RelatorioEncerramentoCheckinController extends MyGenericForwardComposer { + + @Autowired + private DataSource dataSourceRead; + + @Autowired + private EmpresaService empresaService; + + private Datebox dataInicioServico; + private Datebox dataFimServico; + private Datebox dataInicioEncerramento; + private Datebox dataFimEncerramento; + private MyComboboxEstandar cmbEmpresa; + private MyComboboxParada cmbLocalidade; + private List lsEmpresas; + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + lsEmpresas = empresaService.obtenerTodos(); + } + + public void onClick$btnExecutarRelatorio(Event ev) throws Exception { + executarRelatorio(); + } + + private void executarRelatorio() throws Exception { + Map parametros = new HashMap(); + parametros.put("TITULO", Labels.getLabel("relatorioEncerramentoCheckinController.window.title")); + + // Datas + putParametrosDate(parametros, RelatorioEncerramentoCheckin.DATA_INICIO_SERVICO, this.dataInicioServico.getValue()); + putParametrosDate(parametros, RelatorioEncerramentoCheckin.DATA_FIM_SERVICO, this.dataFimServico.getValue()); + putParametrosDate(parametros, RelatorioEncerramentoCheckin.DATA_INICIO_ENCERRAMENTO, this.dataInicioEncerramento.getValue()); + putParametrosDate(parametros, RelatorioEncerramentoCheckin.DATA_FIM_ENCERRAMENTO, this.dataFimEncerramento.getValue()); + + // Validação datas + if (parametros.containsKey(RelatorioEncerramentoCheckin.DATA_INICIO_SERVICO) && !parametros.containsKey(RelatorioEncerramentoCheckin.DATA_FIM_SERVICO) || !parametros.containsKey(RelatorioEncerramentoCheckin.DATA_INICIO_SERVICO) && parametros.containsKey(RelatorioEncerramentoCheckin.DATA_FIM_SERVICO)) { + MensagensUtils.showMessageInformation(Labels.getLabel("relatorioEncerramentoCheckinController.data.servico.obrigatoria"), Labels.getLabel("relatorioEncerramentoCheckinController.window.title")); + return; + } + + if (parametros.containsKey(RelatorioEncerramentoCheckin.DATA_INICIO_ENCERRAMENTO) && !parametros.containsKey(RelatorioEncerramentoCheckin.DATA_FIM_ENCERRAMENTO) || !parametros.containsKey(RelatorioEncerramentoCheckin.DATA_INICIO_ENCERRAMENTO) && parametros.containsKey(RelatorioEncerramentoCheckin.DATA_FIM_ENCERRAMENTO)) { + MensagensUtils.showMessageInformation(Labels.getLabel("relatorioEncerramentoCheckinController.data.encerramento.obrigatoria"), Labels.getLabel("relatorioEncerramentoCheckinController.window.title")); + return; + } + + if (!parametros.containsKey(RelatorioEncerramentoCheckin.DATA_INICIO_SERVICO) && !parametros.containsKey(RelatorioEncerramentoCheckin.DATA_FIM_SERVICO) && !parametros.containsKey(RelatorioEncerramentoCheckin.DATA_INICIO_ENCERRAMENTO) && !parametros.containsKey(RelatorioEncerramentoCheckin.DATA_FIM_ENCERRAMENTO)) { + MensagensUtils.showMessageInformation(Labels.getLabel("relatorioEncerramentoCheckinController.data.obrigatoria"), Labels.getLabel("relatorioEncerramentoCheckinController.window.title")); + return; + } + + // Empresa + if (cmbEmpresa.getSelectedIndex() != -1) { + Empresa empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue(); + parametros.put("empresa_id", empresa.getEmpresaId()); + parametros.put("EMPRESA", empresa.getNombempresa()); + } else { + parametros.put("EMPRESA", "TODAS"); + } + + // Localidade + if (cmbLocalidade.getSelectedIndex() != -1) { + parametros.put("localidade_id", ((Parada) cmbLocalidade.getSelectedItem().getValue()).getParadaId()); + } + + Relatorio relatorio = new RelatorioEncerramentoCheckin(parametros, dataSourceRead.getConnection()); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", Labels.getLabel("relatorioEncerramentoCheckinController.window.title"), args, MODAL); + } + + private void putParametrosDate(Map parametros, String nomeParametro, Date data) { + if (data != null) { + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + parametros.put(nomeParametro, sdf.format(data)); + } + } + + // gets/sets + public List getLsEmpresas() { + return lsEmpresas; + } + + public void setLsEmpresas(List lsEmpresas) { + this.lsEmpresas = lsEmpresas; + } +} \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioEncerramentoCheckin.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioEncerramentoCheckin.java new file mode 100644 index 000000000..f80c8c1d5 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioEncerramentoCheckin.java @@ -0,0 +1,24 @@ +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 ItemMenuRelatorioEncerramentoCheckin extends DefaultItemMenuSistema { + + public ItemMenuRelatorioEncerramentoCheckin() { + super("indexController.mniRelatorioEncerramentoCheckin.label"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIOENCERRAMENTOCHECKIN"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioEncerramentoCheckin.zul", + Labels.getLabel("relatorioEncerramentoCheckinController.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 2a8aeac2a..45acbe6e8 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 @@ -175,6 +175,7 @@ analitico.gerenciais.estatisticos.checkin=com.rjconsultores.ventaboletos.web.uti analitico.gerenciais.estatisticos.relatorioBaixasVendasInternet=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioBaixasVendasInternet analitico.gerenciais.estatisticos.relatorioVendaEmbarcada=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioVendaEmbarcada analitico.gerenciais.estatisticos.movimentacaobilhete=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioMovimentacaoBilhete +analitico.gerenciais.estatisticos.encerramentocheckin=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioEncerramentoCheckin analitico.gerenciais.financeiro=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.gerenciais.financeiro.SubMenuRelatorioFinanceiro analitico.gerenciais.financeiro.receitaDiariaAgencia=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioReceitaDiariaAgencia analitico.gerenciais.financeiro.taxas=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioTaxasLinha diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 694775d15..0276eb30c 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -281,6 +281,7 @@ indexController.mniRelatorioEmpresaCorrida.label = Reporte de la empresa corrida indexController.mniRelatorioEmpresaOnibus.label = Reporte de la empresa autobús indexController.mniRelatorioOCD.label = Reporte de OCD indexController.mniRelatorioMovimentacaoBilhete.label = Movimentações de Bilhetes +indexController.mniRelatorioEncerramentoCheckin.label = Encerramento do Checkin indexController.mniRelatorioGratuidade.label = Gratuidades indexController.mniRelatorioGratuidadeANTT.label = Gratuidades ANTT indexController.mniRelatorioExportacaoIdosoARTESP.label = Reporte Exportación Ancianos ARTESP @@ -8297,4 +8298,16 @@ relatorioMovimentacaoBilheteController.lbOrgaoConcedente.value = Orgão Conceden relatorioMovimentacaoBilheteController.lbStatus = Status relatorioMovimentacaoBilheteController.lbTipoGratuidade.value = Tipos de Passagens relatorioMovimentacaoBilheteController.lbRemoverLinha.value = Remover Linha -relatorioMovimentacaoBilheteController.lbAdicionarLinha.value = Adicionar Linha \ No newline at end of file +relatorioMovimentacaoBilheteController.lbAdicionarLinha.value = Adicionar Linha + +# Relatório Encerramento do Checkin +relatorioEncerramentoCheckinController.window.title = Relatório Encerramento do Checkin +relatorioEncerramentoCheckinController.data.servico.obrigatoria = É necessário preencher a data inicial e final do serviço +relatorioEncerramentoCheckinController.data.encerramento.obrigatoria = É necessário preencher a data inicial e final do encerramento +relatorioEncerramentoCheckinController.data.obrigatoria = Data do Serviço ou Data do Encerramento são obrigatórias +relatorioEncerramentoCheckinController.lbServico.value = Serviço +relatorioEncerramentoCheckinController.lbEncerramento.value = Encerramento +relatorioEncerramentoCheckinController.lbDataInicio.value = Data Início +relatorioEncerramentoCheckinController.lbDataFim.value = Data Final +relatorioEncerramentoCheckinController.lbEmpresa.value = Empresa +relatorioEncerramentoCheckinController.lbLocalidade.value = Localidade \ No newline at end of file diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 6868c52ba..30b910911 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -288,6 +288,7 @@ indexController.mniRelatorioEmpresaCorrida.label = Empresa Corrida indexController.mniRelatorioEmpresaOnibus.label = Empresa Ônibus indexController.mniRelatorioOCD.label = Relatório de OCD indexController.mniRelatorioMovimentacaoBilhete.label = Movimentações de Bilhetes +indexController.mniRelatorioEncerramentoCheckin.label = Encerramento do Checkin indexController.mniRelatorioGratuidade.label = Relatório Tipo Passagem indexController.mniRelatorioGratuidadeANTT.label = Relatório Gratuidades ANTT indexController.mniRelatorioGratuidadeARTESP.label = Relatório Gratuidade ARTESP @@ -8803,4 +8804,16 @@ relatorioMovimentacaoBilheteController.lbOrgaoConcedente.value = Orgão Conceden relatorioMovimentacaoBilheteController.lbStatus = Status relatorioMovimentacaoBilheteController.lbTipoGratuidade.value = Tipos de Passagens relatorioMovimentacaoBilheteController.lbRemoverLinha.value = Remover Linha -relatorioMovimentacaoBilheteController.lbAdicionarLinha.value = Adicionar Linha \ No newline at end of file +relatorioMovimentacaoBilheteController.lbAdicionarLinha.value = Adicionar Linha + +# Relatório Encerramento do Checkin +relatorioEncerramentoCheckinController.window.title = Relatório Encerramento do Checkin +relatorioEncerramentoCheckinController.data.servico.obrigatoria = É necessário preencher a data inicial e final do serviço +relatorioEncerramentoCheckinController.data.encerramento.obrigatoria = É necessário preencher a data inicial e final do encerramento +relatorioEncerramentoCheckinController.data.obrigatoria = Data do Serviço ou Data do Encerramento são obrigatórias +relatorioEncerramentoCheckinController.lbServico.value = Serviço +relatorioEncerramentoCheckinController.lbEncerramento.value = Encerramento +relatorioEncerramentoCheckinController.lbDataInicio.value = Data Início +relatorioEncerramentoCheckinController.lbDataFim.value = Data Final +relatorioEncerramentoCheckinController.lbEmpresa.value = Empresa +relatorioEncerramentoCheckinController.lbLocalidade.value = Localidade \ No newline at end of file diff --git a/web/gui/relatorios/filtroRelatorioEncerramentoCheckin.zul b/web/gui/relatorios/filtroRelatorioEncerramentoCheckin.zul new file mode 100644 index 000000000..9b9887fd7 --- /dev/null +++ b/web/gui/relatorios/filtroRelatorioEncerramentoCheckin.zul @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +