From ea7d33bb35a710571042ee3d6b52be4c316fc608 Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 12 Jun 2017 19:59:03 +0000 Subject: [PATCH] fixes bug #8977 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@69871 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioImpressaoRmd.java | 4 +- .../impl/RelatorioImpressaoRmdBpr.java | 3 +- .../render/RenderRelatorioJasper.java | 21 +++++----- .../templates/RelatorioImpressaoRmd.jasper | Bin 32257 -> 32322 bytes .../templates/RelatorioImpressaoRmd.jrxml | 16 ++++---- .../templates/RelatorioImpressaoRmdBpr.jasper | Bin 32997 -> 33063 bytes .../templates/RelatorioImpressaoRmdBpr.jrxml | 38 +++++++++--------- .../relatorios/utilitarios/Relatorio.java | 11 ++++- web/gui/gr/editarAidf.zul | 2 +- 9 files changed, 52 insertions(+), 43 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmd.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmd.java index cbc37190d..22aa9f7a8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmd.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmd.java @@ -15,9 +15,11 @@ public class RelatorioImpressaoRmd extends Relatorio { public RelatorioImpressaoRmd(final Map parametros, Connection conexao) throws Exception { super(parametros, conexao); - List list = (List) parametros.get("list"); + this.setCustomXls(true); + List list = (List) parametros.get("list"); this.setCollectionDataSource(new JRBeanCollectionDataSource(list)); + } @Override diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmdBpr.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmdBpr.java index d0aa544c0..f40b82b70 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmdBpr.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoRmdBpr.java @@ -15,8 +15,9 @@ public class RelatorioImpressaoRmdBpr extends Relatorio { public RelatorioImpressaoRmdBpr(final Map parametros, Connection conexao) throws Exception { super(parametros, conexao); + this.setCustomXls(true); + List list = (List) parametros.get("list"); - this.setCollectionDataSource(new JRBeanCollectionDataSource(list)); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java index 493e6d479..6df0c102e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java @@ -104,7 +104,7 @@ public class RenderRelatorioJasper { * @see com.rjconsultores.ventaboletos.relatorios.utilitarios.IRenderRelatorio#render() */ - public byte[] render(SaidaRelatorio saida) throws Exception { + public byte[] render(SaidaRelatorio saida, boolean isCustomXls) throws Exception { this.preRender(); byte[] conteudo = null; @@ -128,7 +128,7 @@ public class RenderRelatorioJasper { break; case XLS: - conteudo = this.renderXls(); + conteudo = this.renderXls(isCustomXls); break; } @@ -136,28 +136,27 @@ public class RenderRelatorioJasper { return conteudo; } - protected byte[] renderXls() throws Exception { - + protected byte[] renderXls(boolean isCustomXls) throws Exception { JExcelApiExporter exporterXLS = new JExcelApiExporter(); ByteArrayOutputStream output = new ByteArrayOutputStream(); exporterXLS.setParameter(JExcelApiExporterParameter.JASPER_PRINT, this.jasperPrint); exporterXLS.setParameter(JExcelApiExporterParameter.OUTPUT_STREAM, output); - exporterXLS.setParameter(JExcelApiExporterParameter.IS_ONE_PAGE_PER_SHEET, Boolean.FALSE); - exporterXLS.setParameter(JExcelApiExporterParameter.IS_DETECT_CELL_TYPE, Boolean.TRUE); - exporterXLS.setParameter(JExcelApiExporterParameter.IS_WHITE_PAGE_BACKGROUND, Boolean.FALSE); - exporterXLS.setParameter(JExcelApiExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS, Boolean.TRUE); + + if (!isCustomXls) { + exporterXLS.setParameter(JExcelApiExporterParameter.IS_ONE_PAGE_PER_SHEET, Boolean.FALSE); + exporterXLS.setParameter(JExcelApiExporterParameter.IS_DETECT_CELL_TYPE, Boolean.TRUE); + exporterXLS.setParameter(JExcelApiExporterParameter.IS_WHITE_PAGE_BACKGROUND, Boolean.FALSE); + exporterXLS.setParameter(JExcelApiExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS, Boolean.TRUE); + } // collapseRowSpan // JRXlsExporterParameter. exporterXLS.exportReport(); return output.toByteArray(); - } protected byte[] renderPdf() throws Exception { - return JasperExportManager.exportReportToPdf(this.jasperPrint); - } } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper index 45f9d0dd6088a8b007bd8611b50b19b7e7c20d51..c08a16dc1bf85e9ccf271f082b7d6063f142b9dd 100644 GIT binary patch delta 3754 zcmaKvZA?>F7{~9eP#8r)>J*W;3MeQb1yN8tMJT1xmf9A@sbQtmq@?ARzBuuMVjq|_!2*P$H4G=iv&Adv!yQVoz0vOv=aVs-ThdQ_J*{0JZnw-H2b1c?+t zlxl#4kOjJppcm^lAgFu&3Bv;bVYr7NY9mOb0HRa_B!n!`Jp@hEUo$)d0EQ|8C8z9pG$9oQ$47&)U_h}(qOoAyj~8@~-D)mh39=zD z9v#b)R)F+MD3~QI17S%lGMb)7_dLpO?KbMuJw;HIlL$qXbYC&_<;H`tP%z!O96I&m z$w)AkQCbSUOON`)N~~KMPxwbdVKHP^OEsAu@yCPR{%{}}R>yJ42;=ho;m|}C>|V7C>h;kNJ%ERpL8)TS{YHh_}bIdo>UDy35XXd;6-^BehTpicMKxFL#+HGKw~(qfhJW0O#-4t3TRQDg+7hw z8OwgL@=dR)D?bl-4CgfPq-x+vK)gr+FUqs<=MZn&c}Ug=gmpP@pR!i+_7!Ut&+l0)ieWsgb3`35$0ZoBxr&@f z#U87Bz~dYCc6;n@pTp{-HP5kV?{+@PrQWg{GEtm1=}-dxa8OK13pzPknx~G;x7G5I zO|}Y7>bF($e9X3%=kMCK@%*l>n&-dSOguOAt><}LUn9@o=rf7sHsNwF+w|;WA1vzI zKA7ooU$tF$Hh95tuifhC@d_yJt!!xeR{6LuNHMRV!ez%F2=eWCU)$&$E*cAQ0IFr-TM`Rq z^{x&+#_uYZoov!ov20%F#kwf_+|`mZ#IF;3<~6cET{+rS)dLN$LKQzgoli)d!VtDiVavyXXxVf{|szgMfC+xPlxM#c`5U_56Qo<%kES1$E<6w-*Ohn7|zg* zlX)nTaF&G3Ls1CqzRzf*8K@@nwN@R>SBg7-m?voD3?!K!Zb6=5pIOS;pr@U`PpxL3 zdMda-IKCfxY?e#l5yM3dkECjNBmq5U)-3QS1ny>`$BUW%AWwUo^|lF*1+2lGhrg6^>(Wd1{((BV xo!vh`FYG!<-Njp5JKH+8bat4x4!3S@H@BwDuTRyi_-}7#LTbfh;`ie#{{<)d?r;DA delta 4296 zcmZ{ndu&rx9LMh+>>-b_tpi3k#zs3{>qpt4#=^DP zyn^4V@`t%m?tO51T?HsIWz3h*EjAaEY2@$bxUWJL)TXEI$`ao;Yz(8G?-? z^e-l&5d{Dal0t)`Qat-%<8(gn1SLgv*^|$f@%&5RT&o@Y=%^cu!R^6gGo;-fM2Hc= z&%6{=0{a?K3G8N3g#T@pd87Og-Yu861TmEntlC=5N5Q}C=CPxQ4Vw`iHlpgVv4VD{Q9` z8#bqO*odmb#tJGnR#34~LCbauv)#4#Q8w>$3fp@=a!6Z*!85XeGGUzLJ7{gTS!4 zp#w%#9WYin&F?{{41;T!Osoy|pecs>c=UQ5AL|I#(2_AHzxbBl+> z!=g1KN1|4*NX`vB2?hg$6`;mhP)Gu8@H|rm+)iT^&9%6zJ?M7^1_DlhPas5df;N{4 zbU7D};d`2iD3A^ z+^uvvxYO;gh2iu4?SeB$Fz*4~9y=cdCp*@>($Kf0;iG&mKlFx=XO1MNfmx8M3?BA1y>U zO9b}pK?U%j&mfQtB!+#7DU)GmaW|A7EqQ0)i0VS!`5b(=z6y*4n(4WHvbO@<3K%Hq zKLNph5s_kZL5Gy6I;2Fvq->0elnM|^O?p9v32){|XM>ya;T`<>he&-Ph4i(MV84P$ zv6<2#C8`c75iltmqavk(hIA@7>ET}G*WqMuJ?>{E_`BC-pGK6}T-Tu_stzR)FeMwK zqNIX`@_G)+-Q7$t9eqkKV|{{s22o;jQ-_kMI+R4flx&QOk_sBin>i@q{yenDT7p+S zIg&(2argoMAp6mt#eC%>4_Af{`;y#|h$SOYX(v4Tqu58__TD<7fj`v0GVsT-#?bo GW&Z)12bfR* diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml index 67bc98e8f..f5e617f9c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml @@ -1,6 +1,6 @@ - - + + @@ -43,35 +43,35 @@ - + - + - + - + - + @@ -170,7 +170,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper index b84767cddd5164ac64b259984bad71b17f754671..d6faa8c4283e35da32c7d71214fa0ce2f5ef00d7 100644 GIT binary patch delta 3911 zcmZ{neQXnD9LMi&8ynkzvM!aqbuZmqx4~G)-WVIBZtd2!Tf44hV=Rs`j#22_+M5uK zL;XWV645+Hk!TEmi6IK4NMeEkbP4`}kw~IO44_8;zy!0zNP;2pd4A7x-Cgcz(qHa* zzTfBhe(t%ach^5&7CwGOIR8zK@n??9y2#)A`wO(s)j_+E`;JTqwbZlRJ0us% zZOElV#Okhna{MvJATxuqpN-;~HM zH6jCLQ;G_0A|Ch>A&tl{cXon+X%o zw^mW&y`hxYABxN_L}VM5jAU?LC=#Auh)eQG;(nSQo{gqh5bi4?-rR6Xj7f1tH_eYP zNH~7QOwTyJSMI_KN9p&+BVic;chaDJAvrw#Z|jvDem^qg)unHD74iHrbb6u;t?sVP zCzEq7e1FJ8hThtO6Xc3OIgUcz#!A}O?h@)bf#!RStxAt_moN|c5kiXmbL5Z1F3H)} zVJ_f!a)07DK8U|P_+Sm(VGIO=K$fD^HmktD32+~hUMQykj<$8+r~q(Ej|z?n8n{yc zm+0Bf7ou}L<&5Ibo(#oVLILFrP|&sx1r>lo=}}QIK|^r{D1Ptl#uVo5GDUEEhT;oC z0p$`<(6$Z*6@WtNQBg2KLvaZx{Cz>T3SaeQ@~@M8C`*t}+dBDFfPAG#mCpoC{u1P0 z*)h%XJM48U8#W*9v0Dp%Bpgs~0S9gCa8Lm_lpYla6EqyR()rIg_@I7VCuzlR;@Xz=iKCeFjOneERT;iMLaTex6FCOh0G~>|+2F+xu z*9R*M#7NFG05oiVOfvp7D75?H&gMKu3ql$iNSV z2=CP)OP_2vFnho?;+UE8j>;ndx#(c%xlr?h6pl0p!clQ59usA<8dpsYkfFDm%xKQ_ z6q)`dR~4TAw5uwYO^^N)%jxOj{=ZyJ#I#|!n!#@Z_~~KOl!nGJ;`7)8j&a5hG{q}4 z{qaadoRz}y7~`RfUoei>e8%Z=cn0K==*Dn~NuGX{)8z>`{PLoZt6JfPt7>ysV!|QzAi#g;)-ne(W>~^+S-V+Q{sdUbi}i#a*pE;KfrfY zZjoHc2!5Q6?-~y{M(CB5&_mB?;|sW#uKUW><}(Ayd?DE$AMsUVd$!L$=y-yekD_}c zy}X3Xqobtk@Y1ic|Y`5KDpkUTPkJh`9fwU2GY z*|9N`-bClenoM+}d@>PzuFF%EpnU&sLEzAw|0MdfCLe9C##`YEJpDSy{k2O356U&z zFx-UVMVkss$Tn$oQzP|EX+2a>-gDSsyeL$YpU}cJ^j5H#zl*8@WBApzU8cDlXuvO% z4Yjuj5tN%cL{tSLdZSI%HG@GJ2>( zrW90UOwf?sRgeu#Yy`5RMn={T>$Oa%pgho_qAF0)LmeumprT@ehU$TW>gwcXpt96w z)~kCLSug9+EDobV5gu#Nm`VlZUqF?h+-fR82`UR}&}_Uej}@eSQ_UvDKZnGT1lh*; zwea2ai&O1W@bg;fOeZUvlv&@TKV6-F2mteLJw3;|dSw;c6gqna++b+t&7Ubh@=x+l|h@)c!vOhTPBq delta 4097 zcmai$eN2-_9LJxhKw+Y^v`Da&@=}-uCblTZKtO~7g+fbPM39LE>Q+{GDlKZZgiVvh z3}>dhI9;-2GbS!`Gm3Rf7NhL#j~R^#e>s=EB@5Hd#l^U2VrH`Y-QCkZPx_EG;c|E1 z@7?!v_uRuhA01RJ9Z+5PE=}{4<5Dhh_?LzMR2Wh20S?(fgH0Kr4YB&NteH{0VFN}Xgrk)4IdYNZf!E?qeq=EY!Dk>HD`Pk9Y z6h7XOhdwVG;O7A#^Cq}RaUI!A`a;@P2&V$V;nh-)ESw1#m%#57!LK9#=5=W4Sqnq3 z4pyM679-lZwwz)72pFWeO)zL%0fPzzL+X)XFd+%!Ho+LNR7iH>Qw!`wYI$|$Uw}Z0 zI|PBY6%eRE5TqU%0uz!D?$DhmKf%`h1VTyin1s@{LMRnTsMI41WkOQuV-o7CtfcFX z%~gg|4Z3iY(*&l*1Ji*q!9E$D4n+L$)cDotL#vV3A)7Ua)^ou6OfZmS$^s!}dU9Mg z?uvB{9j5^~H5v>H30(_)X_3HmFp%iXhEDa=%w%9%V$FlzReSv*VY*eAiuy-`AvWY~ zTM_2FU;{o}*Ml*`9}4c75u)N6a6iotj!i}q<8gs8?ia&jnhgtS{3z09l*Rt3)A9TpsKskQ#r0+Ab*~!r)tejVV5doO zh(7EA$xBRyx#Uy81Tc20cl_(SBmn;UA;AJ6Mnt|b3Mv=B^r zjx|_R+$rR)FKs*ty`(s zKve|>Di8)%1qNnMVmM89?(Ddx%#!d}**L4=)f!&?;_54$whj~|d>~5FG zH{x`)wm9u{I8D?}`1ks&W}?ARl~Wk=hXUf<3!OmtTc;Uj%y1MGQNJ$X_XQ^dL&8*i zgxyh+Moeh2&V*j;Qlq1eY_o`VQK9SyR*$Jj{Li8O|Gb`+Z|3{BFxmiu|$+~3~HOh zfb zmof7}^1pfaN3M8r?>I0xh}=^5QxkqB;`i&qRBg_2`LN zQv_4tCE%m1iOfunjQS&iR)1)0CM3Y>RAiPc`7G#PcR3tKJSGFiz;&H4FBiEABG-!d zI3Ary&Lp$Y3;zEn%7TeBYI^gF^St9(O;((TsysVX{1bH8bJC>4r-T0RHy8IYRAG8f z3oH8qU+|&Qt57AyWpctf>7`DEt7y@y-$jkoGbFkAnTHC}Pdib-gt9AMbs6`_ey|a@ z(N|lHXqT@h2LR8}Ar+8=p>^oI&&UI?0sZcS?{96trSt}%lj0h+%h0Jx&}o%=Wav^s zhRy^`DM!C1OKB4M^A~vi|_=q`0NPPF2EAs|xH=LB`I6B=%d& zvquM>Q)V|-#MvJVi0pTPofJz7>{KP}w5q@^6=dv8NMc`Fp8e7G^~&tcgW{3dJ1C+* z0(4S5R6wUHL8ny(bg3XiXF?MC!{yOm9jbyi5uf(`VRq8ri!BV*@cFq;PDj4Y1JPDt zG8_yA+VGb;_VT$%GhAlyG;e{InOnIp1D9H;?uV1A@}S;fcXn-EZEcOsTC=HUq-KM4 ZQ{Bec`Qhr)oTTn3SB-4xMwERZ_di0^F}?r* diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml index 924bd5c0b..83b940342 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml @@ -1,7 +1,7 @@ - - - + + + @@ -43,35 +43,35 @@ - + - + - + - + - + - + - + - + @@ -124,7 +124,7 @@ - + @@ -173,37 +173,37 @@ - + - + - + - + - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java index c7304dd83..1e758311b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java @@ -1,6 +1,5 @@ package com.rjconsultores.ventaboletos.relatorios.utilitarios; -import java.net.URL; import java.sql.Connection; import java.util.HashSet; import java.util.Map; @@ -30,6 +29,7 @@ public abstract class Relatorio { private JRBeanCollectionDataSource collectionDataSource; private String[] nomeSubReporte; private String baseDir; + protected Boolean customXls; protected Relatorio(Map parametros, Connection conexao) { this.parametros = parametros; @@ -121,7 +121,7 @@ public abstract class Relatorio { this.render = new RenderRelatorioJasper(this); } - conteudo = this.render.render(saida); + conteudo = this.render.render(saida, (customXls == null ? false : customXls)); } catch (Exception e) { throw e; @@ -169,4 +169,11 @@ public abstract class Relatorio { this.baseDir = baseDir; } + public Boolean isCustomXls() { + return customXls; + } + + public void setCustomXls(Boolean customXls) { + this.customXls = customXls; + } } \ No newline at end of file diff --git a/web/gui/gr/editarAidf.zul b/web/gui/gr/editarAidf.zul index 69dcc6095..6a1ebaf57 100644 --- a/web/gui/gr/editarAidf.zul +++ b/web/gui/gr/editarAidf.zul @@ -60,7 +60,7 @@