From a2739d3d07408043447881852449e7481c7cd1a8 Mon Sep 17 00:00:00 2001 From: Jesse Martinez Date: Fri, 1 Jun 2012 10:51:31 -0400 Subject: [PATCH] CSPACE-5292: updating Jasper iReports files to remove unused and incorrect accessiondate field that was recently converted into a structured date field. This new field type was breaking the Jasper template. Since that field, even when formatted correctly, wasn't used it was safe to remove entirely from the template. I also modified the report template in minor ways to fix field widths. --- .../src/main/resources/acq_basic.jasper | Bin 52392 -> 49884 bytes .../src/main/resources/acq_basic.jrxml | 49 +++++++----------- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper index b2b633e022aaf69009c6073716b2050573ee0b60..ba00ecee60e56e8703c74c6548ef272a162b7bbd 100644 GIT binary patch literal 49884 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 literal 52392 zcmdUY349#2^}nR?v34exorHuV7-LB6Bz7*&B!H9H#KEzH?ZhO3IvaZ(FR^#c?m7ph zK%vlsQlLPALd#LkmbTmpSIgBxTiPEjE#+#VwDhDLrSzgL|L>DDGaB#g>?XkP_xbPV zGty}E^dvn=?>#*od+VQBaXQ6jCSsZTbbtNH(e!XEm5L1~Q<-#qEU`JBh}Ex@A3Nkn zCVw-Y70ha7V|tTA!|}n`@@OWSVN+U9j&6-M#FGu3u~a-d7(X?-X)v~^l}*%OZPB4v z=SY8le0zpfDB!_pVsk@hCKXR?2H;o?m|8X%O{Y&`r!%oV#pZ;SZBsOj0(LBgH@bkc zTiCSKolR?&xA$~5b+k0L_N;B{=xk|k>siyXyoK4Dl9^0$XjL?YO14m421kYx%aS9B zObeBSLY>3WUKGuZ?T+_l2G+9)@y&^3Dz-X`l+jE)nOM&%eBVR-fOAPVN11NPF1!NhQA_7Fsw5Na?#ZM7{Q`NFea@fH(ZreaC(UznZ z?AkFLYh~q|qP<%-r$C0j46A7c?Hkhl4ZeQSp!!7vkv-9eb{ns#wLG4R^-{4iY(Z$k z403Ad7)iJZni3;Jz+)>siVoELMea96B>8Ovi}azm=~yP6VKX;`=CrbdY6ehXAJZ4> zkB$sxno+G(M3`GgB0gbsNA$y)C&;+AruZ<3lfYS3r zX(anmyEhzkHR;%41C3D)qO48IJ&@u<-YZ<3Yl%^Fw zkj2=*$}+K`;lXHza5Ut@p<1^~r$9p$XNXPc8dds7vaZ!3`D@kf;{dW|+lLvuYAIO# zBs^U4e5+dd>Z9mn%vwob2xJn244G9RpC+cEP>~oZ3Fp!!12JM<>lv70=kQ=W(>OSo z+!pI=WtFl8sqjtPhf}e1S~8w|!`g!d{mRmWk@#MQO)vz~(j6I+TjShlP0YFZi7CrS z7!@5;Y(arkX&Q_Tfvq14&I{txkEkOs8hZ!ggMBH)Ic1bXwKblWoGE6c%dpv@C0yBI z=CWw}Fj}pWgmyiltZz)EqB{uh_K*K$zbhV(e#v6Ig%zdar^cv5Ft)7-PPyAT7#|)! zJ;mz7YDh!0-bWNdM868gAl%2v?1|yj6U9`NiX6_c($21qrmkfxkjuQhxr`PlCN3Hy z(=*Unx;ms@Q7PSh0K!$JcBB8cLMKwVr5Y60f0wedK1V2`Ke_L^KP?PxEy>*|GryPw z(GCftg`p80n~Dw(#Cvt4du1*TD|0I=>W>dfp*0ypgx+;=XXP($GoWS9Z)K%}DEeyZ zwg-l$TiF31j5cdHmY`;uj0%Q!DWif}HQPI^W-ZL+CVR!xl9{(8n&YW-rh6bc7$d&4 zo=w&MxfJW|TVttyFe5}FQAcbjxiv=3MG#BTqqi(&_HZ&C zCyj_W0#vtjCKb!{4p69t6>lSLvW4;Ocy@r)qL9CA z$*plnvkVLGL(qSe(j(=MlM2{ulW!2&r%_u&sg(tw53|uETVgxt6ElLhcLl zDFkRw%GF4PvP>{KnWk3(S`_ABPS2F&a+y4L+CBs4fty{r$vVXw0%T(Dq7u;OM` z(jOfh9*BaMZ6$rZm5E;T+kI3~hsF2yC zwf$tN2{uvLRMa;Uc&v(89qsFbJte~`jo#Xl$iz0sNW?{Go=ZYNR#1mKp?*@h4J!Wt zW{9U!haPMkgbjuiW?jIk0a1Ej9U97vsj(YY`0?uDRT57xO%B2gVwQGk5~@O!6qZOl z-GY+Dd#MPkAq1cy^z}EP_x1I~`t--~n6|*YwI$Xy0L^~$fc|XLXG|UYsA=@KG4b@8 z1V~PdL4T5lA0LIslPM^hzGLXKrY@xgv84XBG>QI`Z*ERq9e}9P7|L54y$B6jeuD8y z6SM$vLMSyJhnTQ}Z5fe+1L{QSu<8lAtT0@qqMJ!u&9K_g=7P59fKqvfLGVOxk~$Tk z0%rO|RvV)mm8YcXlD-m9DS)Is%tzP>#wWAq+VZ=fw2@R&+21sc#yVk5poY*Y$R5|B zF*uwYCOKbm#KGK@>DXJzrUR&XI=UHzE~ z3z_?2vM|b`Z3CIM6Ma&{j}FR`L;TIlr?x@J`qH2y2P*fJ$DCZ#F^a6s&oZ-g`aR*H zlvjHz122>F8fh>ZQBy?lJ(RN<9~(OQhsZ+Zm1X`xiGnR#fM_) zDy;8RbtH$P38=XfJq1?lLlv)FbN$~x{>j6k_Br~saQm@nJ>`d0 zsWX3e)xTZ`mi3OhJPak(O;V_-MJoxCF-z0r7-&2`t&VDo&Qhj7lI17dVnke@7Lk(M zG4lWughsjDoq*(@t{|NYEp?Xw6^K45vr=!C(%}pN!~_d@GCX^!vt@4yNn?$DyPQfE zYV1YPm&(;gB=;yv_RvBXI~CEqw3r$=3Lmw@@v^HdB7sdUO`oJrDV+^8>n(I1f{a=f z6}`-u#J)Kj`>^bnff0qzR*++dCVfF!=CKSIx&<(I$tEiRudIoWfE(nP$*{4|$gnnC zH6Yh*iI$<32_t`3b@lQu2cPRF6C{nV7O4M9N5wdjy1(zsXzd(QXuP4FI}@cPt*pY; zr`-{fZ!OJGtlcy;s-*hsD~6p`tKyCQkUDzMkJaCn#>j@KKiZk-rcR6zX`#^HBKn&o z?^KK$-8&U=DU@MjBzv4AStEV%{Z1!DhhR=N+E#?QH~~`h5l+t}WXoeGN7s&2b%M>x zOiu#w$11p}gIPvwQoXm|Nlchdb)B^;Hl7_D(CJk&6)~7A1xCI%I&}&ZNR}n#RAsGG zM9)W^u;#hBz6uuX-k1b$B~+-FrcAXra2%@p8>(}j*%8%jx7tAB%TKb439)o83?P|`4Ir5r;Uk$D;Uk%j z$RgQ=4xv0h!^#^+G6VHh*btDb?>>Z8xrPseZbXlB$;nTw|jl^)HUH%&XTRmDl8Ag6gyzb61am9)*iqn27gb)vh3zvFKzfr;tuII;Wv^|MScEabH>E^f7_DA6j4^ z8->dwfLMw}L@avw))I${GR*F1THW5!)w8U9O!8SYRQtSxmaQLOjO#q zM9q_J&GI)|&K~#*HNJG72TIXE zMQ@a4%PQAiE&%Od9uce7Ogb_Z*uuUpE_V~tsQg;l-Y!fR z7LqgZ;Vg(8t1RVSgHhFC=#R)RD2NXG)&ZojSe0cK2w1RtjJl}op{7ivk9$0{-=Pvo z=k0)@tzrX)wi)3Y+Gd1rXsd|qq5U=$p9=8@=&x$G-l*X$Aqa|0M1|O!ikn;88@nh0 z;Wcd}wqs$!sh56=+(A(KC(9NffVlvqbl6|AX{2MbY2=GAY2=GAY2-wpJhCh8WhAb) zN~U{o3TP;q=)pXf&esekH=T@=5YYX52e4p(oqD~Jr_i2lPa@GKi^OKHDiSp&!uic& zvj0<&-j*%<9^s&1&L)nd$0DSVFGMryWKFI-7>l_VMAr2+bm;b zok(5gGu11YTCLF<;VtB*9=Bvk0vju;PCKo<3cvS*s-ixgZW?R^z)dOaN}qgAEt?fo;Ws%xvOYG=)#tq{MzdRNyE;&@_aU}o){ zdA0S}`89}br#Lh;vwFjVUzZVgm+)8Q~iYW`u7r z=!mSru-Y91?n~HUsBi~^C)N+jGXhf5BD*Ke5n!(UaGPTzHHUOQ63`qfHlR7o2w!uU z5x(Zo5n0Xg5w{iGm$2rj+=J%8JO+l|(B_~8TggU(_&1#y;_~3oV*xZ$u>mwPBYZS6 zBYZT{5sDCjhH0q%n^Vc;)*ZWJq1IiL0&9v9k#NrxIfqibZD$+k zn7B8)t;=WeGAFhEqb+D*HV+3+PZ^1&cH}=Fb3B2O!3^g!C2^MGSh+f}iV5tvbZ;s? zj1#OG?{G4T>V8FK^A@$!L4lJ63o!);&9tXT|I0nBUMoGMppMj`AQ?fQk`?3_y=(Rx|tjx<@x2;0(e^yJ7Biv3MP}OrCvjPNvYIq0gg0 z>uD!;=Z-Y)4#4Jj>>I;r_$m5ysN_7Ogh$?yJT3vohqEXUS?;RE=t1C&7c$H4#?l9e zAt}Qq>!k(Q*Be(gVb4!z&#FeH*K+Fm*i{m+o9M1{w6!%Y>%xUFCQfx8K7GnyJyz)w>Ix2D@(DWms>T!4Qi++`SR>Kf zcztOrblT;OU5!1R?Q1%gHJPcy>m#o+>6BvBhtw%h=dzBL)m^PkJ`y#AEf=lqXrwtE zE(meOs1Ng4UEJ38WsR-Ak}AuaY_8TMZMpWPo1)WoG^slFEM3#K+>c)YFWWvK8_kO6mnGT|?U)9ISqJ61Jz^)xpw>uT>fN0NSj+)n=oWL+gow#ky)_N9mcBCxYCIlWe`V*e7N1_ zXj-)zhjg1dO}vx5=D-Ho!GMu7rjwQzn_HS%m-|wx6Q-&&K?eJ>bVkhDmX5A9jjb)~ z{gnyb53sUhZ9J73p_`~iRb*02XHUzqZS5URJ*yj!ZE3@SW0MOIuX|Y+gE5i~j7+0! z^qdOzo+7f>1Ze``X+^#1c%MfilJCFE#>!o+r7|b7B8i#Wj3hJ`H>ONkh)z2#7r<=S z{;_1qT$p}f_o=Qz=c*cr$5K()(09})uwqrUq-sX>EQK~Jlj2#`GjfL*{y>4mZ?ROOb_BSNk( zdogw;0+TY)|@OnpMDMB3zJs;qq@hV~kY%xIH zGRZBm1ZG&38;sMxYT*VNHO~|^cQ&;`A}cdsfW}u}oo`JDUA?m^AZ6agByD>PNLpVV zsJ7?KDG)jgy^-grg_N9m2thdtvb?#YeU%ym)x#s3aKOB}zS?MUXZ}+i)X}S2pwxC$t!!^;tMXF2 zyuaEL16A#9K?v%r<9*eT4sH_pp*#?6uPf*2_y=SH&VE!^k(&oOfrQ{4il=+4tH>oh zCVki)!f)E=pga< z>%=g-B(52PLf$)qTjek{#^#=QqBkY)7NhxH_S_M7R6*9ob{>!`! zbMDj`=a$3VA5`IfrPApf3pk?QVpdA$xsQv>RgFjQ(c3=f)=c z*|cc{!`%X)omnHYbt-D=+7xiHONWz0*JO9CXmpniR%;oyY=oXg%Yer9qZ&(fE8l*N zlFoIVT}`-m2lzto7?Jq0nj!#WQ5#L(CMf1@$pjahpvZOK~-BMILq@=)1X_OPQjDi>KNx{c1Yj0h% zs?9Ar;hqo8p6U~nH*HE3GjO`d+loo^kK*0Wn~aLS@|P5jW3Eeh-_B5pazRkBDX*iX zhEAm|Ej%ZuiL*)@DIAAa+H%=VBAB-G9Yu0LHRbOffr`HLg~>>$4A9AUF1? zUa*|z+#ljyDJpx-F@#uO8ba_DaD+M}rlOv@>vJS|sa0v)IC;5t+N${>WHn%%ZD5m} zeA!H#_IU@Hc~_Z<%|;R4dr$5HQ#pj3%=7L1lj&(&Sh;2w8};QUIvB8GDrEnZ&KAWR z&EusyRz;X+s(lgWim5NcTrqVbKs#AXXLFd?BI#*51+o0B3t~`h`7=*jtZG>fla{ea z4SG-y=a?{S#w!a$%wm!|c!c~$MvxNh)u@`K_nBaSy2<_n%?D03B!=upUyVk;0eO9p zjgIPwgsc@ihfagG9J`{6z9oHS32J&eW-6p}c0kjs*np-tBYaJ7M);auN1#Cdra#*$ zqU%$Mw)@))pNzeMligNQ1B+TIQce4+s~lU>sCM!ib5?a#vOn1D;}jrAyL|_32EF-1 zXg4|X@;B9$L>TE@9?(=OHlV4@2wzi~5x%C<5m`-jxkDk>&)ZZ}+@|vEZj)REOIpFO z-61v;o1qNzD}8eFfT5;|epP*aRjcS%wFAGf9U$UnDwlLN2T)4I22je3@KMT)@KH)f zsIs~{K&D}_2_?w7eJ|+ZVhIOk7di`*vK7bd^+o!moueblpTX%Ou&{TvV2PxVg?f2Q z)S{nW_2|Usic{|S#A4a^^KZbHU?gPb%eP~wD3Dg3xGI42+)Irlox1}XNyP>zSb|j>^XU>k)zY53yY#9s==J22>WEo^ z!~b!jmvkNtpqGjbpqClpqn8=sqnC=vrq`pg+F-SvBb$Oqrs4@G{44`?`3>Z}P0kZC zBTrMyIY?C9JV2rEvLqyqO1IQet;CP1OVZCExayz;FIBpyQBn%zQQ=fRN*`#|Vrf4o zAHEp#-4wDpNTQN>e?}w#V)3Z_=Bb91nBs^&&S4GnI*=(c72OO_!0>s2z@+nRKzC5F z0o}oj@O1|>!q**i1d1(5>5hv-s-|EOCQMDGHjY_ zjh?y#R;py8DV0j5x?qzCKU(&o-{ZGir`M?GzKNsQvC&7--p9>)AI2#*D(71t)S)!o zSGtDw!YqsS4#=%jxaseMxSW&;Qf_UeI5X86d4hHcxn)sI>;s86OgH{jq`EZqKgiGaZ^V} zdxydBLv`?XsFu?CSwJmSY(Oo|2wyGD2wyFAgesR5QI0lH<#ah$8)!DPfqtp3QtwjQ zfDwhtOLP>OM>|me+o2{m*>n91(aURr&Gxi|ca3~pjXAsP2Wko^53f{8g4+xdUBJxV z5`dPDcrUvFbZmA5_#(^(@I{yn;6$KAvMjEGpl1VaN%0aktG7pp+{S@S%<4b%siHNW zs6>uXyGEF4`qHrhR8q-QgpW#QgpW!(LQ%t=D)u{5MN9$npK>Mhs`n>pxu${mZviqr zcS8LNy`=%$s&RQa{t(%sdE$)k|M$Lc zp|A~BjI;f*Hmx_x_RL!_Z{Fc^=O22=+=Yi8+B5Ia`ST82P|7%$TVitlksSTU3@!rI zXNi-kQf6^B6$c)0fTKbFMIaW~@ZK&@0++I4&gz_X%4Di1PyU?k<(_`fn@F)=k9IWj zJpV7I%SC@`<8I7dVj)y*cI4_>O>BsXrFxw02Aox86@1jT zSI!p7Q$W;Dvkti%-$rfz;kY^)>puAg4Rua+_=B^C-1!9VO5$u*?i5DJ)E*$tj?4|6 zZ(|l`Gjb=6_8PltLaSjE%G)_qXf@PE9L^SmmBei#4?pc?;%t(0Mo2Pwy_U;y8mhoX za<*}RflP5x`4)yT)ZGYofZ;A4&MMvS-rA-KZLT767OBA%Qt3?1TqHDh+UW&#>>tWvO;oj>JoR#S^%tImEcjV{3BSZHcIlAx2(tSss?mIGd z-;t~Pj%?j`Bj5Q(zVnTI=Of<j7YtY zxxs}6`N}XJqVfY|L8~dIRyh%X8q?F0!M1e#kIT?7@-!NvHHm+_<*e2K=;@ii;E0|C zZtO{|!10Gz!V{#29s-h-ET$bPM{#D&tX*rf<5+7sD`KlSn^=Pze6XWquoH7A`3HUw zYBRAhDX>2HZ(9_p0kU(D=3EUi=JBNIcf8?C^<4bh(+eMqMSDfWDJ;5&AV4FkvNA=Md=s7pW~8`|xL4F{lIGoR#)85ob^_bL<+67n%yqRRmrB`5HjA*bGSs8T zX65QFYGY0+hMc4)Z0gGHdVcS%x2Tn+Zi_7TfKeUX8WkOvu(DodOL@+ z!}p+(o9Tq0%|5A`@>7K=b*_9WWuLLxer!6C@3S`BU%h?KW>xC#LYp0+-ac=$YV~%B z%??y=U$9w?db`|a2dTF&a<*s>s^KtVn_Z=9@+F9z-DKjW>}s1G%w|w!uC-xnk#AqI zS*?1z!De;p?Is)ln<8Ux!PubUf+K+WxU7P+X&5oVT*PKyW4F?{`8sC@m{nEaHKZHY zxR`AAO;w@WAR7V^ma;o+*36EjV&BDa58OaJ4a}_&t6>^EnAN!6ku?4-8z(9HTEK}g zeDn~crNjn06RE~uu3+t2izYXm%?TU+S&XTa-49MmpO=l`Z^;wL_?VeKVjXMD3``!N zM|>a?c#wT-410imn~KEA5gbObA@2JxWU3QB_v5qJ3a6Ynuw(`xS;gqutNLNu;y*JL zVc!Rtsr(pn;Y=&6z)!LtQh|R&Wi3J;zG+8<;RFMAhoMwjYcM7q5%yDxEP({lk?xcu z!hTLsrQE;8HNu{!&k@kwm~KSaFX(F-^dODLcfcsZUZ&`BFB^BN5n;cks4?i1I;DT2 z5n;cjc$?^iX-0(ofr4Wp+BCQ~$%wGmC~h1Ek`rf4F(T{@iXHFK!I)q~*k34e0yKP` zG+=rWVeb&oL{u_pauH$wpy&#(CjO~KguP4gl^zk?iA99{m!c+lQSP)N!etkn4E4#G zR77|YK~I6Es0%x4N)h2`HQ6C0Pfio`UYIZ#>anv++?;icnqfrv7)m%5sz^}6z$rt7 zkE1lxILmji7D^IslZfz%1iv>XK|y)sn>IxFBuc&ym{d@5-^3xp_afMRb5zGj@2U0? zzBi@WFMoB^kRO9_ zMv=;Rq#{fCQk&JQvMeV$)o^xjKnVh9W3wmuv0%V_1-O!jSKoqK%2$GSb#<(1^3S() z^dg(L@>OO0INnCN9z@Q;9RHr#*xK1-^9~i)3F_eDPWo%XH3<+9JSM1Ypv4-#mIw=# z7(99%VUs;%CgvhJ&iO_7Nd#7lzjB=s;Tvt%ps273ALd0kRJyt9LqCDl!ITqBWIchj zd0bKXWC%Q#K!zqKZScou`l{3F$1G%~!z`1!voAfeMaLaE{Fus^E4C z*4yk575pd#8*Fx{3Z72Exi&jY1wT%~c{V#-1wX;rstvxiE5h$Vu2m7f%VtNbGT%qJ zHrebL6?~9_%{FUP!G|b#EIBL4X|dT-74aPkt|aF;j5fJRF~Yw`;Z|~1AwTR$jPM`Y zY?(^&KlHsVCy!CpviVO`3q0-PF)Ff@{|wq9*-Ci}GTlmdB|sg?rUaP3!;sqt`zYUb za#oXbJUJcYbdu9W&Kh#03f)a_Cy*n@{(5@bK+cKe$btS5dg~!)BRNrWHj&dyj?67a zZ*sVArndod;^dr6&K7b8$r&OiL5>{8!}N9vIdT|FL6)JQ9L8JeZ5ugq81FzIcPiPG zhT#EYL}q>}fykkK8ohmt967Ylptm#0kwg0|dOMq(PmpsCIp>n|Npj?f{4~9NhMe=r z`7Al-lk+)pE+9vayo>1V^Wu*>Hq|WA3r!;tWg=^PhcB780xhraN62V!A zSxrqJ1HtZB9Nk8&72Q;+6MQ8m10zc8Q@@<9X5^^LfC3|dInmbzKHe zPNMRD1f3F@N~E^fh~dSb5m9L8q{F)w7YtLg2)evEtvRAs^bvB{2bZ%ZD8*tkXEOr_ zY=GstRK(HwokA(Q^%66CMS`t)_@)PCNSA0Rx^_Ncr4WBpk$v3ClY=!!CKJ<|E2yXPRnP20GTh5M}8M-co z#ddf5;vzF+T~V9Q7Z+lQL0sfwpI4Jfs!C%#`fU7~6sW8NVT((}B{X8bfZD3U&8tZy zGx2`3Rf&4B#T8h^01V8y6a6raWG*XHV0gF1mlWieVJjV7RadjHMX4(CwbW-dL5TF6 zC3I8fGESxqUpQrFT2N@r5}`JPKq3*ff+skp;PZ5ZaW&?4lcVameIEOruYUC_%?JeCx54hKWSe6$R5!-znJ60Eun=>Z1I?Ql*;p+QEV=| zzPp2*&^}IRpD?P4d*0+lMi^zzt1W(@8t6&ReB4TBpGWV|P?Xz`D7XJXyMqhKR{k-y z@=r$b)tt2oAP`~wDPhHg$mIYrvim@HDN!%Bc$RD#&xq%Ydg6}%fn`|xlS`eLL`9qr zw)lm3k)VGGj5TC;FqS;`GrAV6oDH40VzI-yl^!bVlp5TDfceKVGg%MTg{SzmM_t3( zwGsAsgqKA)3~UxUSVa5|CBci_dK?jdKpoUI(-H9}kZpKyBpnfdhK{pXt$QnLNX=0Z z@dhvq!44|k0!zyzwTc`OZ$ppPH*`nDJFw$EAh}kH+F0ai8D4%Xj&b+*Bagw{bSYuF(5 zA|WngPi(GtHMxidTjIeQN4}Y-Rj07ciqI~>U|S0m=7nlSKj&pEv{?aLE`6I7BG#cnjpW$ctiu)RBYcgdVu20Y#y*0O__TE~N7;?Je&f>PV+L}#};tS)Q_^Z?tE z5)`Ww%}LxdEl(GfT9}r|TSe4bfP`pEW)y^@gp^vCpO%AbuEK?~IC5ZH>!H6|>#Pl< zc!iG{om6ghTbL-8b?!*uyaE>WAqtf2s*ty0IyLH|tEEw=R@~LvCjTNue<@ejd7@Ls z*a29RFJc(@>{z^Ep9y9Qf_9lmAA3xsj~yn`$Nm!OV|R)4vA0C}*jXZd>?@Hzc9lpU zdrG8_9VODoeiG?pH;MGImqhy5Ng{phBauFKkw_nVNTiP)B+|!54(VeXhxDrr|(#PHj>0{@F^s#S3`q(ugee9XQYVF>%c!VYTjrc|(EZ-O* zEMpiUtYH`-EIt?^tUVYZEIk+@tUMSYEIb$?tUDMXEISw>tU4GWEE50$uEDdhxEZY3xhRSFPX@oGxbVKDN zV!aT_D6MF{kH@IWuR>Svg}qku&C8iuttc2j`(5=r`&I z=jV*MAZN@)Ib$x)8FOjQn9Fj;T#+;8N{acitj{&5kA9>2T$eNE`kXO0=8U;HXUtc- z>+WISK;E~@Qrt;--`#yXF=k-z8jg4ig;_Pb;(POFRs7&yhGjsP zbByL8vn!qg&`-jEHg(Ugcp5-I3j^u{&@%vfHVmjAK+gf_g)pE20KEvHUxopl44{_) z^s6wSK>)o1px=Z6B>?m)fPNPSGz_5M1L%)oKq&zI2|#}i1IhsCbpX8?2DBAGZvp7- zFre)K`YV9`76x=Gfc_4ke}(~_2B3cd=-**LrvvCe0D3PB=*;ffn2gS!Rmnvd*jWT- z5m<2;*e3|Aguo(UVCQz5!)Xc)81aTPobV=xlN>r7*neEaR%1`=@vMz?urzjYU(UMN zgKQ0Zg{|eZFMBq&{0@oMqvAdfn7#m`x4mnFt95KY<~hfAPnrv?8f9voW{f(aYQZ~vl^_phz(*h z@(`Lb!FI4DyM_&e8=k^mXDL1z&C7YU+c?BGX?^?qx^WJqvK*w#l0y=q$OjYH%rLO) zsb;kV2EH$OZ6LNA32Zij)rW!IOkfQJHZKh9tJ!oyO{J(p9iNc$LeXgo#8VMF4Rrb# z=!8F%gvh#voeA2^=L?kFD7jqHk`>P<+VHl0cJagS;79J_M_qx7_kVu21Wq0uQo7h~ytey|&_y9neOl9@O_ny9kckSXQ zAYmn6e-m4XG#e=4iSsM@N8tAaAs~uZ@~EPfS<<2tRY`kgS?o$4qw*IutFN2o*J;2y zFn<@{atCj^mt$Lq1UXQF47(twWPvaRl6FBdqd}}+D3Gl#$TkIXq??g-p90z8f}EO# zJ`X25(L!xB$2|Js=j_&ew_kpeFh27 zzn5PiB&ozdRQyFUz60@}rv|&2oJ**+Zq)r^i|j#P(9PW|Tg&NTs+*L^#=k_T2mkSM0vCne+x1$nItc^yGs82~w5L0&H*|Bc*l zAjr%7kY+!h1DG4B;x`2V>SQN;@x5pKo%~`XxS3MjLe5tMlH&8%DDGBrz8(Nj$-k-T zsptx@+X(h{a_$I7APYl1p2p6-{O%$Qpq-WcUis>dVWJn;?SH>ZuLlU<6@DrZBzs-a z>sv15w+Zs10LaG_OskOial-Hf z(0w2N4=C_tD7s4iqX4ve{68hpQm6m1uhTPY&My8_*-@Xl4a`DXUn8&^?j$#kt zd03p!9u;3?kKy@_*vTFjkFh84d=I9SABfl4lX!k;jX^(}%AUgWV{0+{38qX>TNmS) z#$)VfMHAW2i>9+@@jO?wh`ms>g1w067ez7lQc;S%jOSNH-(l==mAm|q3}>H$LnF;GgqL^5l2X4J4U#RTUR5ArQtG!^ShA$l@3OFDNvYpwVabwGf5^g8pp^O}5{5~s zKT(6dM$Vt9wLVZO^*UiJNJ_mykOfJpHwm&JDfJdX=8;l=p^Cp90I0ccu$1~MrFw^) zzXc@4=f6|jKgjuK06>70`WL~zOU}Oo66isw1wPGHhC63~= z@yrqD^9Jm?nu}+i*vS`&$M`}#hlpSC!^G?Sa6Cs?WB4L#DqoCeiM5y?Wu^Gh*2Vl7 z>oML~G?6bWn$DNwX)0R8k1blkSKw(Wit*!$QoI$L&D(vU$JJR^`&+aRH~YI>Ix8b=RQtD1fsJrmo z4Jow~5^5Kodm*LnhlF|n&x4Rs--d*G2+zZiQjbmGVu4tQ*(#Qq+2^nkgO;sMgvGCI zmpH8MesRRQq6hgi>#SLw#Sg;Rhizr+JJ%JFyHhN7%>ou+6x{62q6f;?Srzx~635&j zmSaM^ORQ+8HLzWxb(dHz=f+$vrOCN5+u+QN*#>dE=#Xn%8$>7O#=_c&vfwbg=n`vm z3Af-H5?UEMf=W1h-R_iemsqFGqh|Jpx!E7)W`CHRntR!=7aMf;Ct+U*nTro0lj!bc z-ec5UE=S-nsAHL3sIs;;0yUdZMAu>H3=hG=1+Def*4-mEA;TM4q;8k!zwHh&&^qgJ zHeP*BtZThf49vPmoFX$})_MpOedw0t-fga7Vz-(^L&b=R%KQYV%->C32e zDUsIcDs=%$>t+E|u23>-BM=e#jN5beMyn8E#-TtXb+cyQE4CN0QAl^VWSjE} zSU^JeT=x+F!kzpnge*7oU4&r#&~XoUSNz8fe58e1W ztNlRN1Q+T$e|}#P*X#Uf>4TVDIlAebX+=B5O@4egi(7&!d8;4a*Tpvi%742b=#Jo` z-Q|b6JFu3!{H3}ZYp04{l^ANo0!!=m-*2b5-w*bHc+dq?D_a=2vv-Pz{8>JX_04SR zZ}I~@A|BO1StR@JXvoJkBrT;<;UYxbo#K0bxbFwn^oRZ`JR*J+ScRwjxbDWSyQ&Hm z;3mX-O6vCCDV`pU?5Baql#SNfh-B2!e$Lmr$P~ks9sBuPDc;%$hoD{%FKQ^W&%R^= zmD5gf1ypBEJh`sozDn_%&bo?+E5)nu9;p<+h4;Nm@q2hrDer0JJ)^wml=q_Y zUQ*sG%6nCLzgOO$l=r&w-csIQmG^h${Y!cOkskP)_ATv~Xun+hW3@j)`<2?CqWx*w z-&gzlYyUv)AFTaa?L$dKJ+XeN{pL#XM+&d56t9tgybf=u6t7eGMD6$J?*o!@LXIe{!0EO8vj+=zgqj(Y5xZ8-&iUBM({W3 z@XeLt9~8c&Qv8ejuj=n#)8)RkQv92~e_emSty27#!nf=C-l4xgp#5)aAKgOM|507O z$MpBd_4g;V{{tQWq>lfwuHTC~{0p7WFLn4Oo$h7r|4M&Hcan7dwf29bee^H+{kPix zo%Ye;l|Bu>750rF$O_%G>l@_D=zOMZ@wEw2|-_rhHG+p1;VRTwa*LO5s|E9mA z7fZVQL(}!2`a8O{r0cu7zW>(W|D*l?YX3czUZCGoy9=(q3!%ST+Aq@a#X7!3)lWne zy+oPHN0jUE7@f}6KE@68YcWoz8?SwgBchv_sQn758sme;uw;bQK3Ex{7N3{Xkvr8bw!ekp6zKqN|vp>pN3_ z$9R_YLlLAuOQ)Z$%Qr`tuU>!0c&By~b9MYY9Y3GyXR_&XIwyp-q%!PPY0-q^ zxVl|d>HSuj)bw{+wkZS3={855Y@y<{Y~~%-xbL!waPP4y9zwd~9%mK1tVze+Z%tTN zx6|6|PHSAXXCmnt*TvC&AL0S>Aoa%2c6E^NHRkw zsZ~j4_>$1=1=&ev>m+kjlG(l_bO}dxlDRs`e3fLbF9}^inVsYio#Zf;@Yh?n@+M?C22F0MCeG7PI54M5ltT|(CgOR)_T9yy>8Y$)`>f diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml index bb5c3944e..fd1ec8de6 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml @@ -30,7 +30,6 @@ acquisitions_common."acquisitionmethod" AS acquisitions_common_acquisitionmethod, acquisitions_common."acquisitionauthorizerdate" AS acquisitions_common_acquisitionauthorizerdate, acquisitions_common."acquisitionauthorizer" AS acquisitions_common_acquisitionauthorizer, - acquisitions_common."accessiondate" AS acquisitions_common_accessiondate, acquisitions_common."acquisitionreason" AS acquisitions_common_acquisitionreason FROM "public"."acquisitions_common" acquisitions_common INNER JOIN "public"."hierarchy" hierarchy ON acquisitions_common."id" = hierarchy."id" @@ -45,7 +44,6 @@ $P!{where_clause}]]> - @@ -53,28 +51,21 @@ $P!{where_clause}]]> <band height="102" splitType="Stretch"> <frame> - <reportElement mode="Opaque" x="0" y="0" width="721" height="66" backcolor="#FFFFFF"/> + <reportElement mode="Opaque" x="0" y="0" width="797" height="76" backcolor="#FFFFFF"/> <staticText> - <reportElement style="SubTitle" x="370" y="37" width="316" height="29"/> + <reportElement style="SubTitle" x="458" y="0" width="339" height="29"/> <textElement textAlignment="Right"> <font fontName="DejaVu Sans" size="22" isBold="false"/> </textElement> <text><![CDATA[Acquisitions]]></text> </staticText> <image> - <reportElement x="11" y="2" width="366" height="61"/> + <reportElement x="0" y="0" width="349" height="67"/> <imageExpression class="java.lang.String"><![CDATA["http://www.collectionspace.org/sites/all/themes/CStheme/images/CSpaceLogo.png"]]></imageExpression> </image> </frame> <frame> - <reportElement mode="Opaque" x="0" y="70" width="721" height="32" forecolor="#000000" backcolor="#66FFFF"/> - <textField pattern="EEEEE dd MMMMM yyyy"> - <reportElement x="553" y="12" width="144" height="20" forecolor="#FFFFFF"/> - <textElement textAlignment="Right"> - <font fontName="DejaVu Sans" size="12"/> - </textElement> - <textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date()]]></textFieldExpression> - </textField> + <reportElement mode="Opaque" x="0" y="76" width="802" height="14" forecolor="#000000" backcolor="#66FFFF"/> </frame> </band> @@ -82,44 +73,44 @@ $P!{where_clause}]]> - + - + - + - + - + - + - + - + - + @@ -133,7 +124,7 @@ $P!{where_clause}]]> - + @@ -146,14 +137,14 @@ $P!{where_clause}]]> - - + + - + @@ -164,14 +155,14 @@ $P!{where_clause}]]> $F{acquisitions_common_acquisitionauthorizer}.length()-1).replaceAll("[+]"," ")]]> - + - + @@ -213,7 +204,7 @@ $P!{where_clause}]]> - + -- 2.47.3