From 3f669e84aab86a04fd63f8eceef713d2d1106dce Mon Sep 17 00:00:00 2001 From: hms243 Date: Fri, 9 Dec 2022 11:48:32 -0500 Subject: [PATCH 1/4] [BI-1613] Update TAF to include term type --- src/features/OntologyImportBreeder.feature | 7 ++++++- .../OntologyTermCreateGeneralBehavior.feature | 11 +++++++---- ...TermCreateMethodScaleClassBehavior.feature | 5 +++-- src/files/TraitImport/test_import-csv.csv | 12 ++++++------ src/files/TraitImport/test_import-xls.xls | Bin 29696 -> 29696 bytes src/files/TraitImport/test_import-xlsx.xlsx | Bin 15220 -> 15059 bytes src/files/TraitImport/test_traits_2.xlsx | Bin 17193 -> 17504 bytes .../test_traits_case_insensitivity.xlsx | Bin 17401 -> 17709 bytes src/files/TraitImport/test_traits_dupCol.xlsx | Bin 17553 -> 17835 bytes .../test_traits_dupTraitNames.xlsx | Bin 17256 -> 17544 bytes .../test_traits_exceedsCharLen.xlsx | Bin 17595 -> 17881 bytes .../TraitImport/test_traits_extraCols.xlsx | Bin 17423 -> 17708 bytes .../test_traits_invalidFields.xlsx | Bin 17193 -> 17507 bytes src/files/TraitImport/test_traits_maxMin.xlsx | Bin 18654 -> 19076 bytes .../TraitImport/test_traits_missingCol.xlsx | Bin 17473 -> 17759 bytes .../test_traits_missingFormula.xlsx | Bin 17203 -> 17509 bytes .../test_traits_missingReqFields.xlsx | Bin 17576 -> 17848 bytes .../test_traits_missingScaleCat.xlsx | Bin 17814 -> 18114 bytes .../TraitImport/test_traits_missingUnit.xlsx | Bin 16764 -> 17079 bytes 19 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/features/OntologyImportBreeder.feature b/src/features/OntologyImportBreeder.feature index 4ac93860a..e0eea67fb 100644 --- a/src/features/OntologyImportBreeder.feature +++ b/src/features/OntologyImportBreeder.feature @@ -35,6 +35,7 @@ Feature: Ontology Import (10 Scenarios) And user can see "Abort" button And user see a list of ontology terms in a table And user can see "Name" column header + And user can see "Term Type" column header And user can see "Trait" column header And user can see "Method" column header And user can see "Scale Class" column header @@ -80,6 +81,7 @@ Feature: Ontology Import (10 Scenarios) Then user can see banner contains "Imported ontology terms have been added to Snacks." And user can see Ontology table And user can see "Name" column header + And user can see "Term Type" column header And user can see "Trait" column header And user can see "Method" column header And user can see "Scale Class" column header @@ -94,6 +96,7 @@ Feature: Ontology Import (10 Scenarios) Then user can see banner contains "Imported ontology terms have been added to Snacks." And user can see Ontology table And user can see "Name" column header + And user can see "Term Type" column header And user can see "Trait" column header And user can see "Method" column header And user can see "Scale Class" column header @@ -117,6 +120,7 @@ Feature: Ontology Import (10 Scenarios) Then user can see banner contains "Imported ontology terms have been added to Snacks." And user can see Ontology table And user can see "Name" column header + And user can see "Term Type" column header And user can see "Trait" column header And user can see "Method" column header And user can see "Scale Class" column header @@ -195,8 +199,9 @@ Feature: Ontology Import (10 Scenarios) Then user can see "4" row "2" "Method Description" field "Method description exceeds 30 character limit" message @BI-1273 - Scenario: Import Traits - invalid method and scale classes + Scenario: Import Traits - invalid method and scale classes and term type And user uploads "test_traits_invalidFields.xlsx" file And user selects 'Import' button Then user can see "2" row "1" "Method class" field "Invalid method class value" message Then user can see "3" row "2" "Scale class" field "Invalid scale class value" message + Then user can see "3" row "3" "Term Type" field "Invalid term type" message diff --git a/src/features/OntologyTermCreateGeneralBehavior.feature b/src/features/OntologyTermCreateGeneralBehavior.feature index 7ddc46f65..23cf7a61a 100644 --- a/src/features/OntologyTermCreateGeneralBehavior.feature +++ b/src/features/OntologyTermCreateGeneralBehavior.feature @@ -9,6 +9,7 @@ Feature: Ontology Term Create - General Behavior Scenario: Ontology Term Create - New Ontology form elements Given user selects "New Term" button Then user can see 'Ontology Term Name' field on ontology list page + Then user can see 'Term Type" dropdown on ontology list page Then user can see 'Full Name' field on ontology list page Then user can see 'Description' field on ontology list page Then user can see 'Entity' field on ontology list page @@ -30,6 +31,7 @@ Feature: Ontology Term Create - General Behavior @BI-944 Scenario: Ontology Term Create - Trait entity auto-complete behavior, not already in db Given user selects "New Term" button + When user selects "" in 'Term Type' dropdown on ontology list page When user sets "" in 'Name' field on ontology list page When user sets "" in 'Full Name' field on ontology list page When user sets "" in 'Description' field on ontology list page @@ -44,8 +46,8 @@ Feature: Ontology Term Create - General Behavior Then user can see "*" as suggested text in 'Entity' field on ontology list page Examples: - | ont_term_name | trait_description | new_entity | trait_attribute | method_description | - | * | TestTraitDesc * | NewEntity * | TestAttribute * | TestMethDesc * | + | term_type | ont_term_name | trait_description | new_entity | trait_attribute | method_description | + | germplasm passport | * | TestTraitDesc * | NewEntity * | TestAttribute * | TestMethDesc * | @BI-945 Scenario: Ontology Term Create - Synonyms @@ -90,6 +92,7 @@ Feature: Ontology Term Create - General Behavior Scenario: Ontology Term Create - Enter Values, Save Given user selects 'New Term' button on ontology list page Given user sets "" in 'Name' field on ontology list page + And user selects "" in 'Term Type' dropdown on ontology list page And user sets "" in 'Description' field on ontology list page And user sets "" in 'Entity' field on ontology list page And user sets "" in 'Attribute' field on ontology list page @@ -104,8 +107,8 @@ Feature: Ontology Term Create - General Behavior Then user can see "Date" in 'Scale Class' column on ontology list page Examples: - | ont_term_name | trait_description | trait_entity | trait_attribute | method_description | - | * | Testtraitdesc * | TestTraitEntity * | TestAttribute * | TestMethDesc * | + | term_type | ont_term_name | trait_description | trait_entity | trait_attribute | method_description | + | germplasm passport | * | Testtraitdesc * | TestTraitEntity * | TestAttribute * | TestMethDesc * | @BI-1310 Scenario: Ontology Term Create - Trait = Entity + Attribute diff --git a/src/features/OntologyTermCreateMethodScaleClassBehavior.feature b/src/features/OntologyTermCreateMethodScaleClassBehavior.feature index 95ce2f3ff..6efbb1814 100644 --- a/src/features/OntologyTermCreateMethodScaleClassBehavior.feature +++ b/src/features/OntologyTermCreateMethodScaleClassBehavior.feature @@ -224,6 +224,7 @@ Feature: Ontology Term Create - Method & Scale Class Behavior Scenario: scale class Ordinal - values post save BI-1258 Given user selects 'New Term' button on ontology list page Given user sets "" in 'Name' field on ontology list page + And user selects "" in 'Term Type' dropdown on ontology list page And user sets "" in 'Description' field on ontology list page And user sets "" in 'Entity' field on ontology list page And user sets "" in 'Attribute' field on ontology list page @@ -245,8 +246,8 @@ Feature: Ontology Term Create - Method & Scale Class Behavior And user can see "" in Ordinal second field of Show Details on ontology list page Examples: - | ont_term_name | trait_description | trait_entity | trait_attribute | method_description | ordinal_value | first scale category | second scale category | - | term* | description* | trait* | traitattribute* | methoddescription* | ordinalvalue* | first* | second* | + | term_type | ont_term_name | trait_description | trait_entity | trait_attribute | method_description | ordinal_value | first scale category | second scale category | + | germplasm attribute | term* | description* | trait* | traitattribute* | methoddescription* | ordinalvalue* | first* | second* | @BI-1329 Scenario: scale class Nominal - values post save diff --git a/src/files/TraitImport/test_import-csv.csv b/src/files/TraitImport/test_import-csv.csv index 6a3badcf7..eff7a816c 100644 --- a/src/files/TraitImport/test_import-csv.csv +++ b/src/files/TraitImport/test_import-csv.csv @@ -1,6 +1,6 @@ -Name,Full Name,Description,Synonyms,Status,Tags,Trait Entity,Trait Attribute,Method Description,Method Class,Method Formula,Scale Class,Units,Scale Decimal Places,Scale Lower Limit,Scale Upper Limit,Scale Categories -CanIntCol,Internal color,Color of candy interior under shell.,,Active,,Candy interior,color,color of candy inside,Observation,,Ordinal,,,0,1,0 = white/cream; 1 = light brown; 2 = dark brown -CanIntPea,Peanut presence,Presence of internal peanut.,,Active,,Candy interior,color,is peanut inside,Observation,,Ordinal,,,0,1,0 = peanut absent; 1 = peanut present -FruitFlav,Fruit flavor,Fruit flavor of sample by eating.,,Active,,Package,color,flavor of sample,Observation,,Ordinal,,,0,3,0 = no fruit flavor; 1 = slight fruit flavor; 2 = moderate fruit flavor; 3 = intense fruit flavor -Deformity,Deformity,Presence of deformities.,,Active,,Package,shape,deformities or damage,Observation,,Ordinal,,,0,9,0 = < 10%; 1 = 10%; 2 = 20%; 3 = 30%; 4 = 40%; 5 = 50%; 6 = 60%; 7 = 70%; 8 = 80%; 0 = >90% -Homogenity,Sample homogenity,Observed homogenity in sample shapes.,,Active,,Package,shape,homogeneity of piece sizes,Estimation,,Ordinal,,,1,5,1 = 0% homogeneity; 2 = 25% homogeneous; 3 = 50% homogeneous; 4 = 75% homogeneous; 5 = 100% homogeneity +Name,Full Name,Description,Synonyms,Status,Tags,Trait Entity,Trait Attribute,Method Description,Method Class,Method Formula,Scale Class,Units,Scale Decimal Places,Scale Lower Limit,Scale Upper Limit,Scale Categories,Term Type +CanIntCol,Internal color,Color of candy interior under shell.,,Active,,Candy interior,color,color of candy inside,Observation,,Ordinal,,,0,1,0 = white/cream; 1 = light brown; 2 = dark brown, +CanIntPea,Peanut presence,Presence of internal peanut.,,Active,,Candy interior,color,is peanut inside,Observation,,Ordinal,,,0,1,0 = peanut absent; 1 = peanut present,phenotype +FruitFlav,Fruit flavor,Fruit flavor of sample by eating.,,Active,,Package,color,flavor of sample,Observation,,Ordinal,,,0,3,0 = no fruit flavor; 1 = slight fruit flavor; 2 = moderate fruit flavor; 3 = intense fruit flavor,germplasm ATTRIBUTE +Deformity,Deformity,Presence of deformities.,,Active,,Package,shape,deformities or damage,Observation,,Ordinal,,,0,9,0 = < 10%; 1 = 10%; 2 = 20%; 3 = 30%; 4 = 40%; 5 = 50%; 6 = 60%; 7 = 70%; 8 = 80%; 0 = >90%, +Homogenity,Sample homogenity,Observed homogenity in sample shapes.,,Active,,Package,shape,homogeneity of piece sizes,Estimation,,Ordinal,,,1,5,1 = 0% homogeneity; 2 = 25% homogeneous; 3 = 50% homogeneous; 4 = 75% homogeneous; 5 = 100% homogeneity,Germplasm Passport diff --git a/src/files/TraitImport/test_import-xls.xls b/src/files/TraitImport/test_import-xls.xls index 074ca38808541b7646cd1a5d1c459a6e0f0b5304..fa53f30f198ea1759e98fb6d3ed9b011ef5e8d28 100644 GIT binary patch delta 4166 zcmZu!2|U#48-M3CGtMy<5k{9Nv9uvMMy^;_k%Snx3X_pY{HAhLtnk~`ky^@zP*bxc zQI1w6?P_bvl_Tj;WdB-Mj{p19wL9%^KF_?*^L^g)d7j_Q_vO9B@m}Ki0mN^>$EQGB z9sfeS14n>%JsL|yaL(uyabA1$qknFGejX2X%uj@Z*<{#?L7{xKX##a}7cPrpNsu7p zP#cP-bv^W8J#bLWp;~V$19Zb3Q9uS3DCk8CB;?SS z;*xL%OruGB(s+_YR9Axf5r-Cy3Tm+^eHz61)Kvd+)6RUJ zR!Q>HavMHtJ3ec?1ub0?n~pE3{c%!kHQMLZvZSC_utbVSQRoA50Lxt_feAne45>IY z@bze+JcDcx-0g0M32NlWBpLA(7Kq2{;`3vN_A98$(cpLjSUZLt(%5Gu1)6w4#j+!^ zj0PvHD;aFIVp%#^B>@>wj@lY%;ABvafwou+<2m$Z35pC3F%T*Mu7QzZOxIXWAk;Y_ zf#DHRP=|FE3~|nGHaCpPa&_Ij$-*rv5LTtlXVjU^<#Hk-qvk;#Ob~I+hhjai1HfgN ztPWiO`r+23^#M>I0Z_IU00De2eAmIl!qaFO0-#6p1%Ph^D;gesa6JISu-xAo126&0 zy=Vihcqv%@CIFO317K(hOBF`x2y8Q8+Yj4Uur)CQz={rl5VlWXd&?YvKj21BvH&>C zKx^z(@eD~pr~Ny;RKgZ+W-5H^g46+!2Pop9h`jM|icmI?zoF3nRyQZk|IQ<|yGJ&+ zXXOVl3|K`)FEjJ{Lln8UHSb)i=vrbj9C#2v?59K8-_>*`geM)r-e%j_p}V_xXA&-mew^wl(NruLke+BV z*FtXkSsFDpagGK~-alm)&rwz>kqb5iu`8t8biY5*A{`waKy0$@d1@3i>e*!o^lb_XH|y%8$u#_?hi z=9X;lowwo^hk@^KWxB2Ix_|%;gosc>8C~8C4n? znarz7$q2ckkQ6)n!0F-A%VI`@9o z;KqR|H>1DT@93N~=$-rf-XHUGCV%svo>;YGes=Jr+K%gUw|eKsF6x+cN|W-sMi<@T zOPDslXkeUfz?+N@T#Ye4>T&GI(u14ZhFwftN(nPDM@yvlC3-8EGV1kA`<^_#>i>G} zH%UuQBe`ltxr7b<`Ko*R_tq0kvIqM;8sz8hSg{9AGozlLj7!X6^li!{)XDzb;&Mzy zUv0}xx$VBmZUx9dv0~iT2~G8MA1B*o)z6O7OqVy%m+Z)Hz1_X3=tP@I7R&1=Q-b=# z^a#h(B%A!{ttQREYhsy0qAy-cfzjRpu4x z+=iT++w6XBU5a~Md1wwOHmi*@YFfRDoS!``9#enXZJj>#YNeIONRuPgKI~0=EKT#+ zp<7;4eHz_Q)TdRR^4cG9%$BxOCk8D?fXY4 zX?*)BB>snvYxBxM6Xma;aB6%mF-}|w7~9CIjT`DwN{MKi#pTAO(Z&^*kiSo;q%A(1_wRP7LYvk0L3Vza8tEisJ zxVt6hq4A;>9FF+GwC|bK(}^Wfd1n?Y%|w@+SRL>SvS0mhzWvMh_xSEtnjb7N?%y+2 z*BSmg;z8DiWt+?X+InSCN`$1_nYdY@!M3wK+pg*Mwp8M_kB6o4S8#u5A5*-4QLGYe z%{DT;=bz}&VSLH2?~%b> zdjCoNQxZI6&6(eMZbf39k1FmyC|k8dj}mM<26)^0NKTT2EUg+_pI2aN5e%c)QE&l5C_m@t|IldUMtI8kxqpUELsL zFkWBk&$vRgX-)77+VZ-$~ zwuW<|**$60{NQz#RV_Cv8(r^Th%X3UGI;@-YtNb!2%ucb=ANP3oy3|e$@F_+~oOVwU`(B5z#M5|)w8O8{?O5V( z({!!cBIuSC+oF8wln8#qM<&o#G4tB<<(CMP!3=B`cAFO!uht1RY3Cr2GAYCSxJ zUzvI#lJKKCvS<4S?*q5!j#>weQ+v zP0y<1Lym&lW$zD9m$>`%8eZjBvgx(HmkI@P8%)`kjIJY#lO;x^H$K@EXqbHWI|&su zLC-dcQb&``61<7avvb|*Uw8LiLf%*m^}XbXzHsRz>MS*8_2V<$OKlY=XUfg-tpyW{ z4ir>Q?3?IM*pjPIw`wRQcGmfsMem?%mrPK0;BjXs&*8|H@TzMs8YhCT`6Ou0^-R4C zx)#wjB3vUTE7!St(z%j!h>%fgbU4JWH1wO18L}YVU5KN7`LjmDJY4Z7Xei%Z6Mf?$ zgU=90=R6GYkbdIW@-#U}W~^Nx&E1Nsvz_ro9D06x_7Vrk90^Q}G-6Kxl-1C{1j8^v zS)Q)qG!VZ)u`#>Aa|=SmJkT!|xRc_QG#MOPHV!X=7f6^LPISim&gEFIW^bb)W64NeRX4QX&3EeI+WBP{3{0`p+# zAT1b~0$zwenf?^+Xfm1lN`!WaPApy z#?){7r;m+!jo||TFpvlw9pjCB!Og0b!7+M$o1LA-LXAF0ZGNZ)pa}jL6Hv|35O{$} z*+F9AH}DYw7O}vq(wRRdVxZQ6f`eiN1rNmm3JJT**+>FKWAsTq`@2^7$$G*cMcL^q}P$MD% zFA6__A2{eBM4}v7=szwHW1=&%g(!raCK{n{3LLz{G>{IWA%=`72rcHhNB$r(R4gF# zV~jy4@CTkC2x!1pZGo%tAQ}CBEO>{oNfJn(kTB-EMI_Bz3}GCynnd`);fP28x6vTX zFAABTN=A32{Jtag`zkUHg8}RQy9(WQ`scQbgy-EE{Is_Hv>0<%k}$g6HDR?Mo1)%` zKfSTY@F_=;%)l>*!b^atx!}MVbC(q`c0YQX(;zh}%poc<#l%-_LAe01Gc(?>+3W}q z1(V2S?PVA|Qm3sZm>}K-pC)lIIYlr~Y>jF>)kC3Scz#vQ)mOcQJFr_RE04N{>VEPvTS49AL z3$+nE_Z8~_NQU|_)csI*XhFk_0>A-709v6AFaqF(7y#aQDJbYye7~fAXe>y>tB^Ud zo5rw2{e{6qHk>oP6k*sbrn_37l&PWI6|AK%c$W3g!qE7WM^xfuSuDjuC1xQ1`gOE3 zXPYJr8d_UC6h%dAmu)94xEAM*eb*aDsWu{2*D4vBGY(gOq2vxlT+5V=be5qe$9Z6n zW%N38xsKfJ+)blH7U_iR&o#Q2S|{8%So42sXX9NqG;r&`y$fsl@K%a0t#U%N&d#7z z`}AA+)~O!#p^M&>Zk(IK`4Ml;Qg7-=_oXFr4_0^WFOkjp)Vju-AQtk}$%0}k&DOqP zv8$$EPKlX)cHf>v^&`7%tNEieO6iNoY4WYN4jxXjrYRvk9y!I1O!k$GxH+W%j()JP593*nHVFis@T%&)yg&25++iDOcwu= zChw9&>TqbPpKN^AjkSCAK5ai_5PsPpHc6u)`?ALlLc0uWVyl7AQfbpEXEwJ&iL7X==&Jizd2niGfAF_Y4-G44@{FgL7mkn(l?c5}HJ=|urYT*!ConY} zdndEn|2UHx<5l0vj$H1=_jy?0rE<%H%vDj(8NO#2lg;WRxAz)uLJh0wqnC6v7|UGD zYZeBE-CLrY-rLz2UJ-EaY+-oI+QZK?d&ye@a0e=$$857io+vzu&#+Oo;&<(o5VAg$ zp5@tct-^+&F&$}Qk~SQqT3~Zj%RKv~QjU-3(gvqKjHSY=Ol3amtN7r*&$)FUUso6z z`(pFbAfXL1#|^mri0wgAMummKTT+FXW5mX1XUtEJDrYPs zHRbcqP*!i+``V^YStDgrGDkVr$cYL&;C*Y>g==}k}#<0QvdP%PLgP}a_-j~&i-9+@I@ zrek|hA%MIeK%Mnj3 z-%YQLkGHNAuT)k%SEG_3&`!U8nI)<2SX_3BCj0e}R?Ahlu6{k;#}~UIxZyn zql0DL&E200sKl_FH=_mexhn#lKe&{yF?w?M808b<>hmnuBn+Mq)@tR_K_X-|fHx!MDkadM%x=eo?r7 z!*A@Xq3^@Z-ol}`T8!+oRCfk=kOp_xB%~5-*O#V$Y7t4dB$rqDRvqgjZaa4*R#N7h z@-x=jRm#koBUO_95<$tLF&T6-%QdAvBLl1J9riFw>UQx_qpm#?W;m_a>{jUWOCAnA zYI-5TLnh_is@*Z2LPa~LosPE4u2kY^9X=>$A>9;P^kywiwRh6J{~j~sz)ZJP+j0Eu z7X?RyGU@t9ahM z%?fa6tO$@;CtFbAEM)n@KfAmzLmMW+1J zT;jmKuZJtF7*&C@S`Mv&61ck3L7#a4hOX#EX=go>&RoCb+97$xBWL5zg7(5!L!S$a zC?^{4cbr&mSUc#aMpDbaYZu|Vm>$(f6MxgipIn1$!xsDRalOB{3~_lpn)A%n-N;lh zTJg5Y6NjT^?j;)rCwdwxQiYkfp=x22s)1W|Gn=@7V`B+juH)r)e0c~b>ZQKYQs1S z_YZuyo0>_nTdHh(xG^^X^O=5r-xJZx1*LgK7kw!oKgX>L3U;ja9Z>$_5U9AHPP8$l zeAFMY@7-PKk^dy1>(ZU;l1%Fm$pa-Li`=c!SWfCCJNcsc-{0>dOuIFZx+LvbrX8n) zqQ3+;F^w1WS4qf)v>v)8^1jNXb)!@6Dk<(mJ=)01f@}?@oOdvRq+F@ z{*~PDICf9?V*f+*`VSF<6SV^;zS;+mm8?A3kl)=#P`w& zBLeVPQGnLFeBi$fEoXTd+EDN^v`64&Xv4wF&<5luqyKP>b|gRH4~7W)cgC*!63|66kFtj`R-Ny_p&Cv^1uN);08Wx8R zk>u^l-;D}rtUn9MyY2Og4mx#$Z(uti0HYyd5JPa(dR2?xvvohIpD|UDASBEoUonl0+c-HaV2I5u;+hB z=WY`+9(HXoxbO~tctj)kHY+3ygG0hY==|uDK*ToK8riVtHewVii<5^0@eGwGpb;|h R_w&=?#DzvyA2ccvywRACa{4T18IRZethmYrNZ9y+BQ*LcgSOf#r_HG%@P5O_bkcBnmA zR?I-)p{5FG8XIJpIoQnoQ?ON85R-zY{53QVK^$Mqs93p;)o{3w{0We|K~@-8Pnan6 z8umlt;cEU;%bzXOFp#h0#$=}R5FaqPgs)UoA3lX)k?*!`+%&_9W#tT-&?Zt}La(d^ z^4sNaV)t;O$Mk$G4*LFzmA)zM$ z;#J#v!fy=>&rItu3RJB@ej7em<&E2Txn1}E_{SY_6%s=i!3fDE&>pZKTr(VoYj85V zmCF}>U$;%E-sf+@YKT~n1j6%jE3m&OzfBG@)xsJMmez`0N_qg)O;wH2onYVI*eWLMy3Hsb)x)(tupw<4nQ6J%Z_d1hKC{y$ zB6T;r#1U(^ty_K^ykmiHFvRJvvK;(1H~ST5wv%$^0ykYdj+@wiO*Gmud`*#r{ZnPm zeTA0@E}4BfGQE9;gu-0RrmHu13#kaKn^@9b^4Rt zBZSMg`CL~%U!LHg)aA|fF!6fKQ3`P*o0|k%bZSl(c2oK*Td~QtY zilsHRJ?a^E7NUg}*}BdoG@st9!1#qMH&W+6BwxomXgJuIv(VN0bBt%h4s$Uw)cBv< z)b4Nl2mBzShD@U1jY)Njpn3Gt8;0$G!9|uizA-`RW*MU})8R$Xm8w9V0S4T-iSK*6 z9@&p|AFF6?>{$J4CMojFv3{@K(LB#>81&sUhQCE2&`60SU!}q|MM78e0vdJwPNa)b zqRMBzB-Zr8!AJL#!O!!(%Y?gjCgm4 zcq%HCHs()dX5}bl8Pfo2rbv8{c@jBKKFko##)KwlS8=Pg8{_kb^e=;<(?NmXvB4fO z&!+YMowd@^Gy#yw4AbGSBV5!#$Yg)u9F(pBc-X6WtMAGsR%&=Vh(MYYG=_{RbSD23 z--u1RL%E+r=hv9#Ye(S$Q!MyoTLKt|jHb!a9Kp=_bUP*p%a$9Y8OT`Z4DKZgZ5 zjMLCP1KjX>gf8&|21|O7YDGj{tUh_F!QD5!>D7;}Lnu>|nClTvnAWOzs*@C6~>EzDI!b$|!*=hD_j);6Z zzx_;UgUk*R*99QTc42*);|5OZjTV1Ij@g70(d*3|8qH{x*D$ek-swS_m-b9v6Uijr z(-v#@Um)$XFgl@WYzpdMT}dX(`VZm~*AlUrS0A^3WiS&i8O&*;>nWZ`px%pmU0WR0 zyT3lkVj=}?Vj^cA?#)jMV66*^HMHcXGsb0zOrl0TQ~`i|#LwqS6L=)sak#yK*4yeX zUiHA3sDMZ5Dt*PnYPf9^!&@syH2%nL@!Lct?`Y2(0aEWhY2=-2F#nA)>y{?lMviZ> zMe3(j+&$e*yZ$ijw6nqdp~;&sg^Ve+p4;2`n+}`_noUk*%j@iZ z?ymzXAryYJjA)E@RD>>)D%y{QDkLU6?7hOoJs+z5(xf=PGoK5~7cDLkx6{;e16ST7 zzqyGisI${phYLy;=MW~BQQ1MF=A0j8y)k-zz^WXR1N>x>wC!R621vT)uoq z?uV|M18dZNpR;u>WR8aC=H?cvdCn3+$(2$Q3^=wovHORf7(vseM@I=w9lTGCw?4b5 z`sOoxR9taq-G-x^M9~)MPRn4sTWjOi+X;m_?JszttI3&n)sNg4E5dJ@*2p7kO`wXr zC&{Duo_WwJZS&X;2T9v6=%bI^^)C4lf?|T>aT985(ivL9@;Z@3VEITDyASv_k2`1O ze!u?nOs|#0OF=*)a)xoiM}~rmNro$g`g$8w_z1D{T$&PUgKl#A&gi}=Gato_#S2+uI%|BbdU3&4xQTGq|wu^d^(J) zn$p8OyV|K9R{m+xzbzQ#5eue21<_tW7O@LXK z(N3YL^>WrqYaQ*;mxt&y__ePSKk4lg;xqqRSz+t;gdLS-r*@*)WZBKrP1OwMSj-5) z_Vu+Zzc<1B?c=8XlyG!Ug`n`Wb8CD0l*J=E>q>{9Z%e0FE$OWr!Io9)a#ohf#Ewy? z!1MhsGwEX~$?ntsp>Ml8-AV>@pRtm$#^PHpF#g z2(m|(s`qbRa`=9}RNQHla$M`9+w1yjM_g9jwdF`Me%hEmytCeWna%0$axU@VS+eud z{QkzMw)Y*ec|8}}eDW~a%DoqUQfVW;vJe0c2|0jeGUC^Z+Ag|_$actp21I0gY&H6a zG_Kt5`P#@_TZeaI2+Te_f%3)sV(E!4K}F|+(x}glIy%?WXTB>>&8r!om#{XGjJq_6Z#x+W$&gbLY#rM;8^@%!M_UFdY2kO#{$^{7%P zWU+xpHZ>jNU9FAEEaJ|fv)Fr#a!p}*nyEBy)B!0mt*;+?WvflA-~eo@-Xx0aq`!;m zo2ia9&B~dQ%fwODSe&EM86^TgTiWl1o+=|ciw(8SNbyF?jMs_SRO$^UW&1Ff-;=~_ z*2(-c7HZB)T5-6mL*>MZQfM3KrgUV4mBFe7a3XJ34MOXg9J*wyJF5R|_c2aSCU36k zkP=fzG7Co?19s^o!%@$vKDv>;>X|UvL*I=E$>k z?CTmxov{~99#d4obZ!AoFN{^AR@xmK1J1nh`~8H4bZ zp|`Fb1Ys|}u$tC!2$s}$qTpapc}v?6J`eHSp?aa0fGhle3~>O7x}GoQqz^H6z_9iP z8#v)o^#(Jtr{KRVW8w153gGR-f3-FGM=jlg=5D=|PTAl6D?;EGCns!QGO}m^BUPR0K_r>)#{6At5^*=oX7$((!O=(?;N&It*C8Yy zP{9Tf`NyR%N^+e1QOKH=o97>>eG-)F zk}e$9-Uc&AXa9nQIoW9WmnhB2q7|5OYRsn&=1PX2jQkM#lZA4qg(;0SRX3wM?q>3~ zC>%w4soJY4fW_~6$BG|IZD{ZcscVBqRrl9JWj~gFMRQ5s*zRtek2>L*sW-EaQ=)z3 z)IrIz!$UN$sG%RZwI3=lQBS$_`#$i4j&i}4kaka+arDVvJ|$5n?HLpM-pd4`fkmOXo4{>&aFxro_ zdlin%AuzX59uZV+0&5aFFZ=>QBP(rCLScCNa`^(~}Q>nGv+8 zind$Nh0^^WfvoDy4!ez9rpk^1(~zsOT$bh`ga*J`&{X6)g+981SO^ z0K&*mxlNph<2G(y5%7dAiKcj?6Y~cbNAKZm7W#we-;_Lpk}8nIMjYYa`{ag78hn=a zl=WUV5|?>kGD)3YtU&g41$?#FkZ1Qq3V^0>#f}KMHgN$Bw6bwOp?pFb+V)}*ZE{-@ z188!~;gU!x>)0)mcF~gBBx*(+;)z9T0`)5Rsm%y~;Mqt+e4NrRNMo@~z7mVZ2dY)@ zi%SwpztxDZm0e1Z_LzmZ#~cq4FHZ@7TEThq<7F4A2gw-b`@vOPvq7)VrUa_i6+mKu zWYXsne(|b|5-x?!QBY%g&IiNK^f8!X^M?K>riZU^)OACCVtUd^(%j^EmmIrd(;!jN z#bEjt^x$|EGR6|{YL%k}P^VI}Sf-Z9K$;#MGbr&O0h;bua7FzHQqxHVSS1Aq{_{Pn zJ7LV&ksvST^T=tH?QiHg8k2;lKLFeQe#HCU%t~y029s4|3a4UM)8|-5i~zR2XQ;Pc zBnm97_v7zYkKtS)#H;~@J0J2uC=XpwON;#rvUjDT9~sZ)FLv8Yd3C6S1D}9|A?}OM64;vIRa27%ZUYGy(Lut~)$! z&(E*_n|=w(N-{mn7{BQ$&;-r{bhsEd4`mxfzrK-LyQ zwc>WWdP{=Y@hYdALRbn3^)jdD2zD6zll8=sx%XJe@!J0SJr%y%+!>v2d8GN9=!A3U z1|0^wQ;F)Wk&>2Fpc}!4fJNpMZ&)d?@HLjFJm~zJZRSZmE2@I169B{Fc?C7oU(|Bkk1!HniA|xO#g?hV4U|il zylJe08DIzb@HJG&Cxv}M+K*My?*MfM_l6+WWkdSWYqUf8cQXByJo?{{l&Azp`NvJi z0C!LA_wl%KU;~Un4R^+P))tjtWcQr^sfn;UJM##^LqYw-fr5JZ|Ec*oSr|H+ny5HC zTH2cbEscEF*nBxpWBmq%)(wSnY`j%X`rCQy;=Xhzo^X85B&c55`dz0HM{imABYshr zM=c!MCw6W4TIy#y1??c!4%Ii3F+mhdH#S~Y-pf%=uZvNiq^V5TwI8m;{6qk$SbP1i61Rih1 ziYeVjsW$0Dw`Jm8;v9txdQ438Z-*3GW6JQ$DY%SBP&941hsvR4{l&Es8~3@HBNp{E z9|NnGBLVfhkT&J=EK4$86&PS)b&aP}T{G_RrY1a~`KYX8&Q5yU`D0abp@&+6aJ6!x za$ygh0$*w_Dcb&tv^EmGE>n;5Q51UC1uX4p{cUI}0!)!?&i$LWWzos3<=zL*g*Io3 zJF*jRTV~XFu`f3@Q|ah@Y!JzCO4<61vLg4m% z`wJ%am6EDuKAo~@owL!(kkkn#MZ8`CKlANm?o~p&U9ORZAn_F^-n{K|^rdpk+;y~p zp3gYv!pejv5?4ESwQQ05rxMvlmD5>+YC%g@`i!}>wNGV9@cO3wQfmAmwKCg=LR|4paI>}cXR=_j;@tD zE6s5V%Z47BW*Mrh8W}f9-{j{S*`?Uu`rX2G)Rt}O8+dzp6ef|l(R1=9m6lx|MPQX& z)R=FZ**LY1wa`W)G4htOmJB%&$!fTvB(zUsWTYnN8h0f^y#n~5x$D2P!D7`V&U@jj zhBdm`l_PqE+kf@f+eL$&(hq1a$|Q{G)`N(BBS<5VbR<%=9A<|-siDv<@q#20^79tD ze<8NVyo=eviWQh=M?)_W?lU}c4u0C}fO3zdq^h0&DK7zu$Yy$eF!2=f;T&@1tMXfW zBVev`xWygSE<*B_->#v$2;yUR}@0&p1Ou2eN0WErYD!~$BKG@U=ha!x^1;O(56Pj!gc5DiK#8#dmuM#N3 zc^0WmM&NB1`r?3dWsfM`l|ZRwG^}O`U0yFvOn;l-jQV{}jXZbR;k zMMU2N%ounB=KH{RcsXXPq8pxeRkY4826<0stR-}Sm5PUrxtn6zc%|eDkMiy2Gq-F2eqM~kJ;6%C?xP&v>H!v5&{#OF{%aOhjJsDq+GC#`FP z(S_}<9@NevhwMj@*2md*UY;)3SI1x>rprhv3IVn&10i-L;tAPxcnwO1pvr~!He+Q3 zBiWw-LPrkLkT2F7(d1p?Qeu&A8A})@VWiF{Lf@n2uF84aeJLW8p$Nwe(`dG#p|2z* z3)C-s7Wx9HwNdOJ`x>kjwV!krC!+d%r@qR_L_2|q2eAn z#hNTU#yYY>LD^?8I^q*>jW`sB-t7JOrb8}I!l&$zxY)=de3hQCH0uM_8 zRn~Db26TH^S~IUv;%~C&>q@2~FX~y8^B&K1R7un!T}?)b)>-8fYwl#zB|8Eu?_Pa+ z#>eit9b|W=+7uATI|$a8%Ih-kgz+Zs1OhhY=mr3PCYtB??6H219Xd{Q*4 z(_BjpFnQXQTVyoT%uYjV8-7R~5(r%fkdlVW(8WKE+kYa6!fY8mdO*Ao7iK3#i|t_9 z_q(cYjRclU(5b{3cItCP-W+kqh0&PzWLY{orFB`Obq41UwwYg)v8(N#VE?>DO@3vI z^sW3nI^k& z#>Qr*NHj9Mpd>Boc&vk{+mFntL2Q%0RCZh{7;|IR!YXi?QFI|`66lfq*AU6mT2YxM z7rB%848QYfu&%SXjp0$Q`8Mw_=z=A4XP)$S-}94`SHXyWfJ??w- zzb{-QOkdVD<(DP|KHf{MiV$G=(|gEBkc&xY#t1%5d?0(j{+bJ>g(#@(tFD-CNr=^> zi)*A*S#QeHSpU~U;B>(tv<^R>#*ny&?=t!+ZMH{qZhxR2^D8ZL7*?cv&nMb6T|eOW z!pKi%mLv{PxoQvcuRc^?4d7Q55ABoHO@=m1U>}aVolR?`anFs8GJsu@#A#ootfh<$ zTr+Z%@77&O)kN<}#rMaD!?^{1$?8^A1rY$s$K)QyyrH}7^*QUuV%E@dHMCq(*GIXT zA3)kdU@?Z{^bjMe#S4#l8o5UHD<5j)p$W|%H?&T+g!9W&I;pNYmajFKvD@;Ok2j~= zk0~{NR~^q%1T~@TfFM$%AElLVI#oPs**$`cUEt2^5r$+vQc=x~PO0ZqVXB|;BUoFE z_}PGaJ00wC)e(}V9_}5hW`}q8x#!N)rOX+mnSfHJaouAybw@G4z(n;iQT--v-o-E5 zu>0Pnbf$FJJJ=kH#?U*MUN{w3VvQfwH1>Ww!WDNr_lGAt5G`^a<#xvz)i84=q56#X zWi|b6`Zm=%z2psD zH?GvCJRLzomJeT$zY@>4#+8LAd)df^E)7sXS=OwQ0fZmcNI?ohGmbCy6GuMqvlY7E zf(TxfKQ;s(@L~C0jqdmbdg2gQ=$OKTO&3@*7eRSoYOpjSo2X8P`f&A1M(_jSTD1V7 zk!0|7N{aXTJCS2Z?Xl<6SVd;80fuP7Ja0HkpR;*|o0;$HcN&n$HL7{9X_AtP^2y9a z+%@v9Y+H<_X1-o*PQ)?$O5>~I^z<}RK521C{Bf``!<>jrWxv|&YS{z6ZgT>se-^A;6|K;<8z3Ruq+5j_LMpYwg)rOfKtVlP z*Aflqq9}8KnTxhoy!9ULO%9$4%B%xli3-N2{va)`tEhO`*|3jFB>fP8Cr0+`5oXa( zrwPGe>m{YSvqQ6AxO%)=p6pczUnBz6xtJ2;VVU3@u5;9*-&G>{>oqGPLt2z-a@3V* zJa^nL4&$UM`B~gi=j*n^F!WYe9fIbg;VPLWWMU91?NR7J$i@{xN@4{)ewG8EUc!E+h3FK?g@j>Nlcw=1R1uz6nO1XSW_D9d_K-^;;O7Dz z!q@GOsL@&=WamS993;V?+*vaoqQwE$dlQsBaVRg6nXx6NOxwDxB?8pBWdCTrFeyC< z&8r;3B(2At)kcTlx$_Z~{Ke|_@Q;)9FRH}IdY;5>N>XoY0~LQJ4gRST)X+-GDqPFG zmmVLXR~wL$qpwzFnP62{rWukQ|6DC|f&4A6P#Q_<9t65?X4Vt8GLp8!3^gw+h)v4Y zhu+>_UffUK!#Bk@FDOh}c=h*ji}?BLt10bQP*4uFVAi*<040S0W}KjPxnJl7r-}yh zjc^)y!&y3Pai)EZOL`iVbp_=$PhQC2Cb4bfQ|>3vF*!(YM@1Xcgg8xV9t}bqd^|0q zNot;4$A$R-Ym&4)J%~aKp4lQ!S07YHA#3SA_w|(xEWvnO0Y#bA31gG2 z5>_`|km+hDwHEJYqDj8LX%9RG=iq!AMG$4P40loxvw0zL=kjznrG6cB?Ai-uifA5a znWJ_9Mm$}^6Fq21*{Jns>UzWobM`3GfG10@nvZnEj~isLVS};{^UT5Ht8eZO z)3gU2pF1YCC{LPnk7VjV5aP>q`_7Owgenb^-rC66-}}UP##|g@`TJd;FAlE-sobEm zIQ1p#7GmsmGn1gy4eFmp3}WVz{?GUqM}umAvNOHHXhc8?Fv9rG=vb_juQtUh17YAK zq+2#VswKs0AwY6y9}t7<>Kh6Yp&%WuRM!^`Hu-4kjiMNeozpZ+CRnTsvF9WP4#F**e`Gb?UgTSZ*OMBOw^wvNOz#lyiTF$$aFxgKeU_; z_>#in+{yjz%YZLo;Hxr>cBwHK!04MW2fOhJZ$SajcNK{Wl^g#)CD@pIe$4t-lS$$g zesXu00rX}s$mn3;wQr>x^<-zLL~xi}_kDGC{_lVT1c!$ax&sp;$^#<) zw^;@SMeu*Q|E_9pAVQe9kTf1#;{PoR{L7aQf(-Le6aRaR`Ck-Vh8L7K5CR?y;{V=! oFGEF`|3bW6WwJm}c`1qhn=~)49*qBwfe9kRO9^+&`G@#_00t7xuK)l5 delta 9528 zcmZ8{1yCJZvo-E6!6i5Zch^90cXxM}z+eFqoCCq#U4y#@hY;Kyg1f^Hx%a*A``^^5 znwrzytM^*nd)Ka+J>_=kUWEV;Fl`{?<3NCcF+qWWp@M;ddD=30I5^uFJ2==ddfM6M zsmM7jG9$I2&H-qy4v&)*I+1hYsRf!S1c9V>OfWE7=Em>uPbqk;o}Vmz_FK1q8R3M- z?|nLtb#Q+uq2Td%>)wl($c@36Sc(@tQNFM9YQ2~JdLf%Ai;qkz5Rlsd%nzW}=2ky+ zCkcpv9Vu&j8BmL?c|w0{iY*q|9G=na<8OAyX|>avOsmTB|Yc*&i|94z9Yc=<_= zPq&-hoL9c&6zvk5PK3WmeF*x7a)R7erBKz`P+f8beqDyIz2xWhWN5&^3eTM8qQ7%I zW?-8~>WH8&bNsOL;g@FeFRwTuo*^Li^!!R?e1(3NKLs5R5XKr_gc|(m8wwfN2kv?*yzrA|OW}~VngQT?WQy0#QYvBmr9gmxOF_%ID9Tt z8;T^UqtVJhmfaoWL{6c+3pT3_xSO^44KJ6A<;3~bD`PUC2`I?Fv$}n7cv3Fo@l95t zLn4h$fOKK(&9TrjV=c7OUD-xV0XI#-v7%qAPSV=W$vVsXm=~|3w}?{4Zl0{Aw3k0f z`|(%fZM&{(9KT*~U?iS}F@sgIM9QV$cui~A0O3bH9{n`j57acx$goY9AyPweWK0*u zjgUF&g6TEE?Lb0;X74u;10|^s9_2v8p?&^smCz`g624UXNN*>SKQF@aL&mmHEu6?2 zX05l)920;iWQ_8m-U|6aEA7{xyKF<2fqbhp*7k~bEscin?_hk95N9dYNkb`iy^OGG z&pIQ>G@jkR5cH)*A{JmNgh-cv9O`s(FkMM#Fs34H?*!W7o*p7d?Oen55`sJMNcLAT z2uHYAKgLFbLn8JFQiNrRzv~K8TJ5O7F>FC{ZmRk5`Q+zfEtx)_-ivE6>#l8}@`%LI zX;||u$W%MdC_aO%PjHeKDa;BkWYA=F8Be^ zM!awe1R=mX77mZKUBKLEIAU!zx9dtrdWOK6x(UQGt(|b=Kv>UK2^pQyj~hn~t{T>{ zWG9I&6DJv?xM`%ezhf=-N(+0x9lMbh1{TQWoEfG>>y;hl)+qd;s5@Wm7_JEw@@C~) zmkUmG5ja-u@{+w{lO(Dh!i$eeK0s0qJ=BCn4h9TGd4Mj%JD=vSJ&eI4*4C!O?9zP} zl2o`jRekIYF#}h2*e=tMy*ViGO96w?CtXMH23aCKtJe-Hhh1gECCAX>QgwaTY`^EL zn)^O&G?3x2qdR|#J({#0Hn5sf?`@I9G~o~^!3bL^f|{{fGz!w&4|!^{H`!fujaDBf z;|7?7$IFp|bJGps<&n{ZYfj4x5^o(1+#T_U^sUYTCm}S=l^I0)MMQ1{X%fyFF8w0k zn%vpkvhGixe{a-no}@ZM6fFL17NnLv;ANPe3Boa@+OVvS3<4ca=akQE5Y_3l&(TtU zqIa#xWXkoW(C~YAwvkYg5@$#>G*xReQUNreY#}4Dg$e-rE4oU%A7tE9kSk&*8>+h^ zZAJ(ByZD*rm@Gr*3LWoRb$mYr2r3{>aZ?Lv|1!u`Ug;0ws#sTS98VQvEJi1ZA#pH< z6tY9X{*=CvN>ydWdr5g-*7hJiy0dX(gf>=GYBsq>>x)!u*@a!)rT- zDx{3+HbjLAdGw5&imoZ0m2d zk18UzeBWHrg73wfxeE%n`!ERPfX01Cv#E|pPduu^Sxn1bsY{40Q zp_(l%aCWL&*$3rr7}`g!@6ZHEFZ@C)pu*jvMfjtEs?Da~CulEc#hX641BHcQb9z3P z4hOh@h(Z<5e{$BbC>AQ{n^pwT1-4z=(H73JyI`$Hf}JZUheceC2GNJs-HRw zO=BX9I#QDhkm}Ct;7La$O5Nvj_u$_!+*s3dOVd|=faRiE z4Y`-Dma787t(n*`f5o~@(~nYLsSUR&+Hu=)CkVdisqQV5o^yQE=J`DMrtCo-`EMzy z@f6`UVI2$k57Ld>gBp9Te=VL49UI3oG+RvZwu`%95_p4P87K6-K) zU_J25No!Ba*#)GJLaOcZSHW^}19B1vSmvF-?Bh+@I6Inp%q$l`N}x%5dL6>3%5q#&H;Ypah+HfV+6ggOyy1lk>z!__V_u$+8>l+9~*=9`~po z{8|~`rsnHv&AozmBl*6&Mo(47witpYRmj0Ofik5(SV%qoVzBudc&0=KP@^1()K9`c zy5u|zZM6HcXDz(K&vF`xPxQnRP<&&Dl`2y0 r0dav}UEyh>&u4 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 CwCc40 diff --git a/src/files/TraitImport/test_traits_case_insensitivity.xlsx b/src/files/TraitImport/test_traits_case_insensitivity.xlsx index fc3de96d9cad48765b75e1a3211a081299434896..182a3713eac34743b3c5810385ee68d79e034076 100644 GIT binary patch delta 4843 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 delta 4487 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 diff --git a/src/files/TraitImport/test_traits_dupCol.xlsx b/src/files/TraitImport/test_traits_dupCol.xlsx index 352b7c61ef4f94e41993c05a31e04bee7b339393..1e673bbc0ed932ec840ec839e7fde5a9e08f8ed1 100644 GIT binary patch delta 5038 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 P-2zfo=!o-V|I+v$cJYVs diff --git a/src/files/TraitImport/test_traits_dupTraitNames.xlsx b/src/files/TraitImport/test_traits_dupTraitNames.xlsx index d628c9390787570113f1a17d07f12f05226a7c80..d549318163133bd1946a6e1651b0839c5df74d39 100644 GIT binary patch delta 4679 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 delta 4363 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 delta 4799 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 P{$0o5fk0yLzi0me1CO)e delta 4555 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 diff --git a/src/files/TraitImport/test_traits_invalidFields.xlsx b/src/files/TraitImport/test_traits_invalidFields.xlsx index 978c04d856f00a5c99de90556f12749a618a4a78..82f096e38b4be2485ad1e831b9fa13483de733ca 100644 GIT binary patch delta 4656 zcmZ8lbySp1)L)j65|$FAr59Mbd+F|Or5ovf1O$|3A3$(v=?)Pj1(6a&Kt-gM5)hCU zMB>BukN5q)Z|0ntJ7@0PGw06Sdw=&<#bd2L!D@6P0RAlET5duikO@2pgcJgSgn04? z`}lc0@bU5B3-R)-HL>#fCO{cg`0^U|TQ-m$1tBZue&((|_qfBBk!O`=C1W7hi_qlr zb`Va5($5BTXlyv(zTIw|0kO7A!QsfE;Gw>O!uW+PM=3%tKhJ}-Yc+z}6Q(vhs`o-K zMjzGB()OsBMM##=e)=SVBZEwaBRuANL@$USkn3w~h`ts!4kZK+f`4NO_aG+UWm`S5 zAdp6E2!s*>+REJlB8=uVu?1m~)E5cq!JQ^Z;~=xrR_0Gc0e`TjciL~Wfugx}KbO$9 zIBs9$zK`V!yYP)L_0*Bk9V4Z=*VbKmaZ!G)<>l$`-Gd(TsMr_LCbRN7rXl4rH(WyT zc^~k_Dc0xC{oy5YPr1`S+^Q~kxZH)Cs<-4=e1acn&e|*r%zh4u04+YU#rZKjyw}iB zwy6#TNz7uK1vihy^7->E-G*)4eHQu(_m@4cj>MpC--@8vb~2e#G#qa|@O{(nYMzQ- zY8ZNxpQc^w<7lk&fpYC@J?ozj(#C8Xq;$u+nHy{ny5^Ds9C(U`XE5|T!C*WT2PF+< z>{G3&Jh8S_7d-iqRPE8aRuXf$~acJl^0xgUC_mqvNor{S{ zUL9)F33S}4_HUqTpt_HK)St8&7&x6r8eQ+3+5<+jOuWn>K+~4Rmm&l zp21~R{yQeKEAW7eswM0;6pPT4kM^+z4g|tN0zSXX1Y{ccpaozsj@1r0@ zQFDj33owEsa^E$C<>#1U^F*R*L0+ATr;a7})cO_E?pIcm(|c1bX}a!^l@vSQIYFnm z>J(|n;c@0hExw|*9=SutV?Y$XuTQSg({3lO*sq zO=f9EMhuR&e{GD&-0$M-{s~aV>yqE*?`Oae09oBS#RIs656ZXC^)s*uyeQUO%K3@tCTX-E(_Nirc!NEB(E@h*=KiTR4sy0YLGH`Kd z2>3pgLfH=cGAJ*EE&&R2U6P@8T|Kvx@5!beEpo9Y2<~ywD6xjTVFmN8(&GKnG&d^8PV9I3 zx~V1&91Oa}A5Nl=yecuqQjOe%GImA+JPhq87i81+mTmZTw+pwLSP2KqIA>n3e+7;) z;!*!C=M@8Pj3h9o381cKR zV4tR>W9fn4L}!O3^@^|Xy&~0UwIcetFab~^SJ+k%R zewv@ikM+qw?LrEsl*9NIIj7bfGl}vewoxXq5o_NYM;!i$ut~hVS z;`;4^j?a3VP9Uh6am=uNx5`M z%4Nhcx{f+z%APqe$MEpT{5)j(XbcNsR^!WI>*4nd^OD&1Q}d(OXnK2B!(#6W%7X*; z7x-c$kL|&knUT9VCY|;$=%G31MEAu z%vF@r%Y#V^E@HAQJwcW6_}wSHK0Iq;J|SbtDJ}C~TfVS&IjWXk{?zUheO7RPcd39& zhPW}ff+cT2T*@$K{Nw$cL9bK3vzPYuhJE@q8P6s2sJ7p#7_s%1W7nPUivoNqIMbvp zt|VXa0O1`vebF0t<9q{!Zr|MG1`YWKgnByp|HVQt&AfbGNWiY5rY>)-?LB@5iQ{r? zbxV9XwYaFct8w}n3pDrebj;&>J$-pfN2k6y$Dw1T;_kJY8|wT$w@LQ;lj&FoXLE5( z#W1>km_>#fcO6Z68Tf2gu$eY4G&&c*$=HF7xF5H+I-^ys%-h7*8HUE!Nhv_ z3wNJ@do`mjc4F4*UCxl!6KI}Q9ks@i`?~!=tz47Qq;;ZdraLr@!5~|NQ*W6=7g)hu zR1%2Tm5&fH%mA2h9{x|15~z8je7To7&thr@N8hE^P{u)w6YPJ*CKbv|7c#%Stbf<_ zd#GcG*i>eX_xo#mMN2}%TN%PU^k$`V4^!^iXjQjmwU>A4G>8s z8F!H0D+{dil3$IUuQkeaGCGLy z4W{xvb2D#9NK%U43q?r14re`BJbHVCOWWsKY|-&rEN@5n`R{X=Ps!Gq4=5=nd@-qj@SSKxO=RjsSM zPW4NFAPA@#ISdZP6q9DUX(jDd*BaUtEg-)?5$c5na-A!0#UU*%ucXX8(1(%wB!AHXwh^&-iQv!1EY`UGFRDPKs z&o0l(^V!1sLE1_gQLFbHJwbMeq3{$4kW#Hgr)`$)S^5V4`09L_+1|stn=V#?nBY#> z@E13qsW{?k5k1`bP1A!E=aS)fCzU)cr;+L~EtXQ#*+9OR%xo@eh=HG%|G}b5RG%9j^u#evn$#`F4ns zVF*Z%`N@s3?A?~`rXH>Qn+GUN_S`fhX-~7-$h#xs(f<^y>8OnF%lsi^sI?N zTf>!e+0QAV@5HZllzb+*;hIi1adDqb$VY;?g?fw@kCby(dd?`eSGK;)Rb&f;4kBtC z`br`1C!bK@;bJt?5{o}1me*RGA6L+u7_+XE6UVx<9H+-QbI|pZth_HlScRvbi^)&a z(Y1?EBW8;~&o^FMV(8Z43h)=pfV85l;1mO*#a*-(3lu;wf*`(Y3bfa=zC)*@1&C+-}82- z!M1O<=BzJE>zXgai9Cl(4w_E$qGUJ9w^sDc7O7oXGspC4U~AEii9{C8uALUY+lGa+ zHFbH|?^&1 zK@{$3U12m2N4Fs97jChtI?TO7(wz!gU%`6one5K1d(s!`X^LdldGFI!nn>C8ceY_0 zbRfz@g!Y2W4IE~?7vdmMz}QTTo0GB8{qBkq7;#q}R{qM8>d@XcaT?^*`i*0yziH6H zTfY{?P-T`C(5i3%{e*2<=IM7Io7AK~HkkYRg;N)L$rl2LBMXDeD;7eXxv+^xT@#VN zH4c6Lz6t^QwzMJYM$HT@MUwnjB&GO-u@Cem;C`<9*g+_8L5dC_$>$Fn-h5Cw;AfBs zjY(-G`lBiHv&Sxi3KvDtdLXF4p89A-6}T!DljIm)gAl#KH-DPVRadG!r|9C_xBUjq z@%;m=EtKD3T7sx;vL^_pZkxT{`WPEoS=^(}sU#>_A9ijxE%hy$v@mFB;EiRZ)`+yn z6Q3%kym2xIrFXGF6QBOTt9EJgea#O}iIQ#hb}cVn@MYz-xqGA}h%yz^t&(L%Fja;N zC`Hh%3b}utuD+!uNWB^5|L9rCnG+1JQS+EXn&Ju8t=Uh>t$OMf@o#e`gj9VA8p4#OAjDKT*_3ePP@$ycQ)*?)8KiaoTr0}FK zlA+VFKZCmBM*3^w#7xU> z=euE{-CPZtQM0q!Bd0*!^*`W#lUp4MHZZV)a5&<{HN#EllwkykxDenA85DTVMci`D zNK63gA`qYiS3f8!`;qX!LIp@FCrtl;le3#p{crOnzDd;-pd=((9BBU+9sms#DM2PhTI{!s5U_{gE;xQ8 zW)VpX?PUh96sbWoMUorSriE5tJVgHAL z0Rg^IWC8PUgst;~uaWHFGkIDlLJ0Ina^Gl;1l(67hDHj5LN_}LH#^QE;B6*2$fCdv zRS*Yt6*Qr$k~h;Guu(w-sw4dmd7&VJFqVZt90L6Ve7wxPJo()MoVQ1 z$|%g$*A(+YcYoaxyROAUx&5y!Lt?|G$vWcco-c3?>t^`3$K)-aA;0dFlQ5)N^_qV| z-b=>uzeD`;+uQ3rFBtNzI7s1qT16_7^VVs&`aWsubY8jY;@!MN7*+ANh3Ns%pf~A4 z!4LI$bV#bNmLhVhi9~~eXxO2w+B(vYEf%kxwFs_nH_dM7x*Gv}WZm*ecE8Wnl}r9T z*VSJt)NWUXBv)MsOGl1AiePRY*2vx(qXv$=;Z41*;bhJ2# z?*9f+Lpe-%`+es$S|=<%C2SSRY_OiNUGSmS$}?*2j;EK6SuuWRUB?!O>s)TvT_I8P zr;Tr*rAlz3x@RrF@`L~EYQQqS`L^^M4WC7uAxexO^UO{E^D1H2(9lj>T@N1GhPW}s z_*F!)ykhj&{TU&TF}C#hZ~B(f9!(^GXsx~dQjX)Cw@YDSqc*LcZ&nJI72E7ucK; zo*OqH?_TT`gq=YGW(AKm6=^>!z(}gpYY7lCE@L{gJ;Z65na&P1kAgcGx)~wTNw*|QNvRZ%yISIpv0Bb2Wu#U+{c5BG*{NgGI z)WH26!EKn%Cq;EIl=S*igkImZlBXe3+&&FEJhKHC3BP_}S62ieV|@ZbdJr+_1^|Z= zk($QQEZO6MK;ghM3O2-`N2fS-6T>N3{isKm%v-QVLzh{g035rI#}evEUhqPw?91`) z)*U@AKmYOV?d^|xaSs*qwc7%j}dQ3T2YmCir`2iwu_JSW2=1*&osBPTf{lCK? zp~Ki+K6GDPeRu*l+S0AlnOTWMIlWYg)Br;Z*U5pmg!0j*WHyJ z&A6Cx%cy-G@#YNoZ3|}q)4T||B)PFtviHyDx{(s4 zEiqNc)$LeEfQYcFm&9nb?z3JkmTt=`RGMlN)mACTdTpLcI#MMR2Hwt2UKFLa7%%rv zj54u%O;kqa>u%JVonNo^GQ7*qu{CpnY=mU$Y$D&&aeYUaSvD4Ja9*Nwaixm@?4giq zRw{hF>N2`6V#J4D^DlhYp#Pf+1fu*G`2GQpyT}7M-e+R5Tc~!K&^YYB3iY?T0qToS1sEjv$MdK$IpUC{KkgF2) zv~j!H%8)ILCO1Cvr+3_C%kVbi{lt!@HiJj02rPj+?(B1;N_wJ#xL+-g=6y`0tl*5G zg&1pbe{ey^kij^zGsCoxOek}pY-~Jr0Xw1&@qaRzm`!Guq(B*eyH!&+dUdj<#^2<# z)d;1FIa`7#%;IEeIh`COOM&^`3|gD`8egDdC9eNG!5o@_r76scFx5%p8|rs1MFDaM zIS%QFnGE-z>b(bwy_SQfk3L(~yVdKNfM%rEyDddq_6!h_*%+TmkLhzyB?n?5cE5Xr zw&GkOMD4`(Lu9>>jUZcRZQ0aKZ@zK?#el&UJMoi^BMW+LAp=|D^81|0(T0&4qY%#8 zSM)B^bLY@>SqV2=M11ngK51%&fhh?@O5P_X;nMUr6D{6h2d9JOGYv|nW#hXKR)$)n z8f$4e?x-}`VrUX>GIt-&{3v+t_iYPpBBfTek06ahzc^gcPcD4@twOO;FO~NYE0+W~ zd?$*K_^=^iY?rJgXi861k-+&xi|`hGGA=Qh=vQ~1%o_DaANLQi0&`V!-CD&9gguJ+ z(g$gZQ@%GCxm320xlzT;Ta=13$_p&|YX@^c8F>DhjMclK);AB??z~_t0BR$dW6%q@ z+k)%O6~!egHca&k>y|IMg|8CtKc?^Y3GobGxwCdIWuAi?kb>rrPfD39L3(qcs_oh0 zLB;()jUKP$fzzflZo=P|nsVeJG8eighC&(D*^WAs{J#*^9Sd>&^-MIp861?Z>(A`7lTu@+f=z`X`&(+c@G)E_~v@tw-VfQ7J*?n^~rycEHA#Mc{A9Rg^ z_d?9{A7wn&M?<%aOfJ^xyu>xxc*ckLyFSYb)d>XNscF%*od=q^kUn3|eqz-Xa~j(l zl#g^`9;B6_9u_-?MEK}fvX9RcM4#hSlcL=>2JgiwZ*95~>_K&{2Qa!E`a2IJTCFW= zJvzowPvN5Z#F6fHPq9Y+kcVrXLHeg zI(DWkt?0=o2p@k)KF5I6f!jk{#-f64W~L!Ni%rej?P z$Mo0zKH5{Q7N@Q98JD_iuQuNLPB+9BuDKFT%gN+s7&ndU-E|XbY4Pi7=J_T zMON?kDWam20F69+zQ*qUAlG>eqTkG+ald3@O-wHdD^bg9rvfAtq#WGL&Fo0x9(PZVrr8?vm!iDKk2STWL zAdpigd~7+zXNBE0Wm)U1fLb`r#*=#`^$lmu3w9*zWFGQnNmAH2*)^ill}Rxlw%u)+ zOb8)Ofauc8jRc~eQY+9f3MEz2omt+(5A>vE6iS^^8<8&Tf)FG?G(y6d^WzA6tj&i> zN8DKX^9OARLSsdVd$Rbh38iP2VmYHjY5ZPA?Ttu2r|hB$Js0kI)Hx@Gxx9MI+YeOA zjX3{x*n`aMW|pM$sb6oL2#xFptY#UdpKMF(H7obdjJ4T#Fk_FW3O`(nI|rBBjwZezeMZX5VXU^*=!;qzG`P$ zsL!6%hV(oJoD9`AFTKs2f8Aq}|1s8fkEzo&=XMoKw@h{3gLfOGb!Q4k#ovXz`rV_C zyE!p*{F*rJxkLF58K;r8*qK=Sv)H;st3#UCiN~YE&g0s12Q<1Ym76+DwKPXzR4X62 z>`6>_R!+s+MrkfbR1s|g{EH?!CvbuYh0!Y+(1zPp7-*E{%AGT#x<*uPA7*q=1)tf+ zG6e2uAN=@8Y=-_aWwIIs8cn&<=NMI+qf8Dcco4?A77iL6*~tT|vGpo3|AhrJdgv-k z`@Bz!);e7tc=K#_0Gm_^KcjAK>^My>uOi@m;G&Y`uL9aQc0Y9ljqV-fM?llO=fnrH zG+s~J={NB_&)jw6DoyY@NTJQ{8!8#|PZPRdLX~wY*TI`jwe?o%i5K;H&YEhhh;voT zQ@YnnVYhx7TPK*wz1iG-_VR(GsC*GEw}C)5`otsZSN-v?4^megzrhbEO7Z}|*hTW= zCGn~QpcJG)iIfOXrqltrK`8($H7cN600P)aid2&brs4rC>QvQu;tKe{5GOnER7s?o zkqb=%jIi?nGXf&jTpXo%q@g1rxAm^M;KOR{Z5}*?ey2En^gPj(Mt|rlXq2SJY($ch zJawtTllcAzmR_T&nvEBsV?h&1sOR--D}(YG1#k1;M2U&lcm%{O#bQA3-C%`-6wUOn z9-;8J>e8Ehps;nqn`J*|Uzxu*fD-2#j79oFrrLn_F4!Sldwsg2S2rGgZA!44*msuv zx_upl*;0Bu*bcu4$!is{oT``<>M(UzGeBEUf@{{u3=9$!AIGRF#xD!>wAztqPpgPg z416rP9qbWS>^~=O6K9e=r( zuTgB~h4W5v5BI~LN!R*pO*U7kenpFxO;#0aQ1NL)``UV)oKYMuwINmvENN!yx__l} z-KS4`C+7%#yk*~7H{Z)jvYEYz;HK1NO)bDk#0&BSOD%ypjrKlI_O;^uz9-UKhz|4k z>#)*QLq){!sNUZoi*hoS6Y+C1A-FdR_=>V1o;QmT_pLjc~&WTm^FFnx7RhLZrbU`4bUX=s;-Br`Z(l0vAxrDa1WI9nyNQR8q z4?N)G{4XyJt~l+)Q2a43gL_KyjJ{Iq82*TP)Br^v^n|gT!8%Y3Yn!jgjgFHyLwc3P zBJ8L>w@5KDhe!D@tVJ}e30HF%*5r_qxY8}a+pEgSlWU8p*dr<;2D$;<3Dl@(h z72vDN$N&F1`yUrc$Umj~zYHEwQ>AD9la@gs#y^JFQX~@~3}yymRH*@5b!LJ*HW0AD z&IFLCQ3C-`YKlL$d+flKx*7f;7l6^Y33zBg@ke;BMLql}zJF#AievzV=573WexOC2 z?;7sR1jhou7o!If)gjktXU3no4ai=r7_L>^A|Sw5i5}3p-giWmnSet2UsIGCg!Mnv zU;jkV{5in2bVC+sP~&0!@BLl}i~9cl@xF!3S8rfjT9uL{dR>00^L3afe1k$kiY9w zKX*?TYj<}SKK~c4mHLZrKcGY*7Ebp}r$NpfksxAiR5nFo4zvvr9%v4NV4uU$w!)>GELIZ-S*{n?ztuZ|Gh)LZ+T= z1;5H`K_Y(k9Ial_mP0ahrNu$XdtlXgF6MY4HGjl;7LPwcI_ep<5LDl#68A5sO43n{ zbnE zaf&J!kE=6I20Ob)ikmz%Rlm6(htLx8N8l~yV&vU8Jl zMoR2jp!B1pG+ATjT7Do^3q^D2lZl$qdF_bJb}@uv^*(sNI<9(r?~&>x?}hi*}rj-#fV;0KFs^I(<&H+37Fc z5=mw{#i5K$j6k^^zikv=5#CoYzH!=JorC`&ypLF%WT>U0X=Cp?~ zr#&3@BtEmaM8&tIaU7jY)>=zlW~cF!KkE~CaKVYZZ<5QkpN36P1Hs}4Uye%z!!xVW z(ck79pO&6Mq(s(*!S}+bHS=C}FlLbU!dpL?W+RTyMg@6pYr+XZbNx%QptGpFZ96<86SEUj zQ}#m7>0{hBl5BXlUU7up)|mYnwI~(FKCxRh_ZJ!+{Dq38{!Y^3#hShm!=4Txg_ayy z)W*KS{0Ic9CIEr(|2H_iyaQbAy#5Z2dczm)??j32LMLxAH;y7RKw+G=4Nh_OlPfE# z2Pzlez<`m9t8ETn%hc@!Ev>R+>vHkDfpYAs{Z>|%!%gkwxWRBBV{Ku0=|Fb#0J9_| z#^xf~txx_ue=SW^Kv>pyRyY!KvVd@C75Q9nw{u`Qk;pC#XQkM&^qG`j4*O~fjtHp^ zDFLh`ncQF;^}Mv4tqcAx>dDq+HLV!=dpaMQE&b5gRGcCA>xEIcz71R?O~(iNIaz=6 zm)3JW))nZhg+TCV)y$h>_Xba>H6nk$+>sB?qACP#Pvlg43;gsT zRN|h@X*L=eZSh7Tjr0&|WRdY&s_k4js=MQJ~$*ezO(kHxA_%%KH+-ccy zQRZ0IO@!-fZTTO;bU!4&qbaf@xqV}4@qNE-d6=M1AEJ2YaXM}pADnf}a%Ok&;x)}& zmlex)EuNl(p*x$jf2e8*jGR$)tFAh!3~;=(Ake}@>Lr38tst(mQ~g!Kh@&VF8^)p z#~kpOGn2IM5GiPU$Co5|7AEk*=_CZDze`F+x+HWa$1hlzcx~U`QjKmJtb#RJ_{QR6 z#Fol{0!6ip?`7>rVMY5bH0#Q&iKKY90J!?M3)~LXLgngV@&O?X>Auwfn5V5TipAi0 z-Z@q>Awad_EY(ss#_iHFbboP9_}^B0bTWZ_a?3wvQvzpV5AmTNYi z#4X91;Ad?~suxBi>0fk9w%=593n!~^glbXe*eRvTkY9Rz+-;}%iE4t9>ET`J$uzM$(Rit-Ks5>5lA+~22QbH(CP0l6WAhS0${>FPv zAyit#!@sMeAwv*;zfx^KcqRPnV9x9>UnpB)Ze&FR{bP}eb8$7()%HK`XU&&UrBMO6 zV6HaH6{!EKft7j4&9V~@{GBG|s_S!5P`uO$%Y~fHc8jmDkCa4=higw3`GWEGpFK{a z5tU{S+*=J-=4Lxt$Rcgd{VcfHsS1Cd^Vj(qo+02oGw9G>)% zVS1q0Ff0&=>|ZG2Xys{VtLN?Mroq{HaRV*hapE)ir=a zYbil#2eMK3< ze9s}v>=;H6TUO!8YMovt;7?(@mtS6Sc}ZiTW)99ue)@`(`EiYlRIaybivvd&mW4YT0|{vS~xC$i7<>%Ov4y-6!qPT}3Y-#+0Fh``l1}Lkx^3Nx5wE zuHM;JaJOPLiccJWaZjhPlf6A4^lFGq>2<81cq8&ARRW>&l9v2%S!}Py*0N?CJuURe zaKrE~wHSv3ysP5-a3(GJI7jzL*4Ll&ILPSMDidP33*@`xxlR9!b^ALL1|)DKXRLpH zZ?oVhLOe~wi*aB=YkDh-F>|h^@SWEf5n_CF+;R>%|4l}9 z5=3ZV?82wU$p{P(XbSj9%ZN-fbI*p7MIUh-$S|%_LW_A~G-L}@X&u8*+~?czz`nREs?h(- z>b04EioH*)^p8!2u+$3F#hBLU?=4q4x{dj*LT^8 zGrcvmY@sJ#-OO~!^efpVtX>ZWNRHJB_RrfPf5{!l@PC;%F+!_bu^Za;AHu^}j2IR5 zqA4RuCaO-^IJ^vZ8SLs0$so-CG&?*eahS|mBw>TX`yf6OizaczMTEZTDUQ*&q{rx+ z=1Q!<#R4DxjNBw@-F(x`Y45c5RxlN;6^KnFfgoOwjW4p1-KVM>6qokKizzJJi8Sb> zoy!38^Ng*x`3(=)^N8d0CZ=i~Mb{k-S{?3tQw*8%_Cc0iNOFX92@gkbB3`{EyoS+J z1-}`K#}z1z2=_VpZWhnsN=2~c6H!>dmYnoL2MUEOA%8~OWMHnY!Pajt&RFkqPag`1 z`}+rkyT6Z5U)JrG#f!3t+Cj%sYdv>Rb#P5dH&8pr7e`UMfnGE3F1FgyD~~>Y&CM!i z3k1(s>NJ_~T};`p_D;B63(aXrZsLDVvY*Q8fK2E95jd$Aag=Gj^_5yYoEf<*GtMGJ z?&E(!>W|kG9?4AE&GL!#iGHRIdO7{O5OQrqI#w3n4x3TfUxoK5(BUu2s93W}qn5l> zb`jVJQvsiMkK)ww9t~!y*~{~JXtQtp_{G`6h}~?+&(4rKA0&;DG)99OJ!2xi>;cP`prc zfWxk5q%~hBAFWgDnn}=lbP{Y0x0pL2$a5pVY4awxq3UvwLsPdfiiU3LBL@lj>Dp=x zwsjIrq6bZH_xLBI3Jc$1`^dL&oy*CQ85`*i2j?3EMl4wq@I&Di1MiRn0C1(k2(qH98# zO1NK&Vv}t2>PD_rp``!~Xj2O&Pdx;Z&d+n=FY6Tr>jeunjbgdZxq?}_9jsrk_bL(-`HndEjMjlS)W!?Qin+Gc$pR5sLhPo@z`ugCzcIj%n-+-V$jH z`jJdhoRRV=@Lv$iIX<`rH6{kB?q{6W0Hd5Hj{;{K&R>{cO$w(MOj4$fZ^llZ{^K|Q zJOmTEaJr#Hib%G7Oe45r@_RqRyqj>8D*zvfK8WdX=iU%@_aBZ=P^nv*tD9kKvqco& z9;$Z)y}01JthcPz?b5DDc`KGfzSjfSW9@j4 zUUhXWgye%inj-w0r*V9g4XDo0A2NLcpoW$juq4Jn<^XE$>x@MGN8AT~vP(AcQwHUB zr6xjgjZMxCAGy2MsiIy}4yaY!9!iKN=y7F~VLc#NM^>23x2Z12T6BiAI-yNtO>Cnb z8oODc+mjHnEFF@fnuPIDd5t8Z?WvnzrOrn;?B1Xh#;)kMzWl%0Y~*|`6$eZSDWs}? zArx}4TOYlvpX8FMN%NpS_z1_{Q0`_Kf^weC7=IsfAdnt2sW}Rk&o;{(I%2TkKrtS( z$3hp(F;|)M^!R7O+l-EkH>8;f8v#DX`R{lz**XGiNx*rzcO`G<)&Myp^s2dCfBw;0 z*D<7pYa8<4+1eCp zI}?iQPoEKNrM0H0Ly#@Xz~OxyWiIF0x|LM&9J)k)Pqpt$t(Gw{E6g(Wp~$C^F*AJ_ z`yT{rWWa5sf_eCINm~U<^nn{nI<~beSNFCpPw=<7Wf@@egyzGAl=QdnNRcD;`zbOH z@6TKcj&K(y*2T78zP>9o7zp!Gxm<$rGh+={CA){@2Bvnx-X8p zQkmen7FD6p?1CscKnr zy_TMXN+>hvGflwmKn;3_e+T~e-q&&|t81NW@TiUra~lk(XmEeh7Z`^b>T-TnAA9vl z?G(4O=)EeA${#kiKP^ymgtN7(GjWVVWpQ$Pz6IL)_Tv0@#!pH+N{8b2>2nWOA6yC@ zq^*Yj2*{zusry0J`xsc4WC28Bymc_CN-*$85CRCX@YX2`Iw=K;AMruVoIOVFw4Po)oc=vEEv1Ke@kmrPAI`yh^kX6EXYU9`6 zN4zymZ~FRIyspl3ve_$a%mOS560`;2R8hICY)o(ts3U55 zg|#v^Yx1~KAAJD_n#ZC-TE`B@bjhZ&=^@b8BNct^ZC&WCQ6;g9BoRpq87J{j9H5)E z9ehFP}E)3dL=#<)Swrlnp>T-kMU zbjwOC2%E)5If*@+<{PHaW$7Y zmOtZyZ|>4wU`%~2)9nt_f-_P1OQ4H)btELN&Qe3bhb^y8w0{=uI}q*#N7TkB_Hy9n z51+>Lu1O|txtk?cT$_Ej($1f{(Tcx;o(>8ec??~;@iUo&jPtLr0Nd5SvtjItU#E$g z4}V#-&Irl~Mgkfx>rkTTBiw6-_``&pecg1%iZt&GNTVQ8lT^j2Cu#?HAJKD*=)$Zz>dA>Ikd_R>)mj284JQfq3ke9*KScYJ}R(OQr=e$ zy=QNnz>INZw6k5)?V{{UrKK^IL`@)z9|YWk24!rq zEpy`#Vo26bb76J`SA}lQ{NP{}d=Pt=3Y6ltM|E!hR;ejI8qR1`dl!~`f>-ZkL6oPEzWeX(FEg+}jewmIXBNENBTvf>wF zPS%Qmmu*W<@xBjlE)h~%%yy;O{H@*YA}xF+LUJm4hvga2GJxFhJ~P%ho&qv}WLk)0#FL^0@f_uK(YKd&VQQFK&S$Y?!Vh^4-xsV z>kS?-qQF4+-xc-$eFlN%hyZptJFu@ngT_q?s1UIMyoyA0|E`)yK_IICC_l`2$$;;Q zPw4(b{r{~{PW_-j{&z9})GHDJ5sEZuQ}nFJOPSG_}<*9*zM(Aj*fq{xDNk H{9F1T=_4{Z delta 5769 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 diff --git a/src/files/TraitImport/test_traits_missingCol.xlsx b/src/files/TraitImport/test_traits_missingCol.xlsx index 5d0216b455f3a3239ad98030c5d9715535057315..12ccee0d9052b9137d502f068da4e91ba282a2e1 100644 GIT binary patch delta 4937 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 IQ~pE!2Om}Oz5oCK delta 4590 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 delta 4368 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 ayY+XVVW3Ay^jC%9dM^@!KuSt~PyYeu1o?OX diff --git a/src/files/TraitImport/test_traits_missingReqFields.xlsx b/src/files/TraitImport/test_traits_missingReqFields.xlsx index 76edfbe0bb0f3a8c433401daad4f971e92d5913d..a20553fd2ddac12cf116e79094e9e10a345142de 100644 GIT binary patch delta 4972 zcmZ8lcU05O(oRCJp-OK;sM164O=;3X69gi?_YM*S5kWx7PkNUkT_H4)7J5er3W!P* zkS0w)sh9Wt?)Tn%?(83X_UxRUv$H$%%roT);Ff3Lw{9e;h73Zr4G0J{K?njtK_F15 zr)Y?ezlXh#kB3O8muIz^wNH*1T~tBCRrI;Rm~ctq3&Cdh)Fy$=@UUvu6@1a?EU#=+ zv#YZdE*`JLsYXl}17+mpxLg4=_L)tpHB?_vWElUQ3uV2fj@Ix

gr2=uUv6z}?}O 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 delta 4756 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 diff --git a/src/files/TraitImport/test_traits_missingScaleCat.xlsx b/src/files/TraitImport/test_traits_missingScaleCat.xlsx index e865fc483216cbc9572a08bbf461494f58b3f57c..04ea52cb3af37e479db84e62e820f93548b06cad 100644 GIT binary patch delta 5258 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 Y6MZe*JB<+lxPMpI?mmno(7&_)1N$6%z5oCK delta 4990 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 F{{Wye5l;XB diff --git a/src/files/TraitImport/test_traits_missingUnit.xlsx b/src/files/TraitImport/test_traits_missingUnit.xlsx index 244303deda06aa44a41cc87c91e3cdc884481843..a8366df2c2680a6eb9f41009f0f9c55c9164849d 100644 GIT binary patch delta 4635 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 wi3Om}!ssI20 delta 4369 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 From 52da25ba635e8dedfb8382611f51e86ee34bfd9f Mon Sep 17 00:00:00 2001 From: hms243 Date: Fri, 9 Dec 2022 15:16:04 -0500 Subject: [PATCH 2/4] [BI-1613] Step definition and selector fixes --- .../OntologyTermCreateGeneralBehavior.feature | 2 +- src/page_objects/ontologyPage.js | 45 +++++++++++++------ src/step_definitions/ontologySteps.js | 16 +++++++ 3 files changed, 49 insertions(+), 14 deletions(-) diff --git a/src/features/OntologyTermCreateGeneralBehavior.feature b/src/features/OntologyTermCreateGeneralBehavior.feature index 23cf7a61a..474b19cae 100644 --- a/src/features/OntologyTermCreateGeneralBehavior.feature +++ b/src/features/OntologyTermCreateGeneralBehavior.feature @@ -9,7 +9,7 @@ Feature: Ontology Term Create - General Behavior Scenario: Ontology Term Create - New Ontology form elements Given user selects "New Term" button Then user can see 'Ontology Term Name' field on ontology list page - Then user can see 'Term Type" dropdown on ontology list page + Then user can see 'Term Type' dropdown on ontology list page Then user can see 'Full Name' field on ontology list page Then user can see 'Description' field on ontology list page Then user can see 'Entity' field on ontology list page diff --git a/src/page_objects/ontologyPage.js b/src/page_objects/ontologyPage.js index 57c25cfb6..03aac4de9 100644 --- a/src/page_objects/ontologyPage.js +++ b/src/page_objects/ontologyPage.js @@ -37,15 +37,23 @@ module.exports = { selector: "//form//label[@for='Synonyms']/../following-sibling::div", locateStrategy: "xpath", }, + termType:{ + selector: "//*[@id='termTypeField']/div[2]/div/div/div/select", + locateStrategy: "xpath", + }, descriptionField: "#Description", desriptionErrorText: "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(9) > div > div.field-body > div > div > span", tagsField: "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(13) > div > div.field-body > div > div > div > div > div > div.control.is-clearfix > input", - entityField: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(17) > div > div.field-body > div > div > div > div.control.is-clearfix > input", - entityErrorText: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(17) > div > div.field-body > div > div > span:nth-child(3)", + entityField: { + selector: "//*[@id='entity']/div[2]/div/div/div/div[1]/input", + locateStrategy: "xpath", + }, + entityErrorText: { + selector: "//*[@id='entity']/div[2]/div/div/span", + locateStrategy: "xpath", + }, traitText: { selector: ".//div[@class='column is-10 mt-4']", index: 0, @@ -55,25 +63,36 @@ module.exports = { "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(19) > div > div.field-body > div > div > div > div.control.is-clearfix > input", attributeErrorText: "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(19) > div > div.field-body > div > div > span:nth-child(3)", - methodDescription: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(23) > div > div.field-body > div > div > div > div.control.is-clearfix > input", + methodDescription: { + selector: "//*[@id='methodDescription']/div[2]/div/div/div/div[1]/input", + locateStrategy: "xpath", + }, methodDescriptionErrorText: { selector: "span.form-error.has-text-danger", index: 3, }, - methodClass: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(25) > div > div.field-body > div > div > div > select", + methodClass:{ + selector: "//*[@id='methodClass']/div[2]/div/div/div/select", + locateStrategy: "xpath", + }, methodClassErrorText: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(25) > div > div.field-body > div > div > span", + { + selector: "//*[@id='methodClass']/div[2]/div/div/span", + locateStrategy: "xpath", + }, methodText: { selector: "//div[@class='column is-10 mt-4']", index: 1, locateStrategy: "xpath", }, - scaleClass: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(29) > div > div.field-body > div > div > div > select", - scaleClassErrorText: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(29) > div > div.field-body > div > div > span", + scaleClass:{ + selector: "//*[@id='scaleClass']/div[2]/div/div/div/select", + locateStrategy: "xpath", + }, + scaleClassErrorText: { + selector: "//*[@id='scaleClass']/div[2]/div/div/span", + locateStrategy: "xpath", + }, scaleClassNoOptionsText: "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(31) > p", formulaField: "#Formula", diff --git a/src/step_definitions/ontologySteps.js b/src/step_definitions/ontologySteps.js index 5c373ba84..c3d9265c6 100644 --- a/src/step_definitions/ontologySteps.js +++ b/src/step_definitions/ontologySteps.js @@ -165,6 +165,13 @@ Then( } ); +Then( + /^user can see 'Term Type' dropdown on ontology list page$/, + async () => { + await ontologyPage.section.allTraitsForm.assert.visible("@termType"); + } +); + Then(/^user can see 'Save' button on ontology list page$/, async () => { await ontologyPage.section.allTraitsForm.assert.visible("@saveButton"); }); @@ -311,6 +318,15 @@ Then( } ); +When( + /^user selects "([^"]*)" in 'Term Type' dropdown on ontology list page$/, + async (args1) => { + await ontologyPage.section.allTraitsForm.moveToElement("@termType", 1, 1); + await ontologyPage.pause(10000); + await ontologyPage.section.allTraitsForm.setValue("@termType", args1); + } +); + Then( /^user can see "([^"]*)" below the 'Name' field on ontology list page$/, async (args1) => { From 699100900266a77b0187b2ffbf65951373e6a28c Mon Sep 17 00:00:00 2001 From: hms243 Date: Fri, 9 Dec 2022 18:56:51 -0500 Subject: [PATCH 3/4] [BI-1613] More selector fixes --- src/page_objects/ontologyPage.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/page_objects/ontologyPage.js b/src/page_objects/ontologyPage.js index 03aac4de9..5b90add94 100644 --- a/src/page_objects/ontologyPage.js +++ b/src/page_objects/ontologyPage.js @@ -44,8 +44,10 @@ module.exports = { descriptionField: "#Description", desriptionErrorText: "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(9) > div > div.field-body > div > div > span", - tagsField: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(13) > div > div.field-body > div > div > div > div > div > div.control.is-clearfix > input", + tagsField: { + selector: "//*[@id='tags']/div[2]/div/div/div/div[1]/input", + locateStrategy: "xpath", + }, entityField: { selector: "//*[@id='entity']/div[2]/div/div/div/div[1]/input", locateStrategy: "xpath", @@ -59,10 +61,14 @@ module.exports = { index: 0, locateStrategy: "xpath", }, - attributeField: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(19) > div > div.field-body > div > div > div > div.control.is-clearfix > input", - attributeErrorText: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(19) > div > div.field-body > div > div > span:nth-child(3)", + attributeField: { + selector: "//*[@id='attribute']/div[2]/div/div/div/div[1]/input", + locateStrategy: "xpath", + }, + attributeErrorText: { + selector: "//*[@id='attribute']/div[2]/div/div/span", + locateStrategy: "xpath", + }, methodDescription: { selector: "//*[@id='methodDescription']/div[2]/div/div/div/div[1]/input", locateStrategy: "xpath", @@ -94,10 +100,10 @@ module.exports = { locateStrategy: "xpath", }, scaleClassNoOptionsText: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(31) > p", + "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(33) > p", formulaField: "#Formula", formulaErrorText: - "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(31) > div > div.field-body > div > div > span", + "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(33) > div > div.field-body > div > div > span", unitField: "#Unit", unitErrorText: "form > div.columns.is-multiline.is-gapless.is-vcentered > div.column.is-full > div > div.column.new-term.is-10 > div > div.field-body > div > div > span", From e5cc7b8f68b340ff4c970b769fcfdf04402fa2bd Mon Sep 17 00:00:00 2001 From: hms243 Date: Fri, 9 Dec 2022 20:39:27 -0500 Subject: [PATCH 4/4] [BI-1613] Selectors again --- src/page_objects/ontologyPage.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/page_objects/ontologyPage.js b/src/page_objects/ontologyPage.js index 5b90add94..5d6f17a32 100644 --- a/src/page_objects/ontologyPage.js +++ b/src/page_objects/ontologyPage.js @@ -45,7 +45,7 @@ module.exports = { desriptionErrorText: "form > div.columns.is-multiline.is-gapless.is-vcentered > div:nth-child(9) > div > div.field-body > div > div > span", tagsField: { - selector: "//*[@id='tags']/div[2]/div/div/div/div[1]/input", + selector: "//*[@id='tags']/div[2]/div/div/div/div/div/div/input", locateStrategy: "xpath", }, entityField: { @@ -209,27 +209,27 @@ module.exports = { ordinalFields: { selector: "div.column.is-2 div.field-body input" }, firstOrdinalField: { selector: - "div:nth-child(31) div:nth-child(2) div.column.is-2 div.field-body input", + "div:nth-child(33) div:nth-child(2) div.column.is-2 div.field-body input", }, secondOrdinalField: { selector: - "div:nth-child(31) div:nth-child(3) div.column.is-2 div.field-body input", + "div:nth-child(33) div:nth-child(3) div.column.is-2 div.field-body input", }, thirdOrdinalField: { selector: - "div:nth-child(31) div:nth-child(4) div.column.is-2 div.field-body input", + "div:nth-child(33) div:nth-child(4) div.column.is-2 div.field-body input", }, fourthOrdinalField: { selector: - "div:nth-child(31) div:nth-child(5) div.column.is-2 div.field-body input", + "div:nth-child(33) div:nth-child(5) div.column.is-2 div.field-body input", }, fifthOrdinalField: { selector: - "div:nth-child(31) div:nth-child(6) div.column.is-2 div.field-body input", + "div:nth-child(33) div:nth-child(6) div.column.is-2 div.field-body input", }, sixthOrdinalField: { selector: - "div:nth-child(31) div:nth-child(7) div.column.is-2 div.field-body input", + "div:nth-child(33) div:nth-child(7) div.column.is-2 div.field-body input", }, firstCategoryField: { selector: ".//input[@placeholder='Category']",