From 4ac611f7f34db8f135e40f5232cf095d7ad771b6 Mon Sep 17 00:00:00 2001 From: "Hilmer, Carsten" Date: Thu, 8 Sep 2016 16:32:10 +0200 Subject: [PATCH] Datenbank Fundorte und Texte erfasst, Detailseite verfeinert --- www/css/custom_style.css | 29 ++++- www/pokedex.db | Bin 81920 -> 118784 bytes www/templates/imagedownload/js/controllers.js | 4 +- .../pokemonliste/html/pokemon-detail.html | 107 +++++++++++------- www/templates/pokemonliste/js/controllers.js | 29 +++++ www/templates/pokemonliste/js/services.js | 38 ++++++- www/test.html | 2 +- 7 files changed, 159 insertions(+), 50 deletions(-) diff --git a/www/css/custom_style.css b/www/css/custom_style.css index e58d601..3cee560 100644 --- a/www/css/custom_style.css +++ b/www/css/custom_style.css @@ -2,6 +2,15 @@ md-input-container { padding-bottom: 10px; } +.half-image { + width: 50%; +} + +.itemfontsize{ + font-size: 14px; +} + + .image-list-thumb { padding: 2px 2px 2px 2px; height: 64px; @@ -11,7 +20,7 @@ md-input-container { text-align: center; } - +/* Attacken Bewertung */ .typnormal{ border-color: #0a9dc7; background-color: #11c1f3; @@ -19,6 +28,7 @@ md-input-container { text-align: center; } +/* Attacken Bewertung */ .typnmittel{ border-color: #e6b500; background-color: #ffc900; @@ -26,6 +36,7 @@ md-input-container { text-align: center; } +/* Attacken Bewertung */ .typschwach{ border-color: #28a54c; background-color: #33cd5f; @@ -33,6 +44,7 @@ md-input-container { text-align: center; } +/* Attacken Bewertung */ .typstark{ border-color: #e42112; background-color: #ef473a; @@ -117,11 +129,14 @@ md-input-container { .pokemontypsx { display: inline-block; padding: 0 10px; - height: 16px; + height: 18px; font-size: 8px; line-height: 16px; border-radius: 5px; color: white; + border-style: solid; + border-color: white; + border-width: 1px; } .pokemontypsx img { float: left; @@ -134,11 +149,14 @@ md-input-container { .pokemontypsm { display: inline-block; padding: 0 25px; - height: 16px; + height: 18px; font-size: 10px; line-height: 16px; border-radius: 5px; color: white; + border-style: solid; + border-color:white; + border-width: 1px; } .pokemontypsm img { @@ -152,11 +170,14 @@ md-input-container { .pokemontypnor { display: inline-block; padding: 0 25px; - height: 22px; + height: 24px; font-size: 16px; line-height: 22px; border-radius: 6px; color: white; + border-style: solid; + border-color:white; + border-width: 1px; } .pokemontypnor img { diff --git a/www/pokedex.db b/www/pokedex.db index 0889450910a30f7b5f0d23b943932bcd62891113..d895d743ccb05c8f3b63ca4bac2de3b198e23927 100644 GIT binary patch literal 118784 zcmeFa33%Mcbtl;OeSlX31PI^{QU@uK1R6IaQ4lBsAPEA50FaWXvqAg;w9p6C2M?$v z`48HT?=wEen~jr+HpyfXZIaKU@#NDtlQn1dvolG?aWb)UYb+O*y{dY(_{h0r!8BI0xpbmn4A@$1cDwB%!?4-h zahuK7iT~7}9DZ=AU+}NJ>gNVOqK#u;=?eS1YyrolE&8tLeUbYDUv%wq|98h^_;{e# z|E>mr&EkJb6u5E5=WXrjvA^}HLSi{(7M4@<*$p$D%~XDhJiIVDu{3EcO`JS8X&kIn z95fDx0|(EXI%pVY=9VU>Cl`$Qg)_4g3y&K!laCt{7naVSnFH|b5;S@xkPoQ)d>JCgv__!GX%7XC9t8cVTXtMv8B023+;QEh}fvFD^~a)qkRIb?*F< zhB%=0v?>ktLMyu4n zw*J7*;ot6aAamwaS>zj=2?nrW9FE+$&+Tm;AGg2NDM*@8mdRwMkV>qW6NN(J@`jly zG^+6I9AU%n{yucBQ)jnQcN0rX6A#a*1$qalm@AzIgy}K4z(Bg%i|5asTUwZ$nwnf_ zAYP{?E;Ov0oSR&jK2v2ERgdZ6^K*+!3lr$oIC#?BS~By6gT~bPg~>D1b8OEYW)3@I zp!>;%N!VA5)y5#!7!Z=I!6RTcNZtopCnoG~nW&M6#X=&plE|%;XRmB<*4DTy)3-ev z@KS4UzVm;)wQYZh+qlvBKi)=VL@oJ|$enfOsd z{Lrs{7*Ib9svm~b55ww*5%t5U`e97{5brDhRBk(7ZaiLYJzj1;UT!~L?jT<7Aztnx zK6Yf@;UV-NXYBLOr{G3ElQ*9)nwiUH&9BZK*w<7Z&Lq<2Q9vHa*}biI-)*-J)esa? zQ6VROaqMVrN7WnSnxhp38HSMUj>0$pcJxo9UyS}v^fS?4jea8fbJ2ep{b=;vQ7d{i znvJeRAB)c6qvoF`1)3CSQlLqJCIy-lXi}g_fhGl-6lhYQNr5H>ewZoX-R-pPn@Sbe ze7l^sRzz~vQ-Kzzt>Z!_mAt%O@JF4t{ikw?%j>2m;SWU%$Mb^#$<3Od`Fx>hS|)$~1jGl$^}2n3;eVAd@NV&g8OQ54xUCt`_`m zz|PS&e#-B{k25!4Sv7NhCw_c1kKvc# zbUMfF4bLDsFg-py#uD>8*8J0?K$8MZ3N$Iuq(GAbO$szA(4@c{ zq`;Xyd!xJd?ZTf{{u}?c?%OjKzt(qr^jci~?|A>v&H}2SLjFs98a}ss@2*|@_U+o& zO3k4m{I_p^d_=S*KH|R_P&Hj{i3`g0;ptsyjsMWN&{ivk*%}`%j|tz4Ho2tSrud=K zTli#)YDl(6Ew#pnsvD~NxzY-?6rPOk6-44DB>t zpLXrr6Yoc5dHmHR<>qBg)dv#q@FQWKJ2WGy4g&3K9W2vDflxDIq}2^7>d{x~i|}+v z5v!G&cB>m#wW=AQdN#-n0a3=1nF|e#%1>3NJ29`uojw$U4xbMIPntBr z1k7Kpd#EWfh#go}mx%_{NXy@c&-&4zm0dU-WzUycYySb2JGw7mWL!xSZWGtRj*^t}=L4 zqNsS>`>A8`}ki7Cb3JVs&?0j@CMhHH!J#x0r+ zpK;L?^Vpc0jP{-Z?a*YQXn)6aQ&D)%Nu$G{7)KVhU9Ec{W7Jhu|2rqBn)Sq(WPSJ{ z2hpwahX%QCPeb)l?nM#tTDZ@?*A}HeyLRz^qOGC+0qDlTc;E0S!~#F`#|NO5hT|h+ zVK=n5Bl;cE;d`Th7yVB3&ZsByjmUqA{Bq=@kz(YD$av&n#25aP@Nb4+4Syh<3ttQm zhg(B`6Z(AUwa|w{#n6S&NT?(Dz2NT#KN0;@@B`7G4sHf71_y(?1K$pOF7S!KM*~*_ zPXs0c-Tv?U|G@w6{6FR|`JeFL?{D|pd|&kaC*RNb-t9~I=6rp=nD@KhFL*!U{fIZ` zz2NQlwt2qq`KssBo~Jw?^gQIb?&i%2z@4NrK`^Vke?q&Cs`!2WN^$pi&TtDY} zhik(%<2vpNJHP4t4d*X7-{s6YFE~e?osRE0e$VkMj*mI6Ii7HgIXWD6`ybmsZGYAN ze*5$GCHtVgRl9t3yzH~tJM4D5_ra5?;_|YYbMB8m6fQp-MjVWwrdLTz8b)`tL2*MRI%U)c*no>>-6V04qQP^Cp9@X zRlND}jpXHxfZIF%)dBuv6j6I8*UltziGm3-q!McZ4Cxz^3W-4X+qW4TNaT}dZaI}G6u_u| zBLu1al7c;25Bs=+J*tO&Ou^n;5BsQsy;lp{a}o7-)0pp>O5J>Y%}fb?+3oj^|A|m4 z#u7eZ89%a6yu7i6|JIY{vKz>Kht)5~G*mpc_S33`Lz)(*RSSn2w$L?&Z&+0v)QZD_ zNz}7)KS-wsX<9wtNvZnVPN9}3r>BO_2Od^%JsP+JCsnPnczHdOST<9;1A+0s6zZpY z0=2B)41&$$>h-#r@_1b1UlAX)J*2wruI+YQHQcS~w(UU$*Hr`8eL{8F)u77<6liBH z==}<`QxDp8A3k6bAJA*lG1b6KIR%q1|x4l;Zx7Gn4IF35z-I#{UjAN)}!o>I_?y693 zyP__ov<@6q@cVS|_bT{(jfirO`eJW`FWQda3nt3m8lo7773`h{u*O~Li`@;zZ``52 z*wx^Ro__yo-_@xai0B(Qpc)7_XrMzi5Y{%()voG8+WOA@sApRxq%}6$6nIbz z-rkCOCS9h*t0F9fZa8~9YNIac--|`u`Qs$T(w|+ z1?H*;>-3?rhio+GLV}bjt%tBxz9uZ!ZZE3ul+|Su&ZyXMogM}6(89YFJgRl@2V6dz zpZnK=+idN3qX8!Ko;ou3+=)6S=I%zs+;2zo3@)Hy-R-fi;P2fp)Be9b`bReWzxk(0 zfhGl-6lhYQNr5H>niObKph zniObKKuZC?6+*dhlJ@^6ZU531{Xe5`kIqN;Mt(2ylabZPJ>kC!e=_`H_+;1>`gG{M zp@q=C;O_^2GPn^O2>gG6&jdaacs6j%|2O_m`7QrRzsq;i_h#R;Z@2f$-hb`A>OJ9g zdp_&=G0)SU9`_%+f7$(#d)mFv^(EIYxURV-Tp{NdoImB?LItfXk+kGvp9B`O`FL;z&$)%8XhSPk2Zik@vwpo z?_t=7XA|NOU0|;lo!t)nqym>CKgnIEQrW=a0FC_Cy^l=*yrXL56N|}oK9NcUG4O%X z@L*|psKLM=c&H322L8}YVkNPhO9aKZZw);*4(NTIlO~GV z4?a>%Y;IJePZ9StpJvdhU-awAc2w|Iy8OG5*? zz6NXh8k|iOw~}s57LaNH6dwQ(4l@yVabE+cl4~ouqz^dtm4@QFe)?CX3ky`K=&P}GWIZwzvI8YiK zEDbhNCHEgKLkh7xdaB5fZKMHj1N^|fgkP2JzIXO|F0q+Pc=||n-v+w>9_pHCDyehN zbT+k|D0p^*I`PtAziz&d0ER9P*zHkfkt3Ii403p{W2h0(@L>S;5RB~T@Jyz-vSOx+ ztE+B*i)Uc0G}x!``Q){vAKeU<28K1=3>*SLwYoVp zpENg<{x-&^0nq&i0YvA46@ML^ORi)$a0kcZ3%CdRO9KO?0Zf>7i9XT8z$Dg!#d-)h zm&{~6tod&PK5hV^JJ_nmCOc|fF!8uwMkwG$Q2jB6V!mZ{5j(S-EF?DE zP%-`S5^R3zcr@wEm$+fMdJWFu~Qh<=VS@DN$U`=JW2|0Z)9m6dx(!HZWG& zdJOO1RR-O~pt~4!E#cn1*FS_8fNu%h0$|qK5J&14w+D*L`J{U{hKsAmw*(%E0+`je z9CY+#aygrGc`)RGQhcz4d&}A(-xpE6+C;CBne0X}lW=)>#J7ZfAgs`pBMzU&4Z>8i zh}D~id`sxDkb;&&4lSm^dCOTB(Ydb_kC%Y8cFJ$T%Jk7 znb~mq$P~C0?3fp@N()ezUV>d)yY7S*=pVWj=&*-JDFErKcQb# z#@wn)+a4Y+-y<-uWgR@)TY=u^QkX*Is7ty_kS3+-;Njj1cEm}r!q8$^C$3W@*kE$G zp%_X74aR%F1AyHOD8}m`z>Q2czvpre#!N+Yu0tZ`RC5po$qj-bMAJ0(eb}K(vD;HZ`yy}e%<~69w+#8O$gu({5onu z3>{MKbdWn{d)G{2xmd`CoQ6LDr8Nkl7}U84!xqHQK{rZZya>>DPNd;0*bg@Fq4C22b{0F(HYv6Hy3wpnEMF54DOR-h`DCZ0K$S zKlG2*jr91-P#MCA6S%!RpUmWwIaeDn>#ygZ<1f{G|I%z?4cz14?}zK!?|l*9S99o# z{OE|e;bnk&{^~0+080{2PH6%52G}DKWQf7KF8W@mfp}pN1|=L**KURwsDp@a0Yb=} zKzeIFktrn8*?iE?AoWZzbX|2K<@-9WP3F=`(-~~>#QUKa`gM9?`<@LS0ja>C4uLz~2P+GOO4f|A``0n|z|la$>x1RN*=Pzp6` zq2i)xLJc9(6DMmcu8SfJ7Zi}}tpK1+q&eZhNMpF(e0h|D{P~$gW(_*X-2x_!*Ym{j z90B+%T%B72fSF2=l8b9N;(2^8WJq-I{KM;sjG4?)4}o~Ro+E}fc}S#3h5FuHNFv!t z7AaYX0x-Yey44%GBUyk|FBsW{drsR2KdTh4C80^`=yBa+yfMbbaUj`8aM8Lj! zz0mtyO&8D2AlFOEGzCDtVi-s&TqFgO2+6OlC45)~`e38?>7t9H>*a9?aav!>CDx!H zvOYtQpb_NY8jVlbRLtOOu$wr&Uhqym?rqbKLgZk!w`~m~&fUNfT|7#KO&%#sjPRG z7+?d){&_%F$GPXvCDzl$JeemWW2I5;a&o?ml%T}RrqLjo}C;A>+MERW9KSZu~eU%HnUd~TOnV-Ju+At87hr5 z^4%YpDT4~Bo&jhsyAkqnJoq-y51j>c57-KJ8+Uwm2BMPT7xqF3a8khG*8LBhK?~9$ zWFnne0>5OhC7jSIBmJcj-Fh=}8bHz+WT4Xogit4-*kEh~c;7Suisg;RJH435ZJC*5 z!h=oITkmd63P?MV%zlA4UqpI48KDA|L=`H6+IgHyU1rEZ;hOc z*uuYs;^v?(-qyEH=G9 zGHYH925=anZhz#cg(EGrLst3t!}z#Rq|fW47ULF9vxq%Ro9z&7cH2ILr|Q?TxkM(4 zE%x{zj)~y-VtlaCxqt}^=UT+Bmu-(|;YYcJOfnbsQONZ6Z9HV*l#AR9-6h)iAlfKk z_alnkTWk&9b{M@D&b!dIT?OwCoJ(AxZ9B*AKzy)1ihbO|F&Ek!tU$c~QeqPTUIM6( zQy#Z)v}Gs2`*2Jc0lx?V)bC~VS~$)k_Dj_s?|T=p^>Gc`l?cTTYC=yI&apT|@Ip@Y zdnT}#v68r4xSk5_X0ZAlt`Q4ISkx?X*xL4PvHQJ=ooMV~H{ATD`~UXn-w`*5#Xmnl z#%^}iq(GAbO$szA(4;_<0!<1uDbS=qlLAc&G%3)eK$8ML01AZ8(*FNhZ^GuYd|&eQ zc>fP?!vB!}C;XrEf7bse0b8Ig&=)w3yZ+Y#?+g5F;8z1*2z)E(3mU=E;CygB_@>}T zgTEO3bnr{T?}l1JheHpA9t&-T-WK|a&?iHm4gE>j7H$jog-?f{4POhtFZ{FNUk!gD z{H=&DVnjwG^O5z)oAAcqFGfBc`BLP&(U$1p=tI%RqMOmTMSmjt$>?XJ@)4>Z02!KH zG%3)eK$8MZ3N$J34^4rm-TQ2IuOI*O`sr`+m)AZ1ZPAl@Ew%37H(39)OWVHdAFO>R z+Q*>jj~{;|BF={Gt8uG;(o73ep?$MUt6T4Si zesAokw)|-9n6~^_?6|i4c&t}j-W%)FmiNWt+VXg;Ut8WE8_<>y#0ItHgRvoP`A}?F zTRt2c(UyqEk7B1SX=&Z?3A|rRBTdPJ{gX)7tXWu`}B8GqJPUa`yjc zeIK>?KI;2L-=`4+_^!Xje;6@<$NZcAxBVkU0)8(1AH#nX{%&M<g`aiTm)@-jyfhGl-6lhYQNr5H>{%55?Y({IZ z%*4)V%g@DTwdJ$1Ic@n|?7X)8d~9A@J|BBTTmDFFL0i5MThx{>#+J0@OR)>u@(Zzx z+VYFBN44dT#vap_KNfpjTmE?LlD7O(>z`7^O+ zwdK#o658@aY*|~r9J{P7zZ_f9maoK2ZMhj+)t0Zu*0kkov2|_vdMv3ePsX0pmOmHU z(3Wq+QrhxVEUhh1$1>XTOf0J{&&D>j<(skRwdK#pa@z7-EUzuk#|ql=LaeAQFUGED z%df<)YRj+2u4&7!#jb11ugA8u_u()i?NrqSM$DB3!zJ0&HGy|1TS?pA854@zSPxxu+>5UQ&;n&trkL< zx|$EQS_oq5YCha*A&jZ3`3Rl=_eVcRW^B^1&P~_6d(<=NJ>YBc{Wt&b27V@Jg)W6JMJ`46 z;kZpa*?Jp2-yqA4G}1~Ij5TBhMBv(Zf1;R z+E~nHGI%8sza}%sjfvu_k;hMF+E}>xI=;&oh1|_o)(VE1Ct&=(h&O}q<(bS1K0>K% zppZ+fr%;_JuI3ZPwZc*3YBINCte80gVQdvM<~l%EjJ4d&*KU5?%pI@GO0w;7v{XHB zaiho9dyDri$}e9S>j?}Hqcf0TI=^YsAZpM!Zk*%~is*l#nBGKv5n&qyUrLO7W(7%K^;lQEIm zGSLDEvXWT6`Fids)#QzpWO;^>fgXk%pOyL)l;LAxofS1e?n@~L-ASA}hXz(*#gde|wfX7p|6SsOj zdd`T0j zo@&7iujZ2G3Pz0Sld}v=@|fxQ?8eQ1gMcQt>*K#9h>uvbJ%ycG!VWhHoW7!1Nfer>)z*973w2)mmXQY!7&x}C{p>ufS z)R;*niq$;I{Ex>AHcSwMp^)u$byW!^a8oGJV@2Qol!tC-(}SP{~T7>@z~x=z9jFKS){hFK!#a0 z;$# zp7DcHKnKQZ0&CDvpOH53E(3V>RF-HdgkQtCa{(YM6S8-<5?}qUb$75bI zS260FA5UV@#0ZE>upHccrGROXqf8MeN{Xl@Utpa`@v!mg?lS3I5?~W6CZ?KJj(iq8 zFH9EvcJuXRtW{9a#Pr0}(DZF}0*+wiTlQy6GP3U`PCE#%Ow z1@N3{;1QVh6b8vpu3^%zl4j-=aRYB0&?JZ{fKKHVAC?i+vfH$2dT;fvo_umo7$~n}CWt?v%h@!A1gx2C zcOeZwvr4Xbc|8wFqh%s1xD?#VlVY4pn#;tad0NQ?-$GA-#Q@2Z2T3!bK_!-e6M8zG z0M8Rq*!(Ro$2pKYOLA%Cvefw;9_R&gAVD5$)#4_e&CyNlixFm7q@kzR{ch~C^)`N! zP&`(sVZyRnRIBqz@FsW|>n8;4j8uPV$(tGDIddh8RW?`VWe^Z*IIq~5`I{F&md#}o z%!$nSEP@T0);N_|Hj~2c7bKSa&KiSPXboeJM1g<#EyrzGNDUry1h)aF$zScD;S zX&$e6fYF7eN-IbXvt`n2d`5CThpA$A%s>vnj?&CSEdWddhAx&&7)NW6J~F4M5Im02 zWAV??DhMmG&RMaNEo$b7bGO%S`G%!<-BQoDQlo<3ia;V`oQJx@V^t=Z=aPFTp<{tB zJQA4hge4G!bHZen$ZZvKAimHyU|T7Vd8`=ANonL6lVofNy(Y}fVwy-vX7ENfQ^Oq?EIkHw8 zaNCvLWn$o=)*J3yywu7DMwR~}-DBe_S(9Wy+&hM=&TlQz)3!JKw%!JB+b*aVZ+Ve3uN6q{NpX>R4ety~ z0IgvZ^uXI#iB)I_IJ>lZ3n$?!9O5d?E>zfgXpfB4xI)tuOsE<;$4cc-Wb&}$UMCxz zlnTv%#;7n4b3wJUA=DACUFe&*RfG7&y$W%9%xC+&tylLHFk#KF1B35mG{ZD5LD9jc zx{3f08G!i$CVGWPaLUZX1X(sR39OyK9B<#!@&_%m21|$emSlmJ4+3JJ8w()CMKF7b z<*njX6UH_~Xf~07Lxq^q2AaScEEJ8f60i_MbAqq5igP=%Pq8x3D4YlV+sN|4WVvoL zO<7gK+a=wFS%ktSyBDu1NsAc8q}GL1K(;t6EV4j^ft4}hY^9)pV^Q2Ph$380gl;Bb zaF=biES5V87p!kkBmvl{E{U*Y)S&$xcB9~!iCh6+lig092YkF7HALbA83T)HX1Wvu zL6oPw>qfV&xBh`?@#3@r0b>P6SSnV7wNF8*jB%R8islcb!K|3DTPMNrWX_s7jD;N# zIQ$%vf=hv*2`nY>d>Y@afS9leD7sN`7ZElCt!b%wj%Xkx031-(kfLYU4L4tB>s|GX zPRJOjENw7zSuJbOf3B6$moEoxU$yn>UgZ`Kb;G(M@#7T@qauz)ENBxC|3PUXDnMZ( zo;5fm;BWp89Fi*{%!cqLhv3LM0I3SZ6zsX+Lzsevt-N%9$?`dA(!}8t&=n1^j>s4b zq)S9$&P=Rft)Sk@)}WO9nJfZ~>*lg%CEd2Q0on5NYB%n+_0~RGUaP)o{)(h%(`2MW zm=W0FiQusdrW4atUR2V?%+1$wus9*Plv-2*<3MYZPZ9c7Z*yk)^rN%=hMgmVY_l zH|(}v?Q`#E01m$&>~6@{;AsIe%)(Vj>Kp<+nBD?~k})oDCl8Fqk}>!JQatSlX}*lG z1Ez;0Tq3w4xQ0xzjqEyEjVIYxW=AKFwrIK3i#8U<4J`I(*EG&0R)~LAA##`$^vmu# zJc%vMtXq$?D;8&6K4a@`Ur2y_MX%2zU$JO*(j_P}ULBTg6I1VFtXdR{({}&D7h!mpT+qq{b;m z-LXi|UuW=o79Mo#A1U?YoiI_9FEgZMTCDvXg%(jMnpmNd%ke4noq+d7hB#>?uotWe zq1aQ55H-XBpdC7Rhk8)jfR`_{Me2A8Q$?yA1jWR`+ojd49=T@@067j&^MqZt^&VhM zz>>ZePc?2RsbEL)!HZ8GoFHPg9H7S1L63Yv4xuVBL(sf5g(T0Xv6_MKIjL6QG6GSu z10myL*9PkOEEW#pH8Kwgp5kAXHd#TDd|!n)(-*v;WgsG0FY=_W>oMHk*9i=JLq?t<>1@ba5i-4yRIZR5LqM5MRfJr$94{D)dnmH-P=s^Xs zMOXmA?3c)H3nk7wm>blQ5m81rOCzLmC^J9VFU-E<1o3quNG+nGBCfLx^xU2*FPk+H4@iFg zG&3GN&$p8f<*J>+AeJOBZzTjqp%5~uS4@}$ypWO9)L04-143P{K->!R6~+w2R=+2Y4%63SwhiYNtrUq&x$o2WQ7q7OIbq?>$*`bFxxNN zda;)(1STy7W}v@>*U1OuJEWCbUQ_UbCoja6VU;%=O{2=s0BTT9h{};c1r3LVhPFhM zr6Qvf2;rC@BA96zl2SHIU~W>FMk+=Gpw%W8dR-$f6G1HS71{2zT?u~;3`-~Vw%#7*-DD;!o`=-%HR{UC0O?!OsHCc(#MsE>B@GKV$upuLaQfs zfJpq=sz94lDVP{KSx+2ficnM*x{qv|gG3Q}o}E-*Jw2!fhatqKv@nx1v~4G?^;uHj z?5mul9R#u*l{^a?q|E}a?ilhSd5dY<$)VM8lHMdO=C;I!X7%z1f-b-*!%7Fag+?Pv z1AW>@1PNdYV1dI%Dg1rd3iUE=Z5;xR<>z>B?6>tEnopXWNq<|wF@(pmO9R70eP=QT zo~TY?8+--PQxFRSWV0%Tf608o@Jat*hRCf_>V`ENnOK_?O@callumVbJ0q8QT;-3{NlS5KwF81}Q8P9$|)!LgtE{>l;4P zAir`4kl#nv58HP|Tkjq7$!kf!&m$41-@xFN?VeQ(tIE}b+5|Ot!KZ;vVdDhv)q^OK z`=EhYZOaj@Qf!RPfob^a<;j;08E;}pQy5yB2!``2#w@5#=z$o#Bf;W9R9xIlz-Gv; zA;>~!9KidFSd=wrK7S|BEI$EGQNueg7E_zaYmPRu(FaCK1F+FW5h9=z4`W+{Cj{YR z-q2W-T#Z?PMX?(IgrxCmR!bj;1%y$C}7c6#9k^8l+NUgJ**GmQlsLUdTdzakxhYk)@}?ifh`0 zPecX_vjT-$=|~10N`Q4P;wKzVgIv)uB9^2o;t4|lk*mJGKK27};D~r#gZcA!1M~9Z z(zJnn_k0mvbP91>w;yjBW5&lygLo;rTns7~pmdixT$fW;2ag-4Iw-sx(}o{W2@ZF=SG{_rDDipO<)FAlOJwUJ=`XmJJna-vd!xpc^PZaR9LHCiiBkh7M=mKjN zinCwE>H~*v8Ke~I^9)D%!G&0wFqw0F6q0=-Gy(UO4;i4bjY9HDJptn-@WYo%o3wV-ru66=?xen%9J5gtJT7GZIUrI^#j{T4G5Y=-R|F5FU&?cUWOs zs0$HUFIz%9&x9cq3Lh59&~7&tn;f5J<(L3=xwJ&PV78}-DoE*~oshs;QD_c4S;h&UnlPRfX4oY_FsgzTw#7+sjsT#+`U zm*LA(%m*}D6VbIlGYR{ zS-CmRdJ6o6kOU?J4Um0-Mu_&YISra_QaWqs3}_YLh-rV!H{7WR5c69|$ib#?KRu&nJlUQX2 z2YSuiv9jqgM?oO)_UbBPVVQzJOSHhTC=NTI-NF?RoE;TjT=S4Xsr)eWILW$_+|t{T zy(Hg+J1;+3TW>F8X>PcnzXa;CfRzN!WAiZ)<0O1-ET?2~uu_(TD;U)y23OJ2k`|vl z3O4{okm7vI2RKuB4G;<_a`0yohjuZABn z`h4iM(1%0C(1p-Qs3Z8j;O_=M5&cx~1JR!jZU!#~2ZOr<-wu2(@QJ`j16Ko21SSIA z{_p$$!2j?3Kjts_pYY%BZ};1LU-bPa-_Q8o?MwOQe0{!{_q*ONct7F&h&SiG;O+Oe zdA{%Ys^`<5r#v6@Jmk6V>GZtn{#*C&yZ^oW$KBiRW%rc(F1O$H4cBK}Kj(UfYr{3; zI_?TPzv=u9=Px+l<;*%SI7gkGj_)~s&+#jck2$V6o^XsgIvjTUAKO1|f7Ske`}6iC z`=Gs5>(_U@>=TEwyboeEqFqqu{^&!FRsPfU5-Q0s@t!z`-9{3%eBKxGj(_=I(4UWW zyr_UrXn;!!_yIle3kvvwdf>J#RPLjm@5k}*e2d3B{v|Q~&g-Zl1JQdwA9meJtY;hn z*Z7})8A+G7zT9?A0p3>w*mkvCL#L7*0q^*?ex3gO#(^uS>7*vdriwQ|zJcAQfZIF% z)dBuv6j6I8*Umu7v7gR#fY8p{tj{qAqaE9}0fzyo`FDu()=@mKAuP z9z3DI`?TQCD)8P*2v}|KAyt<%H2!;%cF&aSwas@tje17yxCXVS6!38^aQl;}CtKHh zY!TW&XL>4P)b#}F4q+Mb9$Ua-2va(RgB@VhzY&7eeo4U|t%rSF!5-DaKBi#rt%rS7 z!QQKd?YW5hyJ^h#$PkB+;N5=jxO{rWSi&bP<3|>Xmp8WXAC4$5yMf$ySgoA)v@fU; z9G+h#7sTy@9u$?f_IXu#x2*J*E87-P$1-xHMn?8Of*O{(!?jY^c0mE%Qwwxn0o`2( zG^c>>s?l)!XBE(0bwKA7(493v#tdqhD0em>imm-DK4EsaqYiJ|!8532#dAkP#bawf zty(ywX<=HmaHwGmT~qjmRmDNAI2@QnJuCNvw4F!O>H$wm)!%jswLCdJHFQ4ku!8H+ zz#TZLYRd;zb_W9Ee<{>Y_XKKLzws6#%xf6pDUZiB{uS{-+e50`?%Hn0Rm0tyZrdJI za9uTU-6vF+T?D7;@&N_fSqpl<0`1g;cHM^$n8XM4+H_1caA1~Wz&LGGGD97Y@b3D0EZbj=~St=qV0{L@)xJ*HXEG}#Hk5y)fzsi zzS!S@m5qV&7Y*8I>&F+&Ds43cY>%UcrJ$`&Id%7;j#;5qPu%ui1>9N(eBe0hn0I4~ z@;Fo#ml?-U%Y=!+z+O*LhzE|)uBb~Xtpi6D{5~E0y$XI`Bcj}+zS!H~i?$>9f{C)X zhA75i1-qvKtZ|q6Vt0e_8+WKLb~X5-=McVN-M*`#Za=6RX=yN!_8xq}^VhP3ec6=h z2J8NXSWOQYsN*S!YUHu28?`JMQSEZs-GzFd{fK_{yE;_^5q$#(R0H7#4Rojm!rBJ9 z+Esl>Ti>}K^=zwzw8lo80uO4z+gnl3qzl%Ot}CWs1A5qf3N}y=yH~;bwMK2*9@I16 z`D^&DYqx^*=^=M1NM8+PM+<6L3wi4ulJ+Pn8BuTDVA~?9Nl(oZ+7m_%v!|yKd$xrX zFkh>za!WdbsNwOr>$PHAK!Lex`t0y4FjqZTrw^4qWTQD3IHFJMA#9be3Cp$Hi|RXN zb=ib7DmGlFN5MO^@NNZ-=Zl|Lpx&-XHOYi|Sy8h1fdDp*jeb|+Aop;^q3Oc{; z{EYMGo$qz#oO8~jPM_oJj$d>9Z;rP(Rvo7tha7JE*X;k%{!{ih+fDlvRtBHW<8Qaf z+hrPEt0PjEMb0iOv};=FIbe~m%lh!DW=T0)+*?^m>T zLZ?N(E^DhIJO79zr=t~5xyvG7mm4T*hu>k5qsuZ?sF(3Bi+o)MFKEHLE%J9+pXcQO zYy8Fo7Wuu5VO|qU=(Nc5W&Y3U1mK`WjxXEH&o{Jq_gm!svfuDL+sy8Yv(asl=gTA9 z)Q_;oBHx$AX!8ha6pCpT|+amXuTgf(Rg?wOcCEKW#c8mOA=Cn+m zY13|z7c464*s$G7sLHekk{n=$OxHmkw8;Bq0;U=gu+t(JnAs==Hca6VmzfL0T9hHC z9*ewSMsA}Ka)w2oFk4?6^9kI#K~$P_=`Og8e6^=<8&oi6GCIJ4rU`q}yT-nOa$I)JoY$UT@UOL5qA+ChgiSNK2kHlXgvKPjp)3 z4RigfuHLZ7&1SNi4Xpiki`-_Of3t4>4U0T+hF@t2PaZVGuhhYJS>!{r3b-suwKMY6 zZILU@qH(!_vtyA*%}p$8o9M8}v1TQ-T(5*WE%K?ELJ1v(4q9cmI&q6>Ah((uc~;lR zev3S7Rw2*Us*rYzJZh%TGj;Uow8)+2hM&QfRx)$7m|G3OT&7Uu;qTn+vdE!kAzUR@uv5XrS&4i%e>6<&lQ1ls)lB8nn`B zk@3wlGOtr8T^70OjLf`tMmjC>)VYE4`Uc2N=LXJe8)&n7@BzDgb2T2%0jun!&uJFX zHjBJ;hMcW|Y`4fkXIYrlh$%Ve%%|t{ve0Fbd(MMaU+i2hIxTX~8S8U8b=hr^d(K_V zH0pvJbnZfZQQHN%=-kDOu8Vf7?4qBoL$T8$ADw~E>VOYeG<91pfyXdgUSLcQBbp1luWs#@O`w7!k&Sb?GZMVo_=iaC5dhfExVQ1*62GHcS zGxSs)bf-m*JKO1#Iy=4HBCnl+C+mO>iyU{BxKj(Q{tkLOPwZqUjB zi@bTBorg7iZ&+T{!pVj$kU!5YoYc19RxM1-=dUBGDt4P__wg$yHfe*f(}G7YIA}sA z*M{X(O+3`F35ROpAzc#(EqJoR@EmVw@pM@>e8h6{pw{Xl|9`~y-)zYD|9bS}(Ngru z=ty*Lu;MB@7{73`t>)wWID=~R% z15DuC%2wXe5EHn#5|g*oVbZ=0|5mDkH`l5HV;lahmHz&lVyUeF?ESTEuO z9^MNLl+!`0gilxxZZ({TPU{7H#Dm<@EgFWkrTV$vfSKE^>-dDl@_OA&c3Ia@$%tIn zii=@gRUKSw&;j}XE%uPj9O%l-tGMB!tSPwgGFloO8)*7ziA(siVPtzT` za;~hCoKzFH^vZcEaPfujW~s|->dL6R*~Qtb=>Gg0phdDOZn8|+dgJGj&fVp~Jr;ox{VHymYbyznn`o%7G!!4| z;}UTx6Ibm`PE~+wO2|D;Nk1_zO6kWbR8LVBs;gOX6-wL>t-UjbD^zQ_1f^O+?n9)U z#Wfsco&qYkM}!P@bQ=fBl;qtedJ}+eF-~MQkz1Xw?@@l1DKoW#%*xzt#y|qERge)Q z5t-WfqL2VZHxrpr5QWaeQ2Tt!PzN=;l-q&v@aJ&7(RZsPvc z8sC{0m#-+jH&PwrQZ%j|;v%QIql8{4t2JHc!u2!ChA)WOG5)geOw|F?Fc3UZ|zLG3AFfPC8q>MEsqu>#Kg+Zj~YmuD$=auKBOr# zfh}(0C_jHD=bI9(&dTf7qEN*U`4aixBRlELw*>tYUxn{X8r_w{iZ zlM>8;Z>H!6zLbgcu=Gd=7yy?kDNT>aX248eNt`KCW?m)X5Xm4oHygBrys1fd+33nR zWl>GI+5WCqvC zot%VhXs|RiG}Ol>bgLFaRrmcNRdo3-lg!iAKQJk0g_lW;P29ADej%Dno9oFOa&X|) zlC%^8N~nYz#1Lvqwn1`>;o`13HI9_|AcxA4K=~&r&k-g3pjRo7UWoXKBnX%7IavTk zMR%7^CG*H-LD!QY<=`#c#3ME$E?q6);-`)iI!AzeCDQ?}myQsoI8Wn*EDO}Zg?#T1 zBczo6l;VxVj_-@J-o-CdkTbqNEhmn0en3^_jRa?h>0`inIC2;LYj4dG%c-vZ`h!NX_}S>ccyKwOrm z_Av$_A~Xt4?42keVGHRha6XM4d?K@v0k;JG$_XWr_Fd#l$1WP>b}!#hmN1$;iezgt zi`*iC;^Sk$i?e$0rPC*Dy<_MgvAP<-v{zvz3f0KOO>ZfIY!~1r-xj31h!vOk4wvU~ zDh2obCFV5ahRRwc?}PJAYDx`@9B;TnJpswdt#Iy}G~JN~DBaCxBZP=G1qC4UCQve) zR94(y2D|g}P%qEhp8FJTe3=-zi0+%hE#OR6WGopPEe*lA5=B+U71pK3x!-w;F&tVN zm8n89D4#?E$03aaU2-OU22+F+S5o8r5)OteW;nSHvj=R994W}f&HAiSrVCJEt0-1X z+)b}MM?<=zDqle{zg0|8y7+oRSZD87gy2a&Ve7qrA_qbwk;Oz(LHy1P$U3zwUX!?= zPOMo@0fDRnhRV}Vc|?$_U*^fOqJc-@YZ_p3o;STOu_1*s@9A&dn|l(Pj^hrCErfx!f`u<0{wb3P}8 z@=^(>U{O<2Youd>e4`n95(WRVxdZWqvb&JRxiUJ~O3Rk`N+qo^Z=sg54>HHH2LVj3 z+Ik-(Og6L5K)_v(#bzae7;YS4K2)|otg^5u>GdM1e1srz_CtC)BnK-O%S3gidoe-6 zZe-=NY$o`w6Qq>|m1h!9Kp?9IC0JlCM^kwNZQ*(u+nJO^+Bm-jNaPYA{sIAS{S40P zI56fcQk>nxwDpcpEawuz!Zo}hY=nh?^-gUnzW zIcpB|5ts#8rbUJmm9rGy1ts-@qJn%bvdO_Ji=TL)c>>pGQ@r>tCJRNO)#XD-K$T6j zA~ODSW(Ur1gR~o)GTqiQ z_^+aYAGj<2&$B~o@gb!wZKM&#Y`qW7B#=)Vj3pGp4#tvI&{1sKPNX*16IV$MgS99* z6--`E|H*gP=?yHHw#Z|JXC90>Sg&NM4m(hi<;wO(UgFmv2|}Av`X5-(<@6uw zaRK0f>|4mYjY^VRpvCT$(Cx_I1G7Ah44h=_5ZcH`hgGD;CV+KJ3C)NevNe*DO>ue$ zg{=P3vP!g!!Q_ytOy`#@p9H${g*%{&yi_M=VHd;I$ddU9^)Or-9w`lviX~6g<(1BZ zw33Quhw7xvS7hQzo<&-Y%F_s)Sf>VQ!KzY!<*X@n$Rf`*v`leLr9_2+hUErP3Q1f% zVnnZFP|kmPW==Dwk3X!C3=^kfS$}vofzjatX+W@Q4U(b`s%VFP7r0{Sr6jSKn)0hl zx*_8;P9DepT9qEhM3FZ}bC(7?VzpK80xcHP*<%Z$1YANZ+&Ox~P-I4A-mb@OyZw~H zjnm&EW%ntbB*ckmIjcboIHQ7urH-Z)0>QM(gz4=6!Oq6=3bX4ZV3rU|5H>QcX%I3> zDuksQsmp04U(Dv#kmUtFMh*$XFnD|~ykF zw_x(Y$bryMMl>@;-Y2~f0G)v{tWOXd4RKl~i8y|W7Lq*|xAjiq?M*OAJ|R*^508~b z`br}*b+oF(#M7#UM#Y;eWs?fOEANq(cadA3-6|l6^zLvA(+GHp^zu+^#FM0MKnr3U zlOOQ}=_m&!FOWnNPFGYX@=7z3L2atTt&LM0Q5nIRG`tO{cFL z@k?|HB%xD}cGB9E*njFm3fbaeiza2}=$%BV)H2%$r6WSR^ppcf&!j`1HiQ#S2^XQZ zDfEg6FePUr`xN#7qh96Q$h_JdlTcm&B8KHBE|oPHR7qMyi+Q zLF5gCn35!+kko}v1#V6&CgCKium`6X6SVq(9+03N95O+fj$|clQc~o2twK%{I0oSb zK1(VSUI{tDFx9XrMnIurOd2MRCSL@<^A&dsgrjg2Gz^mrsc$HL0Mk!J$R+ovJ^b!nP5Gdgky8|Qrr4hs{|U%v||x zEt{|;$ zT#|&0RwRlj@q}`0hq8rFf=9r0%k22q5=O=UV{Y@zVil<1S9Oo+>5Ip)A- zi`4gsp2Ay!M}SZ*zy8VD4~b)u>x}gxN76BY{EBGVdo26}ZWL*|ZTAA>C?;Zu?r z(8wV-^fU&fhZYEQu0g#p1JrqEj15Ha}A=@X-Y&& z3GiShfgM<2Gk6k)HWkTfrpMZZy+e7i!FHVOwX&KaIVW;Wg1r!puP2L@p95JcF?YOI zIX4YVvYQD<$Rmj|3&qJEldOS)#=xMavdgqoQmVq#cZBSb9Hx6mQ_;UoS#er^vLEJCstB%!QsRzjnLaf9<*HeTQ$`e?Bl5JR1Dd&~Jr*E%Jx|Jl*jhYOJ<* zpJ#UG)eHs=JiPN$2pJ=1vopxMC?jK~Q6!X>h2Sia`dNw{7(f%M8`W7es0tWF|4Py1SUx(I@W^$mgr?+?$Z8;G%Cf0Nz@ z#SkD?_+G}tIA<Q# zcMBa{ZWiQZB~0%)>VqBG1yF;|nh9gpZtGnTXlFCtT`is+lmObwgrxcA@U*ZcVW~5% zR-x;8@xt$z2@GHOn8+|prwQazD6{&C02tZhXiT|?i=ZcRnB##V#4;9>fFhwHr0Bns z{2m+aP9t?YW||sh%c1f}17wBI*$_=Y&$^Qa*4f3f@Y{CTws9nAaXyQN3JLe_Hotpx zK>j9Q7{~g90rGN6D=$p~A}u7jK%LAeJfllTm)6M0!J!X&BpXM1V6svSje|bKy!HHm z8OI)lc$(mJGKC!%X@)O~cGoCcE*CRl`)iOnwFG4Nd=o!chUbiyPT}N(d$-`@!O|!W z3Q!4)>K4?NJhvifibxwci?)?gkUvg{PTT|)M*O*am0m1>a0-0rC;<4gYNJKCw1g{d zK){mbNFzJY)I^m)vXIJ%zXpxs1)xDk76ljXvGrcSpmRz0Zm?h(30SxE5|BcHcBA>t zBoY-WCaazvl84C%$C``@N@Ax2xODA z1JgroeA9&D^QyQJ;mhY(xHq9j(G4iKhUY0@QiEqG6bUZLKER@6o@;#HtBvQ$|*f)bpPAs$G zvP$Qaa5%!4ScY{$Ax4lFkv)BE)Vlw1U|04Kw()@6NIOk$*>M$tR|DT-b>P25htp~`buLsIypy<429pSUizr!BW43U2Z1ww5Gknj z@=&B`fE8f}vHUI5n+8Nvanuj9gpjF{J*a&OU!7tPirAB0eqjz|spGYc!gZ*}5dlmh z_ojlQP(?(y`lap46FVdjYV?VTBEl?rl0b>0C=do2+)5g(oPUf%m{nCqtc;1#5IMk1 zYn${c#VC+^lO9d1XF_%r**4_RHKqq#iAU&m*vL4^fao(!ClDU%3~8fvUJ6N-iN045 z%G$s?e^R%DO!bIwN1x>Rr3Hi{_c&kkBpwLGuGmJ{1INC9Xso|9Hc%QO6^h`<h+w ztX10S;g=lPo@FyP1BZbPTe3Dz)kL^BY(l)ik`4hOMZv0zb9Tv%9>RbQB(eO_vZl2J zh5!G3oBjKaZ#)0Y^=0=Tcs}X<5#NvcuLnxO%b{X86IqQ8{ZM<#|9p|R3Qt#bB~%6+ zpQoo07ER>B9-n)saL8pr$$9N263YVlYAo$IWJ&&lJn>B01+L1@O8~|u&LJ1Jcui#Y z4CW4LPzqv^oeEt-t%>0XcS`a(^Z{aSu(oNZm;DTqLq1Bnqkqy-@JH%3rB!$aXbXn{ z-p`E=TkkXHGs$ZqUyDC5Hbg&GX+`1G5kArpq1UYF;4s!~UYDv4%gtodL>O`(REVDA zmeb<;0Qt;IMQAr@d0|tNayXBObf$nvAQn^J=cx(`f(qnLfP5tM6kNn(d$c?%{VeTy zxe-9rSi><00BF$8KMS| z_BmPsu{M(CqIe7u1>|RA8&64*>46H`W#BpEFKAgH6;|b+3jYIqft??Yk)Rc&mn2cnmRd`ub)ji-3;Amw%Oh z8zD4L8^!#&7eymMc92i8b&|t*&qypOLO}z< zktD>t)iYJA6bHnJv2jaBYgvB52UVDo=QWW-q%0%OsneQIQ?Ov-BnVt`JYh_CNi@iv zyA0$iwm7zCF3(_caA?`t;#H`Lg0e7|_kJ*w;8+e>U`BCfKn4oYJ&lOYOHfn=tVJ6s z#SESZq5@(A;Sv%rphVcFaxVnq<@pi28Z~QnUT(GW0mpiDwgW2_+3eVL1IF75Ugs=e zTOs9T*9q1Np6Z5uu8Ixh7=#xgk9p881o0RiqE6=037GG4M*`$0CBuiK@fINBK@fSec^4;Ph%1=HvaKnt5##nogDEG1t>WU(B!)=-KPH(Z z2g^5Jn5FZ<7}*?j5h4rNdlF_Om>0n;_?jSvcrZ&CuN-EB;L)81(1ItLUz_G?Y4K7I z47orW8yqG!86n<0A{xB0LGRg;!A??)PA0|C-xRs%^{(2=8p$vptf6_{u=OH4>PD8R zK(j1KAd6_%ln&7rq3aRJg{bqgkFYTLnB*}Nl8e-@4DYFopws$<?Xr@H6`W;UlJAq7on zU>6Z+fxpk1N+QbkCH7CKns#f5ztuJ~yu7P)_>QekC`8ODBnJWbb>3Q{qZgzuz(H`) zO`NJ0woKI;2GUnQ%?!CmbOh>Ahj{Th;&{?*I7?=uJ8jR+Ahwq>%>ZoAc;B%6O@t-{ z`<-O$!Jn(R!-8?r=uxB|yqjdJV;QGrR$&hdkg8)cI0ZxR*OG)#gb|ZVmOQT&u)XMp z02XFG5LUJ*=+qQR5p_gvEg2gm{D>COGxyR+gK$%%nJ$2`;hM#9(q&w&)8c(@qbvfz zn~sxi%%Noj1~LNi5%nwd3Y&t=xTonj3ylSjf@ZH_*&^Pf^FU2UG!Oy(3)x)?_G17^K4MO}% zpoj(3IwhNjS|vgQaE&;mg`_}qJLq@S4}&o8?3wAny<8Z!xr3PoCgiL$*ZId1CW`5O z4`m=WQmmNsoEtfK`NWQGuSH+M3$r73Zq^^r@>!U6`@K?Oe@UqOr`k-#FFYORH4TV( zTeJ$2v2~OemBFFaX^)8#0=?Gw1)+z{&`v_1PUd8BSr%*s>%MiWcerhzm zLJuqYWXp?M@u$__uK)$MT0?229JHkC4?&9uW26y(Iyv?55>mcKS0g&4RH-b*w`d9y zS*U`{;)TpPXxXGZfnvJ-@39#&%~1i6htJa>M-~T2ghk6<^}=^qPSiibHsCTwPh!B{ zO(}wa@g(F6l+Cr-o(E)N@<7>dX@`r^sKJwI-BMLRqq=}HtSp-{l=mM#-SdL)Zu7rH zfvI0ZJZtpx(>LXB?@{R!Xj^$8w|Yr07^gshMkgj4fJQCoVv-F7qQVi+q!VP5m|bYz z96$2m#o~Ii{QR+03H4LF$M1D|E~c_2J95Z-e9y=`0{=#GY7ct2522bVP&sSRQ+p8X zl?7!_O=eO2hshxw9)2L3l+g^(ST`L{#Y?0%eJlHqoSM~x$M8QFK#2PtFTQdUHWpEI1w@D+f516sVDDPuszrx;z)dRDYn5TT(>d46@N>($) zV!bC((jQ`ANxwq^0dfrYbA(<&CW;2dE4n;GI}1Y87M(F^Wcf_(}62QSa$Gq!Xu^BbV&uor`8vzJJ z)PS^cNX-&*G9JGm5g|!q4y|bBFao40smqf32|k6k)c_r!nLa&}|`g2t;N8zeNcfIt$h_fn{sNxNpi5!8r0C1T<%{JBU%iH0{#G zYGYsC0EuE))+#ACYqF%oni@lZWN^ofi(zJY_7d)^k89hz4Qj-+r<+V0YFaK?@MlF# zh9lyDqAm#s-fL14V{F1V*<=Mor0>7_cZJQLl&?8X0HzupXopQitmD&h{C1(gidj5&Q9c-Kf zY7U-YQ87EErn=EeggSgip`c(TzEE#yApoi8$|ZymWv=oGn+}!wJ^&b|9e^29A! zRS^MuA$QjT&Tx$xe;I6!sia&uRa^_5YpRwyTk}d43d8GPsXS=>lKy^cimPZ;T$3@KtlD<<?=pk34+P5Ci=fIGBIh%Zkq#^z`&5@ny>SW~Yo5m&055OS8yaZ?qmfX+NMW z6<(JsVY*&6LJ0kO9ygeT3+qHq5m;n_tkd*+%Bq>@u};t+)OsYD#0VUWLrC!+nN3uZ z*~ifmlLd)1Gu;{FkM1smLINN>PC|(Fc|tjipCc0J?Lvxg>=VOyK^6`R9cbFqc$`C6e^W5iuI*9A)cGeDODz@ zy8=0I=P~kXXjL{D9(&?P_bppgxC<0%icEAl3Mh7v<9-V-Klh#W80Rl4UhIoNhg1h#&G zY7Y~~H?EHrEb2J^ zdDYr-%T{$XfWjKB2tk%K`kIzAxfjr`Wh|X1WZFRR9%Sk3ty{)7^p&3j`2+FX^EW}eZ2W0l@WlcSns94P&O zXk+r>Eu!2zd*iezRL;CQFfjdlD4Rjkk9pLj`1J))j8cYbkR}6Fn3dqV9 zWQ`eSWHgX{CasihsBAHe7zrHwW+oYkkaS&jlV*Zi^*)A5p2AJ9rbmFuBR|JpId(w1 zLXt8ldACY@a`ese$nxpal`{l`mrnC4evz48SPE_}n(zlV(5k?tgmQ}!y zCw8YF-Ii;J>FJp;2mx2bEVDyX3Be%4HYkXGo(VDe0aTVM zQ4JM44*%KsFVXy(nayS(iXWN$ihR>-07}klk3a=R64_yu7b&lDm_#Mg1_|>{I%X4%fNo?liZL?>=e@; zu1!(koC%?3UD%lx73S11^<)wgdghws<4oHn#(q#t7PeKSC!umqmmOba! zkMt2ec;5U9L`E1MX9%sY^53<5Hvg`ifHo67^;3c(bOrDb53m}Q*tYewtU$J?6h&t* ztMWCk9PU{<9sxZv_xjxPDFFTDRYr!^#}`VaGiNJHOHW^|EG_fjS^lG?-@a4_Vw@L5 zYQ42d{Tu^hd6Hxg45heom2`X9SrJ_(`MX7rN~hx8FrAT2X2+>(lV9Mn$$WxW`yH_2HE|F(hRm!aO1cdOdz+9uCyt zrb-C!Ff0L4>Uy{<_6%1s0%TPZ7sUu-8f031m)4Ga5qvP4PWFQRTq5{a-29l#1KYpa zBSPZhCu)DTKmZVX?`?#P27?^X(7ccpflf^4iD)D++9e zB-pS8@H8kNmd>mXCzcJdh<=T+iGm8nLD+CqOqmI+NW5Ec*ZG^*_j)jr7Qjd-r-K)W zU?g9WorD~x`+blS!gn;fBBn)((k-?K=p9p2NrgAP9JKMmmoRM{HyQ(*(Dwc zj#zD;fw`L&BNi+cB8l*;bV5EMOFOPy#?l+%o$)$omx8&90A{nK`}t%AX`sqMEcti0 z_B&lk=iFen^unbl1SYu0oVdgute?Iard^!C0 zGm*0tKBsZ!-^g}(?UgpKrCR}*Gcq;hE_)hu1yoyqG} zJ(A+9y*ay17VHZF!d|IoEM-B>=vpg5hllEFGC0kij9oDdEbQo=n*I(2=xdA^be-ZYgorpqxdLwbnG2+Bk(MWwk+x48w)y>a!t>k6 zF6A=dW1M1{e*9RqIwtZJnGSvBc--Agr=kWfOL?U@zoiUuJaw@d4l)&0@tB zoSC*hXo2;1ldji@k~A%&TE*pzdbZSY@Tg)?oJa*P%#PCjya#cC^8=MYcQa)G!#yXW@CkrFjGsq`iq6N-9vV3FiM$+U}7&@b(h*hn=E@x*xp+B9FbR%2Lv?zQ%Eo5 zh26D95}D-$Pu-3{A#!jG5s!|z(P!(>!@iWzMd z^d(Y|=NWz>EgNIRuoF?|BL+32+m9$KJCu3>JD?v|QU*q^klX1P@IqDqO8I!uAm%N_kp2 z3I4xES>}-Vv-GHQd(eS$dVY&J^K?ef&I8l3zs@#y52%`*?MFLsC?fVYC;2q8A`;&p z<_Gk-TETl=A^c*%^^l~-aB>4Lw(=CSS^Zi%bM!?c!8kCtX_G7-tm`K+cx}3iMhc`r zKz0rfK@MT1-)g>xy2%YywbQvi6i|Mh{PsK5T_RPJLcv*oouS~W!r+7+l!?rPUnbCH zERt{zg4;L<`96100zTLdT_837Pu@Zd(lg0O6%_+6uB(()WCQU;`7zyarjA}RzYr#% zHAbTW-8&lK@N_qw2W~=iVe2K`e&=fSJ%#8-1o*k|=7)yd4ixAEE9||+_&^uZ)(TC6 z_Vy`H9%Z(mbad~)0d($>dQ&1`y3;^Xh0wgbDiFx+EQbM%Vx3SA$QO8pxp_^D*kcB> zczEvB6RNjOzP>_un(Rawkv3?}7Y}{kKtE&g99EeBIjGz!M&kR^ummCu=x*s7ttY}l{)+D4H zX;x2<8#1J`61Mjj+1_s$G6=4g=f_akgS&g*>Rv6xWY8!TqG1Dyh;N$cuAC#7#$rTg z+gs$t*hWKv<<+G8gYv(Z|Ec`<<-aTcRr$N+@09%LOYyor%>Vot7e@j@{`N8TA{!vc0f;QlAm~tac6RZN3YQeUL5DQ*NN&>8^tkR zUZHcW)+&zj(yM3+BmCatcBLcy{sx5`)YHwBmy-Fy?PT^VGk-C2e)?~wN2dOA>Ss!S zTl$6apOijb{QdIt;zr>=%Z{JP5e>AIwbyBFn!a^l9H{7t6sODl?oE}eJIhYK_Vb9Iza0a+KMWH9X_Ip$L zBOVTdbj;o+2{*sV$ps;fs&hLI^CYX+NJ&+m*%XOhq^Onz8*XwYSbl&6#IPr4l}@t)^$(OYV5r~Vo$->fq` zPPd|Lism}dI}SG-JaXTm|5kS>K%x*YFe*vzU3CjqX`(ZDxS!@z z=nZL3hB^86#~t#6E^V_iUZj&<#f?t;J=?=+%PQ=kOoT=c-B9#EJ-GxxFSjqewywcR zq|d9FVEIgIO#J+F?(!UhAQK`%f>@nQmmyq;&tXX|d-ZMWK)id|p zx9WMOF|^K`7ll&mLpgs<8E=P(Za}~TT{V58q8KhYNgf_7c@d>yW?gkbn>M{o9PWi{ zVNOYv8rVi{F}*qh%|D+rkFMwW5}dYczP*M!*2Gp>U$`iP8`>5cj+KCpdukU45rGue z)BynT?Dz_YOBwyB4arjIDnqlUXH`L&+)&BVb(QK`Qr!zWc(66raog9R7S%ZRY+?G^ z5ed81;Fk6P#6^)1P6nB8>fvI8zDkhf%%!U+i-KCB*Z>h>%e#u?(B?CC<6f5(4wHab z(t5%Go1&`7$ct#b^O@#5mAy)Ss{1lYbXENKli|hjqhrY{pA12Pw^_RBl*LzPP+%7< z7|;v01XLyk7jKs&;XY*%f&Q!L!SPNq5bP4fSf}2mYHRQHOVm)94n;vy^WeO6s{@*> I4rB3u0gfdM*Z=?k delta 365 zcmZozz~0cnIzdW^rG#X);8IZVbW!m13(*0x0{p#QU0fr45h9Ku zA&$=8Kto(3z$!u_17M1SLmXX$fKpJsu70jT?w)Y2i({y35J-+|^F1y#Q2{o7M+W}4 z{OkCW_#64>@;h!84AAAD?5N+*q`)}2o>z*oe)C&>@dZ3g{9i#{7v%rV|8=wAf*1Vk U0*yRC0shVZ^BE162{0M}0F~}!ga7~l diff --git a/www/templates/imagedownload/js/controllers.js b/www/templates/imagedownload/js/controllers.js index 01f7611..47819d5 100644 --- a/www/templates/imagedownload/js/controllers.js +++ b/www/templates/imagedownload/js/controllers.js @@ -87,13 +87,13 @@ appControllers.controller('imageDownloadCtrl', function ($scope, $stateParams, $ console.log('Error. ' + error.code + ' ' + error.constant); }, function (progress) { //downloadprogress=(progress.loaded / progress.total) * 100; - $scope.progressprozent = Math.round(pokedexid / 721 * 100); + $scope.progressprozent = Math.round(pokedexid / 152 * 100); $scope.progressval = pokedexid; $scope.currentfile=filename; //+ downloadprogress; }); console.log(pokedexid); - if (pokedexid<721){ + if (pokedexid<152){ downloadtimer(); } else{ diff --git a/www/templates/pokemonliste/html/pokemon-detail.html b/www/templates/pokemonliste/html/pokemon-detail.html index 0f2b58d..0954e20 100644 --- a/www/templates/pokemonliste/html/pokemon-detail.html +++ b/www/templates/pokemonliste/html/pokemon-detail.html @@ -24,47 +24,82 @@
- -

- {{pokemon.pokemontext}} -

-
- - -
-
- Beschreibung -
-
- This is a basic Card with some text. -
-
- - -
-
- Typ -
-
-
+
-
+ +
+
+

Trainer Infos:

+
+
Fangchance:
+
{{pokemon.pokemonfangchance}}%
+
+
+
Fluchtchance:
+
{{pokemon.pokemonfluchtchance}}%
+
+
+
Ei-Distanz:
+
{{pokemon.pokemoneidistanz}} Km
+
+
+
Entw. ab:
+
+
+
{{pokemon.pokemonentwicklungtext}} {{pokemon.pokemonname}}-Bonbons
+
+
+
+ +
+
+
PokemonTyp {{ pokemon.pokemontypaString }}
-
-
+
+
PokemonTyp {{ pokemon.pokemontypbString }}
+
+ +

Beschreibung:

+

{{pokemon.pokemontext}}

+

Fundorte:

+

{{pokemon.pokemonfundort}}

+
+ +
+ +
+
+ Entwicklung
+
+ +
+ +
+ +
+

{{ pokemonentwicklung.pokemonpokedexid }} Bonbons

+ +

Pokedex-ID: {{ pokemonentwicklung.pokemonpokedexid }}

+
+ +
+ +
+
+
Schaden durch Attacken-Typ @@ -73,7 +108,7 @@
-
+
PokemonTyp {{ pokemonschwaeche.pokemontyptext1 }}
@@ -81,7 +116,7 @@
-
+
PokemonTyp {{ pokemonschwaeche.pokemontyptext2 }}
@@ -89,7 +124,7 @@
-
+
PokemonTyp {{ pokemonschwaeche.pokemontyptext3 }}
@@ -131,7 +166,7 @@
Attacke
-
+
Typ
@@ -151,8 +186,8 @@
{{ pokemonattacke.pokemonattacke }}
-
-
+
+
PokemonTyp {{ pokemonattacke.pokemonattacketyptext }}
@@ -171,14 +206,6 @@
-
-
- Evolution -
-
- {{ pokemon.pokemonentwa }} -
-
diff --git a/www/templates/pokemonliste/js/controllers.js b/www/templates/pokemonliste/js/controllers.js index 8defb4b..42964dc 100644 --- a/www/templates/pokemonliste/js/controllers.js +++ b/www/templates/pokemonliste/js/controllers.js @@ -94,11 +94,34 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas $scope.pokemonschwaechenliste = []; $scope.pokemonattackenliste = []; + $scope.pokemonentwicklungliste = []; // $scope.pokemon is the variable that store pokemon detail data that receive form pokemon list page. // Parameter : // $stateParams.pokemondetail(object) = pokemon that user select from pokemon list page. $scope.pokemon = $scope.getPokemonData($stateParams.pokemondetail); + var entwarr = $scope.pokemon.pokemonentwicklung.split("|"); + var entwkostenarr=$scope.pokemon.pokemonentwicklungkosten.split("|"); + var index; + for (index = 0; index < entwarr.length; ++index) { + + + var dataItemEntwicklung = { + pokemonpokedexid : entwarr[index] , + pokemonimage : $scope.getPokemonImage(entwarr[index]), + pokemonlistentyp : 1 + }; + $scope.pokemonentwicklungliste.push(dataItemEntwicklung); + + if (entwkostenarr[index]>0){ + var dataItemEntwicklung = { + pokemonpokedexid : entwkostenarr[index] , + pokemonlistentyp : 2 + }; + $scope.pokemonentwicklungliste.push(dataItemEntwicklung); + } + } + //$scope.actionDelete is the variable for allow or not allow to delete data. // It will allow to delete data when have data in the database. $timeout(function () { @@ -120,6 +143,12 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas $scope.pokemonschwaechenliste = pokedexDB.getTypenEffekte(pokedexid); };//End getPokemonList. + // getPokemonList is for get all pokemons. + // By calling pokedexDB.all() service. + $scope.getPokemonImage = function (pokedexid) { + return pokedexDB.getPokemonImage(pokedexid); + };//End getPokemonList. + // getPokemonList is for get all pokemons. // By calling pokedexDB.all() service. $scope.getStandardAttacken = function (pokedexid) { diff --git a/www/templates/pokemonliste/js/services.js b/www/templates/pokemonliste/js/services.js index 4311850..4b6ad6c 100644 --- a/www/templates/pokemonliste/js/services.js +++ b/www/templates/pokemonliste/js/services.js @@ -40,6 +40,8 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) var pokemontypen = []; var pokemoneffektlist = []; var pokemonstandardattackenliste= []; + var pokemonfundorte = []; + var pokemonimages = []; return { // Select all data from sqlite @@ -47,6 +49,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) { pokemonList = []; pokemontypen = []; + pokemonfundorte = []; //Typen einlesen var query = "SELECT * FROM tblPokemonTyp order by ID ASC"; @@ -61,17 +64,34 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) } } }); + + //Typen einlesen + var query = "SELECT * FROM tblPokemonFundorte order by ID ASC"; + $cordovaSQLite.execute(db, query).then(function (res) + { + if (res.rows.length > 0) + { + pokemonfundorte.push(''); + for (var i = 0; i < res.rows.length; i++) + { + pokemonfundorte.push(res.rows.item(i).FUNDORT); + } + } + }); + // Variable for prepare query statement to select all contracts. - var query = "SELECT * FROM tblPokemon"; + var query = "SELECT * FROM tblPokemon order by POKEDEXID ASC"; // Execute query statement from query variable. $cordovaSQLite.execute(db, query).then(function (res) { if (res.rows.length > 0) { + pokemonimages.push(''); for (var i = 0; i < res.rows.length; i++) { var dummypokedexid=''; + var dummyfundort=''; dummypokedexid=res.rows.item(i).POKEDEXID.toString(); @@ -83,6 +103,14 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) dummypokedexid='0' + dummypokedexid; } + if (res.rows.item(i).POKEMONTYPA > 0 ){ + dummyfundort=dummyfundort + pokemonfundorte[res.rows.item(i).POKEMONTYPA]; + } + + if (res.rows.item(i).POKEMONTYPB > 0 ){ + dummyfundort=dummyfundort + " " + pokemonfundorte[res.rows.item(i).POKEMONTYPB]; + } + var dataItem = { id : res.rows.item(i).ID , pokedexid : res.rows.item(i).POKEDEXID , @@ -94,6 +122,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) pokemontypbString : pokemontypen[res.rows.item(i).POKEMONTYPB] , pokemonfangchance : res.rows.item(i).POKEMONFANGCHANCE , pokemonfluchtchance : res.rows.item(i).POKEMONFLUCHTCHANCE , + pokemonfundort : dummyfundort , pokemoneidistanz : res.rows.item(i).POKEMONEIDISTANZ , pokemonentwicklungtext : res.rows.item(i).POKEMONENTWICKLUNGTEXT , pokemonentwicklung : res.rows.item(i).POKEMONENTWICKLUNG , @@ -102,6 +131,7 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) pokemonnote : res.rows.item(i).POKEMONNOTE , pokemonimage : res.rows.item(i).POKEMONIMAGE }; + pokemonimages.push(res.rows.item(i).POKEMONIMAGE); pokemonList.push(dataItem); } } @@ -208,8 +238,10 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) }); return pokemoneffektlist; }, - - + getPokemonImage: function (pokedexid) + { + return pokemonimages[pokedexid]; + }, getStandardAttacken: function (pokedexid) { diff --git a/www/test.html b/www/test.html index 61ff168..3d69b9e 100644 --- a/www/test.html +++ b/www/test.html @@ -46,7 +46,7 @@ - +
PokemonTyp