From 9efdf0860fc906a4fce16ce5f7ae986d85032540 Mon Sep 17 00:00:00 2001
From: "eduardo.dicarde" <eduardo.dicarde@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 25 Feb 2016 17:52:16 +0000
Subject: [PATCH] fixes bug #7152

Artefatos Alterados:
      RelatorioCheckin.java
      RelatorioCheckin.jasper
      RelatorioCheckin.jrxml

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53271 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioCheckin.java     |   3 ++-
 .../templates/RelatorioCheckin.jasper         | Bin 28803 -> 28818 bytes
 .../templates/RelatorioCheckin.jrxml          |   4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java
index a56b73bfe..dcd8c4824 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckin.java
@@ -97,7 +97,7 @@ public class RelatorioCheckin extends Relatorio {
 		sql.append("          then b.numfoliosistema else b.numoperacion end  numoperacion, ");
 		sql.append("b.feccorrida, bc.datavenda, bc.datacancelado, bc.dataremarcacao, u.nombusuario, u.cveusuario ");
 		sql.append("from boleto b ");
-		sql.append("inner join boleto_checkin bc on b.boletooriginal_id = bc.boletooriginal_id ");
+		sql.append("inner join boleto_checkin bc on b.boleto_id = bc.boletooriginal_id ");
 		sql.append("inner join parada o on b.origen_id = o.parada_id ");
 		sql.append("inner join usuario u on b.usuario_id = u.usuario_id ");
 		sql.append(" where b.activo = 1  ");
@@ -105,6 +105,7 @@ public class RelatorioCheckin extends Relatorio {
 		sql.append(corridaId == null ? "" : " and b.corrida_id = ? ");
 		sql.append(origenId == null ? "" : " and b.origen_id = ? ");
 		sql.append((lsInt == null || lsInt.size() == 0) ? "" : " and u.USUARIO_ID in ( "+ createIn(lsInt.size()) + ") ");
+		sql.append(" order by bc.datacancelado desc");
 
 		return sql.toString();
 	}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jasper
index 360c65b9c34331f3c9d445975b80e61e22229836..71fdfc0f53ea54f74b8cc31a932d1044e2d5314b 100644
GIT binary patch
delta 2717
zcmZ{mO-vg{6vt;=Vv2#pU_K3Y%10;-#F!5glGNbEHmUJq8)Jw<L1trbA`|0vjA>9+
zq0&}L<V2C0Ipxy!np-6wDm7Bms#4WUPCZoWp@OJXJymJKDQZOLYr`&feR!VP|Np)D
zz43VLPj}({UHEmr7Y*5(inn`LAp9NO=(M6YPT%R?y8*TU4LjL&GL8c9V=RkbuZ2A{
zYqtcMk$L7zJxsV%M!=<L;YGFR4l?)M<p|&O+2J4POGno!@SH42!?Q9ZOr<1jScXI^
z=t#IwLh=lgoIwx!7dVae%xjthLPNu=GBix3G;COgMl0xOxKKj#iqh0LE_0fX9gL>C
zx(35Q8caxVT9Rze))X~c&O9}xFgigCqY6i1pozld2Cj0L7XvDcmB7%@LSfjv42)LL
zo*0&FWf?jco>2nRLSgot4YjpNDKB}YOhQgeNwhocLT3jp98n%r5qk+D4LuZ*&C4Ka
z1s$SR&>?c61hI!AUK)Cz!#o*MVO#`;hG7cB=4D{Cf(}M2=wP@|0y9iu9uKc_7~hBr
z<0UXO2o#3R%fM&_9gJ4c!Em7jMxZdGE(iK*;COM>m8q~UW%J-fW@BwiNvD*#)OucC
zlgJ$b<H+f4uOqTi$)&EznZu_I<Y`qx$>mZ>DUjqs_`I!=2&SuYf@@saK5u0y<isq<
znWVY`7FtM(?kFjTS*=7oPO_pHE0>TGl16PJYIR0gyE4DNA>~r4gt_4ok}g<i56#89
z7p_A*{7C3TR<{Kfki*@H=d<osJihL>R>tv0<v}mnZnL3>?mGPRk=u?PzqwE1@k_T2
zk8yW+JUV_-<F=y@$IbZZopBp~I)H1~(UbA!_5y^YXl>LV2}fgbG3*sYKmBlF{Qg8c
z&azE(;kv>^x0id(+#3tb_~VP=kZPxN^{dhcl4B#EN;_hyHF;6V$gCPmM&{*a^mxK}
zjP`=yJ9hNfL<?R8dfw_{{Wa1GX(@Bf;Y~~H>!Knh<s2`9e4e*4P1@6sa~^m)@c5DE
z+~uQW{+Wm<#Qbx-5lYr@Naj`2X*rQkDH$yrsGcKRFct8NJ~b1~2-Zek-8dBxWBw?w
zi9aV-2UqI(jw}SCv3WrZENWeyXkV}xdHcdrQ>9wq^rX#JfPifO@lY7=Wz>(M!_h!k
zb&wNMK--h8xJ`TpTe;ih6Ji493<;v@)T-WaG#c;;@qkZNp_ep4S2E)I7yThsVJpnw
zb?Em9$6MZl=|vtuC;4*ygW7zpmCy6QFgCP_J|F8V%07QZ`xi9b006l8HvkY|tHDTr
z{tZ>=r}rYA<~*o~2p9dN#!>SYaUVlt0Y9ulTY-?ZuAGaQ+R>i@H#T)oi`LfvHx;Id
z>F4Qi176nX4U6+LA?Du7fp^glGaYCpT7e?LVR#FD7W6<5{wvdlc7k^J6deTn7YL?-
zhDq9(?hg$U*ck`fUrwE%z3;eywndAPl}1imv%xS)Znff$_%F0y+05e20|)qp&n8|T
zm<hu&xl#-(=w;}E=_%H0vbcj0+QD~WX(2;Y8scR*naTtmr&iE$GJ$gP;k}5AkHCIp
z4=&Tcd;7D!@DpT<{@S)8f_ient;>0@vX)JyWgnhlAh?1~%$>6CPk2a2pyuYAIGV|D
zlU|VfC^Q#r7#(qrIb9<z*HHZI;JLA}kxBs3z2%<bFLU2F!W=RwVsR&xF~D3goc@-)
OnUrBzSCWQ8S=WE?s7|T?

delta 2756
zcmZ`*TTCNW7(S<5%4G$XTWM*_!a^1oC<V$zq_jgB*g|2-w5$ni=~n2PBD4jDg{Wb@
zL_;)&xF<efOpH%HsEM0C824!t<AV=A8M6<@?4oNlF|qC@`b1XGZP*!F=i%>v&iDWS
z_x)$inVy?R@Qow*h0<QM0rtS{%**X52!BEwEf!RC@txKOWR{wH=`G^R0DK)z<L3l;
zfadHq(=3q1%;&~1;JG{iE=3D3s73FgqpmLG>4<U}Uv=2wFX&^(`8M#7kW!P)qlTeW
z4RiCT(E>U(9LQ0VrD{Iyyv)^DyH3<RCTgfT&ZCB*R1I_UsL=vCH5|xMbBxuz#g)A7
zU`krc%drqhO(|;bt0`t<bjwvU&D>mS7GBN(Ewu`qriP_-A(ZZGoc`}_mEKI~sWDM{
zHm3B<%|ovRbo3m^p*K<b-<-82r7JNdb~&Cz?{yC#cTWx0GuJajw@7RG1)_zTHmZe<
zsTStu(V_)(S~!rSrHyKd^e*zH_`X+N3KyZLrkB#QF{Nj29(paHqvt>leJ`c|rf-$g
zPq|e3F+xv`m(sH_rDtv)dM%)%=Rgj<m(q{)JIEIUdNMoxsY1&_S^<^G?e&S&S|Sxn
zY$@^e7&+E3a&y>vmY~I{&BP1w<jG_$nJisSZEhx3V*V92k0QgiIs%kki!XDGBL~A4
zmcn2E3a^ha&_Gh2B7iTJT#m2BR#H#0%ml0;po~RrF2|N*8nm9E<;m3g^YdHVvCRaB
zuxh4b`Fea?5129^Jo_Sq5p-W@LGA7uxQ|BMEqEMtn_KoFOcO0rLMSN8QCSR1a+t0<
zjNp}2Ks$P^(T2WspT%k4y6rgacXt!^OGa(j$L(L>C8}9&bX*7v(U3GR`^3|A>}Y?q
z3g;e<+KjAvH?D3+KaQHLst{f!Ao+xVS^!metT?U1a~@Mlp4L$wT*ZUK{uwd4AkC`r
zRCx7j?0U?xtt8eQ;lz4;A(f0XJ^SdEr-k!7P><1y{_!;6@|E6mxV+QbT+GU&hAUPh
zZvnmJ?ZhFUc$;}*7ft-bYic^JMVtu+gs>P=Gn<8T79LX`!iyW7@QZ=*6L?Xu)N#0Y
z!XF5WvYJR<*JlEGU3Y{gtn9wfuPO^(sXtLRG-k8yLqOhD#jJ!ELKZQ<B>N>^2yYEs
z<6z8;Yv8?S=D}t3MNRl;g@DSaMSYSi`^SZ-e_TZ?eMBiGD#qm}#aSJ}qR&bX4`zAa
z_x95d6#$*&KxGwB-Q#c#xO$vVo*{z#MM8GbM?)PMWn3(@e#q)Q24Lq;03g6IhC=$s
zZ7`xAE(KdE6i^rxCPk8bI(Uyn7obVM2#x4n|7>ezz9<r8Ax8~d1ppMHqf3rzax*X(
z`M)}uF2d6nQDUmzV*1}2=y1x7iSABGwOCcLPYTS>%(CdcO)x@thqI&zElv-@HxZil
z!clxjX++s+J3K-afzBH~LQ9R8_N}|AFu=!vfaVsW1GM)R9iaU#ssP>}g-P`gfCc2W
z84U*dZOmi?$IyOtH;sD-|KbOqA1n@35rvCnwG2zBR5~m>!uXjq?$347-*-~%#u|yB
zCX%NUhUV!+3+Ou00=iB(aJrMvgY$UP70mq#7wJ8)KyHVxqE7j4<5B=rlMm@uT=AvW
z(}}hCI38iSa0%H%ZI(wKFX<Va*(t%cinzP<L;MIuLenPaVDG>)uED{fzUbh9bD($7
z2p|NVXrsuA4wj6WpF?-*;3_hw0-0<gX@IMlrM27S$DHbe)j8P;YM!&BSJL(W0V}sy
AQUCw|

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml
index 15a2699bf..57058e880 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCheckin.jrxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioCheckin" pageWidth="675" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="635" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="48d32af4-ba9f-41c2-91a5-5d2fe57e149c">
 	<property name="ireport.zoom" value="1.4641000000000008"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="82"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
 	<parameter name="DATA_INICIAL" class="java.util.Date"/>
@@ -141,7 +141,7 @@
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{dataCancelado}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="64e2b043-f9cb-4211-852c-def2fed7ae2c" x="376" y="0" width="115" height="20"/>