From dc68694040905a332beb859dfa41fb84c0f2108d Mon Sep 17 00:00:00 2001 From: samuele Date: Thu, 26 Aug 2010 08:47:42 +0000 Subject: [PATCH] completate funzioni active task git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@203 365432ac-a1b5-4ffd-bb28-6d3099d32164 --- .../WebUserControls/mod_activeTask.ascx | 36 +++++++++-- .../WebUserControls/mod_activeTask.ascx.cs | 25 +++++++- .../mod_activeTask.ascx.designer.cs | 58 +++++++++++++++++- GMW/GMW_Term/WebUserControls/mod_search.ascx | 3 +- .../WebUserControls/mod_search.ascx.cs | 38 ++++++++++++ GMW/GMW_Term/bin/GMW_Term.dll | Bin 32256 -> 33280 bytes GMW/GMW_Term/obj/Debug/GMW_Term.dll | Bin 32256 -> 33280 bytes 7 files changed, 149 insertions(+), 11 deletions(-) diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx index 584df26f..259dfb97 100644 --- a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx @@ -13,11 +13,35 @@ - -
- +
+ +
+
+ + + +
+
+ +
+ +
+
+ + + +
+
+ + +
+ +
+
+ + + +
- ultimo barcode scannato -
- ultimo comando digitato + \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs index 1d78d84e..7a507796 100644 --- a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs @@ -54,6 +54,8 @@ namespace GMW_Term.WebUserControls if (!Page.IsPostBack) { lblListaAttiva.Text = "Lista prelievo attiva:"; + lblBarcode.Text = "Ultimo barcode:"; + lblRicerca.Text = "Ultima ricerca:"; } disegnaControlli(); } @@ -66,13 +68,32 @@ namespace GMW_Term.WebUserControls if (memLayer.ML.isInSessionObject("CodListaAttiva")) { pnlListaPrelievo.Visible = true; - hkListaAttiva.Text = memLayer.ML.StringSessionObj("CodListaAttiva"); + hlListaAttiva.Text = memLayer.ML.StringSessionObj("CodListaAttiva"); } else { pnlListaPrelievo.Visible = false; } - // altri valori + // altri valori: barcode + if (memLayer.ML.isInSessionObject("scannedValue")) + { + pnlBarcode.Visible = true; + hlBarcode.Text = memLayer.ML.StringSessionObj("scannedValue"); + } + else + { + pnlListaPrelievo.Visible = false; + } + // altri valori: ricerca + if (memLayer.ML.isInSessionObject("searchValue")) + { + pnlRicerca.Visible = true; + hlRicerca.Text = memLayer.ML.StringSessionObj("searchValue"); + } + else + { + pnlRicerca.Visible = false; + } } /// diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs index eea4116d..2f33eebc 100644 --- a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs @@ -68,12 +68,66 @@ namespace GMW_Term.WebUserControls { protected global::System.Web.UI.WebControls.Label lblListaAttiva; /// - /// hkListaAttiva control. + /// hlListaAttiva control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.HyperLink hkListaAttiva; + protected global::System.Web.UI.WebControls.HyperLink hlListaAttiva; + + /// + /// pnlBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlBarcode; + + /// + /// lblBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblBarcode; + + /// + /// hlBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlBarcode; + + /// + /// pnlRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlRicerca; + + /// + /// lblRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblRicerca; + + /// + /// hlRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlRicerca; } } diff --git a/GMW/GMW_Term/WebUserControls/mod_search.ascx b/GMW/GMW_Term/WebUserControls/mod_search.ascx index 5ee9b6a0..a23d0610 100644 --- a/GMW/GMW_Term/WebUserControls/mod_search.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_search.ascx @@ -8,7 +8,8 @@
- + diff --git a/GMW/GMW_Term/WebUserControls/mod_search.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_search.ascx.cs index 533dab8e..d5636c67 100644 --- a/GMW/GMW_Term/WebUserControls/mod_search.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_search.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW_Term.WebUserControls { @@ -15,5 +16,42 @@ namespace GMW_Term.WebUserControls //lblTitle.Text = (string)(Session["loginName"]); } + /// + /// in caso di valore cercato... + /// + /// + /// + protected void txtRicerca_TextChanged(object sender, EventArgs e) + { + valoreRicerca = txtSearch; + } + /// + /// testo contenuto nella textbox + /// + public string txtSearch + { + get + { + return txtRicerca.Text.Trim(); + } + set + { + txtRicerca.Text = value; + } + } + /// + /// valore della scansione barcode + /// + public string valoreRicerca + { + get + { + return memLayer.ML.StringSessionObj("searchValue"); + } + set + { + memLayer.ML.setSessionVal("searchValue", value, false); + } + } } } \ No newline at end of file diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 2ad5896f93ad7e3414be9e4da0c852141bc1ef25..d9721279d694cce5d5b456e6c57fc8410068375d 100644 GIT binary patch delta 8356 zcmb_i33!y%x&F?X$z*0SNhbL-TV^4FkW4lj5*k7ZN+3W0B|roLix?mzf#{?IN-&Ti ziY%f?JP1TlLAtm^u-uImUCk(Y#@AEXz^S|@G z-+q>Vg_UR6%2j;h+Wyyvue*edzoW#nlbDt0dMGTq^1rrrJv=?7Z7WfoRBR`jZ0gF^ z94`|&z<9eKSA&C70@a}ArinyM zOlcq5Gnqf-$hwF)4-ZD&@DN$NKr3P7hC3rlBiX>pfU#yw{7mR8C} z^q4Yo7^@Ls*EQ@WvBlNG8im`;8U^E+b?^yngZTFR9~QaP<`RnNCOXFC0_RWlIE$Dx!{fBkKUc^?_#ZQI!{dy zM|~N^*_=p|d(9kKE@$Uc^dA`~7k>r79xZ0nnxyX@L}X{W=A|YW+ptd!j*V^4r4FwQ z#6Gb*5;b$0dDv5O8=IrW2+=1c4{X{wR=G#cpgG#vr|1v=iWn0=^82hYnUaU+iOK%z z616wBz|RuCT-NYNqu$nwQmZS>o(Rq^J5_ul2Klp@3Qd=Gy+7T5FBhBr7qeFJuKy?f z7pb|KWo!^v1eX9iChGi@EfQsc>~JgGifk6oS>`^AQ{0nmD|S-!FfyA|KS@-WLQ$7R zEDv04lcP;4v__|i*8&yEG892cg*F~;6}I4YIpZzo!os*PSk&1}S_#J@80USoQS1!n zVvoEY46ttTO)!tYX%W3#69YoUxWG&a4UH|tnipT+&$bx*+deRQ8cE&ZbxO7+Qme<1 zvmtv8xeT(;kS9XUG~_vu{f4{@a=?%U=ZD*$;pUTWh{l!D9(`5ZkhO@t zDn83{v%?}KC%`@t{j+xlzee#e_M;_ow_2Zeocm@T)vQu2KFnT+%WX^lHmlLe4dPV) zO;B|Xn22P*9gzPIDGPHlS-TjU)4~dSdUBp%tWGrKW>@@LZhfa-09So;6eDVlpgXxE zwy8n3Uj{u^({3pqiNWDgYK}f8Udk=N*?Tf~5L+j_dEwB#@D1N513HEwnunz#QV9|A zHgRQMC{MX`OBX8ahfGssrrj7%WVouQ&b#n-u`{od-7DVD%L|^5sMw5oGeS-y1o`37 z&sW%}rqM!$R~puQTc1@d3#Y0~{ltUeqF|k}?2wJ(%4q+Gs=Z+i*WQHu?e43kU;AWq z7wHeb=nC*~kC+qA6z}8**|wf9^T#q=pDGLIroD@{67*G{qfg8uh4R|-!PN@k?O zRFr5GyNj~axf&857dge5qMXW-0MP)X+=kz+A;@)0qRrPdF2)FG2&Vlq1P_>2M{9A# z#J-~etqAzVHY!;eo-^(m?z@7{ItCA}mQu8D*lRk7jYq3y5@?O@TT9X$f zTj(L@US_9-X*1I7)T!_ug)b_6SK;Rh?dj5IU`+kYPQNJKPCrwqYql!=zVxTld+7J+ za?X;pPvBDsL|d9{Vv*)Y;SJh?8EF3INJR>HziPx2jL=l%vbf4=DY^)bt()F({nKa8S11`r?)IquhXrXuA zdtv<&`dpgs8S1gqM$Zc1HjgZGKky(ugWF9mec^e}lTNwv9!HzKa$dK2PuT4AtapVc zL`S?QVwmKwy>c|UK8e*pJI(aTL<@ly5=#HN!nYOnD*VPL7bP=O`j5+$sTXF-CA$}z z5QY6GZ2f7Re?hXHHu>euz3zX^Z>MkkGUtxKx`3Tt3e04eq|n(w152UwU<1pg;^2E8 zH_Z-?3Z~E!Xza8m_?SPP?hMK~csoc`Kv|&^wu3YnTgpxoLXY_^bX7>s$BK}+p=55X z9M7S+(b1)pOnIcU6^ezaLfKYP7B*o%RVubo*$QZcVw)5zq>B~XrdSbGDR#e#E5@U- ztniH5%GIjLBKy)?gf5?Gr&xr0xcGnxRa)@v?cBWIuyDT zh7^W@W*UN<#0h?nnva0lP8rtVtVU{m#QJi4dz9;(a@=<+{~l)z+ImH4-cXu@ zO7nrzoKl*vq0#7I&)>`L;;~g^vS>7fGVoANwAz|!DaY0=H(1zG307mUa@dAav%zX$ z8%iBI^Pa(}S3#>4TSXgCpn}%L*(#|k&Q?jAbX!aX4ySE##^E%4kZOi@nI_OhG*f5F z^J1!3OfPXU&5yHHQA?byie8Mfji!BZw$U`{N3udE#TpYe8beDB+6gv}wj1nju<>-n zV9$X~q@xBq40b6UQ*5gIevUsELj$_8MvSUa%2(Ta%NR zX%A5|U8-0omD)A1%MDx9{xvP4dc)QM&#S3bvDLKJegbTd!8U_kLmwG&yO1Rop;LzO zR|xzW4X@A(9=D$bYcg1RQUY5{ci^cMqo;vM8eL2GD%MHmNg-NF<8*uq~yR4K_8& z!In`59$#eK9I)$YhQSskouKv@ZC7-awJqrwEvLU2#tm>?P60gM%D}t8R?u*RJpk50 zvlLrJJt!EXWd{3Cuui(wV28nOq#XwP6znE?S}}dguA$f)it5w7hK?Gp>ytHFOB*ke zT{wikU}B+iL7}2fLZVis>iidTKM+0c5$A&M4MNClGfVEw4ft7W8Y_ zZX;)GlunaULexbg6f|dl+S!rxCcBzB1T8uq~8=XH9AQ1Z*qi z8SD&LH;pt{DD?>4Niz*r0(KWg4K^EW8?86kGO)Yp{%Wk8O!_G3J@les+y{0q{SHh{ zlssj&({p(0mFzW>M)y$-zB$N+Ii4EAt^Eaq^`=&WU4_?V=_&Wcf6xwt$$jwvJ!dd^ zQa(gqfMNWrtyX6(=ow|i1dLF}P-;%tx75y@i42p^@RamL5#BO_3D`Z#4xkj?069w#$CTgcJ3IYaa$ zCE#nyx$!?*@00B+?7J{NwNrVz<1pTu(^sCy z;(GbM^6@GDU2^RIn<#$tKO|P4iSP7`VJiL|dq^9MKj?RgrBSWXjF zhB#}C;>Zt@&-Z>|>r?(^bKkC_=PCX6D8H+~IlY)s_0!mRt&%#~Y@m(Wv>9w2yGhCN zF}RCu(XM1&>`rY0t?^wt_CJ%MA;5jma&vQ!D=&N?0GgLqn!4$>oV5EdVfY2 zJHQTRY-WdGy_wVx;uH(!>XJE@vc$)2XokiyN zRGwoljd!yzTpn)YX7@m#)g3F~`&er_wMFt@Cn86DO65%FRSyG!)cy(0!A72_Mok0-d}Q`S`^&V*lW;4y|44}w8pEU z%m(jUd>Mb$`ws8q2fT;*I{pzd93YeL5Bwxc^BqS+LEkCf%}agdw1Z#jJ4T(n9{2>m z&KJV_K!;D`u`YI#ubUsBhkRz!^ZZGu4$uoo@d`iTvzzv-0w-B=rqgr?<8zxn;Bpl| z;Bx&A(7;UTUkV(ohVc-M%+%;4pPV_!bdt{i_Odyd<#dRtLGmS;r?AiD6Y&9BnOVmU z#OPN1oaVdXw4Z*N*}`98`ygWjWp-ntj%C)G4$#-|>1GLj$jtBG%zF7lzH3d(RJ*;b z(tnI>CRrd&VGdfUV>$GR{}xjYeeU06$~Kt;cbjY`M_?ypS70~fVBkq$tN<#T>Bq`2 zGVlw?6O?AU(#(aXmlg%yL|8OXPQA1WvW=b$yl2Wc)n+`wvQ2vfM`3*@@F!@3zRyja z?EOF`b#pne@%-ZenX^q_1yanzRC84d#{+9=is_6f9+NhCL-44%o4pV`Zf-XHZ}4OD z5PH@7jd?g7@TMemn&g>Pgu(Q(BAOA>67tndce3VCSwfd78o~=2za>B;k@7Bu?<;hsO3fIBTY)BA#VuH;6iT90d;?0O z6!FN|ve-#W6a2nZc!$Hsh_)-dA*BNHSf|v?NsvBMolRuL8z9G5o;o0>L}Yc+G`!zi z@h)hF#)^+N3{?`KzZ~_fcq_C(lLTLm4^xTItij>L1H2U)M-0wZd=Iiibt{mgwIs;5 z;U8zMv;oM`axzlLrk&IUW~Gfl*+we#X+S3)rJc~<4&;PSjnHdAC*1*NrA>) z=dy;jC8L|_uW4+UPmK*r=D<|fP#>MwM2jzA(so^aOC;K0L@N6Q8u8hrjh^%I7ub4M z)IMdK*m6np;wAM}OO`ZWS5K|iw2VTb$ovLsncF8e^+~XwD+T*GvB{8nhR=-HbH8C+3aJ$Oh-MR}QcbKW#o-!pLj6TIip0&a49 z7URXc9$zQ%5|15IPc3+bZRk1F{8!7Ae$&8~;Enofir{@@uHhHKOML^rRZ^V29`-0a z=fNU#)k`})wtDf0dA1Q%H||^FJ(6LaxATv!mf~~&Yd|j5N*sULf@2vrd0lngf)|cX z`Sh@9)Js)UTzj_;p44BYEnSqp9sjO%?(ZcjXLV(}Esra$*tN82XV!AolhXE$iBb1xBC=GuA%^aN6fD-hwWY>I^LB}oShlt(abma> z<<1!cuh2?SIIqhiGVrU$KG*fDZ_xL?u3vtGzSnjAk{k3ruj`iyeazoB0CHf+F3`}PHjjK8@yBWXd=LQm8miInEZIE`WhB1l`ItlS=Sxi3{8MT)!!9u zxavuYGYD($UD2lY+A!5Su~Wp77i}2;-A!6CQPl+LZBmVPW7l`ll-(#B4(6k+{4_Ap zP=pNv>!e*&(^;FQIy-SxGT7OXwQsF+W-!)IYe{;5-LKhPGudQqfvXJow(Bk6YWGOC zPHS_gu@^PPlg8fE+IxDjG1@&IjUCs%_p}>OFUN@2b%{*oc+kisKP(J9I8HordgfjV|12S_+Ei{lFi%u0oZwM`bw(7X{ zP;zp%@C_{lcU@)i=KOShzNOj)bzEfrFB`P|$;rjfV*2ccs-&1}W0D2d^BU{+f*3$U z)%5EM2mDJyTB0wFP1OG2>)%1HqcH5o$ehdiB27Few2^`h?$9u_O(h?aX7_ou{l3^p zJbx}m3;27p8QMgD_w*^U^LOdPk`$URVxq@ninh<67MuaMJhRb#m7$Nh%#Cg)Qq=)8 zr^q7WC^vzs{uZMdQhJ+3*Wz+bRXw%gDJAhD6hU#hW*(fOHKo*KbTD2E3-*K2l1oN0 zyd2|-O)iGFYJ`>>$n1FCI-eF6ps>&*fJ`2A;89hNEFnw=X7P4ZEOk$7p+FX^*LDW- z*<9^ZpiB53EQkF0?aXtq2Q2NY+7RRlVqZeO1lg_2=2)8L(PbZGuP%3joUF@(Ap3N= z60%>H>maA-vIaRI<*Vuju(sxG`oThs0Q0~txWT?_q82qTT;#-W3U#np(jOOc^wWy1F!l~sy) zwwf)=k8PKi@9Z^t_j8jV+T#(VN!AEop4yucIUPyslUR^c)fvI!Q4*e%4 z@roI`(dG03HXcf+TLz6Dg0CU^te>{EpraWphQ$2r*4heuW&J3b$ImSsw3ssmZSb!SLwPquoGaqI~nrz7gF1HBzNSwfa*2BWzI>~6HCm^R2i@$6& zQn$pz%tHGTwzoGGe>;**5yuq2Umc9IBq9v799bQ)-+EZ1RJ`@2%q zOxosJiuKp#Itu*KC7SsTc#>jqx@S_UJJ;=?x#Fa!Pu*f%zjW7{EoAZ>bp@!vQya!0 z5B7-O%$2wnXrUb*k!T;#NFPhR&ntW~B=(g!+$$z!24oAZ_lnf}ykg2OLKC2Q$+hNm zTAzH`YN1b(#mM=5`77A)1RCMLmnG0|fSI(=pX+wfF2CkaphM7D z=mS6b9Q1`>j6nvLUJlJpsWqRZhap>NV+#3LhIql!|?qO`RosOxkj&M6xxK#qy zapPfNo6Pxz@!ui874smlDfS)UQ?c&@cS_tBmXAZRCs61V(<$IKiDx91m`}hpy2RCS zc4nY0aXHYx7$=H*P2ziTNzk8)6Wur`F@tA9{z`g&FMSlN@V8lor{5~9W!7*C$V5q| zTSdPctZC4^Xl)NXBsFhK%^9gljL&9_K8`;H&*-vhxrklDMf3kCi;?I6qb>=eViE2iWqTM1=E*-GeO#70|{p;)ACQJ&rDe3WN*x)8C2W%E7h z+bCmC8h~pNQKb3aR3=%ZwBB?=vU>X7s8T8YU1yG16)Qh@tB9+o0m4Wel} zn+Z0AW=PiP35(tjqv{Bibq}K^$r|WbY=DN-L7iQY?5t!5*>|y(u#GJg4K@%rRbqQB z>KI{mlS*aOqO$g-$bnO247OI%_sxz^O1zvV-)j`4ZS6-L?~1?xo|B)zbm9 z3U)@fDVED&no8$&qsGZv1jpVg_3RcubR!Ui5_t7lL8mNm!r5RMM+sYAlKONL< zHI}Pj7j?G962n3ikNX>XPp=?uHn}CMr^AQ~&!Ga{_&$tts6=PyELQd)tAgrC^^a4jE=-qndMD^Z z6oV_ISWq*;!sON2La=(umn^a?7E^!8BE!9y#_FE_coos6ULs39^^Omq*E4lCO0os` z!(WWWR>jI1DcmAyWOFT{i#nT(G|Q;Ek8rK0S_CeqZzXG>rLZlhrKQ5wK$~D&Nv}%Q zXxbj1&sNe|oxK^~5v;VY@NAT;YZVRC*>S|JqH$r+RIJO3@uxwnbw&xNX*I2kxXKga zFJx-&*M3#Ywdz|jqSp}FzjXGNZwuYY8*-Egr^lCrca75s5 zL7$*wy74Wrb@aK;z5-iM3T}+T(_%YK&E(fvZ?Fy2S!Wes8>tNJ+DW>J3h|ahu!D+9 zPtpE?g4I)vEkG?)GzfDn=)<;dpdSnp#s;}CHj{U7go$;rg$i{hHsy0PO|nK)vuy-e zwa&KN&e2v{p|f^MG1xAh6)N4p_Umk~t(dk^8yMPeH2ne1Z==6NjB-eyClmf4yVi^6 z={CtC!@Yw>N7;7J*eKfzG)cFKLSLZuQJyc*SiJEP-8Cl$XczrXu(00WU35Yk8%Xr` zCHh>lNP{oKkI@~tx^t=k{&IPojJg@3|2L+ql&({wFuLIfe^v9*8U9HQ|LQ*dQ=(s) zC(J0)zExq(7JF zf75H3{l=dj|vNmb0pxd0nXAH1{M7zitcI-d{ zco#*I0Tjm@AT+XFF89mkJMc935?;wix<{a|xhJG`D%5#qD`OCoF{IDm0yZt*Jm4}s*vNo zXZTyZ#A{KG$Og`{iQYuz6#C~<+PIj-HZJDx7}ZGs#lQ}-8{4VLtI~PC*;}BT=i7mo z*h}7GI>lrs`62HGtTS=*Jx0g8Y$nD3 zCnZ~HQFpU6#p6EhN+k{fj-Zjs z7464?_Odhnvxa6CpYn-ey3#M@b3+k1JwFv(X?4_L?A_(3apOQQDqpxgURF^$HxV4K7<5SaV7B&rD|kWbo#=I)qj$aBs%jZAnW z!tv4uujBC>i!3JmAJ70z8IXg;Ag>u{qLFz2m59Ig@Jbx-e`2AJ1Dfbzd=hCfkmFy5 zW;~a`o=8i>cyPQ6iUWBRCKImRR)pE0<0v*B`W1MZaOF;bCJ`2f;%$&t;bX$(I}sXH zyr?AyFp(a^(}er81Nu?0aJ+IAI0Ns1I4vYM^kE>!MYf$6WIZ-3!_CzP)dq>1CB|*H47nHM|9b$?HQWM%TroE8frFby+*EX z{bXdTIc~=A>2s{QgTbN^2L^E-FxSD0VauS-#WN#DZG`2)I^ zb}Z`Hw@XRizQtP2l+mnn>wiqy%^9`UO*bg5>t=p$v{TOseZSd%XZ7&qG3TG@`@7|@ zY&ko}n1Aixx}u;(_*_|oPYux><^9X2ync4%mmey9-zXiKba;J-+f%jp`7<2Pu7#Wa h^M;U9o6=nTrM24D`O{hx7W}B7ar>gLSyN%`{{X3Sn&SWf diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 2ad5896f93ad7e3414be9e4da0c852141bc1ef25..d9721279d694cce5d5b456e6c57fc8410068375d 100644 GIT binary patch delta 8356 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