From 9b217116dc070960844df636869ad96efd33f7dc Mon Sep 17 00:00:00 2001 From: vkovtun <viktor.kovtun@id.ethz.ch> Date: Fri, 31 Mar 2023 12:49:10 +0200 Subject: [PATCH] SSDM-13256: Added missing column for sample. --- .../export/helper/XLSSampleExportHelper.java | 7 ++++++- .../xls/export/resources/export-sample.xlsx | Bin 6445 -> 6563 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java index 132f721c24a..83cab69d25e 100644 --- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java +++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java @@ -24,6 +24,7 @@ import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.IDENTIFIER import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.MODIFICATION_DATE; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.MODIFIER; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.PARENTS; +import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.PERM_ID; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.PROJECT; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.REGISTRATION_DATE; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.REGISTRATOR; @@ -85,7 +86,7 @@ public class XLSSampleExportHelper extends AbstractXLSEntityExportHelper<Sample, @Override protected Attribute[] getAttributes(final Sample entity) { - return new Attribute[] { $, IDENTIFIER, CODE, SPACE, PROJECT, EXPERIMENT, AUTO_GENERATE_CODE, PARENTS, CHILDREN, + return new Attribute[] { $, PERM_ID, IDENTIFIER, CODE, SPACE, PROJECT, EXPERIMENT, AUTO_GENERATE_CODE, PARENTS, CHILDREN, REGISTRATOR, REGISTRATION_DATE, MODIFIER, MODIFICATION_DATE }; } @@ -112,6 +113,10 @@ public class XLSSampleExportHelper extends AbstractXLSEntityExportHelper<Sample, { switch (attribute) { + case PERM_ID: + { + return sample.getPermId().getPermId(); + } case IDENTIFIER: { return sample.getIdentifier().getIdentifier(); diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample.xlsx index ce75bbec3c14d1568bf9c66eb80feed5d1e4807c..cf696b0adfd950f3df1e40c21cbb752f665005e2 100644 GIT binary patch delta 3463 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 Fe*yD{FX;dP delta 3283 zcmZ`*2T&7Ax27l|(t8s`LTEvZ^d<%nl-_#@y@cKk8iI1^p(P=gF48W7(t;ozq)3sA zbU}JYI)aF_A9*wP{rAnhojG&Po;iEw?0&o7o_vY7;xzhN<ky%<C@CpPPJ^CR((sd# zUuvQxsTA3j;Yt3S{I`MIrGTKV0y1Tp!)D=aySCdhAvZ&YtS7y30z~&(i4%2LVmgUK z<fe7lnWl=}XM>vqx>-t+zCUGW>z=LI^?lb%GI95$cc-$xm0q@-Mo}V>#dbKIa=fv6 z9Ni&lnK6d6T;SwR*DIEKaOXVjft~+s8GRl_fPU?xmAIjme6QMx8z$~(k9msG&0a>F zNZ}@aYQjrZKO;V~Wa!6D!K%{g;{LzeA5|sMHCnTB$ahZEt4M8S(Hj@xBWKIvinf~W zuRJ~O)A-eDxV6X;`DD_D<Ft-+*Nlau?T)P>q&=0I#zl_kic`E5dvu{#cUvpSXjd26 zL=^cd*e3!$+E^j~K3$=So@RAce);gjii6lGoXODw&zz!_MHIL@T&1>YiJN)F^$;z! zAb%EHp8l%E^X^JbBl6w=)fgR5y7K4!ZpGjSJaF53QULJN?DbH$M<3N2KG3a-b_Au@ zG(ECERf#*zD`p@XRuQ^dcH4nsEmi)|!o<6$5$4mO<igvgqTN*0=z<8XjG38SMrY>b z#gnqJYA1dfz0o^j0Dzoj(FS&(o}F8u3DwT0B<^85h^_0O`Ab&Wxko}O0pr+m@4~>2 zbAa7U#=^2nzAjNh{^GW`+1tiEwsj`k_^R&G)A{<&pE;TD;n7DLPHm8>f>UL@L7IB+ z8?NdEm!~t+i0X@8bdIN07k5(9$ygTEV1;*|W`)S9n1B6(pT(<<E^o$Y)ogRKW<J}1 z;B<?Z7I%LISfHj-kIB6Bdp`4JRVEzoR1pOa;^iRjkn`2fJHtiGTR2@}kd_~K@f&Bg z$o|byOUpKk!X#1kAGO7uvjnABib})218c}05;a2@!r^n!QR2IAcDFcCJ!>0S3?0^q zSD2i;5FNv>+QW`uZ<?dWq&Q&$F#vZbQ4U9LM<+Fan-iZflMU#8A8;neUqIMZzPH2Q z)kkk#{!D((?XfFil_xyF{AqQ(o&yq~F%lnTd_UWtsV|APmFrleg}TSFXA_gY*bW7N zT&CkjB+y@{W7cO54Ku`6u03FX2va!s=A^+pd{Se58K?>6e)e&ViQ$E$#gD9{flX5k zWpF^>o6JawS{X%^*q>9kJD7ZkLect7Hm|w}7b~wqd5z70?^FXJ*JZMbql`v<$2e4y zvs)kyGJ5@N2JiDn8r>1D+<aty6g$(AuxpG-Du?J)G1x<>TGq8(+&r`24Tcm$`k0u% zV!qR+VCZ|8_pbA~7<HI+FNh3$l%aVzxcrhcW@vVYGsbW{o>rVo760LU?RHaRxpDhD zglsc@WV<_1PF!b%wfShDxwq35PvlD-pwAomv1HQmI!b-?>qbge2)*>giDp;|!ON>9 zYEA<k!ZIC(OO9n_UOs>Am;d;vp)27pw<EIpJ?1TO)F1k{=Ba+g%v#;rD_w-lB$k(H zf!g_hEH#-8EsY`x#ox81vPz<eOOZ(Fr{hTJh<Zc7<YwgaE;wekmTtl1+0o-+*hsp- z?S`lfio7y$&KUVIey4HkOJ`frZ8Drrv;q22CT;%T(%kCY-i$<#dK&~ZXJPeYIEOlK zg*7>q)lz|1Rd0fqQNnhpPSTWWW6_b%eEtZzNdc#Jafxw6tZ_O5T3KR5BVZ8u?FI5n zrT~OIx#;8<X7ipxbiv;#^5CGv*0d4XeQuL1)tZ~eA#~g)fUfm9&o`1s;KHq6_#iZU zAu^ZPEdM9Jiy_@%q1GZmL??n&bJ(smbae{^VVA_G)+W7?Obox2+&7ZW2PPIsebcg1 zv36_I9Cgzft*XhxJ?S5`_nc5dkc#lOq&6k<*4$e{5E_bZ%?MJeG>j`_U_tK<3L59- z9S|e|#Cs`15FHLj6H`a+w@=Z>OW1uW>^>YjQs%=)3wlkWDPjO-X|?=htfBls-;k3! z8BamZ&$0;;zO2Q#BB|iAmP^Sk$jv9AZY6o#8-X2qHZk|Yhih|?EuTgh5jq-kKiDzS z@O&{mSif&NxZU*K6tDa<biBqM#v_9uSX>l?Y2KRVRf(szt!O~gto7liSTOIIzt$(R z^d;CLwf#VeX*E9goE^3YOdV>|UPhK>zAsxmPFa;BZE%gfHwv$c*4YVilyr~i*4e|< zpT!Oqm3^V!2~l5OuV6uNPIa;{Y|4cdqs#PBomEbHtitBlh4CAYTq1yAcV&w?=ZxuF z<HtKD%F$;*AVKuH8%ROb8TkToPK+k(sEy<Da-^^0?$f<3Um3&B7r{^=4JBFeWbDXF z>#Df%gGSyh0s;zOKAv!CuoPX99ca*bB9J_IPhnFrcxC>Hc9(ASEJpO4Twe=73H>SN z@`-|kB!rKI<X>N+Dak*BXirOh^*!Qz=>*XRKABMZkF!U@qI#27h{siLdnrvc-MC`0 zC7)NjBeWKPo-PU|`&%0V7A9My-19(aOT)$S=|_S06XPt%>t26gjlRK=_;68U;UyPM z_<lp16u8UZVqa4uZHSyblqn2|sqBc<lqj_F$OJkTeNpM}Pes7$WjqQ!yr=VLpy*+@ zxxxvuFZB+p11D_=F@A95q=rJ__^j}R#$E_u(A{ox7z*X1PUK@6-u>X-AWCrn`3%jx zuLSmM^<=LIc|)@tWJFpSO`(6P*qqtKFBfNn=Y4BV^;t;K5L_0ui6T)`az6yzh<8{- zkz0<GIawphxDmb*U*k#wWp9K<p%b8{0j0iPCv(|qJy}-Pt~}Y%gOGq1@rjJW<$k;h zncprp)Y^)91E8!3X8D7t{O2;9KY8}hx>5N(PcU&rJ74u*^t%nfPxk#GEV`h+KL?0U zrxKI5zs=^xTH>tU0kYaGvI<H?|NgEP`m&N}+2y?`843fp;$EhPj*PilqA$En2gNlO zgy5pXO6z&iYU1$Y+2&s}<)%(C9)$|IHK=cL=*OjEMRh_ePIlP3>_nerD>V-)zf3<s zP5-#pMv#U=V)V6j6En8VK!>D4ltcPS3vl)ld;n#fuVdF3DG3QT@c+LIxc3bF=mSSj z(4;)@v#vI8C9va8!8WTKPH3<B{JwiFfs{$+r0Gvrg&$Aq%X{sp#x&jv@NcW}lYj%o zMiDB6cnev+=c;A?wutLY{v?lzCPvNK1*#(jOKHsUb7VdRH<?^i#$uujzIAYlY=_#u zQnYZh@;i8KW6<6y2q)FabAv%(=$wG1YH4bn)yKMox;4@ME<%E`m=Iq7xyqwOTkV#2 zlr{crw<JHMS7Dz(eGMkD*`Yg5f>T?;O*WH{Q5W}6*$)(D@}mq#;oxwmMI(^5`5Yy3 zj^<0Hbzfsa$Wc5;4^~LygAj0Wp0D11J*IR0Yub4zoQucNi&)2Os$gS>-Zf`7gjEFE zZ3t%PnXb<LkxFsqK#V#i{n@yLc(-TO4U6nsRUcA54Aa{7-M;%OIeC_+@#FP3UPO8O zi-Ghg15SZ_HATC#+YLN9{S%y$sdqe`QOOolJ|)4(>6)*N=<wD>ZJPy0y!i(P@Ad~~ z87R`<@Pw&X^rJ4}*`p`>KltEWnV{&eLDa7#-G-}~hJx2Vdz%p6Ckw+h4UNyw$lO{v zP8ROouYp%(RQLXvi>NMAGcm}crmj`V@QQD)KYI4Oiawn|+k*U#JPZc;1ygDYn#=zq z8T<lxXR>pRzz%38?^j8g6bPc&kct;RwDOEr_J2ZrHe$zD*5{vSA7^(hX37Q~zNT%x zz1XC0f4tXRu}&+tC$tVz=;YIXQEu-FGRhu-m3}mCaa!t>1Ixv0FxC?u@F?jj>;??- zm%DnncfG!_{d9uFO;aDNN5khBWR^FB@S00fZM793WWZR4sh(Q;rsOUh^iu?KcEw!G z_O({WmmHOOc_P1=3;0hrkIQBry=vlvSPK4!w{EgYUp4b4Z1Ptc%O*>E+1#7{FZ<!X zu*vfNcIoXNhYnq)1z(;q=RXwq+c>1bLD_|_g8uuVF#juvjt+;WW5p%1Q{VcX?H|Z4 zvoZWDP!Lzg&U=;Yzc)hvub4$f+%Y@PRmGefT%?>hX%4=tnH2{Y**-Jw2?v<sPuAZ{ F{sXdY^w0nR -- GitLab